Changeset 643Tweet

Timestamp:

May 13, 2011, 9:13:53 AM (9 years ago)

Author:

Sam Hocevar

Message:

imlib: refactor Event and EventHandler?.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (2 diffs)
• automap.cpp (modified) (1 diff)
• automap.h (modified) (1 diff)
• chars.cpp (modified) (3 diffs)
• chat.h (modified) (1 diff)
• clisp.cpp (modified) (9 diffs)
• console.cpp (modified) (1 diff)
• console.h (modified) (1 diff)
• cop.cpp (modified) (8 diffs)
• demo.cpp (modified) (3 diffs)
• demo.h (modified) (1 diff)
• dev.cpp (modified) (34 diffs)
• dev.h (modified) (3 diffs)
• devsel.cpp (modified) (1 diff)
• devsel.h (modified) (1 diff)
• director.cpp (modified) (4 diffs)
• endgame.cpp (modified) (20 diffs)
• game.cpp (modified) (45 diffs)
• game.h (modified) (2 diffs)
• gamma.cpp (modified) (1 diff)
• gui.cpp (modified) (5 diffs)
• gui.h (modified) (2 diffs)
• help.cpp (modified) (1 diff)
• help.h (modified) (1 diff)
• imlib/Makefile.am (modified) (1 diff)
• imlib/event.cpp (added)
• imlib/event.h (modified) (1 diff)
• imlib/include.cpp (modified) (1 diff)
• imlib/input.cpp (modified) (7 diffs)
• imlib/input.h (modified) (4 diffs)
• imlib/jwindow.cpp (modified) (16 diffs)
• imlib/jwindow.h (modified) (9 diffs)
• imlib/mouse.h (modified) (1 diff)
• imlib/pmenu.cpp (modified) (9 diffs)
• imlib/pmenu.h (modified) (3 diffs)
• imlib/scroller.cpp (modified) (5 diffs)
• imlib/scroller.h (modified) (3 diffs)
• imlib/tools.h (modified) (1 diff)
• imlib/video.h (modified) (2 diffs)
• innet.cpp (modified) (2 diffs)
• level.cpp (modified) (7 diffs)
• light.cpp (modified) (2 diffs)
• lisp/lisp.cpp (modified) (1 diff)
• loadgame.cpp (modified) (2 diffs)
• menu.cpp (modified) (16 diffs)
• morpher.cpp (modified) (1 diff)
• net/engine.cpp (modified) (1 diff)
• net/gserver.cpp (modified) (1 diff)
• net/undrv.cpp (modified) (1 diff)
• netcfg.cpp (modified) (11 diffs)
• objects.cpp (modified) (9 diffs)
• particle.cpp (modified) (8 diffs)
• profile.cpp (modified) (1 diff)
• profile.h (modified) (1 diff)
• sdlport/event.cpp (modified) (24 diffs)
• sdlport/video.cpp (modified) (5 diffs)
• statbar.cpp (modified) (2 diffs)
• view.cpp (modified) (5 diffs)
• view.h (modified) (1 diff)

abuse/trunk/src/ant.cpp

@@ -449 +449 @@
     fade_out(8);
     wm->set_mouse_position(0,0);
-    screen->clear();
+    main_screen->clear();
     image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
-    im->put_image(screen,0,0);
-
-
-    int x1=im->Size().x+1,y1=0,x2=xres,y2=screen->Size().y;
+    im->put_image(main_screen,0,0);
+
+
+    int x1=im->Size().x+1,y1=0,x2=xres,y2=main_screen->Size().y;
     fade_in(NULL,16);
 
@@ -475 +475 @@
     int w=wm->font()->width()*strlen(msg),h=wm->font()->height();
     int x=(x1+x2)/2-w/2,y=(y1+y2)/2-h/2;
-    screen->bar(x-10,y-10,x+w+10,y+h+10,wm->bright_color());
-    screen->bar(x-9,y-9,x+w+9,y+h+9,wm->medium_color());
-
-    wm->font()->put_string(screen,x+1,y+1,msg,wm->dark_color());
-    wm->font()->put_string(screen,x,y,msg,wm->bright_color());
+    main_screen->bar(x-10,y-10,x+w+10,y+h+10,wm->bright_color());
+    main_screen->bar(x-9,y-9,x+w+9,y+h+9,wm->medium_color());
+
+    wm->font()->put_string(main_screen,x+1,y+1,msg,wm->dark_color());
+    wm->font()->put_string(main_screen,x,y,msg,wm->bright_color());
     wm->flush_screen();
     Timer now; now.WaitMs(500);

abuse/trunk/src/automap.cpp

@@ -188 +188 @@
 }
 
-void automap::handle_event(event &ev)
+void automap::handle_event(Event &ev)
 {
 

abuse/trunk/src/automap.h

@@ -24 +24 @@
   automap(level *l, int width, int height);
   void toggle_window();
-  void handle_event(event &ev);
+  void handle_event(Event &ev);
   void draw();
   ~automap() { if (automap_window) toggle_window(); }

abuse/trunk/src/chars.cpp

@@ -170 +170 @@
     if (t->tiv <= number || !t->vars[number])
     {
-        lbreak("access : variable does not exsist for this class\n");
+        lbreak("access : variable does not exists for this class\n");
         return 0;
     }
@@ -181 +181 @@
   if (t->tiv<=number || !t->vars[number])
   {
-    lbreak("set : variable does not exsist for this class\n");
+    lbreak("set : variable does not exists for this class\n");
     return;
   }
@@ -192 +192 @@
   if (t->tiv<=number || !t->vars[number])
   {
-    lbreak("access : variable does not exsist for this class\n");
+    lbreak("access : variable does not exists for this class\n");
     return;
   }

abuse/trunk/src/chat.h

@@ -18 +18 @@
 
   public :
-  int chat_event(event &ev) { if (!con_win) return 0; else return con_win==ev.window; }
+  int chat_event(Event &ev) { if (!con_win) return 0; else return con_win==ev.window; }
   void draw_user(char *st);
   void put_all(char *st);

abuse/trunk/src/clisp.cpp

@@ -1200 +1200 @@
 
     case 50 : dev_cont->add_palette(args); break;
-    case 51 : write_PCX(screen,pal,lstring_value(CAR(args))); break;
+    case 51 : write_PCX(main_screen,pal,lstring_value(CAR(args))); break;
 
     case 52 : the_game->zoom=lnumber_value(CAR(args)); the_game->draw(); break;
@@ -1216 +1216 @@
     case 59 : return menu(args,big_font); break;
     case 60 :
-    { event ev; dev_cont->do_command(lstring_value(CAR(args)),ev); return 1; } break;
+    { Event ev; dev_cont->do_command(lstring_value(CAR(args)),ev); return 1; } break;
     case 61 : the_game->set_state(lnumber_value(CAR(args))); break;
 
@@ -1294 +1294 @@
       the_game->game_to_mouse(x1,y1,current_view,cx1,cy1);
       the_game->game_to_mouse(x2,y2,current_view,cx2,cy2);
-      screen->line(cx1,cy1,cx2,cy2,c);
+      main_screen->line(cx1,cy1,cx2,cy2,c);
       return 1;
     } break;
@@ -1844 +1844 @@
       int32_t y1=lnumber_value(CAR(args)); args=lcdr(args);
       int32_t id=lnumber_value(CAR(args));
-      cache.img(id)->put_image(screen,x1,y1,1);
+      cache.img(id)->put_image(main_screen,x1,y1,1);
     } break;
     case 217 :
@@ -2044 +2044 @@
       int32_t cy2=lnumber_value(CAR(args)); args=lcdr(args);
       int32_t c1=lnumber_value(CAR(args)); args=lcdr(args);
-      screen->bar(cx1,cy1,cx2,cy2,c1);
+      main_screen->bar(cx1,cy1,cx2,cy2,c1);
     } break;
     case 248 :
@@ -2183 +2183 @@
       int y=lnumber_value(CAR(args));
       c_target=id;
-      if (screen)
+      if (main_screen)
         wm->set_mouse_shape(cache.img(c_target)->copy(),x,y);
     } break;
@@ -2204 +2204 @@
       if (args)
         color=lnumber_value(CAR(args));
-      fnt->put_string(screen,x,y,st,color);
+      fnt->put_string(main_screen,x,y,st,color);
     } break;
     case 278 : return ((JCFont *)lpointer_value(CAR(args)))->width(); break;
@@ -2222 +2222 @@
       int32_t y2=lnumber_value(CAR(args));   args=CDR(args);
       int32_t c=lnumber_value(CAR(args));
-      screen->bar(x1,y1,x2,y2,c);
+      main_screen->bar(x1,y1,x2,y2,c);
     } break;
     case 283 :
@@ -2231 +2231 @@
       int32_t y2=lnumber_value(CAR(args));   args=CDR(args);
       int32_t c=lnumber_value(CAR(args));
-      screen->rectangle(x1,y1,x2,y2,c);
+      main_screen->rectangle(x1,y1,x2,y2,c);
     } break;
     case 284 :

abuse/trunk/src/console.cpp

@@ -195 +195 @@
 }
 
-int shell_term::handle_event(event &ev)
+int shell_term::handle_event(Event &ev)
 {
   if (ev.window==con_win && con_win)

abuse/trunk/src/console.h

@@ -48 +48 @@
   shell_term(JCFont *font, int width, int height, char const *Name);
   virtual ~shell_term() { };
-  int handle_event(event &ev);
+  int handle_event(Event &ev);
   virtual void prompt();
   virtual void execute(char const *st);

abuse/trunk/src/cop.cpp

@@ -829 +829 @@
     player_draw(just_fired,o->get_tint());
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_health_image)->put_image(screen,o->controller()->cx2-20,
+      cache.img(S_health_image)->put_image(main_screen,o->controller()->cx2-20,
                         o->controller()->cy1+5,1);
       } break;
@@ -850 +850 @@
     o->state=(character_state)old_state;
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_fast_image)->put_image(screen,o->controller()->cx2-20,
+      cache.img(S_fast_image)->put_image(main_screen,o->controller()->cx2-20,
                         o->controller()->cy1+5,1);
       } break;
@@ -871 +871 @@
 
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_fly_image)->put_image(screen,o->controller()->cx2-20,
+      cache.img(S_fly_image)->put_image(main_screen,o->controller()->cx2-20,
                         o->controller()->cy1+5,1);
       } break;
@@ -884 +884 @@
 
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_sneaky_image)->put_image(screen,o->controller()->cx2-20,
+      cache.img(S_sneaky_image)->put_image(main_screen,o->controller()->cx2-20,
                         o->controller()->cy1+5,1);
       } break;
@@ -1031 +1031 @@
         strcat(msg," <<");
 
-      fnt->put_string(screen,x,y,msg,color);
+      fnt->put_string(main_screen,x,y,msg,color);
       y+=fnt->height();
     }
@@ -1046 +1046 @@
   fade_out(8);
   wm->set_mouse_position(0,0);
-  screen->clear();
+  main_screen->clear();
   image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
-  im->put_image(screen,0,0);
-  int x1=im->Size().x+1,y1=0,y2=screen->Size().y;
+  im->put_image(main_screen,0,0);
+  int x1=im->Size().x+1,y1=0,y2=main_screen->Size().y;
   JCFont *fnt=wm->font();
 
@@ -1057 +1057 @@
   int y=(y1+y2)/2-(tp+2)*fnt->height()/2,x=x1+10;
   char const *header_str = symbol_str("score_header");
-  fnt->put_string(screen,x,y,header_str,wm->bright_color());
+  fnt->put_string(main_screen,x,y,header_str,wm->bright_color());
   y+=fnt->height();
 
-  screen->widget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3,
+  main_screen->widget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3,
              wm->bright_color(),wm->medium_color(),wm->dark_color());
   y+=fnt->height();
@@ -1075 +1075 @@
 
     sprintf(msg,"%-17s %3ld  %3ld",max_name,(long)v->kills,(long)(v->tkills+v->kills));
-    fnt->put_string(screen,x,y,msg,color);
+    fnt->put_string(main_screen,x,y,msg,color);
 
     y+=fnt->height();

abuse/trunk/src/demo.cpp

@@ -38 +38 @@
 extern void fade_out(int steps);
 
-void get_event(event &ev)
+void get_event(Event &ev)
 { wm->get_event(ev);
   switch (ev.type)
@@ -168 +168 @@
   while (*c) { if (*c=='\\') *c='/'; c++; }
 
-  bFILE *probe=open_file(tname,"rb");   // see if the level still exsist?
+  bFILE *probe=open_file(tname,"rb");   // see if the level still exists?
   if (probe->open_failure()) { delete record_file; delete probe; return 0; }
   delete probe;
@@ -209 +209 @@
       l_difficulty = initial_difficulty;
       the_game->set_state(MENU_STATE);
-      wm->push_event(new event(ID_NULL,NULL));
+      wm->Push(new Event(ID_NULL,NULL));
 
       view *v=player_list;

abuse/trunk/src/demo.h

@@ -40 +40 @@
 extern demo_manager demo_man;
 
-extern void get_event(event &ev);
+extern void get_event(Event &ev);
 extern int event_waiting();
 

abuse/trunk/src/dev.cpp

@@ -181 +181 @@
         wm->flush_screen();
 
-        event ev;
+        Event ev;
         wm->get_event(ev);
         if(ev.type == EV_MESSAGE && ev.message.id == ID_QUIT_OK)
@@ -257 +257 @@
   {
     char *name=search_window->read(ID_SEARCH_TEXT);
-    int type=-1;    // see if this type exsists
+    int type=-1;    // see if this type existss
     int i;
     for (i=0; i<total_objects; i++)
@@ -265 +265 @@
     {
       char msg[60];
-      sprintf(msg,"Object type '%s' does not exsists!\n",name);
+      sprintf(msg,"Object type '%s' does not existss!\n",name);
       the_game->show_help(msg);
       the_game->need_refresh();
@@ -295 +295 @@
       else
       {
-    the_game->show_help("No object matching name exsist in level\n");
+    the_game->show_help("No object matching name exists in level\n");
 
       }
@@ -339 +339 @@
   } else
   {
-    event ev;
+    Event ev;
     dv->do_command(st,ev);
   }
@@ -482 +482 @@
     {
       image *im=cache.img(light_buttons[f->type]);
-      im->put_image(screen,f->x-vx+v->cx1-im->Size().x/2,f->y-vy+v->cy1-im->Size().y/2,1);
-      screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
+      im->put_image(main_screen,f->x-vx+v->cx1-im->Size().x/2,f->y-vy+v->cy1-im->Size().y/2,1);
+      main_screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
                 wm->medium_color());
     }
@@ -493 +493 @@
       int32_t rx1,ry1;
       the_game->game_to_mouse(link_object->x,link_object->y,v,rx1,ry1);
-      screen->line(rx1,ry1,dlastx,dlasty,yellow);
+      main_screen->line(rx1,ry1,dlastx,dlasty,yellow);
     }
 
@@ -502 +502 @@
       int32_t rx1,ry1;
       the_game->game_to_mouse(selected_light->x,selected_light->y,v,rx1,ry1);
-      screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color());
+      main_screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color());
     }
 
@@ -511 +511 @@
     the_game->game_to_mouse(o->x,o->y,current_view,x1,y1);
     char *nm=object_names[o->otype];
-    console_font->put_string(screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm);
+    console_font->put_string(main_screen,x1-strlen(nm)*console_font->width()/2,y1+2,nm);
       }
 
@@ -526 +526 @@
       game_object *other=o->get_object(i);
       the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);
-      screen->line(x1,y1,x2,y2,wm->bright_color());
+      main_screen->line(x1,y1,x2,y2,wm->bright_color());
     }
 
@@ -533 +533 @@
       light_source *l=o->get_light(i);
       the_game->game_to_mouse(l->x,l->y,current_view,x2,y2);
-      screen->line(x1,y1,x2,y2,light_connection_color);
+      main_screen->line(x1,y1,x2,y2,light_connection_color);
     }
 
@@ -545 +545 @@
       the_game->game_to_mouse(x1,y1,v,rx1,ry1);
       the_game->game_to_mouse(x2,y2,v,rx2,ry2);
-      screen->rectangle(rx1,ry1,rx2,ry2,wm->bright_color());
+      main_screen->rectangle(rx1,ry1,rx2,ry2,wm->bright_color());
 
       the_game->game_to_mouse(selected_object->x,selected_object->y,current_view,x1,y1);
@@ -552 +552 @@
     game_object *other=selected_object->get_object(i);
     the_game->game_to_mouse(other->x,other->y,current_view,x2,y2);
-    screen->line(x1,y1,x2,y2,light_connection_color);
+    main_screen->line(x1,y1,x2,y2,light_connection_color);
       }
     }
@@ -976 +976 @@
 }
 
-void dev_controll::do_command(char const *command, event &ev)
+void dev_controll::do_command(char const *command, Event &ev)
 {
   char fword[50];
@@ -1036 +1036 @@
       current_level->unactivate_all();
 
-      if (screen)  // don't draw if graphics haven't been setup yet.
+      if (main_screen)  // don't draw if graphics haven't been setup yet.
         the_game->draw();
       player_list->reset_player();
@@ -1516 +1516 @@
 
 
-void dev_controll::area_handle_input(event &ev)
+void dev_controll::area_handle_input(Event &ev)
 {
 
@@ -1554 +1554 @@
 }
 
-void dev_controll::pick_handle_input(event &ev)
+void dev_controll::pick_handle_input(Event &ev)
 {
   area_controller *find=NULL;
@@ -1627 +1627 @@
 int sshot_fcount=-1;
 
-void dev_controll::handle_event(event &ev)
+void dev_controll::handle_event(Event &ev)
 {
   int32_t x,y;
@@ -1637 +1637 @@
   }
 
-  if (dev_menu && dev_menu->handle_event(ev,screen)) return ;
+  if (dev_menu && dev_menu->handle_event(ev,main_screen)) return ;
 
   if (!current_level) return ;
@@ -1652 +1652 @@
 
   if (ev.type==EV_KEY && ev.key==JK_F2)
-    write_PCX(screen,pal,"scrnshot.pcx");
+    write_PCX(main_screen,pal,"scrnshot.pcx");
   else if (ev.type==EV_KEY && ev.key==JK_F3)
   {
     char name[100];
     sprintf(name,"shot%04d.pcx",screen_shot_on++);
-    write_PCX(screen,pal,name);
+    write_PCX(main_screen,pal,name);
   } else if (ev.type==EV_KEY && ev.key==JK_F5)
   {
@@ -2049 +2049 @@
       sprintf(cmd,"load %s",mess_win->read(ID_MESS_STR1));
       dev_cont->do_command(cmd,ev);
-      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+      wm->Push(new Event(ID_CANCEL,NULL));        // close window
     } break;
     case ID_GAME_SAVE :
@@ -2086 +2086 @@
       {
         current_level->set_name(mess_win->read(ID_MESS_STR1));
-        wm->push_event(new event(ID_CANCEL,NULL));        // close window after save
-        wm->push_event(new event(ID_LEVEL_SAVE,NULL));
+        wm->Push(new Event(ID_CANCEL,NULL));        // close window after save
+        wm->Push(new Event(ID_LEVEL_SAVE,NULL));
       }
     } break;
@@ -2127 +2127 @@
     case ID_LEVEL_NEW_OK :
     {
-      wm->push_event(new event(ID_CANCEL,NULL));  // close_window
+      wm->Push(new Event(ID_CANCEL,NULL));  // close_window
       if (current_level)
         delete current_level;
@@ -2153 +2153 @@
                     atoi(mess_win->read(ID_MESS_STR2)));
       } else the_game->show_help("Create a level first!");
-      wm->push_event(new event(ID_CANCEL,NULL));  // close_window
+      wm->Push(new Event(ID_CANCEL,NULL));  // close_window
     } break;
 
@@ -2201 +2201 @@
     {
       demo_man.set_state(demo_manager::RECORDING,mess_win->read(ID_RECORD_DEMO_FILENAME));
-      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+      wm->Push(new Event(ID_CANCEL,NULL));        // close window
     } break;
 
@@ -2258 +2258 @@
                     symbol_str("WARNING"));
         wm->grab_focus(warn_win);
-      } else wm->push_event(new event(ID_SET_SCROLL_OK,NULL));
+      } else wm->Push(new Event(ID_SET_SCROLL_OK,NULL));
     } break;
     case ID_WARN_CANCEL :
     {
       wm->close_window(warn_win); warn_win=NULL;
-      wm->push_event(new event(ID_CANCEL,NULL));
+      wm->Push(new Event(ID_CANCEL,NULL));
     } break;
     case ID_SET_SCROLL_OK :
@@ -2272 +2272 @@
       bg_ymul=atoi(mess_win->read(ID_MESS_STR3));
       bg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
-      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+      wm->Push(new Event(ID_CANCEL,NULL));        // close window
     } break;
 
@@ -2311 +2311 @@
       char const *s=name;
       LObject::Compile(s)->Eval();
-      wm->push_event(new event(ID_CANCEL,NULL));        // close window
+      wm->Push(new Event(ID_CANCEL,NULL));        // close window
     } break;
     case ID_TOGGLE_DELAY :
@@ -2324 +2324 @@
     case ID_CLEAR_WEAPONS :
     {
-      event ev;
+      Event ev;
       do_command("clear_weapons",ev);
     } break;
@@ -2761 +2761 @@
       case 'A' : { if (selected_object)
                {
-             if (oedit) wm->push_event(new event(DEV_OEDIT_OK,NULL));
+             if (oedit) wm->Push(new Event(DEV_OEDIT_OK,NULL));
              make_ai_window(selected_object);
                }
@@ -2825 +2825 @@
       if (selected_object && selected_object->controller()==NULL)
       { copy_object=selected_object;
-            wm->push_event(new event(DEV_OEDIT_COPY,NULL)); } break;
+            wm->Push(new Event(DEV_OEDIT_COPY,NULL)); } break;
 
       case 'D' : the_game->toggle_delay(); break;
@@ -2872 +2872 @@
         {
           v->god=!v->god;
-          sbar.redraw(screen);
+          sbar.redraw(main_screen);
         }
       } break;
@@ -3026 +3026 @@
 }
 
-void pal_win::handle_event(event &ev)
+void pal_win::handle_event(Event &ev)
 {
   int d=cur_fg;
@@ -3573 +3573 @@
          new pmenu_item(symbol_str("file_top"),new psub_menu(i_recurse(filemenu),NULL),
      new pmenu_item(symbol_str("edit_top"),new psub_menu(i_recurse(editmenu),NULL),
-     new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),screen);
+     new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),main_screen);
 }
 

abuse/trunk/src/dev.h

@@ -41 +41 @@
   void open_window();
   char *name;
-  void handle_event(event &ev);
+  void handle_event(Event &ev);
   pal_win(void *args);
   void resize(int xa, int ya);
@@ -101 +101 @@
   void show_mem();
   dev_controll();
-  void handle_event(event &ev);
-  void do_command(char const *st, event &ev);
+  void handle_event(Event &ev);
+  void do_command(char const *st, Event &ev);
   int is_pal_win(Jwindow *win);
   void dev_draw(view *v);
@@ -115 +115 @@
   int32_t snap_x(int32_t x);
   int32_t snap_y(int32_t y);
-  void area_handle_input(event &ev);
-  void pick_handle_input(event &ev);
+  void area_handle_input(Event &ev);
+  void pick_handle_input(Event &ev);
   void close_area_win(int read_values);
   void notify_deleted_object(game_object *o);

abuse/trunk/src/devsel.cpp

@@ -147 +147 @@
 
 
-void tile_picker::handle_inside_event(event &ev, image *screen, InputManager *inm)
+void tile_picker::handle_inside_event(Event &ev, image *screen, InputManager *inm)
 {
   if (ev.type==EV_MOUSE_BUTTON)

abuse/trunk/src/devsel.h

@@ -19 +19 @@
   tile_picker(int X, int Y, int ID, int spec_type,
          int scale, int scroll_h, int Wid, ifield *Next);
-  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
+  virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm);
   virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }

abuse/trunk/src/director.cpp

@@ -44 +44 @@
 {
   int cx1, cy1, cx2, cy2, word_size, word_len;
-  screen->GetClip(cx1, cy1, cx2, cy2);
-  screen->InClip(x1,y1,x2+1,y2+1);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->InClip(x1,y1,x2+1,y2+1);
   int h=font->height()+2,w=font->width(),x=x1,dist;
   y+=y1;
@@ -107 +107 @@
       while (word_len--)
       {
-    font->put_char(screen,x+1,y+1,*word_start,0);
-    font->put_char(screen,x,y,*word_start,c);
+    font->put_char(main_screen,x+1,y+1,*word_start,0);
+    font->put_char(main_screen,x,y,*word_start,c);
     word_start++;
     x+=w;
@@ -115 +115 @@
 
   }
-  screen->SetClip(cx1,cy1,cx2,cy2);
+  main_screen->SetClip(cx1,cy1,cx2,cy2);
   return (y<=y1);
 }
@@ -179 +179 @@
     while (wm->event_waiting())
     {
-      event ev;
+      Event ev;
       wm->get_event(ev);
       if (ev.type==EV_KEY)

abuse/trunk/src/endgame.cpp

@@ -185 +185 @@
 
 
-  screen->clear();
+  main_screen->clear();
   int c[4]={ pal->find_closest(222,222,22),
         pal->find_closest(200,200,200),
@@ -197 +197 @@
     *(si++)=jrand()%200;
     *(si++)=c[jrand()%4];
-    screen->PutPixel(vec2i(si[-3],si[-2]),si[-1]);
+    main_screen->PutPixel(vec2i(si[-3],si[-2]),si[-1]);
   }
   int32_t paddr[256];
@@ -214 +214 @@
 
 
-  scan_map(screen,ex,ey,cache.img(planet),cache.img(planet2),0,paddr,p,cache.img(mask)->Size().y,eoff,coff);
+  scan_map(main_screen,ex,ey,cache.img(planet),cache.img(planet2),0,paddr,p,cache.img(mask)->Size().y,eoff,coff);
   image *tcopy=cache.img(planet)->copy();
   fade_in(NULL,32);
@@ -231 +231 @@
 
       old_time.get_time();
-      screen->clear();
+      main_screen->clear();
       int j;
       for (si=sinfo,j=0; j<800; j++,si+=3)
-        screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
+        main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
 
       if (i>=30 && i<=37)
@@ -240 +240 @@
     cache.img(planet)->put_image(tcopy,0,0);
     cache.fig(explo_frames1[i-30])->forward->PutImage(tcopy,vec2i(100,50));
-        scan_map(screen,ex,ey,tcopy,
+        scan_map(main_screen,ex,ey,tcopy,
            cache.img(planet2),
            0,paddr,
@@ -246 +246 @@
       }
       else
-        scan_map(screen,ex,ey,cache.img(planet),
+        scan_map(main_screen,ex,ey,cache.img(planet),
            cache.img(planet2),
            0,paddr,
@@ -258 +258 @@
 
 
-        scale_put_trans(s,screen,ex-(i-38)*5,ey+cache.img(mask)->Size().y/2+t*4,nw,nh);
+        scale_put_trans(s,main_screen,ex-(i-38)*5,ey+cache.img(mask)->Size().y/2+t*4,nw,nh);
     if (i==77)
       if (sound_avail&SFX_INITIALIZED)
@@ -283 +283 @@
 
       old_time.get_time();
-      screen->clear();
+      main_screen->clear();
       int j;
       for (si=sinfo,j=0; j<800; j++,si+=3)
-        screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
-
-
-      scan_map(screen,ex,ey,cache.img(planet),
+        main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
+
+
+      scan_map(main_screen,ex,ey,cache.img(planet),
            cache.img(planet2),i*256/200,paddr,p,cache.img(mask)->Size().y,eoff,coff);
 
@@ -322 +322 @@
       last=c;
       if (c->char_num)
-        cache.fig(explo_frames2[c->frame])->forward->PutImage(screen,vec2i(c->x,c->y));
+        cache.fig(explo_frames2[c->frame])->forward->PutImage(main_screen,vec2i(c->x,c->y));
 
       c->x-=3;
@@ -337 +337 @@
   while (clist) { ex_char *p=clist; clist=clist->next; delete p; }
 
-  screen->clear();
+  main_screen->clear();
   int j;
   for (si=sinfo,j=0; j<800; j++,si+=3)
-    screen->PutPixel(vec2i(si[0],si[1]),si[2]);
-
-  event ev;
+    main_screen->PutPixel(vec2i(si[0],si[1]),si[2]);
+
+  Event ev;
   i=0;
   do
@@ -353 +353 @@
 
       old_time.get_time();
-      scan_map(screen,ex,ey,cache.img(planet),
+      scan_map(main_screen,ex,ey,cache.img(planet),
            cache.img(planet2),
            256,paddr,
@@ -381 +381 @@
   for (i=0; i<320 && ev.type!=EV_KEY; i++)
   {
-    screen->clear();
+    main_screen->clear();
     int j;
     for (si=sinfo,j=0; j<800; j++,si+=3)
-      screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
-
-    scan_map(screen,ex,ey,cache.img(planet),
+      main_screen->PutPixel(vec2i(dx+si[0],dy+si[1]),si[2]);
+
+    scan_map(main_screen,ex,ey,cache.img(planet),
          cache.img(planet2),
          256,paddr,
@@ -412 +412 @@
 
   fade_out(16);
-  screen->clear();
+  main_screen->clear();
 
 
@@ -426 +426 @@
   image blank(vec2i(2, 2)); blank.clear();
   wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
-  screen->clear();
+  main_screen->clear();
 
   image *im=cache.img(cache.reg("art/fore/endgame.spe","tbc",SPEC_IMAGE,1));
@@ -437 +437 @@
 
   int dx=(xres+1)/2-im->Size().x/2,dy=(yres+1)/2-im->Size().y/2;
-  im->put_image(screen,dx,dy);
-  console_font->put_string(screen,xres/2+35,yres/2+100-console_font->height()-2,
+  im->put_image(main_screen,dx,dy);
+  console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2,
                lstring_value(to_be));
   fade_in(NULL,32);
@@ -447 +447 @@
     cmap[i]=pal->find_closest(i*256/32,i*256/32,i*256/32);
 
-  event ev; ev.type=EV_SPURIOUS;
+  Event ev; ev.type=EV_SPURIOUS;
   time_marker start;
   for (i=0; i<320 && ev.type!=EV_KEY; i++)
   {
-    im->put_image(screen,dx,dy);
-    console_font->put_string(screen,xres/2+35,yres/2+100-console_font->height()-2,
+    im->put_image(main_screen,dx,dy);
+    console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2,
                lstring_value(to_be));
 
@@ -473 +473 @@
   wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
   show_sell(1);
-  wm->push_event(new event(ID_SHOW_SELL,NULL));
+  wm->Push(new Event(ID_SHOW_SELL,NULL));
 }
 
@@ -482 +482 @@
   image blank(vec2i(2, 2)); blank.clear();
   wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
-  screen->clear();
+  main_screen->clear();
 
   image *im=cache.img(cache.reg("art/fore/endgame.spe","end.pcx",SPEC_IMAGE,1));
@@ -499 +499 @@
     cmap[i]=pal->find_closest(i*256/32,i*256/32,i*256/32);
 
-  event ev; ev.type=EV_SPURIOUS;
+  Event ev; ev.type=EV_SPURIOUS;
   time_marker start;
   for (i=0; i<320 && ev.type!=EV_KEY; i++)
   {
-    im->put_image(screen,dx,dy);
+    im->put_image(main_screen,dx,dy);
 
     text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),wm->font(),cmap,wm->bright_color());
@@ -524 +524 @@
 
   fade_out(16);
-  screen->clear();
+  main_screen->clear();
 
   show_sell(1);

abuse/trunk/src/game.cpp

@@ -120 +120 @@
     Jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR");
 
-    event ev;
+    Event ev;
     do
     {
@@ -461 +461 @@
 }
 
-void Game::joy_calb(event &ev)
+void Game::joy_calb(Event &ev)
 {
     if(!joy_win) // make sure the joystick calibration window is open
@@ -490 +490 @@
 }
 
-void Game::menu_select(event &ev)
+void Game::menu_select(Event &ev)
 {
     state = DEV_MOUSE_RELEASE;
@@ -496 +496 @@
     {
 #if 0
-        wm->push_event(new event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL));
+        wm->Push(new Event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL));
         wm->close_window(top_menu);
         top_menu = NULL;
@@ -581 +581 @@
       yoff / ftile_height()>y || yoff / ftile_height()+(viewy2 - viewy1)/ftile_height()+1 < y) return;
       int cx1, cy1, cx2, cy2;
-      screen->GetClip(cx1, cy1, cx2, cy2);
-      screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
-      im->PutImage(screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),
+      main_screen->GetClip(cx1, cy1, cx2, cy2);
+      main_screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
+      im->PutImage(main_screen, vec2i((x - xoff / ftile_width())*ftile_width()+viewx1 - xoff % ftile_width(),
             (y - yoff / ftile_height())*ftile_height()+viewy1 - yoff % ftile_height()));
-      screen->SetClip(cx1, cy1, cx2, cy2);
+      main_screen->SetClip(cx1, cy1, cx2, cy2);
     }
   }
@@ -603 +603 @@
       yo / btile_height()>y || yo / btile_height()+(viewy2 - viewy1)/btile_height()+1 < y) return;
       int cx1, cy1, cx2, cy2;
-      screen->GetClip(cx1, cy1, cx2, cy2);
-      screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
-      im->put_image(screen, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),
+      main_screen->GetClip(cx1, cy1, cx2, cy2);
+      main_screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
+      im->put_image(main_screen, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),
             (y - yo / btile_height())*btile_height()+viewy1 - yo % btile_height(), 0);
-      screen->SetClip(cx1, cy1, cx2, cy2);
+      main_screen->SetClip(cx1, cy1, cx2, cy2);
     }
   }
@@ -633 +633 @@
     int xs, ys;
     if(mousex < xmargin &&  dev_cont->ok_to_scroll()) xs = -18;
-    else if(mousex>(screen->Size().x-xmargin) &&  dev_cont->ok_to_scroll()) xs = 18;
+    else if(mousex>(main_screen->Size().x-xmargin) &&  dev_cont->ok_to_scroll()) xs = 18;
     else if(wm->key_pressed(JK_LEFT) && !last_input && !dev_cont->need_arrows())
       xs = -18;
@@ -642 +642 @@
 
     if(mousey < ymargin && dev_cont->ok_to_scroll()) ys = -18;
-    else if(mousey>(screen->Size().y-ymargin) &&  dev_cont->ok_to_scroll()) ys = 18;
+    else if(mousey>(main_screen->Size().y-ymargin) &&  dev_cont->ok_to_scroll()) ys = 18;
     else if(wm->key_pressed(JK_UP) && !last_input)
       ys = -18;
@@ -698 +698 @@
   if(DEFINEDP(l_post_render->GetFunction()))
   {
-    screen->dirt_off();
+    main_screen->dirt_off();
     LSpace::Tmp.Clear();
     l_post_render->EvalFunction(NULL);
     LSpace::Tmp.Clear();
-    screen->dirt_on();
+    main_screen->dirt_on();
   }
 }
@@ -711 +711 @@
   int x1, y1, x2, y2, x, y, xo, yo, nxoff, nyoff;
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
 
   if(!current_level || state == MENU_STATE)
@@ -718 +718 @@
     {
       if(state == SCENE_STATE)
-        screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
+        main_screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
       image *tit = cache.img(title_screen);
-      tit->put_image(screen, screen->Size().x/2 - tit->Size().x/2,
-                    screen->Size().y/2 - tit->Size().y/2);
+      tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2,
+                    main_screen->Size().y/2 - tit->Size().y/2);
       if(state == SCENE_STATE)
-        screen->SetClip(cx1, cy1, cx2, cy2);
+        main_screen->SetClip(cx1, cy1, cx2, cy2);
       wm->flush_screen();
     }
@@ -736 +736 @@
 
   if(small_render)
-    screen->AddDirty(v->cx1, v->cy1, (v->cx2 - v->cx1 + 1)*2 + v->cx1 + 1, v->cy1+(v->cy2 - v->cy1 + 1)*2 + 1);
+    main_screen->AddDirty(v->cx1, v->cy1, (v->cx2 - v->cx1 + 1)*2 + v->cx1 + 1, v->cy1+(v->cy2 - v->cy1 + 1)*2 + 1);
   else
-    screen->AddDirty(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
+    main_screen->AddDirty(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
 
   if(v->draw_solid != -1)      // fill the screen and exit..
   {
     int c = v->draw_solid;
-    screen->Lock();
+    main_screen->Lock();
     for(int y = v->cy1; y <= v->cy2; y++)
-      memset(screen->scan_line(y)+v->cx1, c, v->cx2 - v->cx1 + 1);
-    screen->Unlock();
+      memset(main_screen->scan_line(y)+v->cx1, c, v->cx2 - v->cx1 + 1);
+    main_screen->Unlock();
     v->draw_solid = -1;
     return;
@@ -765 +765 @@
     v->cy2 = small_render->Size().y-1;
 
-    old_screen = screen;
-    screen = small_render;
+    old_screen = main_screen;
+    main_screen = small_render;
   } else
-    screen->dirt_off();
+    main_screen->dirt_off();
 
 
@@ -788 +788 @@
   current_vyadd = yoff - v->cy1;
 
-  screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
+  main_screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
 
   nxoff = xoff * bg_xmul / bg_xdiv;
@@ -828 +828 @@
     else bt = get_bg(0);
 
-        bt->im->put_image(screen, draw_x, draw_y);
+        bt->im->put_image(main_screen, draw_x, draw_y);
 //        if(!(dev & EDIT_MODE) && bt->next)
 //      current_level->put_bg(x, y, bt->next);
@@ -890 +890 @@
   {
     int ncx1, ncy1, ncx2, ncy2;
-    screen->GetClip(ncx1, ncy1, ncx2, ncy2);
-
-    int scr_w = screen->Size().x;
+    main_screen->GetClip(ncx1, ncy1, ncx2, ncy2);
+
+    int scr_w = main_screen->Size().x;
     if(dev & MAP_MODE)
     {
       if(dev & EDIT_MODE)
-        screen->clear(wm->bright_color());
+        main_screen->clear(wm->bright_color());
       else
-        screen->clear(wm->black());
-      screen->Lock();
+        main_screen->clear(wm->black());
+      main_screen->Lock();
       for(y = y1, draw_y = yo; y <= y2; y++, draw_y += yinc)
       {
@@ -905 +905 @@
     {
       uint16_t *cl = current_level->get_fgline(y)+x1;
-      uint8_t *sl1 = screen->scan_line(draw_y)+xo;
+      uint8_t *sl1 = main_screen->scan_line(draw_y)+xo;
       for(x = x1, draw_x = xo; x <= x2; x++, cl++, sl1 += xinc, draw_x += xinc)
       {
@@ -924 +924 @@
     }
       }
-      screen->Unlock();
+      main_screen->Unlock();
 
       if(dev & EDIT_MODE)
@@ -952 +952 @@
           if(fort_num != BLACK)
           {
-            get_fg(fort_num)->im->PutImage(screen, vec2i(draw_x, draw_y));
+            get_fg(fort_num)->im->PutImage(main_screen, vec2i(draw_x, draw_y));
 
         if(!(dev & EDIT_MODE))
@@ -994 +994 @@
         {
           if(dev & DRAW_BG_LAYER)
-          get_fg(fort_num)->im->PutImage(screen, vec2i(draw_x, draw_y));
+          get_fg(fort_num)->im->PutImage(main_screen, vec2i(draw_x, draw_y));
           else
-          get_fg(fort_num)->im->PutFilled(screen, vec2i(draw_x, draw_y), 0);
+          get_fg(fort_num)->im->PutFilled(main_screen, vec2i(draw_x, draw_y), 0);
 
           if(!(dev & EDIT_MODE))
@@ -1002 +1002 @@
           else
           {
-        screen->line(draw_x, draw_y, draw_x + xinc, draw_y + yinc, wm->bright_color());
-        screen->line(draw_x + xinc, draw_y, draw_x, draw_y + yinc, wm->bright_color());
+        main_screen->line(draw_x, draw_y, draw_x + xinc, draw_y + yinc, wm->bright_color());
+        main_screen->line(draw_x + xinc, draw_y, draw_x, draw_y + yinc, wm->bright_color());
           }
         }
@@ -1037 +1037 @@
         {
           d += 2;
-          screen->line(draw_x+*(d - 2), draw_y+*(d - 1), draw_x+*d, draw_y+*(d + 1), b);
+          main_screen->line(draw_x+*(d - 2), draw_y+*(d - 1), draw_x+*d, draw_y+*(d + 1), b);
         }
-        screen->line(draw_x+*d, draw_y+*(d - 1), draw_x + p->data[0], draw_y + p->data[1], b);
+        main_screen->line(draw_x+*d, draw_y+*(d - 1), draw_x + p->data[0], draw_y + p->data[1], b);
           }
         }
@@ -1063 +1063 @@
     int x1 = v->cx1, y1 = v->cy1, x2 = v->cx2, y2 = v->cy1 + wm->font()->height()+10;
 
-    remap_area(screen, x1, y1, x2, y2, white_light + 40 * 256);
-    screen->bar(x1, y1, x2, y1, color);
-    screen->bar(x1, y2, x2, y2, color);
-
-    wm->font()->put_string(screen, x1 + 5, y1 + 5,
+    remap_area(main_screen, x1, y1, x2, y2, white_light + 40 * 256);
+    main_screen->bar(x1, y1, x2, y1, color);
+    main_screen->bar(x1, y2, x2, y2, color);
+
+    wm->font()->put_string(main_screen, x1 + 5, y1 + 5,
                    help_text, color);
     if(color > 30)
@@ -1079 +1079 @@
     dev_cont->dev_draw(v);
     if(cache.in_use())
-    cache.img(vmm_image)->put_image(screen, v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1);
+    cache.img(vmm_image)->put_image(main_screen, v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1);
 
     if(dev & DRAW_LIGHTS)
@@ -1085 +1085 @@
       if(small_render)
       {
-    double_light_screen(screen, xoff, yoff, white_light, v->ambient, old_screen, old_cx1, old_cy1);
+    double_light_screen(main_screen, xoff, yoff, white_light, v->ambient, old_screen, old_cx1, old_cy1);
 
     v->cx1 = old_cx1;
@@ -1091 +1091 @@
     v->cx2 = old_cx2;
     v->cy2 = old_cy2;
-    screen = old_screen;
+    main_screen = old_screen;
       } else
       {
-    screen->dirt_on();
+    main_screen->dirt_on();
     if(xres * yres <= 64000)
-          light_screen(screen, xoff, yoff, white_light, v->ambient);
-    else light_screen(screen, xoff, yoff, white_light, 63);            // no lighting for hi - rez
+          light_screen(main_screen, xoff, yoff, white_light, v->ambient);
+    else light_screen(main_screen, xoff, yoff, white_light, 63);            // no lighting for hi - rez
       }
 
     } else
-      screen->dirt_on();
+      main_screen->dirt_on();
 
 
 
   }  else
-    screen->dirt_on();
+    main_screen->dirt_on();
 
   rand_on = ro;                // restore random start in case in draw funs moved it
@@ -1113 +1113 @@
   post_render();
 
-  screen->SetClip(cx1, cy1, cx2 + 1, cy2 + 1);
+  main_screen->SetClip(cx1, cy1, cx2 + 1, cy2 + 1);
 
 
@@ -1149 +1149 @@
 }
 
-int Game::in_area(event &ev, int x1, int y1, int x2, int y2)
+int Game::in_area(Event &ev, int x1, int y1, int x2, int y2)
 {
   return (last_demo_mx >= x1 && last_demo_mx <= x2 &&
@@ -1171 +1171 @@
     if (im)
     {
-        screen->clear();
-        im->put_image(screen, (xres + 1) / 2 - im->Size().x / 2,
+        main_screen->clear();
+        im->put_image(main_screen, (xres + 1) / 2 - im->Size().x / 2,
                               (yres + 1) / 2 - im->Size().y / 2);
     }
@@ -1194 +1194 @@
     if (N == 0)
     {
-        screen->clear();
+        main_screen->clear();
         wm->flush_screen();
         old_pal->load();
@@ -1268 +1268 @@
         }
 
-        screen->clear();
+        main_screen->clear();
         pal->load();
 
         int dx = (xres + 1) / 2 - gray->Size().x / 2, dy = (yres + 1) / 2 - gray->Size().y / 2;
-        gray->put_image(screen, dx, dy);
-        smoke[0]->put_image(screen, dx + 24, dy + 5);
+        gray->put_image(main_screen, dx, dy);
+        smoke[0]->put_image(main_screen, dx + 24, dy + 5);
 
         fade_in(NULL, 16);
@@ -1280 +1280 @@
         cmap[i] = pal->find_closest(i * 256 / 32, i * 256 / 32, i * 256 / 32);
 
-        event ev;
+        Event ev;
         ev.type = EV_SPURIOUS;
         Timer total;
@@ -1293 +1293 @@
                 break;
 
-            gray->put_image(screen, dx, dy);
-            smoke[i % 5]->put_image(screen, dx + 24, dy + 5);
+            gray->put_image(main_screen, dx, dy);
+            smoke[i % 5]->put_image(main_screen, dx + 24, dy + 5);
             text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color());
             wm->flush_screen();
@@ -1446 +1446 @@
   console_font = new JCFont(cache.img(console_font_pict));
 
-  wm = new WindowManager(screen, pal, bright_color,
+  wm = new WindowManager(main_screen, pal, bright_color,
                          med_color, dark_color, game_font);
 
@@ -1496 +1496 @@
   else
   {
-    screen->clear();
+    main_screen->clear();
     if(title_screen >= 0)
     {
       image *tit = cache.img(title_screen);
-      tit->put_image(screen, screen->Size().x/2 - tit->Size().x/2,
-                    screen->Size().y/2 - tit->Size().y/2);
+      tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2,
+                    main_screen->Size().y/2 - tit->Size().y/2);
     }
     set_state(MENU_STATE);   // then go to menu state so windows will turn off
@@ -1524 +1524 @@
     char str[16];
     sprintf(str, "%ld", (long)(10000.0f / avg_ms));
-    console_font->put_string(screen, first_view->cx1, first_view->cy1, str);
+    console_font->put_string(main_screen, first_view->cx1, first_view->cy1, str);
 
     sprintf(str, "%d", total_active);
-    console_font->put_string(screen, first_view->cx1, first_view->cy1 + 10, str);
+    console_font->put_string(main_screen, first_view->cx1, first_view->cy1 + 10, str);
 }
 
@@ -1573 +1573 @@
     {
       for(view *f = first_view; f; f = f->next)
-        cache.img(pause_image)->put_image(screen, (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2,
+        cache.img(pause_image)->put_image(main_screen, (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2,
                    f->cy1 + 5, 1);
     }
@@ -1649 +1649 @@
 void Game::get_input()
 {
-    event ev;
+    Event ev;
     idle_ticks++;
     while(event_waiting())
@@ -1713 +1713 @@
             {
                 if(v->local_player() && v->handle_event(ev))
-                    ev.type = EV_SPURIOUS;       // if the event was used by the view, gobble it up
+                    ev.type = EV_SPURIOUS;       // if the Event was used by the view, gobble it up
             }
 
@@ -1806 +1806 @@
                                     case 'v':
                                     {
-                                        wm->push_event(new event(DO_VOLUME, NULL));
+                                        wm->Push(new Event(DO_VOLUME, NULL));
                                     } break;
                                     case 'p':
@@ -1821 +1821 @@
                                         if(start_edit)
                                         {
-                                            wm->push_event(new event(ID_LEVEL_SAVE, NULL));
+                                            wm->Push(new Event(ID_LEVEL_SAVE, NULL));
                                         }
                                     } break;
@@ -1865 +1865 @@
                             case EV_REDRAW:
                             {
-                                screen->AddDirty(ev.redraw.x1, ev.redraw.y1,
+                                main_screen->AddDirty(ev.redraw.x1, ev.redraw.y1,
                                     ev.redraw.x2 + 1, ev.redraw.y2 + 1);
                             } break;
@@ -2033 +2033 @@
   } else if(state == JOY_CALB_STATE)
   {
-    event ev;
+    Event ev;
     joy_calb(ev);
   } else if(state == MENU_STATE)
@@ -2128 +2128 @@
 void Game::draw(int scene_mode)
 {
-    screen->AddDirty(0, 0, xres + 1, yres + 1);
-
-    screen->clear();
+    main_screen->AddDirty(0, 0, xres + 1, yres + 1);
+
+    main_screen->clear();
 
     if(scene_mode)
     {
         char const *helpstr = "ARROW KEYS CHANGE TEXT SPEED";
-        wm->font()->put_string(screen, screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2 + 1,
-            screen->Size().y-wm->font()->height()-5 + 1, helpstr, wm->dark_color());
-        wm->font()->put_string(screen, screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2,
-            screen->Size().y-wm->font()->height()-5, helpstr, wm->bright_color());
+        wm->font()->put_string(main_screen, main_screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2 + 1,
+            main_screen->Size().y-wm->font()->height()-5 + 1, helpstr, wm->dark_color());
+        wm->font()->put_string(main_screen, main_screen->Size().x/2-(wm->font()->width()*strlen(helpstr))/2,
+            main_screen->Size().y-wm->font()->height()-5, helpstr, wm->bright_color());
     }
 /*    else
     {
         char *helpstr="PRESS h FOR HELP";
-        wm->font()->put_string(screen, screen->Size().x-wm->font()->width()*strlen(helpstr)-5,
-            screen->Size().y-wm->font()->height()-5, helpstr);
+        wm->font()->put_string(main_screen, main_screen->Size().x-wm->font()->width()*strlen(helpstr)-5,
+            main_screen->Size().y-wm->font()->height()-5, helpstr);
     }*/
 /*    int dc = cache.img(window_colors)->pixel(0, 2);
     int mc = cache.img(window_colors)->pixel(1, 2);
     int bc = cache.img(window_colors)->pixel(2, 2);
-    screen->line(0, 0, screen->Size().x-1, 0, dc);
-    screen->line(0, 0, 0, screen->Size().y-1, dc);
-    screen->line(0, screen->Size().y-1, screen->Size().x-1, screen->Size().y-1, bc);
-    screen->line(screen->Size().x-1, 0, screen->Size().x-1, screen->Size().y-1, bc); */
+    main_screen->line(0, 0, main_screen->Size().x-1, 0, dc);
+    main_screen->line(0, 0, 0, main_screen->Size().y-1, dc);
+    main_screen->line(0, main_screen->Size().y-1, main_screen->Size().x-1, main_screen->Size().y-1, bc);
+    main_screen->line(main_screen->Size().x-1, 0, main_screen->Size().x-1, main_screen->Size().y-1, bc); */
 
     for(view *f = first_view; f; f = f->next)
         draw_map(f, 0);
 
-    sbar.redraw(screen);
+    sbar.redraw(main_screen);
 }
 
@@ -2204 +2204 @@
     dev_console->show();
     int t = 0;
-    event ev;
+    Event ev;
     do
     {

abuse/trunk/src/game.h

@@ -132 +132 @@
 
 
-  int in_area(event &ev, int x1, int y1, int x2, int y2);
+  int in_area(Event &ev, int x1, int y1, int x2, int y2);
   void load_level(char const *name);
   void set_level(level *nl);
@@ -145 +145 @@
   void get_input();
   void do_intro();
-  void joy_calb(event &ev);
-  void menu_select(event &ev2);
+  void joy_calb(Event &ev);
+  void menu_select(Event &ev2);
   int can_morph_into(int type);
   void morph_into(int type);

abuse/trunk/src/gamma.cpp

@@ -150 +150 @@
         Jwindow *gw = wm->new_window(xres / 2 - 190, yres / 2 - 90, -1, -1, gp);
 
-        event ev;
+        Event ev;
         wm->flush_screen();
 #if !defined __CELLOS_LV2__

abuse/trunk/src/gui.cpp

@@ -73 +73 @@
 }
 
-void ico_switch_button::handle_event(event &ev, image *screen, InputManager *im)
+void ico_switch_button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -92 +92 @@
 
   if (active!=act  && activate_id!=-1 && active)
-    wm->push_event(new event(activate_id,NULL));
+    wm->Push(new Event(activate_id,NULL));
 
   if (up && !active)
@@ -103 +103 @@
 
   if (act!=active && active && activate_id!=-1)
-    wm->push_event(new event(activate_id,NULL));
+    wm->Push(new Event(activate_id,NULL));
   act=active;
 
@@ -121 +121 @@
 extern int sfx_volume;
 
-void ico_button::handle_event(event &ev, image *screen, InputManager *im)
+void ico_button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -130 +130 @@
     up=!up;
     draw(act,screen);
-    wm->push_event(new event(id,(char *)this));
+    wm->Push(new Event(id,(char *)this));
     if (S_BUTTON_PRESS_SND)
       cache.sfx(S_BUTTON_PRESS_SND)->play(sfx_volume);

abuse/trunk/src/gui.h

@@ -25 +25 @@
   virtual void draw_first(image *screen) { draw(0,screen); }
   virtual void draw(int active, image *screen);
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
 
   virtual char *read() { return (char *)&up; }
@@ -44 +44 @@
   virtual void draw_first(image *screen) { cur_but->draw_first(screen); }
   virtual void draw(int active, image *screen) { cur_but->draw(active,screen); act=active; }
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
   virtual ifield *unlink(int id);
   virtual char *read() { return cur_but->read(); }

abuse/trunk/src/help.cpp

@@ -31 +31 @@
   int x1=xres/2-im->Size().x/2,y1=yres/2-im->Size().y/2;
   int x2=x1+im->Size().x,y2=y1+im->Size().y;
-  im->put_image(screen,x1,y1);
-  screen->bar(0,0,x1-1,yres,0);
-  screen->bar(0,0,xres,y1-1,0);
-  screen->bar(x2,y1,xres,yres,0);
-  screen->bar(x1,y2,x2,yres,0);
+  im->put_image(main_screen,x1,y1);
+  main_screen->bar(0,0,x1-1,yres,0);
+  main_screen->bar(0,0,xres,y1-1,0);
+  main_screen->bar(x2,y1,xres,yres,0);
+  main_screen->bar(x1,y2,x2,yres,0);
 }
 
-void help_handle_event(event &ev)
+void help_handle_event(Event &ev)
 {
   if (ev.window!=NULL) return ;

abuse/trunk/src/help.h

@@ -16 +16 @@
 extern int total_help_screens;
 extern int *help_screens;
-void help_handle_event(event &ev);
+void help_handle_event(Event &ev);
 void draw_help();        // called from game draw if in help mode
 

abuse/trunk/src/imlib/Makefile.am

@@ -26 +26 @@
     jwindow.cpp jwindow.h \
     video.cpp video.h \
-    event.h mouse.h timing.h jdir.h visobj.h \
+    event.cpp event.h \
+    mouse.h timing.h jdir.h visobj.h \
     $(NULL)
 

abuse/trunk/src/imlib/event.h

@@ -32 +32 @@
 class Jwindow;
 
-class event : public linked_node
+class Event : public linked_node
 {
-public :
-  int                             type;
-  struct { int x,y; }             mouse_move;
-  int                             mouse_button;
-  int                             key;
-  struct { char alt,ctrl,shift; } key_special;
-  struct { int x1,y1,x2,y2;
-       void *start; }         redraw;
-  Jwindow                        *window;      // NULL is root
-  struct { int x,y; }             window_position;
-  struct { int id; char *data; }  message;
-  event(int id, char *data) { type=EV_MESSAGE; message.id=id; message.data=data; }
-  event() { type=EV_SPURIOUS; }
-} ;
+public:
+    Event()
+    {
+        type = EV_SPURIOUS;
+    }
 
-class event_handler
+    Event(int id, char *data)
+    {
+        type = EV_MESSAGE;
+        message.id = id;
+        message.data = data;
+    }
+
+    int type;
+    vec2i mouse_move;
+    int mouse_button, key;
+
+    struct { char alt, ctrl, shift; } key_special;
+    struct { int x1, y1, x2, y2; void *start; } redraw;
+
+    Jwindow *window;      // NULL is root
+    vec2i window_position;
+    struct { int id; char *data; } message;
+};
+
+class EventHandler
 {
-  sprite_controller sc;
-  int mhere,ewaiting,last_keystat,last_key;
-  int get_key_flags();
-  linked_list events;
-public :
+public:
+    EventHandler(image *screen, palette *pal);
+    ~EventHandler();
+
+    void Push(Event *ev)
+    {
+        m_events.add_end(ev);
+    }
+
   JCMouse *mouse;
   sprite *mouse_sprite() { return mouse->mouse_sprite(); }
-  event_handler(image *screen, palette *pal);
   int event_waiting();
-  void get_event(event &ev);
+  void Get(Event &ev);
   void add_redraw(int X1, int Y1, int X2, int Y2, void *Start);
   void mouse_status(int &x, int &y, int &button)
-  { if (mouse)
+  {
+    if (mouse)
     {
-      x=mouse->x(); y=mouse->y(); button=mouse->button();
-    } else x=y=button=0;
+      x = mouse->x();
+      y = mouse->y();
+      button = mouse->button();
+    } else x = y = button = 0;
   }
-  void push_event(event *ev) { events.add_end(ev); }
   void flush_screen();
-  int has_mouse() { return mouse->exsist(); }
-  void set_mouse_shape(image *im, int centerx, int centery) { mouse->set_shape(im,-centerx,-centery); }
-  void set_mouse_position(int mx, int my) { if (mouse) mouse->set_position(mx,my); }
-  ~event_handler();
-} ;
+  int has_mouse() { return mouse->exists(); }
+  void set_mouse_shape(image *im, int centerx, int centery) { mouse->set_shape(im, -centerx, -centery); }
+  void set_mouse_position(int mx, int my) { if (mouse) mouse->set_position(mx, my); }
+
+private:
+    int get_key_flags();
+
+    linked_list m_events;
+    int mhere, ewaiting, last_keystat, last_key;
+    sprite_controller sc;
+};
+
 #endif
 

abuse/trunk/src/imlib/include.cpp

@@ -28 +28 @@
       tmp_name[j]='_';
 
-  FILE *fp=fopen(filename,"rb");  // see if the file already exsist
+  FILE *fp=fopen(filename,"rb");  // see if the file already exists
   if (fp)
   {

abuse/trunk/src/imlib/input.cpp

@@ -113 +113 @@
 }
 
-void button_box::handle_event(event &ev, image *screen, InputManager *im)
+void button_box::handle_event(Event &ev, image *screen, InputManager *im)
 {
   switch (ev.type)
@@ -268 +268 @@
 }
 
-void text_field::handle_event(event &ev, image *screen, InputManager *im)
+void text_field::handle_event(Event &ev, image *screen, InputManager *im)
 {
   int xx;
@@ -293 +293 @@
            draw_text(screen);
            draw_cur(wm->bright_color(),screen);
-           wm->push_event(new event(id,(char *)this));
+           wm->Push(new Event(id,(char *)this));
          } break;
       default : if (ev.key>=' ' && ev.key<='~')
@@ -306 +306 @@
            draw_text(screen);
            draw_cur(wm->bright_color(),screen);
-           wm->push_event(new event(id,(char *)this));
+           wm->Push(new Event(id,(char *)this));
          } break;
     }
@@ -366 +366 @@
 { up=!up; }
 
-void button::handle_event(event &ev, image *screen, InputManager *im)
+void button::handle_event(Event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -376 +376 @@
     draw_first(screen);
     draw(act,screen);
-    wm->push_event(new event(id,(char *)this));
+    wm->Push(new Event(id,(char *)this));
   }
 }
@@ -385 +385 @@
   area(x1,y1,x2,y2);
   if (active!=act  && act_id!=-1 && active)
-    wm->push_event(new event(act_id,NULL));
+    wm->Push(new Event(act_id,NULL));
 
   if (pressed)

abuse/trunk/src/imlib/input.h

@@ -30 +30 @@
   virtual void draw_first(image *screen);
   virtual void draw(int active, image *screen);
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
   void change_visual(image *new_visual);
   virtual void remap(Filter *f);
@@ -53 +53 @@
   virtual void draw_first(image *screen);
   virtual void draw(int active, image *screen);
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
   virtual ~button_box();
   virtual char *read();   // return pointer to first button which is depressed
@@ -84 +84 @@
   virtual void draw_first(image *screen);
   virtual void draw(int active, image *screen);
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
 
   virtual ~text_field() { free(prompt); free(format); free(data); }
@@ -104 +104 @@
   virtual void draw_first(image *screen);
   virtual void draw(int active, image *screen) { ; }
-  virtual void handle_event(event &ev, image *screen, InputManager *im) { ; }
+  virtual void handle_event(Event &ev, image *screen, InputManager *im) { ; }
   virtual char *read() { return text; }
   virtual int selectable() { return 0; }

abuse/trunk/src/imlib/jwindow.cpp

@@ -22 +22 @@
 #include "event.h"
 #include "filter.h"
-#include "event.h"
 #include "jwindow.h"
 
@@ -73 +72 @@
         {
             p->hide();
-            screen->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h);
+            m_screen->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h);
         }
     }
@@ -100 +99 @@
         k->next = j->next;
     }
-    screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+    m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
     j->hide();
 }
@@ -113 +112 @@
 }
 
-void WindowManager::get_event(event &ev)
-{
-  Jwindow *j;
-  eh->get_event(ev);
+void WindowManager::get_event(Event &ev)
+{
+  Get(ev);
+
   if (ev.type==EV_KEY)
     key_state[ev.key]=1;
@@ -124 +123 @@
   if (state==inputing)
   {
+    Jwindow *j;
     for (ev.window=NULL,j=first; j; j=j->next)
       if (!j->is_hidden() && ev.mouse_move.x>=j->x && ev.mouse_move.y>=j->y &&
@@ -180 +180 @@
     {
       Jwindow *j=ev.window;
-/*      screen->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h);
+/*      m_screen->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h);
       for (p=first; p!=j; p=p->next)
         p->screen->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */
@@ -213 +213 @@
   if (ev.type == EV_REDRAW)
   {
-    for (j=first; j; j=j->next)
+    for (Jwindow *j = first; j; j = j->next)
        j->screen->AddDirty(ev.redraw.x1 - j->x, ev.redraw.y1 - j->y,
                            ev.redraw.x2 + 1 - j->x, ev.redraw.y2 + 1 - j->y);
-    screen->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);
+    m_screen->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);
     flush_screen();
     ev.type=EV_SPURIOUS;   // we took care of this one by ourselves.
@@ -231 +231 @@
 {
   Jwindow *p;
-  screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+  m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
   for (p=first; p!=j; p=p->next)
     p->screen->AddDirty(j->x - p->x, j->y - p->y, j->x + j->l - p->x, j->y + j->h - p->y);
@@ -241 +241 @@
 void WindowManager::move_window(Jwindow *j, int x, int y)
 {
-    screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+    m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
     for(Jwindow *p = first; p != j; p = p->next)
         p->screen->AddDirty(j->x - p->x, j->y - p->y,
@@ -250 +250 @@
 }
 
-WindowManager::WindowManager(image *Screen, palette *Pal, int Hi,
+WindowManager::WindowManager(image *screen, palette *pal, int Hi,
                              int Med, int Low, JCFont *Font)
+  : EventHandler(screen, pal)
 {
     wm = this;
-    screen = Screen;
-    hi = Hi; low = Low; med = Med; first = NULL; pal = Pal; grab = NULL;
+    m_screen = screen;
+    hi = Hi; low = Low; med = Med; first = NULL; m_pal = pal; grab = NULL;
     bk = pal->find_closest(0, 0, 0);
     state = inputing; fnt = Font;  wframe_fnt = Font;
     memset(key_state, 0, sizeof(key_state));
-    eh = new event_handler(screen, pal);
     frame_suppress = 0;
 }
@@ -265 +265 @@
 WindowManager::~WindowManager()
 {
-    delete eh;
     while(first)
         close_window(first);
@@ -310 +309 @@
     }
 
-    screen->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h);
+    m_screen->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h);
 }
 
@@ -316 +315 @@
                                      ifield * fields, char const *name)
 {
-    if(x > screen->Size().x - 4)
-        x = screen->Size().x - 25;
-    if(y > screen->Size().y - 4)
-        y = screen->Size().y - 10;
+    if(x > m_screen->Size().x - 4)
+        x = m_screen->Size().x - 25;
+    if(y > m_screen->Size().y - 4)
+        y = m_screen->Size().y - 10;
 
     Jwindow * j = new Jwindow (x, y, l, h, fields, name);
@@ -336 +335 @@
     if(has_mouse())
     {
-        mouse_pic = eh->mouse_sprite()->visual;
-        mouse_save = eh->mouse_sprite()->save;
-        mx = eh->mouse->drawx();
-        my = eh->mouse->drawy();
-
-        screen->put_part(mouse_save, 0, 0, mx, my,
+        mouse_pic = mouse_sprite()->visual;
+        mouse_save = mouse_sprite()->save;
+        mx = mouse->drawx();
+        my = mouse->drawy();
+
+        m_screen->put_part(mouse_save, 0, 0, mx, my,
                          mx + mouse_pic->Size().x - 1,
                          my + mouse_pic->Size().y - 1);
-        mouse_pic->put_image(screen, mx, my, 1);
+        mouse_pic->put_image(m_screen, mx, my, 1);
     }
 
     for(p = first; p; p = p->next)
         if(!p->is_hidden())
-            screen->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);
-    update_dirty(screen);
+            m_screen->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);
+    update_dirty(m_screen);
 
     if(has_mouse())
-        mouse_save->put_image(screen, mx, my);
+        mouse_save->put_image(m_screen, mx, my);
 
     for(p = first; p; p = p->next)
@@ -369 +368 @@
         }
 
-//          screen->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);
+//          m_screen->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);
         for(q = p->next; q; q = q->next)
             if(!q->is_hidden())
@@ -598 +597 @@
 }
 
-void InputManager::handle_event(event &ev, Jwindow *j)
+void InputManager::handle_event(Event &ev, Jwindow *j)
 {
   ifield *i,*in_area=NULL;

abuse/trunk/src/imlib/jwindow.h

@@ -11 +11 @@
 #ifndef __JWIN__
 #define __JWIN__
+
 #include "video.h"
 #include "image.h"
 #include "event.h"
 #include "filter.h"
-#include "event.h"
 #include "fonts.h"
 
@@ -40 +40 @@
 
 public:
-  InputManager(image *Screen, ifield *First);
-  InputManager(Jwindow *owner, ifield *First);
-  void handle_event(event &ev, Jwindow *j);
+  InputManager(image *screen, ifield *first);
+  InputManager(Jwindow *owner, ifield *first);
+  void handle_event(Event &ev, Jwindow *j);
   ifield *get(int id);
   void redraw();
@@ -74 +74 @@
     virtual void draw_first(image *screen) = 0;
     virtual void draw(int active, image *screen) = 0;
-    virtual void handle_event(event &ev, image *screen, InputManager *im) = 0;
+    virtual void handle_event(Event &ev, image *screen, InputManager *im) = 0;
     virtual int selectable() { return 1; }
     virtual void remap(Filter *f) { ; }
@@ -133 +133 @@
 };
 
-class WindowManager
+class WindowManager : public EventHandler
 {
     friend class Jwindow;
@@ -142 +142 @@
 
 public:
-    event_handler *eh;
+    WindowManager(image *, palette *, int hi, int med, int low, JCFont *);
+    ~WindowManager();
+
     Jwindow *first, *grab;
-    image *screen, *mouse_pic, *mouse_save;
-    palette *pal;
+    image *mouse_pic, *mouse_save;
     int hi, med, low, bk; // bright, medium, dark and black colors
     int key_state[512];
@@ -152 +153 @@
     Jwindow *drag_window;
     JCFont *fnt, *wframe_fnt;
-
-    WindowManager(image *, palette *, int hi, int med, int low, JCFont *);
-    ~WindowManager();
 
     Jwindow *new_window(int x, int y, int l, int h,
@@ -164 +162 @@
     void resize_window(Jwindow *j, int l, int h);
     void move_window(Jwindow *j, int x, int y);
-    void get_event(event &ev);
-    void push_event(event *ev) { eh->push_event(ev); }
-    int event_waiting() { return eh->event_waiting(); }
+    void get_event(Event &ev);
     void flush_screen();
     int bright_color() { return hi; }
@@ -174 +170 @@
     void set_colors(int Hi, int Med, int Low) { hi=Hi; med=Med; low=Low; }
     JCFont *font() { return fnt; }
-    int has_mouse() { return eh->has_mouse(); }
-    void mouse_status(int &x, int &y, int &button) { eh->mouse_status(x,y,button); }
-    void set_mouse_shape(image *im, int centerx, int centery)
-    { eh->set_mouse_shape(im,centerx,centery); }
-
-    void set_mouse_position(int mx, int my)
-    { eh->set_mouse_position(mx,my); }
 
     int key_pressed(int x) { return key_state[x]; }
@@ -191 +180 @@
     void release_focus();
     int window_in_area(int x1, int y1, int x2, int y2); // true if a window lies in this area
+
+private:
+    palette *m_pal;
+    image *m_screen;
 };
 

abuse/trunk/src/imlib/mouse.h

@@ -34 +34 @@
   int last_button() { if (here) return lbut; else return 0; }
   int button() { return but; }
-  int exsist() { return here; }
+  int exists() { return here; }
   sprite *mouse_sprite() { return sp; }
   void set_position(int new_mx, int new_my);

abuse/trunk/src/imlib/pmenu.cpp

@@ -148 +148 @@
   calc_size(w,h);
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
   // FIXME: is this correct? it looks like it used to be incorrect
   // before the GetClip refactoring...
@@ -191 +191 @@
   calc_size(w,h);
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
   if (parent->x+w+x>=cx2)
     x=cx2-1-w-parent->x;
@@ -311 +311 @@
 
 
-int psub_menu::handle_event(Jwindow *parent, int x, int y, event &ev)
+int psub_menu::handle_event(Jwindow *parent, int x, int y, Event &ev)
 {
   int w,h;
   calc_size(w,h);
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
 
   x=win->x;
@@ -353 +353 @@
 
 int pmenu_item::handle_event(Jwindow *parent, int x, int y, int w, int top,
-                 event &ev)
+                 Event &ev)
 {
   x+=parent->x;
@@ -364 +364 @@
     {
       if (ev.type==EV_MOUSE_BUTTON &&n)
-        wm->push_event(new event(id,(char *)this));
+        wm->Push(new Event(id,(char *)this));
       return 1;
     }
@@ -393 +393 @@
 }
 
-int psub_menu::own_event(event &ev)
+int psub_menu::own_event(Event &ev)
 {
   if (win && ev.window==win) return 1; else
@@ -402 +402 @@
 }
 
-int pmenu_item::own_event(event &ev)
+int pmenu_item::own_event(Event &ev)
 {
   if (sub)
@@ -413 +413 @@
 }
 
-int pmenu::handle_event(event &ev, image *screen)
+int pmenu::handle_event(Event &ev, image *screen)
 {
   if (!active && ev.window!=bar) return 0;
@@ -436 +436 @@
     if (r)
     {
-      wm->push_event(new event(r->id,(char *)r));
+      wm->Push(new Event(r->id,(char *)r));
       return 1;
     }

abuse/trunk/src/imlib/pmenu.h

@@ -33 +33 @@
   void draw       (Jwindow *parent, int x, int y, int w, int top, int active);
   void draw_self  (Jwindow *parent, int x, int y, int w, int top, int active);
-  int handle_event(Jwindow *parent, int x, int y, int w, int top, event &ev);
-  int own_event(event &ev);
+  int handle_event(Jwindow *parent, int x, int y, int w, int top, Event &ev);
+  int own_event(Event &ev);
   ~pmenu_item();
 } ;
@@ -52 +52 @@
   psub_menu(pmenu_item *First, psub_menu *Next)
   { first=First; Next=Next; win=0; active=0; }
-  int handle_event(Jwindow *parent, int x, int y, event &ev);
+  int handle_event(Jwindow *parent, int x, int y, Event &ev);
   void draw(Jwindow *parent, int x, int y);
   void hide(Jwindow *parent, int x, int y);
-  int own_event(event &ev);
+  int own_event(Event &ev);
   ~psub_menu();
 } ;
@@ -72 +72 @@
   void move(int new_x, int new_y);
   void draw(image *screen, int top_only=0);
-  int handle_event(event &ev, image *screen);
+  int handle_event(Event &ev, image *screen);
 
 } ;

abuse/trunk/src/imlib/scroller.cpp

@@ -180 +180 @@
 
 
-void scroller::handle_event(event &ev, image *screen, InputManager *inm)
+void scroller::handle_event(Event &ev, image *screen, InputManager *inm)
 {
   int mx=ev.mouse_move.x,my=ev.mouse_move.y;
@@ -414 +414 @@
 }
 
-void pick_list::handle_inside_event(event &ev, image *screen, InputManager *inm)
+void pick_list::handle_inside_event(Event &ev, image *screen, InputManager *inm)
 {
   if (ev.type==EV_MOUSE_MOVE && activate_on_mouse_move())
@@ -431 +431 @@
     {
       if (sel==cur_sel)
-      wm->push_event(new event(id,(char *)this));
+      wm->Push(new Event(id,(char *)this));
       else
       {
@@ -439 +439 @@
     }
   } else if (ev.type==EV_KEY && ev.key==JK_ENTER)
-    wm->push_event(new event(id,(char *)this));
+    wm->Push(new Event(id,(char *)this));
   else if (ev.type==EV_KEY)
   {
@@ -628 +628 @@
 
 
-void spicker::handle_inside_event(event &ev, image *screen, InputManager *inm)
+void spicker::handle_inside_event(Event &ev, image *screen, InputManager *inm)
 {
   switch (ev.type)

abuse/trunk/src/imlib/scroller.h

@@ -42 +42 @@
   virtual void draw_first(image *screen);
   virtual void draw(int active, image *screen);
-  virtual void handle_event(event &ev, image *screen, InputManager *im);
+  virtual void handle_event(Event &ev, image *screen, InputManager *im);
   virtual char *read() { return (char *)&sx; }
 
   virtual int activate_on_mouse_move() { return 1; }
-  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm) { ; }
+  virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm) { ; }
   virtual void scroll_event(int newx, image *screen);
   virtual void handle_up(image *screen, InputManager *inm);
@@ -70 +70 @@
   int first_selected();
   virtual void scroll_event(int newx, image *screen);
-  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
+  virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm);
 
   // you should define \/
@@ -105 +105 @@
   pick_list(int X, int Y, int ID, int height,
         char **List, int num_entries, int start_yoffset, ifield *Next, image *texture=NULL);
-  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
+  virtual void handle_inside_event(Event &ev, image *screen, InputManager *inm);
   virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }

abuse/trunk/src/imlib/tools.h

@@ -39 +39 @@
   virtual int item_height() { return ih; }
   virtual void note_new_current(image *screen, InputManager *inm, int x)
-  { wm->push_event(new event(ids[x],NULL)); }
+  { wm->Push(new Event(ids[x],NULL)); }
 
   void remap(palette *pal, image *screen);

abuse/trunk/src/imlib/video.h

@@ -22 +22 @@
 #include "image.h"
 
-
 extern int xres,yres;
 extern int xoff,yoff;
-extern image *screen;
+extern image *main_screen;
 
 void set_mode(int mode, int argc=0, char **argv=NULL);
@@ -40 +39 @@
 
 #endif
+

abuse/trunk/src/innet.cpp

@@ -607 +607 @@
                 if (wm->event_waiting())
                 {
-                  event ev;
+                  Event ev;
                   do
                   {
@@ -707 +707 @@
     if (wm->event_waiting())
     {
-      event ev;
+      Event ev;
       do
       {

abuse/trunk/src/level.cpp

@@ -771 +771 @@
       char name[100];
       sprintf(name,"shot%04d.pcx",screen_shot_on++);
-      write_PCX(screen,pal,name);
+      write_PCX(main_screen,pal,name);
     }
   }
@@ -802 +802 @@
     the_game->game_to_mouse(a->x,a->y,v,sx1,sy1);
     the_game->game_to_mouse(a->x+a->w,a->y+a->h,v,sx2,sy2);
-    screen->rectangle(sx1,sy1,sx2,sy2,c1);
-    screen->bar(sx1-1,sy1-1,sx1+1,sy1+1,c2);
-    screen->bar(sx2-1,sy2-1,sx2+1,sy2+1,c2);
+    main_screen->rectangle(sx1,sy1,sx2,sy2,c1);
+    main_screen->bar(sx1-1,sy1-1,sx1+1,sy1+1,c2);
+    main_screen->bar(sx2-1,sy2-1,sx2+1,sy2+1,c2);
   }
 }
@@ -1079 +1079 @@
     fp->read(old_name,fp->read_uint8());
     int new_type=o_remap[i];
-    if (new_type<total_objects)     // make sure old object still exsist
+    if (new_type<total_objects)     // make sure old object still exists
     {
       int k=0;
@@ -1117 +1117 @@
       fp->read(old_name,fp->read_uint8());
       int new_type=o_remap[i];
-      if (new_type!=0xffff)        // make sure old object still exsist
+      if (new_type!=0xffff)        // make sure old object still exists
       {
         int k=0;
@@ -1370 +1370 @@
   stat_man->update(10);
 
-  /***************** Check map for non exsistant tiles **************************/
+  /***************** Check map for non existsant tiles **************************/
   int32_t i,w;
   uint16_t *m;
@@ -1792 +1792 @@
       if (fp->read_uint8()==RC_32)
       {
-    int32_t m=fp->read_uint32();  // read how many weapons exsisted when last saved
+    int32_t m=fp->read_uint32();  // read how many weapons existsed when last saved
     int i;
     for (v=player_list; v; v=v->next)
@@ -2323 +2323 @@
             {
                 write_player_info( fp, objs );
-                write_thumb_nail( fp,screen );
+                write_thumb_nail( fp,main_screen );
             }
 

abuse/trunk/src/light.cpp

@@ -794 +794 @@
   light_patch *f=first;
 
-  screen->Lock();
-
-  int scr_w=screen->Size().x;
-  uint8_t *screen_line=screen->scan_line(cy1)+cx1;
+  main_screen->Lock();
+
+  int scr_w=main_screen->Size().x;
+  uint8_t *screen_line=main_screen->scan_line(cy1)+cx1;
 
   for (int y = cy1; y < cy2; )
@@ -887 +887 @@
     screen_line-=prefix;
   }
-  screen->Unlock();
+  main_screen->Unlock();
 
   while (first)

abuse/trunk/src/lisp/lisp.cpp

@@ -764 +764 @@
 
 
-LSymbol *make_find_symbol(char const *name)    // find a symbol, if it doesn't exsist it is created
+LSymbol *make_find_symbol(char const *name)    // find a symbol, if it doesn't exists it is created
 {
   LSymbol *s=find_symbol(name);

abuse/trunk/src/loadgame.cpp

@@ -112 +112 @@
 
   Jwindow *l_win=create_num_window(mx,MAX_SAVE_GAMES,MAX_SAVE_LINES,NULL);
-  event ev;
+  Event ev;
   int got_level=0;
   int quit=0;
@@ -238 +238 @@
     first->put_image(preview->screen,preview->x1(),preview->y1());
 
-    event ev;
+    Event ev;
     int got_level=0;
     int quit=0;

abuse/trunk/src/menu.cpp

@@ -52 +52 @@
   int x,y;
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
   if (x1<cx1) x1=cx1;
   if (y1<cy1) y1=cy1;
@@ -61 +61 @@
   percent=256-percent;
 
-  screen->Lock();
+  main_screen->Lock();
   for (y=y1; y<=y2; y++)
   {
-    uint8_t *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=main_screen->scan_line(y)+x1;
     for (x=x1; x<=x2; x++,sl++)
     {
@@ -74 +74 @@
     }
   }
-  screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
-  screen->Unlock();
+  main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
+  main_screen->Unlock();
 }
 
@@ -82 +82 @@
   int x,y;
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
+  main_screen->GetClip(cx1, cy1, cx2, cy2);
   if (x1<cx1) x1=cx1;
   if (y1<cy1) y1=cy1;
@@ -89 +89 @@
   if (x2<x1 || y2<y1) return ;
 
-  screen->Lock();
+  main_screen->Lock();
   for (y=y1; y<=y2; y++)
   {
-    uint8_t *sl=screen->scan_line(y)+x1;
+    uint8_t *sl=main_screen->scan_line(y)+x1;
     for (x=x1; x<=x2; x++,sl++)
     {
@@ -102 +102 @@
     }
   }
-  screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
-  screen->Unlock();
+  main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
+  main_screen->Unlock();
 }
 
 void dark_widget(int x1, int y1, int x2, int y2, int br, int dr, int amount)
 {
-  screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
-  screen->line(x1,y1,x1,y2,br);
-  screen->line(x1+1,y1,x2,y1,br);
-  screen->line(x2,y1+1,x2,y2,dr);
-  screen->line(x1+1,y2,x2,y2,dr);
+  main_screen->AddDirty(x1, y1, x2 + 1, y2 + 1);
+  main_screen->line(x1,y1,x1,y2,br);
+  main_screen->line(x1+1,y1,x2,y1,br);
+  main_screen->line(x2,y1+1,x2,y2,dr);
+  main_screen->line(x1+1,y2,x2,y2,dr);
   darken_area(x1+1,y1+1,x2-1,y2-1,amount);
 }
@@ -154 +154 @@
 
   int mw=(font->width())*maxw+20;
-  int mx=screen->Size().x/2-mw/2,
-      my=screen->Size().y/2-mh/2;
-
-
-  screen->AddDirty(mx, my, mx + mw, my + mh);
+  int mx=main_screen->Size().x/2-mw/2,
+      my=main_screen->Size().y/2-mh/2;
+
+
+  main_screen->AddDirty(mx, my, mx + mw, my + mh);
 
   if (title)
   {
     int tl=strlen(title)*font->width();
-    int tx=screen->Size().x/2-tl/2;
+    int tx=main_screen->Size().x/2-tl/2;
     dark_widget(tx-2,my-font->height()-4,tx+tl+2,my-2,wm->medium_color(),wm->dark_color(),180);
-    font->put_string(screen,tx+1,my-font->height()-2,title,wm->bright_color());
+    font->put_string(main_screen,tx+1,my-font->height()-2,title,wm->bright_color());
   }
 
@@ -175 +175 @@
   {
     char *ms=men_str(CAR(c));
-    font->put_string(screen,mx+10+1,y+1,ms,wm->black());
-    font->put_string(screen,mx+10,y,ms,wm->bright_color());
+    font->put_string(main_screen,mx+10+1,y+1,ms,wm->black());
+    font->put_string(main_screen,mx+10,y,ms,wm->bright_color());
     y+=font->height()+1;
   }
 
   wm->flush_screen();
-  event ev;
+  Event ev;
   int choice=0,done=0;
   int bh=font->height()+3;
@@ -240 +240 @@
       int by2=by1+bh-1;
 
-      screen->put_part(save,0,0,mx+1,by1,mx+mw-2,by2);
+      main_screen->put_part(save,0,0,mx+1,by1,mx+mw-2,by2);
       tint_area(mx+1,by1,mx+mw-2,by2,63,63,63,color);
 
       char *cur=men_str(nth(choice,args));
-      font->put_string(screen,mx+10+1,by1+3,cur,wm->black());
-      font->put_string(screen,mx+10,by1+2,cur,wm->bright_color());
-      screen->rectangle(mx+1,by1,mx+mw-2,by2,wm->bright_color());
+      font->put_string(main_screen,mx+10+1,by1+3,cur,wm->black());
+      font->put_string(main_screen,mx+10,by1+2,cur,wm->bright_color());
+      main_screen->rectangle(mx+1,by1,mx+mw-2,by2,wm->bright_color());
 
       color+=cdir;
@@ -256 +256 @@
       }
       wm->flush_screen();
-      save->put_image(screen,mx+1,by1);
+      save->put_image(main_screen,mx+1,by1);
     } else { Timer tmp; tmp.WaitMs(10); }
 
@@ -286 +286 @@
     while(volume_window)
     {
-        event ev;
+        Event ev;
 
         do
@@ -410 +410 @@
       fade_in(cache.img(im),16);
 
-      event ev;
+      Event ev;
       do
       { wm->flush_screen();
@@ -425 +425 @@
 
 
-void menu_handler(event &ev, InputManager *inm)
+void menu_handler(Event &ev, InputManager *inm)
 {
   switch (ev.type)
@@ -516 +516 @@
     {
       show_sell(1);
-      screen->clear();
+      main_screen->clear();
       if (title_screen>=0)
       {
         image *tit=cache.img(title_screen);
-          tit->put_image(screen,screen->Size().x/2-tit->Size().x/2,
-                          screen->Size().y/2-tit->Size().y/2);
+          tit->put_image(main_screen,main_screen->Size().x/2-tit->Size().x/2,
+                          main_screen->Size().y/2-tit->Size().y/2);
       }
       inm->redraw();
@@ -661 +661 @@
     list=make_default_buttons(xres-33,y,list);
 
-    InputManager *inm=new InputManager(screen,list);
+    InputManager *inm=new InputManager(main_screen,list);
     inm->allow_no_selections();
     inm->clear_current();
 
-    screen->AddDirty(0, 0, 320, 200);
-
-    event ev;
+    main_screen->AddDirty(0, 0, 320, 200);
+
+    Event ev;
 
     int stop_menu=0;
@@ -684 +684 @@
             inm->handle_event(ev,NULL);
             if (ev.type==EV_KEY && ev.key==JK_ESC)
-                wm->push_event(new event(ID_QUIT,NULL));
+                wm->Push(new Event(ID_QUIT,NULL));
 
             menu_handler(ev,inm);

abuse/trunk/src/morpher.cpp

@@ -26 +26 @@
     int32_t rx,ry;
     the_game->game_to_mouse(who->x-(cx>>16),who->y-(cy>>16),v,rx,ry);
-    mor->show(screen,rx,ry,color_table,pal,1000);
+    mor->show(main_screen,rx,ry,color_table,pal,1000);
     cx+=dcx;
     cy+=dcy;

abuse/trunk/src/net/engine.cpp

@@ -155 +155 @@
 
 
-  unlink(DIN_NAME);    // remove any previous files if they exsists
+  unlink(DIN_NAME);    // remove any previous files if they existss
   unlink(DOUT_NAME);
 

abuse/trunk/src/net/gserver.cpp

@@ -63 +63 @@
   int last_count=0;
   Jwindow *stat=NULL;
-  event ev;
+  Event ev;
   int abort=0;
   while (!abort && total_players()<main_net_cfg->min_players)

abuse/trunk/src/net/undrv.cpp

@@ -91 +91 @@
     unlink(DLOCK_NAME);
   }
-  unlink(DIN_NAME);    // remove any previous files if they exsists
+  unlink(DIN_NAME);    // remove any previous files if they existss
   unlink(DOUT_NAME);
   return 1;

abuse/trunk/src/netcfg.cpp

@@ -66 +66 @@
   Jwindow *j=wm->new_window(-1,0,-1,-1,new info_field(0, 0, 0, msg,
       new button(0, 30,CFG_ERR_OK,symbol_str("ok_button"),NULL)),symbol_str("input_error"));
-  event ev;
+  Event ev;
   do
   {
@@ -188 +188 @@
                         NULL)))),symbol_str("Networking"));
 
-  event ev;
+  Event ev;
   int done=0;
   do
@@ -270 +270 @@
 void net_configuration::error(char const *message)
 {
-  image *screen_backup=screen->copy();
+  image *screen_backup = main_screen->copy();
 
   image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1));
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(screen,x,y);
+  ns->put_image(main_screen,x,y);
   JCFont *fnt=wm->font();
 
   uint8_t *remap=white_light+30*256;
 
-  uint8_t *sl=screen->scan_line(0);
-  int xx=screen->Size().x*screen->Size().y;
+  uint8_t *sl = main_screen->scan_line(0);
+  int xx = main_screen->Size().x * main_screen->Size().y;
   for (; xx; xx--,sl++) *sl=remap[*sl];
 
@@ -287 +287 @@
     fy=y+ns_h/2-fnt->height();
 
-  fnt->put_string(screen,fx+1,fy+1,message,wm->black());
-  fnt->put_string(screen,fx,fy,message,wm->bright_color());
+  fnt->put_string(main_screen,fx+1,fy+1,message,wm->black());
+  fnt->put_string(main_screen,fx,fy,message,wm->bright_color());
 
 
@@ -299 +299 @@
     button *sb=new button(bx,by,NET_SERVER,ok,NULL);
 
-    InputManager inm(screen,sb);
+    InputManager inm(main_screen, sb);
     inm.allow_no_selections();
     inm.clear_current();
 
     int done=0;
-    event ev;
+    Event ev;
     do
     {
@@ -315 +315 @@
   }
 
-  screen_backup->put_image(screen,0,0);
+  screen_backup->put_image(main_screen, 0, 0);
   wm->flush_screen();
   delete screen_backup;
@@ -340 +340 @@
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(screen,x,y);
+  ns->put_image(main_screen,x,y);
   JCFont *fnt=wm->font();
   image *ok_image=cache.img(cache.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(),
@@ -419 +419 @@
 
   {
-    InputManager inm(screen,list);
+    InputManager inm(main_screen, list);
     inm.allow_no_selections();
     inm.clear_current();
 
     int done=0;
-    event ev;
+    Event ev;
     do
     {
@@ -455 +455 @@
   int ret=0;
 #if !defined __CELLOS_LV2__
-  screen->clear();
+  main_screen->clear();
 
   image *ns=cache.img(cache.reg("art/frame.spe","net_screen",SPEC_IMAGE,1));
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(screen,x,y);
+  ns->put_image(main_screen, x, y);
   char const *nw_s = symbol_str("Networking");
   JCFont *fnt=wm->font();
 
 
-  wm->font()->put_string(screen,x+ns_w/2-strlen(nw_s)*fnt->width()/2,y+21/2-fnt->height()/2,
+  wm->font()->put_string(main_screen,x+ns_w/2-strlen(nw_s)*fnt->width()/2,y+21/2-fnt->height()/2,
       nw_s,wm->medium_color());
   {
@@ -475 +475 @@
       sb=new button(x+40,y+ns_h-9-fnt->height(),NET_SINGLE,symbol_str("single_play"),sb);
 
-    InputManager inm(screen,sb);
+    InputManager inm(main_screen,sb);
 
     inm.allow_no_selections();
@@ -481 +481 @@
 
 
-    event ev;
+    Event ev;
     int done=0;
     int button_y=25,total_games=0;

abuse/trunk/src/objects.cpp

@@ -110 +110 @@
       if (t->tiv<=number || !t->vars[number])
       {
-    lbreak("access : variable does not exsist for this class\n");
+    lbreak("access : variable does not exists for this class\n");
     return 0;
       }
@@ -393 +393 @@
 
     for (i=sy1; i<=sy2; i++)
-      p->PutScanLine(screen,vec2i(sx,i),0);
+      p->PutScanLine(main_screen,vec2i(sx,i),0);
   }
 }
@@ -669 +669 @@
 {
   TransImage *cpict=picture();
-  cpict->PutFade(screen,
+  cpict->PutFade(main_screen,
           vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                 y-cpict->Size().y+1-current_vyadd),
@@ -681 +681 @@
   TransImage *cpict=picture();
   if (fade_count())
-    cpict->PutFadeTint(screen,
+    cpict->PutFadeTint(main_screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                      y-cpict->Size().y+1-current_vyadd),
@@ -690 +690 @@
 
   else
-    cpict->PutRemap(screen,
+    cpict->PutRemap(main_screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                      y-cpict->Size().y+1-current_vyadd),
@@ -701 +701 @@
   TransImage *cpict=picture();
   if (fade_count())
-    cpict->PutFadeTint(screen,
+    cpict->PutFadeTint(main_screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                      y-cpict->Size().y+1-current_vyadd),
@@ -710 +710 @@
 
   else
-    cpict->PutDoubleRemap(screen,
+    cpict->PutDoubleRemap(main_screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                      y-cpict->Size().y+1-current_vyadd),
@@ -722 +722 @@
 {
   TransImage *cpict=picture();
-  cpict->PutPredator(screen,
+  cpict->PutPredator(main_screen,
              vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                    y-cpict->Size().y+1-current_vyadd));
@@ -745 +745 @@
     {
       TransImage *cpict=picture();
-      cpict->PutImage(screen,
+      cpict->PutImage(main_screen,
                vec2i((direction<0 ? x-(cpict->Size().x-x_center()-1) : x-x_center())-current_vxadd,
                      y-cpict->Size().y+1-current_vyadd));

abuse/trunk/src/particle.cpp

@@ -165 +165 @@
   for (part_animation *p=first_anim; p; p=p->next)
   {
-    cache.part(p->seq->frames[p->frame])->draw(screen,p->x-v->xoff()+v->cx1,p->y-v->yoff()+v->cy1,p->dir);
+    cache.part(p->seq->frames[p->frame])->draw(main_screen,p->x-v->xoff()+v->cx1,p->y-v->yoff()+v->cy1,p->dir);
   }
 }
@@ -210 +210 @@
 {
     int cx1, cy1, cx2, cy2;
-    screen->GetClip(cx1, cy1, cx2, cy2);
+    main_screen->GetClip(cx1, cy1, cx2, cy2);
 
     int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
@@ -219 +219 @@
     s = ( 15 - s );
 
-    screen->Lock();
+    main_screen->Lock();
     while( t-- )
     {
@@ -226 +226 @@
         if( !( x < cx1 || y < cy1 || x >= cx2 || y >= cy2 ) )
         {
-            *(screen->scan_line( y ) + x ) = c;
+            *(main_screen->scan_line( y ) + x ) = c;
         }
         xo += dx;
         yo += dy;
     }
-    screen->Unlock();
+    main_screen->Unlock();
 }
 
@@ -239 +239 @@
 {
     int cx1, cy1, cx2, cy2;
-    screen->GetClip(cx1, cy1, cx2, cy2);
+    main_screen->GetClip(cx1, cy1, cx2, cy2);
 
     int t = abs( x2 - x1 ) > abs( y2 - y1 ) ? abs( x2 - x1 ) + 1 : abs( y2 - y1 ) + 1;
@@ -248 +248 @@
     s = ( 15 - s );
 
-    screen->Lock();
-
-    int w = screen->Size().x;
+    main_screen->Lock();
+
+    int w = main_screen->Size().x;
     uint8_t *addr;
 
@@ -261 +261 @@
         if( !( x <= cx1 || y <= cy1 || x >= cx2 - 1 || y >= cy2 - 1) )
         {
-            addr = screen->scan_line( y ) + x;
+            addr = main_screen->scan_line( y ) + x;
             *addr = c1;
             *(addr + w) = c2;
@@ -272 +272 @@
     }
 
-    screen->Unlock();
-}
-
+    main_screen->Unlock();
+}
+

abuse/trunk/src/profile.cpp

@@ -44 +44 @@
 }
 
-int profile_handle_event(event &ev)
+int profile_handle_event(Event &ev)
 {
   if (ev.type==EV_CLOSE_WINDOW && ev.window==prof_win)

abuse/trunk/src/profile.h

@@ -20 +20 @@
 void profile_update();
 void profile_toggle();
-int profile_handle_event(event &ev);
+int profile_handle_event(Event &ev);
 int profiling();
 

abuse/trunk/src/sdlport/event.cpp

@@ -36 +36 @@
 #include "game.h"
 
-extern int get_key_binding( char const *dir, int i );
+extern int get_key_binding(char const *dir, int i);
 extern int mouse_xscale, mouse_yscale;
 short mouse_buttons[5] = { 0, 0, 0, 0, 0 };
 
 // Pre-declarations
-void handle_mouse( event &ev );
+void handle_mouse(Event &ev);
 
 //
 // Constructor
 //
-event_handler::event_handler( image *screen, palette *pal )
-{
-    CHECK( screen && pal );
-    mouse = new JCMouse( screen, pal );
-    mhere = mouse->exsist();
+EventHandler::EventHandler(image *screen, palette *pal)
+{
+    CHECK(screen && pal);
+    mouse = new JCMouse(screen, pal);
+    mhere = mouse->exists();
     last_keystat = get_key_flags();
     ewaiting = 0;
 
     // Ignore activate events
-    SDL_EventState( SDL_ACTIVEEVENT, SDL_IGNORE );
-}
-
-//
-// Destructor
-//
-event_handler::~event_handler()
-{
-    delete mouse;
-}
-
-//
-// flush_screen()
-// Redraw the screen
-//
-void event_handler::flush_screen()
-{
-    update_dirty( screen );
+    SDL_EventState(SDL_ACTIVEEVENT, SDL_IGNORE);
 }
 
@@ -79 +62 @@
 // Return the flag for the key modifiers
 //
-int event_handler::get_key_flags()
+int EventHandler::get_key_flags()
 {
     SDLMod key_flag;
@@ -85 +68 @@
     key_flag = SDL_GetModState();
 
-    return ( ( key_flag & KMOD_SHIFT ) != 0 ) << 3 |
-           ( ( key_flag & KMOD_CTRL ) != 0 ) << 2 |
-           ( ( key_flag & KMOD_ALT ) != 0 ) << 1;
+    return ((key_flag & KMOD_SHIFT) != 0) << 3 |
+           ((key_flag & KMOD_CTRL) != 0) << 2 |
+           ((key_flag & KMOD_ALT) != 0) << 1;
 }
 
@@ -94 +77 @@
 // Are there any events in the queue?
 //
-int event_handler::event_waiting()
-{
-    if( ewaiting )
+int EventHandler::event_waiting()
+{
+    if(ewaiting)
     {
         return 1;
     }
-    if( SDL_PollEvent( NULL ) )
+    if(SDL_PollEvent(NULL))
     {
         ewaiting = 1;
     }
     return ewaiting;
-}
-
-//
-// add_redraw()
-// Add a redraw rectangle.
-//
-void event_handler::add_redraw( int X1, int Y1, int X2, int Y2, void *Start )
-{
-    event *ev;
-    ev = new event;
-    ev->type = EV_REDRAW;
-    ev->redraw.x1 = X1;
-    ev->redraw.x2 = X2;
-    ev->redraw.y1 = Y1;
-    ev->redraw.y2 = Y2;
-    ev->redraw.start = Start;
-    events.add_end(ev);
 }
 
@@ -128 +94 @@
 // Get and handle waiting events
 //
-void event_handler::get_event( event &ev )
-{
-    event *ep;
-    while( !ewaiting )
+void EventHandler::Get(Event &ev)
+{
+    Event *ep;
+    while(!ewaiting)
     {
         event_waiting();
@@ -142 +108 @@
     }
 
-    ep = (event *)events.first();
-    if( ep )
+    ep = (Event *)m_events.first();
+    if(ep)
     {
         ev = *ep;
-        events.unlink(ep);
+        m_events.unlink(ep);
         delete ep;
-        ewaiting = events.first() != NULL;
+        ewaiting = m_events.first() != NULL;
     }
     else
@@ -159 +125 @@
 
         // Gather events
-        SDL_Event event;
-        if( SDL_PollEvent( &event ) )
+        SDL_Event Event;
+        if(SDL_PollEvent(&Event))
         {
             // always sort the mouse out
-            handle_mouse( ev );
-            mouse->update( ev.mouse_move.x, ev.mouse_move.y, ev.mouse_button );
-
-            switch( event.type )
+            handle_mouse(ev);
+            mouse->update(ev.mouse_move.x, ev.mouse_move.y, ev.mouse_button);
+
+            switch(Event.type)
             {
                 case SDL_QUIT:
@@ -175 +141 @@
                 case SDL_MOUSEBUTTONUP:
                 {
-                    switch( event.button.button )
+                    switch(Event.button.button)
                     {
                         case 4:        // Mouse wheel goes up...
                         {
-                            ev.key = get_key_binding( "b4", 0 );
+                            ev.key = get_key_binding("b4", 0);
                             ev.type = EV_KEYRELEASE;
                             break;
@@ -185 +151 @@
                         case 5:        // Mouse wheel goes down...
                         {
-                            ev.key = get_key_binding( "b3", 0 );
+                            ev.key = get_key_binding("b3", 0);
                             ev.type = EV_KEYRELEASE;
                             break;
@@ -194 +160 @@
                 case SDL_MOUSEBUTTONDOWN:
                 {
-                    switch( event.button.button )
+                    switch(Event.button.button)
                     {
                         case 4:        // Mouse wheel goes up...
                         {
-                            ev.key = get_key_binding( "b4", 0 );
+                            ev.key = get_key_binding("b4", 0);
                             ev.type = EV_KEY;
                             break;
@@ -204 +170 @@
                         case 5:        // Mouse wheel goes down...
                         {
-                            ev.key = get_key_binding( "b3", 0 );
+                            ev.key = get_key_binding("b3", 0);
                             ev.type = EV_KEY;
                             break;
@@ -216 +182 @@
                     // Default to EV_SPURIOUS
                     ev.key = EV_SPURIOUS;
-                    if( event.type == SDL_KEYDOWN )
+                    if(Event.type == SDL_KEYDOWN)
                     {
                         ev.type = EV_KEY;
@@ -224 +190 @@
                         ev.type = EV_KEYRELEASE;
                     }
-                    switch( event.key.keysym.sym )
+                    switch(Event.key.keysym.sym)
                     {
                         case SDLK_DOWN:            ev.key = JK_DOWN; break;
@@ -266 +232 @@
                         {
                             // Only handle key down
-                            if( ev.type == EV_KEY )
+                            if(ev.type == EV_KEY)
                             {
                                 // Toggle fullscreen
-                                SDL_WM_ToggleFullScreen( SDL_GetVideoSurface() );
+                                SDL_WM_ToggleFullScreen(SDL_GetVideoSurface());
                             }
                             ev.key = EV_SPURIOUS;
@@ -277 +243 @@
                         {
                             // Only handle key down
-                            if( ev.type == EV_KEY )
+                            if(ev.type == EV_KEY)
                             {
                                 // Toggle grab mouse
-                                if( SDL_WM_GrabInput( SDL_GRAB_QUERY ) == SDL_GRAB_ON )
-                                {
-                                    the_game->show_help( "Grab Mouse: OFF\n" );
-                                    SDL_WM_GrabInput( SDL_GRAB_OFF );
+                                if(SDL_WM_GrabInput(SDL_GRAB_QUERY) == SDL_GRAB_ON)
+                                {
+                                    the_game->show_help("Grab Mouse: OFF\n");
+                                    SDL_WM_GrabInput(SDL_GRAB_OFF);
                                 }
                                 else
                                 {
-                                    the_game->show_help( "Grab Mouse: ON\n" );
-                                    SDL_WM_GrabInput( SDL_GRAB_ON );
+                                    the_game->show_help("Grab Mouse: ON\n");
+                                    SDL_WM_GrabInput(SDL_GRAB_ON);
                                 }
                             }
@@ -297 +263 @@
                         {
                             // Only handle key down
-                            if( ev.type == EV_KEY )
+                            if(ev.type == EV_KEY)
                             {
                                 // Grab a screenshot
-                                SDL_SaveBMP( SDL_GetVideoSurface(), "screenshot.bmp" );
-                                the_game->show_help( "Screenshot saved to: screenshot.bmp.\n" );
+                                SDL_SaveBMP(SDL_GetVideoSurface(), "screenshot.bmp");
+                                the_game->show_help("Screenshot saved to: screenshot.bmp.\n");
                             }
                             ev.key = EV_SPURIOUS;
@@ -308 +274 @@
                         default:
                         {
-                            ev.key = (int)event.key.keysym.sym;
+                            ev.key = (int)Event.key.keysym.sym;
                             // Need to handle the case of shift being pressed
                             // There has to be a better way
-                            if( (event.key.keysym.mod & KMOD_SHIFT) != 0 )
+                            if((Event.key.keysym.mod & KMOD_SHIFT) != 0)
                             {
-                                if( event.key.keysym.sym >= SDLK_a &&
-                                    event.key.keysym.sym <= SDLK_z )
+                                if(Event.key.keysym.sym >= SDLK_a &&
+                                    Event.key.keysym.sym <= SDLK_z)
                                 {
                                     ev.key -= 32;
                                 }
-                                else if( event.key.keysym.sym >= SDLK_1 &&
-                                         event.key.keysym.sym <= SDLK_5 )
+                                else if(Event.key.keysym.sym >= SDLK_1 &&
+                                         Event.key.keysym.sym <= SDLK_5)
                                 {
                                     ev.key -= 16;
@@ -325 +291 @@
                                 else
                                 {
-                                    switch( event.key.keysym.sym )
+                                    switch(Event.key.keysym.sym)
                                     {
                                         case SDLK_6:
@@ -371 +337 @@
 // able to detect that.
 //
-void handle_mouse( event &ev )
+void handle_mouse(Event &ev)
 {
     Uint8 buttons;
@@ -377 +343 @@
 
     // always sort the mouse out
-    buttons = SDL_GetMouseState( &x, &y );
-    x = (x << 16) / mouse_xscale;
-    y = (y << 16) / mouse_yscale;
-    if( x > screen->Size().x - 1 )
-    {
-        x = screen->Size().x - 1;
-    }
-    if( y > screen->Size().y - 1 )
-    {
-        y = screen->Size().y - 1;
-    }
+    buttons = SDL_GetMouseState(&x, &y);
+    x = Min((x << 16) / mouse_xscale, main_screen->Size().x - 1);
+    y = Min((y << 16) / mouse_yscale, main_screen->Size().y - 1);
     ev.mouse_move.x = x;
     ev.mouse_move.y = y;
@@ -393 +351 @@
 
     // Left button
-    if( (buttons & SDL_BUTTON(1)) && !mouse_buttons[1] )
+    if((buttons & SDL_BUTTON(1)) && !mouse_buttons[1])
     {
         ev.type = EV_MOUSE_BUTTON;
@@ -399 +357 @@
         ev.mouse_button |= LEFT_BUTTON;
     }
-    else if( !(buttons & SDL_BUTTON(1)) && mouse_buttons[1] )
+    else if(!(buttons & SDL_BUTTON(1)) && mouse_buttons[1])
     {
         ev.type = EV_MOUSE_BUTTON;
         mouse_buttons[1] = !mouse_buttons[1];
-        ev.mouse_button &= ( 0xff - LEFT_BUTTON );
+        ev.mouse_button &= (0xff - LEFT_BUTTON);
     }
 
     // Middle button
-    if( (buttons & SDL_BUTTON(2)) && !mouse_buttons[2] )
+    if((buttons & SDL_BUTTON(2)) && !mouse_buttons[2])
     {
         ev.type = EV_MOUSE_BUTTON;
@@ -414 +372 @@
         ev.mouse_button |= RIGHT_BUTTON;
     }
-    else if( !(buttons & SDL_BUTTON(2)) && mouse_buttons[2] )
+    else if(!(buttons & SDL_BUTTON(2)) && mouse_buttons[2])
     {
         ev.type = EV_MOUSE_BUTTON;
         mouse_buttons[2] = !mouse_buttons[2];
-        ev.mouse_button &= ( 0xff - LEFT_BUTTON );
-        ev.mouse_button &= ( 0xff - RIGHT_BUTTON );
+        ev.mouse_button &= (0xff - LEFT_BUTTON);
+        ev.mouse_button &= (0xff - RIGHT_BUTTON);
     }
 
     // Right button
-    if( (buttons & SDL_BUTTON(3)) && !mouse_buttons[3] )
+    if((buttons & SDL_BUTTON(3)) && !mouse_buttons[3])
     {
         ev.type = EV_MOUSE_BUTTON;
@@ -429 +387 @@
         ev.mouse_button |= RIGHT_BUTTON;
     }
-    else if( !(buttons & SDL_BUTTON(3)) && mouse_buttons[3] )
+    else if(!(buttons & SDL_BUTTON(3)) && mouse_buttons[3])
     {
         ev.type = EV_MOUSE_BUTTON;
         mouse_buttons[3] = !mouse_buttons[3];
-        ev.mouse_button &= ( 0xff - RIGHT_BUTTON );
-    }
-}
+        ev.mouse_button &= (0xff - RIGHT_BUTTON);
+    }
+}

abuse/trunk/src/sdlport/video.cpp

@@ -43 +43 @@
 
 SDL_Surface *window = NULL, *surface = NULL;
-image *screen = NULL;
+image *main_screen = NULL;
 int win_xscale, win_yscale, mouse_xscale, mouse_yscale;
 int xres, yres;
@@ -123 +123 @@
 
     // Create the screen image
-    screen = new image(vec2i(xres, yres), NULL, 2);
-    if(screen == NULL)
+    main_screen = new image(vec2i(xres, yres), NULL, 2);
+    if(main_screen == NULL)
     {
         // Our screen image is no good, we have to bail.
@@ -130 +130 @@
         exit(1);
     }
-    screen->clear();
+    main_screen->clear();
 
     if (flags.gl)
@@ -203 +203 @@
         SDL_WM_GrabInput(SDL_GRAB_ON);
 
-    update_dirty(screen);
+    update_dirty(main_screen);
 }
 
@@ -223 +223 @@
         SDL_FreeSurface(texture);
 #endif
-    delete screen;
+    delete main_screen;
 }
 

abuse/trunk/src/statbar.cpp

@@ -86 +86 @@
 
   int n=num/100;
-  scale_put(cache.img(offset[n]),screen,x,y,dw,dh);
+  scale_put(cache.img(offset[n]),main_screen,x,y,dw,dh);
   num-=n*100;
 
   x+=dw; n=num/10;
-  scale_put(cache.img(offset[n]),screen,x,y,dw,dh);
+  scale_put(cache.img(offset[n]),main_screen,x,y,dw,dh);
   num-=n*10;
 
   x+=dw;
-  scale_put(cache.img(offset[num]),screen,x,y,dw,dh);
+  scale_put(cache.img(offset[num]),main_screen,x,y,dw,dh);
 }
 
@@ -264 +264 @@
 
     if (need_rf)
-      redraw(screen);
+      redraw(main_screen);
   }
 }

abuse/trunk/src/view.cpp

@@ -308 +308 @@
       {
     last_weapons[i]=weapons[i];
-        sbar.draw_ammo(screen,i,weapons[i],current_weapon==i);
+        sbar.draw_ammo(main_screen,i,weapons[i],current_weapon==i);
       }
   }
@@ -637 +637 @@
 }
 
-int view::handle_event(event &ev)
+int view::handle_event(Event &ev)
 {
     if( ev.type == EV_KEY )
@@ -721 +721 @@
         int h = focus->hp();
         last_hp=h;
-        sbar.draw_health( screen, focus->hp() );
+        sbar.draw_health( main_screen, focus->hp() );
     }
     else
     {
-        sbar.draw_health( screen, 0 );
+        sbar.draw_health( main_screen, 0 );
     }
 }
@@ -738 +738 @@
                                  // when adding or deleting local players
 {
-  if (screen)
+  if (main_screen)
   {
     int t=total_local_players();
@@ -907 +907 @@
       current_object=o;
     }
-    sbar.redraw(screen);
+    sbar.redraw(main_screen);
 
     int i;

abuse/trunk/src/view.h

@@ -103 +103 @@
   void note_upkey();
   void note_downkey();
-  int handle_event(event &ev);
+  int handle_event(Event &ev);
   void update_scroll();
   void draw_hp();