Changeset 106 for abuseTweet

Timestamp:

Mar 15, 2008, 12:55:44 AM (15 years ago)

Author:

Sam Hocevar

Message:

• Rename the "eh" variable to "wm" because it's a window manager, not an event handler.
• No longer pass the window manager to functions, there's only one.

Inspired by Win32 Abuse changelog for January 28, 2001:

• Starting work on singleton code; will get rid of all

references to an arbitrary window_manager* because
there's only going to be one, and it's not ever
going to change.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (2 diffs)
• automap.cpp (modified) (3 diffs)
• chat.cpp (modified) (1 diff)
• chat.hpp (modified) (1 diff)
• clisp.cpp (modified) (3 diffs)
• config.cpp (modified) (1 diff)
• console.cpp (modified) (4 diffs)
• console.hpp (modified) (2 diffs)
• cop.cpp (modified) (4 diffs)
• demo.cpp (modified) (4 diffs)
• demo.hpp (modified) (1 diff)
• dev.cpp (modified) (84 diffs)
• dev.hpp (modified) (1 diff)
• devsel.cpp (modified) (6 diffs)
• devsel.hpp (modified) (2 diffs)
• director.cpp (modified) (3 diffs)
• endgame.cpp (modified) (13 diffs)
• game.cpp (modified) (38 diffs)
• game.hpp (modified) (1 diff)
• gamma.cpp (modified) (6 diffs)
• go.cpp (modified) (1 diff)
• gui.cpp (modified) (7 diffs)
• gui.hpp (modified) (2 diffs)
• imlib/filesel.cpp (modified) (6 diffs)
• imlib/filesel.hpp (modified) (1 diff)
• imlib/guistat.cpp (modified) (6 diffs)
• imlib/guistat.hpp (modified) (1 diff)
• imlib/input.cpp (modified) (23 diffs)
• imlib/input.hpp (modified) (6 diffs)
• imlib/jwindow.cpp (modified) (13 diffs)
• imlib/jwindow.hpp (modified) (3 diffs)
• imlib/pmenu.cpp (modified) (18 diffs)
• imlib/pmenu.hpp (modified) (3 diffs)
• imlib/scroller.cpp (modified) (35 diffs)
• imlib/scroller.hpp (modified) (3 diffs)
• imlib/tools.cpp (modified) (4 diffs)
• imlib/tools.hpp (modified) (1 diff)
• imlib/visobj.cpp (modified) (4 diffs)
• imlib/visobj.hpp (modified) (3 diffs)
• innet.cpp (modified) (7 diffs)
• level.cpp (modified) (4 diffs)
• loadgame.cpp (modified) (6 diffs)
• menu.cpp (modified) (18 diffs)
• net/gserver.cpp (modified) (4 diffs)
• netcfg.cpp (modified) (22 diffs)
• oldhelp.cpp (modified) (6 diffs)
• profile.cpp (modified) (3 diffs)
• scene.cpp (modified) (1 diff)
• statbar.cpp (modified) (1 diff)
• unixnfc.cpp (modified) (5 diffs)

abuse/trunk/src/ant.cpp

@@ -443 +443 @@
   {
     fade_out(8);
-    eh->set_mouse_position(0,0);
+    wm->set_mouse_position(0,0);
     screen->clear();
     image *im=cash.img(cash.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
@@ -468 +468 @@
     } else sprintf(msg,"%s : %s",symbol_str("lev_complete"),current_level->original_name());
 
-    int w=eh->font()->width()*strlen(msg),h=eh->font()->height();    
+    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,eh->bright_color());
-    screen->bar(x-9,y-9,x+w+9,y+h+9,eh->medium_color());
-
-    eh->font()->put_string(screen,x+1,y+1,msg,eh->dark_color());    
-    eh->font()->put_string(screen,x,y,msg,eh->bright_color());
-    eh->flush_screen();
+    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());
+    wm->flush_screen();
     milli_wait(500);
   }

abuse/trunk/src/automap.cpp

@@ -153 +153 @@
   if (automap_window)
   {    
-    eh->close_window(automap_window);
+    wm->close_window(automap_window);
     automap_window=NULL;
   } 
@@ -161 +161 @@
     old_dy=-1000;
 
-    automap_window=eh->new_window(0,0,w*AUTOTILE_WIDTH,h*AUTOTILE_HEIGHT);
-    automap_window->screen->bar(17,1,17+8*6+3,6,eh->medium_color());    
-    eh->font()->put_string(automap_window->screen,20,2,"AUTOMAP");
+    automap_window=wm->new_window(0,0,w*AUTOTILE_WIDTH,h*AUTOTILE_HEIGHT);
+    automap_window->screen->bar(17,1,17+8*6+3,6,wm->medium_color());    
+    wm->font()->put_string(automap_window->screen,20,2,"AUTOMAP");
     draw();    
   }  
@@ -198 +198 @@
         break;  
       case EV_CLOSE_WINDOW :
-        eh->close_window(automap_window);
+        wm->close_window(automap_window);
         automap_window=NULL;
         break;               

abuse/trunk/src/chat.cpp

@@ -13 +13 @@
 #include "dev.hpp"
 
-chat_console::chat_console(window_manager *WM, JCFont *font, int width, int height) :
-  console(WM,font,width,height<4 ? 4 : height,symbol_str("CHAT"))
+chat_console::chat_console(JCFont *font, int width, int height) :
+  console(font,width,height<4 ? 4 : height,symbol_str("CHAT"))
 {
   clear();

abuse/trunk/src/chat.hpp

@@ -21 +21 @@
   void put_all(char *st);
   void clear();
-  chat_console(window_manager *WM, JCFont *font, int width, int height);
+  chat_console(JCFont *font, int width, int height);
   
 } ;

abuse/trunk/src/clisp.cpp

@@ -927 +927 @@
       return ret;
     } break;
-    case 51 :   return new_lisp_pointer(eh->font()); break;
+    case 51 :   return new_lisp_pointer(wm->font()); break;
     case 52 : 
     {
@@ -1297 +1297 @@
       return 1;
     } break;
-    case 93 : return eh->dark_color(); break;
-    case 94 : return eh->medium_color(); break;
-    case 95 : return eh->bright_color(); break;
+    case 93 : return wm->dark_color(); break;
+    case 94 : return wm->medium_color(); break;
+    case 95 : return wm->bright_color(); break;
 
     case 99 : current_object->remove_object((game_object *)lpointer_value(CAR(args))); return 1; break;
@@ -2184 +2184 @@
       c_target=id;
       if (screen)
-        eh->set_mouse_shape(cash.img(c_target)->copy(),x,y);
+        wm->set_mouse_shape(cash.img(c_target)->copy(),x,y);
     } break;
     case 276 :

abuse/trunk/src/config.cpp

@@ -161 +161 @@
                         b4 = 0;
                 }
-                else if( !eh )
+                else if( !wm )
                 {
                         x = y = b1 = b2 = b3 = b4 = 0;

abuse/trunk/src/console.cpp

@@ -75 +75 @@
 }
 
-console::console(window_manager *WM, JCFont *font, int width, int height, char const *Name)
-{
-  wm=WM;
+console::console(JCFont *font, int width, int height, char const *Name)
+{
   con_win=NULL;
   w=width;
@@ -122 +121 @@
       memset(screen+w*(h-1),' ',w);
       redraw();
-      eh->flush_screen();
+      wm->flush_screen();
     }
   } else draw_cursor();    
@@ -173 +172 @@
 
 
-shell_term::shell_term(window_manager *WM, JCFont *font, int width, int height, char const *Name) :
-  console(WM,font,width,height,Name)
+shell_term::shell_term(JCFont *font, int width, int height, char const *Name) :
+  console(font,width,height,Name)
 {
   shcmd[0]=0;
@@ -191 +190 @@
 }
 
-int shell_term::handle_event(event &ev, window_manager *wm)
+int shell_term::handle_event(event &ev)
 {
   if (ev.window==con_win && con_win)

abuse/trunk/src/console.hpp

@@ -19 +19 @@
   char *screen;
   jwindow *con_win;
-  window_manager *wm;
   char *name;
   public :
 
-  console(window_manager *WM, JCFont *font, int width, int height, char const *Name);
+  console(JCFont *font, int width, int height, char const *Name);
   int showing() { return con_win!=NULL; }
   void show();
@@ -46 +45 @@
   char shcmd[300];
   public :
-  shell_term(window_manager *WM, JCFont *font, int width, int height, char const *Name);
+  shell_term(JCFont *font, int width, int height, char const *Name);
   virtual ~shell_term() {};
-  int handle_event(event &ev, window_manager *wm);
+  int handle_event(event &ev);
   virtual void prompt();
   virtual void execute(char const *st);

abuse/trunk/src/cop.cpp

@@ -1008 +1008 @@
   }
 
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
   if (local)
   {
@@ -1039 +1039 @@
 {
   fade_out(8);
-  eh->set_mouse_position(0,0);
+  wm->set_mouse_position(0,0);
   screen->clear();
   image *im=cash.img(cash.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
   im->put_image(screen,0,0);
   int x1=im->width()+1,y1=0,y2=screen->height();
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
   
   view *v=player_list; int tp=0,i;
@@ -1051 +1051 @@
   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,eh->bright_color());
+  fnt->put_string(screen,x,y,header_str,wm->bright_color());
   y+=fnt->height();
 
   screen->wiget_bar(x,y+2,x+strlen(header_str)*fnt->width(),y+fnt->height()-3,
-                     eh->bright_color(),eh->medium_color(),eh->dark_color());
+                     wm->bright_color(),wm->medium_color(),wm->dark_color());
   y+=fnt->height();
   v=player_list;
@@ -1075 +1075 @@
   }
   
-  eh->flush_screen();
+  wm->flush_screen();
   milli_wait(4000);   // wait 4 seconds
 

abuse/trunk/src/demo.cpp

@@ -35 +35 @@
 extern void fade_out(int steps);
 
-void get_event(event &ev, window_manager *wm)
+void get_event(event &ev)
 { wm->get_event(ev); 
   switch (ev.type)
@@ -57 +57 @@
 }
 
-int event_waiting(window_manager *wm)
+int event_waiting()
 { return wm->event_waiting(); }
 
@@ -120 +120 @@
         int32_t mx,my;
         the_game->game_to_mouse(player_list->pointer_x,player_list->pointer_y,player_list,mx,my);
-        eh->set_mouse_position(small_render ? mx*2 : mx, small_render ? my*2 : my);
+        wm->set_mouse_position(small_render ? mx*2 : mx, small_render ? my*2 : my);
       }
       else
@@ -210 +210 @@
       l_difficulty=initial_difficulty;
       the_game->set_state(MENU_STATE);
-      eh->push_event(new event(ID_NULL,NULL));
+      wm->push_event(new event(ID_NULL,NULL));
 
       view *v=player_list;

abuse/trunk/src/demo.hpp

@@ -38 +38 @@
 extern demo_manager demo_man;
 
-extern void get_event(event &ev, window_manager *wm);
-extern int event_waiting(window_manager *wm);
+extern void get_event(event &ev);
+extern int event_waiting();
 
 

abuse/trunk/src/dev.cpp

@@ -100 +100 @@
   public :
   cached_image(int Id) { id=Id; }
-  virtual void draw(image *screen, int x, int y, 
-                    window_manager *wm, filter *f)
+  virtual void draw(image *screen, int x, int y, filter *f)
   {
     if (f)
@@ -108 +107 @@
       cash.img(id)->put_image(screen,x,y); 
   }
-  virtual int width(window_manager *wm) { return cash.img(id)->width(); }
-  virtual int height(window_manager *wm) { return cash.img(id)->height(); }
+  virtual int width() { return cash.img(id)->width(); }
+  virtual int height() { return cash.img(id)->height(); }
 } ;
 
@@ -139 +138 @@
 {
   public :
-  amb_cont(int X, int Y, ifield *Next) : scroller(X,Y,ID_NULL,100,eh->font()->height()+2,0,64,Next) 
+  amb_cont(int X, int Y, ifield *Next) : scroller(X,Y,ID_NULL,100,wm->font()->height()+2,0,64,Next) 
   { if (player_list) sx=player_list->ambient; }
-  virtual void scroll_event(int newx, image *screen, window_manager *wm)
+  virtual void scroll_event(int newx, image *screen)
   {
     screen->bar(x,y,x+l-1,y+h-1,wm->dark_color());
     char st[100];
     sprintf(st,"%d",newx);
-    wm->font()->put_string(screen,x+30,y+1,st,eh->bright_color());
+    wm->font()->put_string(screen,x+30,y+1,st,wm->bright_color());
     if (player_list)
       player_list->ambient=newx;
@@ -160 +159 @@
 
 
-  jwindow *quitw=eh->new_window(xres/2+40,yres/2,80,-1,
+  jwindow *quitw=wm->new_window(xres/2+40,yres/2,80,-1,
                           new button(WINDOW_FRAME_LEFT+10,WINDOW_FRAME_TOP+20,ID_QUIT_OK,ok_image,
                           new button(WINDOW_FRAME_LEFT+38,WINDOW_FRAME_TOP+20,ID_CANCEL,cancel_image,
                           new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,symbol_str("sure?"),NULL))),
                                     symbol_str("quit_title"));
-  eh->grab_focus(quitw);
+  wm->grab_focus(quitw);
   int fin=0,quit=0;
   do
   {
-    eh->flush_screen();
+    wm->flush_screen();
 
     event ev;
-    eh->get_event(ev);
+    wm->get_event(ev);
     if (ev.type==EV_MESSAGE && ev.message.id==ID_QUIT_OK)
       fin=quit=1;
@@ -189 +188 @@
   the_game->reset_keymap();
 
-  eh->close_window(quitw);
-  eh->flush_screen();
+  wm->close_window(quitw);
+  wm->flush_screen();
   return quit;
 }
@@ -292 +291 @@
 int32_t dev_controll::snap_x(int32_t x)
 {
-  if (eh->key_pressed(JK_CTRL_L) || eh->key_pressed(JK_CTRL_R))
+  if (wm->key_pressed(JK_CTRL_L) || wm->key_pressed(JK_CTRL_R))
     return x-(x%the_game->ftile_width());
-  else if (eh->key_pressed(JK_ALT_L) || eh->key_pressed(JK_ALT_R))
+  else if (wm->key_pressed(JK_ALT_L) || wm->key_pressed(JK_ALT_R))
     return x-(x%the_game->ftile_width())+the_game->ftile_width()/2;
   else return x;  
@@ -301 +300 @@
 int32_t dev_controll::snap_y(int32_t y)
 {
-  if (eh->key_pressed(JK_CTRL_L) || eh->key_pressed(JK_CTRL_R))
+  if (wm->key_pressed(JK_CTRL_L) || wm->key_pressed(JK_CTRL_R))
     return y-(y%the_game->ftile_height())-1;
-  else if (eh->key_pressed(JK_ALT_L) || eh->key_pressed(JK_ALT_R))
+  else if (wm->key_pressed(JK_ALT_L) || wm->key_pressed(JK_ALT_R))
     return y-(y%the_game->ftile_height())+the_game->ftile_height()/2-1;
   else return y;
@@ -311 +310 @@
 {
   if (!ambw)
-  ambw=eh->new_window(prop->getd("ambient x",-1),
+  ambw=wm->new_window(prop->getd("ambient x",-1),
                       prop->getd("ambient y",-1),-1,-1,
                       new amb_cont(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,NULL),"ambient");
@@ -466 +465 @@
           im->put_image(screen,f->x-vx+v->cx1-im->width()/2,f->y-vy+v->cy1-im->height()/2,1);
           screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
-                            eh->medium_color());
+                            wm->medium_color());
         }
       }
@@ -484 +483 @@
       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,eh->bright_color());
+      screen->rectangle(rx1-l,ry1-h,rx1+l,ry1+h,wm->bright_color());
     }
 
@@ -508 +507 @@
           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,eh->bright_color());
+          screen->line(x1,y1,x2,y2,wm->bright_color());
         }
 
@@ -527 +526 @@
       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,eh->bright_color());
+      screen->rectangle(rx1,ry1,rx2,ry2,wm->bright_color());
 
       the_game->game_to_mouse(selected_object->x,selected_object->y,current_view,x1,y1);
@@ -574 +573 @@
     {
       int h=st[i]*100/3000;  x++;
-      memprof->screen->bar(x,y,x,y+h,eh->bright_color());
+      memprof->screen->bar(x,y,x,y+h,wm->bright_color());
       h=ch[i]*100/3000;
-      memprof->screen->bar(x,y,x,y+h,eh->medium_color());
+      memprof->screen->bar(x,y,x,y+h,wm->medium_color());
       x++;
     }
@@ -583 +582 @@
     char buf[100];
     sprintf(buf,"%8ld %8ld",(long int)j_allocated(),(long int)j_available());
-    eh->font()->put_string(memprof->screen,memprof->x1(),memprof->y2()-eh->font()->height(),buf);
+    wm->font()->put_string(memprof->screen,memprof->x1(),memprof->y2()-wm->font()->height(),buf);
 
   }
@@ -595 +594 @@
     prop->setd("memprof x",memprof->x);
     prop->setd("memprof y",memprof->y);
-    eh->close_window(memprof);
+    wm->close_window(memprof);
     memprof=NULL;
   } else
@@ -603 +602 @@
     jfree(st);
     jfree(ch);
-    memprof=eh->new_window(0,0,total*2+20,100,NULL);
+    memprof=wm->new_window(0,0,total*2+20,100,NULL);
     update_memprof();   
   }
@@ -615 +614 @@
     prop->setd("toolbar x",tbw->x);
     prop->setd("toolbar y",tbw->y);
-    eh->close_window(tbw);
+    wm->close_window(tbw);
     tbw=NULL;
   } else
@@ -631 +630 @@
                                              ID_NULL,
                                              5,(visual_object **)dev_mode_pict,dev_mode_ids,DEV_MODES,
-                                                pal,pal,eh,NULL);
-    tbw=eh->new_window(prop->getd("toolbar x",-1),
+                                                pal,pal,NULL);
+    tbw=wm->new_window(prop->getd("toolbar x",-1),
                        prop->getd("toolbar y",-1),-1,-1,tp);
-    tp->set_x(setx,tbw->screen,eh);
+    tp->set_x(setx,tbw->screen);
   }
 }
@@ -645 +644 @@
     prop->setd("layer x",show_menu->x);
     prop->setd("layer y",show_menu->y);
-    eh->close_window(show_menu);
+    wm->close_window(show_menu);
     show_menu=NULL;
   } else
@@ -659 +658 @@
     button *fb=new button(sx,sy+ 0,  SHOW_FOREGROUND,       symbol_str("l_fore"),bdb);      if (dev&DRAW_FG_LAYER)       fb->push();
 
-    show_menu=eh->new_window(prop->getd("layer x",-1),
+    show_menu=wm->new_window(prop->getd("layer x",-1),
                              prop->getd("layer y",-1),
                              -1,-1,fb,symbol_str(symbol_str("SHOW?")));
@@ -676 +675 @@
     prop->setd("objects x",omenu->x);
     prop->setd("objects y",omenu->y);
-    eh->close_window(omenu);
+    wm->close_window(omenu);
     omenu=NULL;
     jfree(listable_objs);
@@ -698 +697 @@
       }
               
-    omenu=eh->new_window(prop->getd("objects x",0),
+    omenu=wm->new_window(prop->getd("objects x",0),
                          prop->getd("objects y",0),-1,-1,
                          new pick_list(WINDOW_FRAME_LEFT,
-                                       WINDOW_FRAME_TOP,DEV_CREATE,yres/eh->font()->height()/2,
+                                       WINDOW_FRAME_TOP,DEV_CREATE,yres/wm->font()->height()/2,
                                        listable_objs,total_listable,0,NULL,cash.img(window_texture)));
   }  
@@ -721 +720 @@
     prop->setd("pal x",pmenu->x);
     prop->setd("pal y",pmenu->y);
-    eh->close_window(pmenu);
+    wm->close_window(pmenu);
     pmenu=NULL;
     jfree(pwin_list);
@@ -733 +732 @@
       pwin_list[i]=pal_wins[i]->name;
 
-    pmenu=eh->new_window(prop->getd("pal x",0),
+    pmenu=wm->new_window(prop->getd("pal x",0),
                          prop->getd("pal y",-1),
                          -1,-1,
                          new pick_list(WINDOW_FRAME_LEFT,
-                                       WINDOW_FRAME_TOP,DEV_PALETTE,yres/eh->font()->height()/2,
+                                       WINDOW_FRAME_TOP,DEV_PALETTE,yres/wm->font()->height()/2,
                                        pwin_list,total_pals,0,NULL,cash.img(window_texture)));
   } else the_game->show_help(symbol_str("no_pals"));
@@ -751 +750 @@
 
     tile_picker *f_tp=new tile_picker(WINDOW_FRAME_LEFT+1,WINDOW_FRAME_TOP+1,
-                                         DEV_FG_PICKER,SPEC_FORETILE,eh,fg_scale,maxh,fg_w,NULL);
+                                         DEV_FG_PICKER,SPEC_FORETILE,fg_scale,maxh,fg_w,NULL);
     f_tp->reverse();
 
-    forew=eh->new_window(prop->getd("fore x",-30),
+    forew=wm->new_window(prop->getd("fore x",-30),
                          prop->getd("fore y",0),
                          -1,-1,
@@ -763 +762 @@
     prop->setd("fore x",forew->x);
     prop->setd("fore y",forew->y);
-    eh->close_window(forew);
+    wm->close_window(forew);
     forew=NULL;
   }
@@ -772 +771 @@
 /*  if (!music_window)
   {
-    music_window=eh->new_window(-1,30,0,0,
+    music_window=wm->new_window(-1,30,0,0,
                          new pick_list(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,
                                        DEV_MUSIC_PICKLIST,10,song_list,total_songs,0,NULL));
-    eh->fnt->put_string(music_window->screen,WINDOW_FRAME_LEFT,1,"songs");
+    wm->fnt->put_string(music_window->screen,WINDOW_FRAME_LEFT,1,"songs");
   } else
   { 
-    eh->close_window(music_window);
+    wm->close_window(music_window);
     music_window=NULL;
   }*/
@@ -790 +789 @@
     int maxh=(yres-25)/(the_game->btile_height()/bg_scale);
 
-    backw=eh->new_window(prop->getd("back x",-30),
+    backw=wm->new_window(prop->getd("back x",-30),
                          prop->getd("back y",0),
                          -1,-1,
                          new tile_picker(WINDOW_FRAME_LEFT+1,WINDOW_FRAME_TOP+1,
-                                         DEV_BG_PICKER,SPEC_BACKTILE,eh,bg_scale,maxh,bg_w,NULL),symbol_str("l_bg"));
+                                         DEV_BG_PICKER,SPEC_BACKTILE,bg_scale,maxh,bg_w,NULL),symbol_str("l_bg"));
   } else
   { 
@@ -800 +799 @@
     prop->setd("back x",backw->x);
     prop->setd("back y",backw->y);
-    eh->close_window(backw);
+    wm->close_window(backw);
     backw=NULL;
   }
@@ -812 +811 @@
         wh=WINDOW_FRAME_TOP+1;
     int bw=cash.img(dev_forward)->width();
-    search_window=eh->new_window(prop->getd("searchw x",-30),
+    search_window=wm->new_window(prop->getd("searchw x",-30),
                                  prop->getd("searchw y",0),
                                  -1,-1,
@@ -818 +817 @@
                                                 "***************************",
                                                 prop->get("search name",""),
-                                  new button(wl+bw*1,wh+eh->font()->height()+5,ID_SEARCH_BACKWARD,
+                                  new button(wl+bw*1,wh+wm->font()->height()+5,ID_SEARCH_BACKWARD,
                                             cash.img(dev_backward),
-                                  new button(wl+bw*3,wh+eh->font()->height()+5,ID_SEARCH_FOREWARD,
+                                  new button(wl+bw*3,wh+wm->font()->height()+5,ID_SEARCH_FOREWARD,
                                             cash.img(dev_forward),NULL))),"SEARCH");
     searchw_on=0;
@@ -829 +828 @@
     prop->setd("searchw y",search_window->y);
     prop->set("search name",search_window->read(ID_SEARCH_TEXT));
-    eh->close_window(search_window);
+    wm->close_window(search_window);
     search_window=NULL;
     search_object=NULL;
@@ -961 +960 @@
   dev_console=new dev_term(50,18,this);
   if (start_edit)
-    dev_menu=make_menu(0,yres-eh->font()->height()-5);    
+    dev_menu=make_menu(0,yres-wm->font()->height()-5);    
 
   if (get_option("-nolight"))
@@ -1243 +1242 @@
       cur_fg=current_level->get_fg(x,y);
       if (forew)      
-        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen,eh);      
+        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);      
       the_game->need_refresh();
     }
@@ -1267 +1266 @@
 
       if (forew)      
-        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen,eh);      
+        ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);      
     }   
   }
@@ -1349 +1348 @@
   if (!lightw)
   {
-    int wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,bh=16+6,bw=20+6,th=eh->font()->height()+4;    
-    lightw=eh->new_window(prop->getd("light create x",0),
+    int wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,bh=16+6,bw=20+6,th=wm->font()->height()+4;    
+    lightw=wm->new_window(prop->getd("light create x",0),
                           prop->getd("light create y",0),
                           -1,-1,new button_box(wl,wh,DEV_LIGHT_BUTTON_BOX,1,
@@ -1388 +1387 @@
     prop->setd("light create r1",atoi(lightw->read(DEV_LIGHTR1)));
     prop->setd("light create r2",atoi(lightw->read(DEV_LIGHTR2)));
-    eh->close_window(lightw);
+    wm->close_window(lightw);
     lightw=NULL;
   }
@@ -1396 +1395 @@
 {
   ai_object=o;
-  int th=eh->font()->height()+4,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP+20;
+  int th=wm->font()->height()+4,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP+20;
   if (figures[o->otype]->total_fields)
   {
@@ -1424 +1423 @@
       wh+=th;
     }         
-    aiw=eh->new_window(prop->getd("ai x",0),
+    aiw=wm->new_window(prop->getd("ai x",0),
                        prop->getd("ai y",0),
                        -1,-1,                
@@ -1432 +1431 @@
   else
   {
-    aiw=eh->new_window(prop->getd("ai x",0),
+    aiw=wm->new_window(prop->getd("ai x",0),
                        prop->getd("ai y",0),
                        -1,-1,
@@ -1450 +1449 @@
   }
 
-  eh->grab_focus(aiw);
+  wm->grab_focus(aiw);
 }
 
@@ -1461 +1460 @@
       prop->setd("ledit x",ledit->x);
       prop->setd("ledit y",ledit->y);
-      eh->close_window(ledit); ledit=NULL;
+      wm->close_window(ledit); ledit=NULL;
     }
     edit_light=NULL;
@@ -1536 +1535 @@
     prop->setd("ai x",aiw->x);
     prop->setd("ai y",aiw->y);
-    eh->close_window(aiw);
+    wm->close_window(aiw);
     aiw=NULL;
     ai_object=NULL;
@@ -1577 +1576 @@
       current_area->view_yoff_speed=atoi(area_win->read(DEV_AREA_VIEW_YOFF_SPEED));
     }    
-    eh->close_window(area_win);
+    wm->close_window(area_win);
     area_win=NULL;
   }
@@ -1609 +1608 @@
       if (area_win) close_area_win(0);
       int wl=WINDOW_FRAME_LEFT;
-      int wh=WINDOW_FRAME_TOP,th=eh->font()->height()+12,bw=cash.img(dev_ok)->width()+10;
-      area_win=eh->new_window(prop->getd("area_box x",0),
+      int wh=WINDOW_FRAME_TOP,th=wm->font()->height()+12,bw=cash.img(dev_ok)->width()+10;
+      area_win=wm->new_window(prop->getd("area_box x",0),
                               prop->getd("area_box y",0),
                               -1,-1,
@@ -1647 +1646 @@
     prop->setd("oedit x",oedit->x);
     prop->setd("oedit y",oedit->y);
-    eh->close_window(oedit);
+    wm->close_window(oedit);
     oedit=NULL;      
     edit_object=NULL;
@@ -1666 +1665 @@
   }
 
-  if (dev_menu && dev_menu->handle_event(ev,screen,eh)) return ;
+  if (dev_menu && dev_menu->handle_event(ev,screen)) return ;
 
   if (!current_level) return ;
@@ -1677 +1676 @@
     dlasty=last_demo_my;    
   }
-  if (dev_console && dev_console->handle_event(ev,eh))
+  if (dev_console && dev_console->handle_event(ev))
     return;
 
@@ -1941 +1940 @@
             int bw=20+6,bh=16+6,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP;
 
-            oedit=eh->new_window(prop->getd("oedit x",0),
+            oedit=wm->new_window(prop->getd("oedit x",0),
                                  prop->getd("oedit y",0),
                                  -1,-1,new button_box(wl,wh,ID_NULL,1,
@@ -1969 +1968 @@
               prop->setd("ledit x",ledit->x);
               prop->setd("ledit x",ledit->y);
-              eh->close_window(ledit);
+              wm->close_window(ledit);
             }
-            int bw=20+6,bh=16+6,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,th=eh->font()->height()+4;
+            int bw=20+6,bh=16+6,wl=WINDOW_FRAME_LEFT,wh=WINDOW_FRAME_TOP,th=wm->font()->height()+4;
             edit_light=selected_light;
             if (edit_object)
@@ -1978 +1977 @@
               edit_light->known=1;
             }
-            ledit=eh->new_window(prop->getd("ledit x",0),
+            ledit=wm->new_window(prop->getd("ledit x",0),
                                  prop->getd("ledit y",0),
                                  -1,-1,
@@ -2059 +2058 @@
           if (mess_win)
           {
-            eh->close_window(mess_win);
+            wm->close_window(mess_win);
             mess_win=NULL;
           } break;
@@ -2067 +2066 @@
           if (!mess_win)
           {
-            mess_win=file_dialog(eh,symbol_str("level_name"),current_level ? current_level->name() : "",
+            mess_win=file_dialog(symbol_str("level_name"),current_level ? current_level->name() : "",
                                  ID_LEVEL_LOAD_OK,symbol_str("ok_button"),ID_CANCEL,symbol_str("cancel_button"),
                                  symbol_str("FILENAME"),ID_MESS_STR1);
-            eh->grab_focus(mess_win);
+            wm->grab_focus(mess_win);
           }
         } break;
@@ -2078 +2077 @@
           sprintf(cmd,"load %s",mess_win->read(ID_MESS_STR1));
           dev_cont->do_command(cmd,ev);
-          eh->push_event(new event(ID_CANCEL,NULL));        // close window
+          wm->push_event(new event(ID_CANCEL,NULL));        // close window
         } break;        
         case ID_GAME_SAVE :
@@ -2103 +2102 @@
           if (!mess_win)
           {
-            mess_win=file_dialog(eh,symbol_str("saveas_name"),current_level ? current_level->name() : "untitled.spe",
+            mess_win=file_dialog(symbol_str("saveas_name"),current_level ? current_level->name() : "untitled.spe",
                                ID_LEVEL_SAVEAS_OK,symbol_str("ok_button"),
                                  ID_CANCEL,symbol_str("cancel_button"),
                                  symbol_str("FILENAME"),ID_MESS_STR1);
-            eh->grab_focus(mess_win);
+            wm->grab_focus(mess_win);
           }
         } break;
@@ -2115 +2114 @@
           {
             current_level->set_name(mess_win->read(ID_MESS_STR1));
-            eh->push_event(new event(ID_CANCEL,NULL));        // close window after save
-            eh->push_event(new event(ID_LEVEL_SAVE,NULL));          
+            wm->push_event(new event(ID_CANCEL,NULL));        // close window after save
+            wm->push_event(new event(ID_LEVEL_SAVE,NULL));          
           }
         } break;
@@ -2147 +2146 @@
           if (!mess_win)
           {
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                        new button(WINDOW_FRAME_LEFT+10,WINDOW_FRAME_TOP+20,ID_LEVEL_NEW_OK,symbol_str("YES"),
                        new button(WINDOW_FRAME_LEFT+40,WINDOW_FRAME_TOP+20,ID_CANCEL,symbol_str("NO"),
               new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,symbol_str("sure?"),NULL))),symbol_str("New?"));
-            eh->grab_focus(mess_win);
+            wm->grab_focus(mess_win);
           }
         } break;
         case ID_LEVEL_NEW_OK :
         {
-          eh->push_event(new event(ID_CANCEL,NULL));  // close_window
+          wm->push_event(new event(ID_CANCEL,NULL));  // close_window
           if (current_level)      
             delete current_level;        
@@ -2165 +2164 @@
           if (!mess_win)
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                     new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("width_"),"****",
                                current_level ? current_level->foreground_width() : 100,
@@ -2182 +2181 @@
                                     atoi(mess_win->read(ID_MESS_STR2)));
           } else the_game->show_help("Create a level first!");
-          eh->push_event(new event(ID_CANCEL,NULL));  // close_window
+          wm->push_event(new event(ID_CANCEL,NULL));  // close_window
         } break;
 
@@ -2217 +2216 @@
           if (!mess_win)
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                     new text_field(wl,wt+h*0,ID_RECORD_DEMO_FILENAME,
                                    "demo filename","*******************",
@@ -2230 +2229 @@
         {
           demo_man.set_state(demo_manager::RECORDING,mess_win->read(ID_RECORD_DEMO_FILENAME));
-          eh->push_event(new event(ID_CANCEL,NULL));        // close window       
+          wm->push_event(new event(ID_CANCEL,NULL));        // close window       
         } break;
 
@@ -2237 +2236 @@
           if (!mess_win)
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                     new text_field(wl,wt+h*0,ID_PLAY_DEMO_FILENAME,
                                    "demo filename","*******************",
@@ -2250 +2249 @@
         {
           demo_man.set_state(demo_manager::PLAYING,mess_win->read(ID_PLAY_DEMO_FILENAME));
-          eh->close_window(mess_win);
+          wm->close_window(mess_win);
           mess_win=NULL;
         } break; 
@@ -2258 +2257 @@
           if (!mess_win)
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                     new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("x_mul"),"****",bg_xmul,
                     new text_field(wl,wt+h*1,ID_MESS_STR2,symbol_str("x_div"),"****",bg_xdiv,
@@ -2278 +2277 @@
               (((float)tbg_ymul/(float)tbg_ydiv) < ((float)bg_ymul/(float)bg_ydiv)))
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-
-            warn_win=eh->new_window(xres/2-40,yres/2-40,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+
+            warn_win=wm->new_window(xres/2-40,yres/2-40,-1,-1,
                               new info_field(wl,wt,ID_NULL,
                                           symbol_str("back_loss"),
@@ -2286 +2285 @@
                                           new button(wt+40,wt+h*4,ID_WARN_CANCEL,symbol_str("cancel_button"),NULL))),
                                     symbol_str("WARNING"));
-            eh->grab_focus(warn_win);
-          } else eh->push_event(new event(ID_SET_SCROLL_OK,NULL));
+            wm->grab_focus(warn_win);
+          } else wm->push_event(new event(ID_SET_SCROLL_OK,NULL));
         } break;
         case ID_WARN_CANCEL :
         {
-          eh->close_window(warn_win); warn_win=NULL;
-          eh->push_event(new event(ID_CANCEL,NULL));
+          wm->close_window(warn_win); warn_win=NULL;
+          wm->push_event(new event(ID_CANCEL,NULL));
         } break;
         case ID_SET_SCROLL_OK :
         {
-          if (warn_win) { eh->close_window(warn_win); warn_win=NULL; }
+          if (warn_win) { wm->close_window(warn_win); warn_win=NULL; }
           bg_xmul=atoi(mess_win->read(ID_MESS_STR1));
           bg_xdiv=atoi(mess_win->read(ID_MESS_STR2));
           bg_ymul=atoi(mess_win->read(ID_MESS_STR3));
           bg_ydiv=atoi(mess_win->read(ID_MESS_STR4));
-          eh->push_event(new event(ID_CANCEL,NULL));        // close window
+          wm->push_event(new event(ID_CANCEL,NULL));        // close window
         } break;
 
@@ -2323 +2322 @@
           if (!mess_win)
           {
-            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=eh->font()->height()+8;
-            mess_win=eh->new_window(xres/2,yres/2,-1,-1,
+            int wl=WINDOW_FRAME_LEFT,wt=WINDOW_FRAME_TOP,h=wm->font()->height()+8;
+            mess_win=wm->new_window(xres/2,yres/2,-1,-1,
                     new text_field(wl,wt+h*0,ID_MESS_STR1,symbol_str("ap_width"),"****",2,
                     new text_field(wl,wt+h*1,ID_MESS_STR2,symbol_str("ap_height"),"****",2,
@@ -2340 +2339 @@
           char const *s=name;
           eval(compile(s));
-          eh->push_event(new event(ID_CANCEL,NULL));        // close window
+          wm->push_event(new event(ID_CANCEL,NULL));        // close window
         } break;
         case ID_TOGGLE_DELAY :
@@ -2471 +2470 @@
           prop->setd("ledit x",ledit->x);
           prop->setd("ledit y",ledit->y);
-          eh->close_window(ledit); ledit=NULL;
+          wm->close_window(ledit); ledit=NULL;
           if (current_level)
             current_level->remove_light(edit_light);
@@ -2499 +2498 @@
           prop->setd("ledit x",ledit->x);
           prop->setd("ledit y",ledit->y);
-          eh->close_window(ledit); ledit=NULL;
+          wm->close_window(ledit); ledit=NULL;
           the_game->need_refresh();       
         } break;
@@ -2506 +2505 @@
           prop->setd("ledit x",ledit->x);
           prop->setd("ledit y",ledit->y);
-          eh->close_window(ledit); ledit=NULL;
+          wm->close_window(ledit); ledit=NULL;
           state=DEV_MOVE_LIGHT;
         } break;
@@ -2514 +2513 @@
           prop->setd("ledit x",ledit->x);
           prop->setd("ledit y",ledit->y);
-          eh->close_window(ledit); ledit=NULL;    
+          wm->close_window(ledit); ledit=NULL;    
           state=DEV_MOVE_LIGHT;
         } break;
@@ -2597 +2596 @@
           prop->setd("commandw x",commandw->x);
           prop->setd("commandw y",commandw->y);
-          eh->close_window(commandw); 
+          wm->close_window(commandw); 
           commandw=NULL;
           do_command(cmd,ev);
@@ -2700 +2699 @@
           prop->setd("commandw x",commandw->x);
           prop->setd("commandw y",commandw->y);   
-          eh->close_window(commandw); 
+          wm->close_window(commandw); 
           commandw=NULL;        
         } else if (ev.window==oedit)
           close_oedit_window();
         else if (ev.window==ambw)
-        { eh->close_window(ambw); ambw=NULL; }
+        { wm->close_window(ambw); ambw=NULL; }
         else if (ev.window==backw) toggle_bgw();
         else if (ev.window==forew) toggle_fgw();
@@ -2791 +2790 @@
           case 'A' : { if (selected_object)
                        {
-                         if (oedit) eh->push_event(new event(DEV_OEDIT_OK,NULL));                      
+                         if (oedit) wm->push_event(new event(DEV_OEDIT_OK,NULL));                      
                          make_ai_window(selected_object);
                        }
@@ -2856 +2855 @@
           if (selected_object && selected_object->controller()==NULL)
           { copy_object=selected_object;
-                        eh->push_event(new event(DEV_OEDIT_COPY,NULL)); } break;
+                        wm->push_event(new event(DEV_OEDIT_COPY,NULL)); } break;
           
           case 'D' : the_game->toggle_delay(); break;
@@ -2920 +2919 @@
                 if (ledit)
                 {
-                  eh->close_window(ledit);
+                  wm->close_window(ledit);
                   ledit=NULL;
                 }
@@ -3012 +3011 @@
 { 
   if (me) close_window();
-  me=eh->new_window(x,y,w*f_wid/scale,h*f_hi/scale,NULL,name);
+  me=wm->new_window(x,y,w*f_wid/scale,h*f_hi/scale,NULL,name);
   draw();
 }
@@ -3023 +3022 @@
                 //  it will be in the same spot
     y=me->y;
-    eh->close_window(me);
+    wm->close_window(me);
     me=NULL;
     
@@ -3054 +3053 @@
                           me->y1()+(i/w)*th,
                           me->x1()+(i%w)*tw+tw-1,
-                          me->y1()+(i/w)*th+th-1,eh->bright_color());
+                          me->y1()+(i/w)*th+th-1,wm->bright_color());
       }
     }
@@ -3097 +3096 @@
             if (dev_cont->forew)      
               ((tile_picker *)dev_cont->forew->
-               read(DEV_FG_PICKER))->recenter(dev_cont->forew->screen,eh);      
+               read(DEV_FG_PICKER))->recenter(dev_cont->forew->screen);      
           }
         } else if (ev.mouse_button==2)
@@ -3613 +3612 @@
          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,eh);
+         new pmenu_item(symbol_str("window_top"),new psub_menu(i_recurse(winmenu),NULL),NULL))),screen);
 }
 
@@ -3623 +3622 @@
   if (dev&EDIT_MODE)
   {
-    eh->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
+    wm->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
     pal->load();
   }
@@ -3629 +3628 @@
   {
     if (dev&MAP_MODE) dev-=MAP_MODE;                        // no map mode while playing!
-    eh->set_mouse_shape(cash.img(c_target)->copy(),8,8);
+    wm->set_mouse_shape(cash.img(c_target)->copy(),8,8);
   }
   if ((dev&EDIT_MODE) && !dev_menu)
   {
-    dev_menu=make_menu(0,yres-eh->font()->height()-5);    
+    dev_menu=make_menu(0,yres-wm->font()->height()-5);    
   }
   else if (!(dev&EDIT_MODE) && dev_menu)

abuse/trunk/src/dev.hpp

@@ -129 +129 @@
   dev_controll *dv;
   public :
-  dev_term(int width, int height, dev_controll *dev) : shell_term(eh,console_font,width,height,"dev")
+  dev_term(int width, int height, dev_controll *dev) : shell_term(console_font, width, height, "dev")
   {
-    dv=dev;
+    dv = dev;
   }
   virtual ~dev_term() {};

abuse/trunk/src/devsel.cpp

@@ -19 +19 @@
 int cur_bg=0,cur_fg=0,cur_char=0;
 
-void tile_picker::recenter(image *screen, window_manager *wm)
+void tile_picker::recenter(image *screen)
 {
-  set_x(get_current(),screen,wm);
+  set_x(get_current(), screen);
 }
 
@@ -72 +72 @@
 }
 
-tile_picker::tile_picker(int X, int Y, int ID, int spec_type, window_manager *wm, 
+tile_picker::tile_picker(int X, int Y, int ID, int spec_type, 
                          int Scale, int scroll_h, int Wid, ifield *Next)
      : scroller(X,Y,ID,2,2,1,0,Next)
@@ -86 +86 @@
 
 
-void tile_picker::scroll_event(int newx, image *screen, window_manager *wm)
+void tile_picker::scroll_event(int newx, image *screen)
 {
   int yo=y,ya=pich(),xw=picw(),c=get_current(),xo;
@@ -92 +92 @@
   last_sel=newx;
 
-  screen->bar(x,y,x+l-1,y+h-1,eh->black());
+  screen->bar(x,y,x+l-1,y+h-1,wm->black());
   for (int i=newx;i<newx+th*wid;i++)
   {
@@ -142 +142 @@
 
 
-void tile_picker::handle_inside_event(event &ev, image *screen, window_manager *wm, input_manager *inm)
+void tile_picker::handle_inside_event(event &ev, image *screen, input_manager *inm)
 {
   if (ev.type==EV_MOUSE_BUTTON)
@@ -150 +150 @@
     {
       set_current(sel);
-      scroll_event(last_sel,screen,wm);
+      scroll_event(last_sel, screen);
     }
   }

abuse/trunk/src/devsel.hpp

@@ -16 +16 @@
   int th,last_sel,type,scale,wid,rev;
   public :
-  tile_picker(int X, int Y, int ID, int spec_type, window_manager *wm, 
+  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, window_manager *wm, input_manager *inm);
-  virtual void scroll_event(int newx, image *screen, window_manager *wm);
+  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm);
+  virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }
   int picw();
@@ -26 +26 @@
   int get_current();
   void set_current(int x);
-  void recenter(image *screen, window_manager *wm);
+  void recenter(image *screen);
   void reverse() { rev=!rev; }
 } ;

abuse/trunk/src/director.cpp

@@ -125 +125 @@
        *text_symbol=make_find_symbol("text");
       
-  JCFont *font=eh->font();
+  JCFont *font=wm->font();
 
   do
@@ -156 +156 @@
                     the_game->first_view->cy2-tbottom,text,font,
                     white_light+32*256,
-                    eh->bright_color()
+                    wm->bright_color()
                     
                     ))
@@ -174 +174 @@
     } else if (arg==text_symbol) done=1;
             
-    eh->flush_screen();   
-    while (eh->event_waiting())
+    wm->flush_screen();   
+    while (wm->event_waiting())
     {   
       event ev;     
-      eh->get_event(ev);
+      wm->get_event(ev);
       if (ev.type==EV_KEY)
       {

abuse/trunk/src/endgame.cpp

@@ -179 +179 @@
 
   image blank(2,2); blank.clear();
-  eh->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
 
 
@@ -263 +263 @@
       eoff+=2; if (eoff>=320) eoff-=320;
       coff+=1; if (coff>=320) coff-=320;      
-      eh->flush_screen();
+      wm->flush_screen();
       i++;
     }
@@ -326 +326 @@
       }
 
-      eh->flush_screen();
+      wm->flush_screen();
 
     }
@@ -356 +356 @@
       eoff+=2; if (eoff>=320) eoff-=320;
       coff+=1; if (coff>=320) coff-=320;      
-      eh->flush_screen();
+      wm->flush_screen();
       i++;
     }
     
-    if (eh->event_waiting())
-      eh->get_event(ev);
+    if (wm->event_waiting())
+      wm->get_event(ev);
 
   } while (ev.type!=EV_KEY && ev.type!=EV_MOUSE_BUTTON);
@@ -387 +387 @@
              256,paddr,
              p,cash.img(mask)->height(),eoff,coff);      
-    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),eh->font(),cmap,eh->bright_color());
-    eh->flush_screen();
+    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),wm->font(),cmap,wm->bright_color());
+    wm->flush_screen();
     time_marker now; while (now.diff_time(&start)<0.18) now.get_time(); start.get_time();
 
-    while (eh->event_waiting() && ev.type!=EV_KEY) eh->get_event(ev);
+    while (wm->event_waiting() && ev.type!=EV_KEY) wm->get_event(ev);
   }
 
@@ -412 +412 @@
 
 
-  eh->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
+  wm->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
   the_game->set_state(MENU_STATE);
 }
@@ -422 +422 @@
   fade_out(16);
   image blank(2,2); blank.clear();
-  eh->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
   screen->clear();
 
@@ -453 +453 @@
                            lstring_value(to_be));
 
-    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(mid_plot),eh->font(),cmap,eh->bright_color());
-    eh->flush_screen();
+    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(mid_plot),wm->font(),cmap,wm->bright_color());
+    wm->flush_screen();
     time_marker now; while (now.diff_time(&start)<0.18) now.get_time(); start.get_time();
-    while (eh->event_waiting() && ev.type!=EV_KEY) eh->get_event(ev);
+    while (wm->event_waiting() && ev.type!=EV_KEY) wm->get_event(ev);
   }
 
@@ -463 +463 @@
     do
     {
-      eh->flush_screen();
-      eh->get_event(ev);    
+      wm->flush_screen();
+      wm->get_event(ev);    
     } while (ev.type!=EV_KEY && ev.type!=EV_MOUSE_BUTTON);
   }
 
   fade_out(16);
-  eh->set_mouse_shape(blank.copy(),0,0);      // don't show mouse  
+  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse  
   show_sell(1);
-  eh->push_event(new event(ID_SHOW_SELL,NULL));
+  wm->push_event(new event(ID_SHOW_SELL,NULL));
 }
 
@@ -479 +479 @@
   fade_out(16);
   image blank(2,2); blank.clear();
-  eh->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+  wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
   screen->clear();
 
@@ -503 +503 @@
     im->put_image(screen,dx,dy);
 
-    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),eh->font(),cmap,eh->bright_color());
-    eh->flush_screen();
+    text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),wm->font(),cmap,wm->bright_color());
+    wm->flush_screen();
     time_marker now; while (now.diff_time(&start)<0.18) now.get_time(); start.get_time();
-    while (eh->event_waiting() && ev.type!=EV_KEY) eh->get_event(ev);
+    while (wm->event_waiting() && ev.type!=EV_KEY) wm->get_event(ev);
   }
 
@@ -513 +513 @@
     do
     {
-      eh->flush_screen();
-      eh->get_event(ev);    
+      wm->flush_screen();
+      wm->get_event(ev);    
     } while (ev.type!=EV_KEY && ev.type!=EV_MOUSE_BUTTON);
   }
@@ -526 +526 @@
   show_sell(1);
 
-  eh->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
+  wm->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
   the_game->set_state(MENU_STATE);
 }

abuse/trunk/src/game.cpp

@@ -60 +60 @@
 extern crc_manager *net_crcs;
 game *the_game;
-window_manager *eh = NULL;
+window_manager *wm = NULL;
 int dev, shift_down = SHIFT_DOWN_DEFAULT, shift_right = SHIFT_RIGHT_DEFAULT;
 double sum_diffs = 1, total_diffs = 12;
@@ -101 +101 @@
         "and try again.\n";
 
-    if(!eh)
+    if(!wm)
     {
         fprintf(stderr, "%s\n", no_space_msg);
@@ -108 +108 @@
 
     info_field *inf = new info_field(WINDOW_FRAME_LEFT, WINDOW_FRAME_TOP +
-                                       eh->font()->height() * 2, ID_NULL,
+                                       wm->font()->height() * 2, ID_NULL,
                                      no_space_msg, NULL);
     button *b = new button(WINDOW_FRAME_LEFT, WINDOW_FRAME_TOP,
                            ID_QUIT_OK, "Quit", inf);
-    jwindow *no_space = eh->new_window(0, 0, -1, -1, b, "ERROR");
+    jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR");
 
     event ev;
     do
     {
-        eh->flush_screen();
-        eh->get_event(ev);
+        wm->flush_screen();
+        wm->get_event(ev);
     } while(ev.type != EV_MESSAGE || ev.message.id != ID_QUIT_OK);
-    eh->close_window(no_space);
+    wm->close_window(no_space);
 
     close_graphics();
@@ -430 +430 @@
     // so we need to redraw.
     if(window_state(new_state) && !window_state(state))
-        eh->show_windows();
+        wm->show_windows();
     else if(!window_state(new_state) && window_state(state))
-        eh->hide_windows();
+        wm->hide_windows();
 
     int old_state = state;
@@ -440 +440 @@
 
     if(playing_state(state) &&  !(dev & EDIT_MODE))
-        eh->set_mouse_shape(cash.img(c_target)->copy(), 8, 8);
+        wm->set_mouse_shape(cash.img(c_target)->copy(), 8, 8);
     else
-        eh->set_mouse_shape(cash.img(c_normal)->copy(), 1, 1);
+        wm->set_mouse_shape(cash.img(c_normal)->copy(), 1, 1);
 
     if(old_state == SCENE_STATE && new_state != SCENE_STATE)
@@ -473 +473 @@
         int dx = WINDOW_FRAME_LEFT + 20, dy = WINDOW_FRAME_TOP + 5;
         image *jim = cash.img(joy_picts[but * 9+(y + 1)*3 + x + 1]);
-        joy_win->screen->bar(dx, dy, dx + jim->width()+6, dy + jim->height()+6, eh->black());
+        joy_win->screen->bar(dx, dy, dx + jim->width()+6, dy + jim->height()+6, wm->black());
         jim->put_image(joy_win->screen, dx + 3, dy + 3);
 
@@ -481 +481 @@
     else if(ev.type == EV_MESSAGE && ev.message.id == JOY_OK)
     {
-        eh->close_window(joy_win);
+        wm->close_window(joy_win);
         joy_win = NULL;
         set_state(MENU_STATE);
@@ -493 +493 @@
     {
 #if 0
-        eh->push_event(new event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL));
-        eh->close_window(top_menu);
+        wm->push_event(new event(men_mess[((pick_list *)ev.message.data)->get_selection()], NULL));
+        wm->close_window(top_menu);
         top_menu = NULL;
 #endif
@@ -511 +511 @@
                       int val, int max)
 {
-    screen->bar(x, y, x + w - 1, y + h, eh->dark_color());
-    screen->bar(x, y + 1, x + w * val / max, y + h - 1, eh->bright_color());
+    screen->bar(x, y, x + w - 1, y + h, wm->dark_color());
+    screen->bar(x, y + 1, x + w * val / max, y + h - 1, wm->bright_color());
 }
 
@@ -630 +630 @@
     if(mousex < xmargin &&  dev_cont->ok_to_scroll()) xs = -18;
     else if(mousex>(screen->width()-xmargin) &&  dev_cont->ok_to_scroll()) xs = 18;
-    else if(eh->key_pressed(JK_LEFT) && !last_input && !dev_cont->need_arrows())
+    else if(wm->key_pressed(JK_LEFT) && !last_input && !dev_cont->need_arrows())
       xs = -18;
-    else if(eh->key_pressed(JK_RIGHT) && !last_input && !dev_cont->need_arrows())
+    else if(wm->key_pressed(JK_RIGHT) && !last_input && !dev_cont->need_arrows())
       xs = 18;
     else xs = 0;
@@ -639 +639 @@
     if(mousey < ymargin && dev_cont->ok_to_scroll()) ys = -18;
     else if(mousey>(screen->height()-ymargin) &&  dev_cont->ok_to_scroll()) ys = 18;
-    else if(eh->key_pressed(JK_UP) && !last_input)
+    else if(wm->key_pressed(JK_UP) && !last_input)
       ys = -18;
-    else if(eh->key_pressed(JK_DOWN) && !last_input)
+    else if(wm->key_pressed(JK_DOWN) && !last_input)
       ys = 18;
     else ys = 0;
@@ -717 +717 @@
       if(state == SCENE_STATE)
         screen->set_clip(cx1, cy1, cx2, cy2);
-      eh->flush_screen();
+      wm->flush_screen();
     }
     return;
@@ -896 +896 @@
     {
       if(dev & EDIT_MODE)
-        screen->clear(eh->bright_color());
+        screen->clear(wm->bright_color());
       else
-        screen->clear(eh->black());
+        screen->clear(wm->black());
       for(y = y1, draw_y = yo; y <= y2; y++, draw_y += yinc)
       {
@@ -1009 +1009 @@
           else
           {
-        screen->line(draw_x, draw_y, draw_x + xinc, draw_y + yinc, eh->bright_color());
-        screen->line(draw_x + xinc, draw_y, draw_x, draw_y + yinc, eh->bright_color());
+        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());
           }
         }
@@ -1021 +1021 @@
     if(dev & DRAW_FG_BOUND_LAYER)
     {
-      int b = eh->bright_color();
+      int b = wm->bright_color();
       int fg_h = current_level->foreground_height(), fg_w = current_level->foreground_width();
 
@@ -1068 +1068 @@
         color = 2+(help_text_frames - 10);
 
-    int x1 = v->cx1, y1 = v->cy1, x2 = v->cx2, y2 = v->cy1 + eh->font()->height()+10;
+    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);
@@ -1074 +1074 @@
     screen->bar(x1, y2, x2, y2, color);
 
-    eh->font()->put_string(screen, x1 + 5, y1 + 5,
+    wm->font()->put_string(screen, x1 + 5, y1 + 5,
                    help_text, color);
     if(color > 30)
@@ -1198 +1198 @@
     }
     pal->load();
-    eh->flush_screen();
+    wm->flush_screen();
     milli_wait(25);
   }
@@ -1222 +1222 @@
     }
     pal->load();
-    eh->flush_screen();
+    wm->flush_screen();
     milli_wait(25);
   }
   screen->clear();
-  eh->flush_screen();
+  wm->flush_screen();
   delete pal;
   pal = old_pal;
@@ -1261 +1261 @@
         image *blank = new image(2, 2);
         blank->clear();
-        eh->set_mouse_shape(blank->copy(), 0, 0); // hide mouse
+        wm->set_mouse_shape(blank->copy(), 0, 0); // hide mouse
         delete blank;
         fade_in(cash.img(cdc_logo), 32);
@@ -1313 +1313 @@
                 gray->put_image(screen, dx, dy);
                 smoke[i % 5]->put_image(screen, dx + 24, dy + 5);
-                text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, eh->font(), cmap, eh->bright_color());
-                eh->flush_screen();
+                text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color());
+                wm->flush_screen();
                 time_marker now;
 
@@ -1325 +1325 @@
                 start.get_time();
 
-                while(eh->event_waiting() && ev.type != EV_KEY)
+                while(wm->event_waiting() && ev.type != EV_KEY)
                 {
-                    eh->get_event(ev);
+                    wm->get_event(ev);
                 }
                 if((i % 5) == 0 && DEFINEDP(space_snd) && (sound_avail & SFX_INITIALIZED))
@@ -1354 +1354 @@
             fade_in(cash.img(title_screen), 32);
 
-        eh->set_mouse_shape(cash.img(c_normal)->copy(), 1, 1);
+        wm->set_mouse_shape(cash.img(c_normal)->copy(), 1, 1);
     }
 }
@@ -1483 +1483 @@
   console_font = new JCFont(cash.img(console_font_pict));
 
-  eh = new window_manager(screen, pal, bright_color,
+  wm = new window_manager(screen, pal, bright_color,
                                    med_color,
                                    dark_color,
@@ -1489 +1489 @@
 
   delete stat_man;  // move to a graphical status manager
-  gui_status_manager *gstat = new gui_status_manager(eh);
+  gui_status_manager *gstat = new gui_status_manager();
   gstat->set_window_title("status");
   stat_man = gstat;
 
 
-  chat = new chat_console(eh, console_font, 50, 6);
-
-  if(!eh->has_mouse())
+  chat = new chat_console( console_font, 50, 6);
+
+  if(!wm->has_mouse())
   {
     close_graphics();
@@ -1601 +1601 @@
       {
             draw_map(f, 1);
-        eh->flush_screen();
+        wm->flush_screen();
       }
           draw_map(f, 0);
@@ -1622 +1622 @@
     cash.prof_poll_end();
 
-  eh->flush_screen();
+  wm->flush_screen();
 
 }
@@ -1699 +1699 @@
     event ev;
     idle_ticks++;
-    while(event_waiting(eh))
-    {
-        get_event(ev, eh);
+    while(event_waiting())
+    {
+        get_event(ev);
 
         if(ev.type == EV_MOUSE_MOVE)
@@ -1781 +1781 @@
                             int wx = WINDOW_FRAME_LEFT, wy = WINDOW_FRAME_TOP;
 
-                            joy_win = eh->new_window(80, 50, -1, -1,
+                            joy_win = wm->new_window(80, 50, -1, -1,
                                     new button(wx + 70, wy + 9, JOY_OK, "OK",
                                     new info_field(wx, wy + 30, DEV_NULL,
@@ -1802 +1802 @@
             else if(ev.type == EV_CLOSE_WINDOW && ev.window == top_menu)
             {
-                eh->close_window(top_menu);
+                wm->close_window(top_menu);
                 top_menu = NULL;
             }
@@ -1854 +1854 @@
                                     case 'v':
                                     {
-                                        eh->push_event(new event(DO_VOLUME, NULL));
+                                        wm->push_event(new event(DO_VOLUME, NULL));
                                     } break;
                                     case 'p':
@@ -1869 +1869 @@
                                         if(start_edit)
                                         {
-                                            eh->push_event(new event(ID_LEVEL_SAVE, NULL));
+                                            wm->push_event(new event(ID_LEVEL_SAVE, NULL));
                                         }
                                     } break;
@@ -1893 +1893 @@
                                         if(!dev_cont->need_plus_minus())
                                         {
-                                            if(eh->key_pressed(JK_CTRL_L))
+                                            if(wm->key_pressed(JK_CTRL_L))
                                                 grow_views(20);
                                             else
@@ -1909 +1909 @@
                                         if(!dev_cont->need_plus_minus())
                                         {
-                                            if(eh->key_pressed(JK_CTRL_L))
+                                            if(wm->key_pressed(JK_CTRL_L))
                                                 grow_views(-20);
                                             else
@@ -2186 +2186 @@
   config_cleanup();
   delete color_table;
-  delete eh;
+  delete wm;
   delete game_font;
   delete big_font;
@@ -2212 +2212 @@
     {
         char const *helpstr = "ARROW KEYS CHANGE TEXT SPEED";
-        eh->font()->put_string(screen, screen->width()/2-(eh->font()->width()*strlen(helpstr))/2 + 1,
-            screen->height()-eh->font()->height()-5 + 1, helpstr, eh->dark_color());
-        eh->font()->put_string(screen, screen->width()/2-(eh->font()->width()*strlen(helpstr))/2,
-            screen->height()-eh->font()->height()-5, helpstr, eh->bright_color());
+        wm->font()->put_string(screen, screen->width()/2-(wm->font()->width()*strlen(helpstr))/2 + 1,
+            screen->height()-wm->font()->height()-5 + 1, helpstr, wm->dark_color());
+        wm->font()->put_string(screen, screen->width()/2-(wm->font()->width()*strlen(helpstr))/2,
+            screen->height()-wm->font()->height()-5, helpstr, wm->bright_color());
     }
 /*    else
     {
         char *helpstr="PRESS h FOR HELP";
-        eh->font()->put_string(screen, screen->width()-eh->font()->width()*strlen(helpstr)-5,
-            screen->height()-eh->font()->height()-5, helpstr);
+        wm->font()->put_string(screen, screen->width()-wm->font()->width()*strlen(helpstr)-5,
+            screen->height()-wm->font()->height()-5, helpstr);
     }*/
 /*    int dc = cash.img(window_colors)->pixel(0, 2);
@@ -2284 +2284 @@
     do
     {
-      get_event(ev, eh);
+      get_event(ev);
       if(ev.type == EV_KEY)
       {
@@ -2307 +2307 @@
     }
       }
-      eh->flush_screen();
+      wm->flush_screen();
     } while(ev.type != EV_KEY || ev.key != JK_ENTER);
     dprintf("\n");

abuse/trunk/src/game.hpp

@@ -46 +46 @@
 
 /* Cleaned-up externs */
-extern window_manager *eh;
+extern window_manager *wm;
 
 

abuse/trunk/src/gamma.cpp

@@ -30 +30 @@
 public:
         int sc;
-        virtual void draw_item(window_manager *wm, image *screen, int x, int y, int num, int active)
-        {
-                long x2 = x + item_width( wm ) - 1;
-                long y2 = y + item_height( wm ) - 1;
+        virtual void draw_item(image *screen, int x, int y, int num, int active)
+        {
+                long x2 = x + item_width() - 1;
+                long y2 = y + item_height() - 1;
                 screen->bar( x, y, x2, y2, 0 );
                 screen->bar( x, y, x2 - 3, y2, sc + num );
@@ -43 +43 @@
         void set_pos( int x ) { cur_sel = x; }
         virtual int total() { return 32; }
-        virtual int item_width( window_manager *wm ) { return 12; }
-        virtual int item_height( window_manager *wm ) { return 20; }
+        virtual int item_width() { return 12; }
+        virtual int item_height() { return 20; }
         virtual int activate_on_mouse_move() { return 0; }
 
@@ -94 +94 @@
                 gray_pal->load();
 
-                int wm_bc = eh->bright_color(), wm_mc = eh->medium_color(), wm_dc = eh->dark_color();
+                int wm_bc = wm->bright_color(), wm_mc = wm->medium_color(), wm_dc = wm->dark_color();
 
                 int br_r = pal->red( wm_bc ) + 20;
@@ -144 +144 @@
                 }
 
-                eh->set_colors( gray_pal->find_closest( br_r, br_g, br_b ),
+                wm->set_colors( gray_pal->find_closest( br_r, br_g, br_b ),
                         gray_pal->find_closest( md_r, md_g, md_b ),
                         gray_pal->find_closest( dr_r, dr_g, dr_b ) );
 
                 int wl = WINDOW_FRAME_LEFT, wh = WINDOW_FRAME_TOP;
-                int sh = eh->font()->height() + 35;
+                int sh = wm->font()->height() + 35;
                 button *but = new button( wl + 5, wh + 5 + sh * 3, ID_GAMMA_OK, cash.img( ok_button ),
                         new info_field( wl + 35, wh + 10 + sh * 3, ID_NULL, lang_string( "gamma_msg" ), 0 ) );
@@ -156 +156 @@
                 gp->set_pos( dg / 4 );
 
-                jwindow *gw = eh->new_window( xres / 2 - 190, yres / 2 - 90, -1, -1, gp);
+                jwindow *gw = wm->new_window( xres / 2 - 190, yres / 2 - 90, -1, -1, gp);
 
                 event ev;
-                eh->flush_screen();
+                wm->flush_screen();
                 do
                 {
                         do
                         {
-                                eh->get_event(ev);
-                        } while( ev.type == EV_MOUSE_MOVE && eh->event_waiting() );
-                        eh->flush_screen();
+                                wm->get_event(ev);
+                        } while( ev.type == EV_MOUSE_MOVE && wm->event_waiting() );
+                        wm->flush_screen();
                         if( ev.type == EV_CLOSE_WINDOW)
                         {
@@ -179 +179 @@
                 dg = ( (spicker *)gw->inm->get( ID_GREEN_PICKER ) )->first_selected() * 4;
 
-                eh->close_window( gw );
-                eh->flush_screen();
-
-                eh->set_colors( wm_bc, wm_mc, wm_dc);
+                wm->close_window( gw );
+                wm->flush_screen();
+
+                wm->set_colors( wm_bc, wm_mc, wm_dc);
                 delete gray_pal;
 

abuse/trunk/src/go.cpp

@@ -338 +338 @@
     game_object::draw();
     int sx=the_game->screenx(x),sy=the_game->screeny(y);      
-    screen->rectangle(sx-xrange,sy-yrange,sx+xrange,sy+yrange,eh->bright_color());      
+    screen->rectangle(sx-xrange,sy-yrange,sx+xrange,sy+yrange,wm->bright_color());      
   }  
 }

abuse/trunk/src/gui.cpp

@@ -31 +31 @@
 }
 
-void ico_switch_button::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void ico_switch_button::area(int &x1, int &y1, int &x2, int &y2)
 {
   x1=10000;
@@ -40 +40 @@
   for (ifield *b=blist;b;b=b->next)
   {    
-    b->area(X1,Y1,X2,Y2,wm);
+    b->area(X1,Y1,X2,Y2);
     if (X1<x1) x1=X1;
     if (Y1<y1) y1=Y1;
@@ -68 +68 @@
 }
 
-void ico_switch_button::handle_event(event &ev, image *screen, window_manager *wm, input_manager *im)
+void ico_switch_button::handle_event(event &ev, image *screen, input_manager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -75 +75 @@
     cur_but=cur_but->next;
     if (!cur_but) cur_but=blist;
-    cur_but->draw(act,screen,wm);
-    cur_but->handle_event(ev,screen,wm,im);
+    cur_but->draw(act,screen);
+    cur_but->handle_event(ev,screen,im);
   }
 
 }
 
-void ico_button::draw(int active, image *screen, window_manager *wm)
+void ico_button::draw(int active, image *screen)
 {
   int x1,y1,x2,y2;
-  area(x1,y1,x2,y2,wm); 
+  area(x1,y1,x2,y2); 
  
   if (active!=act  && activate_id!=-1 && active)
@@ -116 +116 @@
 extern int sfx_volume;
 
-void ico_button::handle_event(event &ev, image *screen, window_manager *wm, input_manager *im)
+void ico_button::handle_event(event &ev, image *screen, input_manager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -122 +122 @@
   {
     int  x1,y1,x2,y2;
-    area(x1,y1,x2,y2,wm);
+    area(x1,y1,x2,y2);
     up=!up;
-    draw(act,screen,wm);
+    draw(act,screen);
     wm->push_event(new event(id,(char *)this));
     if (S_BUTTON_PRESS_SND)
@@ -131 +131 @@
 }
 
-void ico_button::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void ico_button::area(int &x1, int &y1, int &x2, int &y2)
 {
   x1=x; y1=y;

abuse/trunk/src/gui.hpp

@@ -21 +21 @@
   ico_button(int X, int Y, int ID, int Up, int down, int upa, int downa, ifield *Next, int act_id=-1, char const *help_key=NULL);
 
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm) { draw(0,screen,wm); }
-  virtual void draw(int active, image *screen, window_manager *wm); 
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen) { draw(0,screen); }
+  virtual void draw(int active, image *screen); 
+  virtual void handle_event(event &ev, image *screen, input_manager *im);
 
   virtual char *read() { return (char *)&up; }
@@ -40 +40 @@
   public :
   ico_switch_button(int X, int Y, int ID, int start_on, ifield *butts, ifield *Next);
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm) { cur_but->draw_first(screen,wm); }
-  virtual void draw(int active, image *screen, window_manager *wm) { cur_but->draw(active,screen,wm); act=active; }
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  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, input_manager *im);
   virtual ifield *unlink(int id);
   virtual char *read() { return cur_but->read(); }

abuse/trunk/src/imlib/filesel.cpp

@@ -23 +23 @@
   file_picker(int X, int Y, int ID, int Rows, ifield *Next);
   virtual int total() { return tf+td; }
-  virtual int item_width(window_manager *wm) { return wm->font()->width()*wid; }
-  virtual int item_height(window_manager *wm) { return wm->font()->height()+1; }
-  virtual void draw_item(window_manager *wm, image *screen, int x, int y, int num, int active);
-  virtual void note_selection(window_manager *wm, image *screen, input_manager *inm, int x);
+  virtual int item_width() { return wm->font()->width()*wid; }
+  virtual int item_height() { return wm->font()->height()+1; }
+  virtual void draw_item(image *screen, int x, int y, int num, int active);
+  virtual void note_selection(image *screen, input_manager *inm, int x);
   void free_up();
   ~file_picker() { free_up(); }
@@ -42 +42 @@
 }
 
-void file_picker::note_selection(window_manager *wm, image *screen, input_manager *inm, int x)
+void file_picker::note_selection(image *screen, input_manager *inm, int x)
 {
   if (x<td)
@@ -49 +49 @@
     {
       int x1,y1,x2,y2;
-      area(x1,y1,x2,y2,wm);
+      area(x1,y1,x2,y2);
       screen->bar(x1,y1,x2,y2,wm->medium_color());
 
@@ -72 +72 @@
 
       reconfigure();  
-      draw_first(screen,wm);
+      draw_first(screen);
     }
   } else
@@ -79 +79 @@
     sprintf(nm,"%s/%s",cd,f[x-td]);
     text_field *link=(text_field *)inm->get(sid);
-    link->change_data(nm,strlen(nm),1,screen,wm);
+    link->change_data(nm,strlen(nm),1,screen);
   }
 
 }
 
-void file_picker::draw_item(window_manager *wm, image *screen, int x, int y, int num, int active)
+void file_picker::draw_item(image *screen, int x, int y, int num, int active)
 {
   if (active)
-    screen->bar(x,y,x+item_width(wm)-1,y+item_height(wm)-1,wm->black());
+    screen->bar(x,y,x+item_width()-1,y+item_height()-1,wm->black());
 
   if (num<td)
@@ -116 +116 @@
 }
 
-jwindow *file_dialog(window_manager *wm, char const *prompt, char const *def,
+jwindow *file_dialog(char const *prompt, char const *def,
                      int ok_id, char const *ok_name, int cancel_id,
                      char const *cancel_name, char const *FILENAME_str,

abuse/trunk/src/imlib/filesel.hpp

@@ -13 +13 @@
 #include "jwindow.hpp"
 
-jwindow *file_dialog(window_manager *wm, char const *prompt, char const *def,
+jwindow *file_dialog(char const *prompt, char const *def,
                      int ok_id, char const *ok_name, int cancel_id,
                      char const *cancel_name, char const *FILENAME_str,

abuse/trunk/src/imlib/guistat.cpp

@@ -10 +10 @@
 #include "config.h"
 
+#include "input.hpp"
 #include "status.hpp"
 #include "timing.hpp"
@@ -21 +22 @@
   visual_object *show;
   jwindow *stat_win;
-  window_manager *wm;
   int last_update;
   time_marker last_time;
-  gui_status_node(char const *Name, visual_object *Show, window_manager *WM, gui_status_node *Next) 
+  gui_status_node(char const *Name, visual_object *Show, gui_status_node *Next) 
   { name=strcpy((char *)jmalloc(strlen(Name)+1,"status name"),Name); 
     show=Show;
@@ -30 +30 @@
     last_update=0;
     stat_win=NULL;
-    wm=WM;
   }
   ~gui_status_node();
@@ -73 +72 @@
 void gui_status_manager::push(char const *name, visual_object *show)
 {
-  first=new gui_status_node(name,show,wm,first);  
+  first=new gui_status_node(name,show,first);  
 }
 
-gui_status_manager::gui_status_manager(window_manager *WM) 
+gui_status_manager::gui_status_manager() 
 { 
-  wm=WM; 
   first=NULL; 
   strcpy(title,"STATUS"); 
@@ -95 +93 @@
       {
         long wx=xres/2,wy=10,len1=strlen(first->name)*wm->font()->width()+10,len2=0,len3,
-          h1=wm->font()->height()+5,h2=first->show ? first->show->height(wm) : 0;
+          h1=wm->font()->height()+5,h2=first->show ? first->show->height() : 0;
 
-        if (first->show) len2=first->show->width(wm)/2;
+        if (first->show) len2=first->show->width()/2;
         if (len2>len1) len3=len2; else len3=len1;
         wx-=len3/2; 
@@ -112 +110 @@
         if (first->show)
           first->show->draw(first->stat_win->screen,(first->stat_win->x2()-first->stat_win->x1())/2-
-                            first->show->width(wm)/2,my+h1,wm,NULL);
+                            first->show->width()/2,my+h1,NULL);
 
         draw_bar(first,percentage);

abuse/trunk/src/imlib/guistat.hpp

@@ -17 +17 @@
 class gui_status_manager : public status_manager
 {
-  window_manager *wm;
   char title[40];
   int last_perc;
   public :   
   gui_status_node *first;
-  gui_status_manager(window_manager *WM);
+  gui_status_manager();
   virtual void push(char const *name, visual_object *show);
   virtual void update(int percentage);

abuse/trunk/src/imlib/input.cpp

@@ -60 +60 @@
 }
 
-void button_box::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void button_box::area(int &x1, int &y1, int &x2, int &y2)
 {
   button *b=buttons;
@@ -66 +66 @@
   else
   {
-    b->area(x1,y1,x2,y2,wm);
+    b->area(x1,y1,x2,y2);
     int xp1,yp1,xp2,yp2;
     for (b=(button *)b->next;b;b=(button *)b->next)
     {
-      b->area(xp1,yp1,xp2,yp2,wm);
+      b->area(xp1,yp1,xp2,yp2);
       if (xp1<x1) x1=xp1;
       if (xp2>x2) x2=xp2;
@@ -79 +79 @@
 }
 
-void button_box::draw_first(image *screen, window_manager *wm)
+void button_box::draw_first(image *screen)
 {
   for (button *b=buttons;b;b=(button *)b->next)
-    b->draw_first(screen,wm);
-}
-
-void button_box::draw(int active, image *screen, window_manager *wm)
+    b->draw_first(screen);
+}
+
+void button_box::draw(int active, image *screen)
 {
   return ;
@@ -100 +100 @@
 }
 
-void button_box::handle_event(event &ev, image *screen, window_manager *wm, input_manager *im)
+void button_box::handle_event(event &ev, image *screen, input_manager *im)
 {
   switch (ev.type)
@@ -110 +110 @@
       for (button *b=buttons;!found && b;b=(button *)b->next)  // see if the user clicked on a button
       {
-        b->area(x1,y1,x2,y2,wm);
+        b->area(x1,y1,x2,y2);
         if (ev.mouse_move.x>=x1 && ev.mouse_move.x<=x2 && 
             ev.mouse_move.y>=y1 && ev.mouse_move.y<=y2)
         {
-          b->handle_event(ev,screen,wm,im);
+          b->handle_event(ev,screen,im);
 
           int total=0;
@@ -131 +131 @@
                   total--;
                   b2->push();
-                  b2->draw_first(screen,wm);
+                  b2->draw_first(screen);
                 }
             }
-            b->draw_first(screen,wm);
+            b->draw_first(screen);
           } else if (total==0 && maxdown)
             b->push();    // don't let the user de-press a button if non others are selected.     
@@ -154 +154 @@
 
 
-void button_box::arrange_left_right(window_manager *wm)
+void button_box::arrange_left_right()
 {
   button *b=buttons;
@@ -160 +160 @@
   for (;b;b=(button *)b->next)
   {
-    b->area(x1,y1,x2,y2,wm);
+    b->area(x1,y1,x2,y2);
     b->x=x_on;
     b->y=y;
@@ -167 +167 @@
 }
 
-void button_box::arrange_up_down(window_manager *wm)
+void button_box::arrange_up_down()
 {  
   button *b=buttons;
@@ -173 +173 @@
   for (;b;b=(button *)b->next)
   {
-    b->area(x1,y1,x2,y2,wm);
+    b->area(x1,y1,x2,y2);
     b->y=y_on;
     b->x=x;
@@ -186 +186 @@
 }
 
-void button::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void button::area(int &x1, int &y1, int &x2, int &y2)
 {  
   x1=x; y1=y; 
@@ -237 +237 @@
 
 void text_field::change_data(char const *new_data, int new_cursor, // cursor==-1, does not change it.
-                             int active, image *screen, window_manager *wm)
+                             int active, image *screen)
 {
   if (strlen(format)<strlen(new_data))
@@ -245 +245 @@
   if (new_cursor!=-1)
     cur=new_cursor;
-  draw_first(screen,wm);
-  draw(active,screen,wm);
+  draw_first(screen);
+  draw(active,screen);
 }
 
@@ -259 +259 @@
 #endif
 
-void text_field::handle_event(event &ev, image *screen, window_manager *wm, input_manager *im)
+void text_field::handle_event(event &ev, image *screen, input_manager *im)
 {
   int xx;
@@ -266 +266 @@
     switch (ev.key)
     {
-      case JK_LEFT : if (cur) { draw_cur(wm->dark_color(),screen,wm); cur--;
-                           draw_cur(wm->bright_color(),screen,wm); } break; 
-      case JK_RIGHT : if (cur<(int)strlen(format)-1) { draw_cur(wm->dark_color(),screen,wm); cur++;
-                           draw_cur(wm->bright_color(),screen,wm); } break; 
+      case JK_LEFT : if (cur) { draw_cur(wm->dark_color(),screen); cur--;
+                           draw_cur(wm->bright_color(),screen); } break; 
+      case JK_RIGHT : if (cur<(int)strlen(format)-1) { draw_cur(wm->dark_color(),screen); cur++;
+                           draw_cur(wm->bright_color(),screen); } break; 
       case JK_END : if (cur!=last_spot()) 
-                          { draw_cur(wm->dark_color(),screen,wm); cur=last_spot(); 
+                          { draw_cur(wm->dark_color(),screen); cur=last_spot(); 
                             if (cur==(int)strlen(format)-1) cur--; 
-                           draw_cur(wm->bright_color(),screen,wm); } break; 
+                           draw_cur(wm->bright_color(),screen); } break; 
       case JK_HOME : if (cur) 
-                          { draw_cur(wm->dark_color(),screen,wm); cur=0;
-                           draw_cur(wm->bright_color(),screen,wm); } break; 
+                          { draw_cur(wm->dark_color(),screen); cur=0;
+                           draw_cur(wm->bright_color(),screen); } break; 
       case JK_BACKSPACE : if (cur)
-         { draw_cur(wm->dark_color(),screen,wm); cur--;
+         { draw_cur(wm->dark_color(),screen); cur--;
            for (xx=cur;xx<(int)strlen(format)-1;xx++)
              data[xx]=data[xx+1];
            data[strlen(format)-1]=' ';
-           draw_text(screen,wm);
-           draw_cur(wm->bright_color(),screen,wm); 
+           draw_text(screen);
+           draw_cur(wm->bright_color(),screen); 
            wm->push_event(new event(id,(char *)this));
          } break; 
       default : if (ev.key>=' ' && ev.key<='~')
          { 
-           draw_cur(wm->dark_color(),screen,wm); 
+           draw_cur(wm->dark_color(),screen); 
            for (xx=strlen(format)-1;xx>cur && xx>0;xx--)
              data[xx]=data[xx-1];
@@ -295 +295 @@
              cur++;
            data[strlen(format)]=0;
-           draw_text(screen,wm);
-           draw_cur(wm->bright_color(),screen,wm); 
+           draw_text(screen);
+           draw_cur(wm->bright_color(),screen); 
            wm->push_event(new event(id,(char *)this));
          } break;
@@ -307 +307 @@
 #endif
 
-void text_field::draw(int active, image *screen, window_manager *wm)
+void text_field::draw(int active, image *screen)
 {
   if (active)
   {
-    screen->rectangle(xstart(wm),y,xend(wm),yend(wm),wm->bright_color());
-    draw_cur(wm->bright_color(),screen,wm);
+    screen->rectangle(xstart(),y,xend(),yend(),wm->bright_color());
+    draw_cur(wm->bright_color(),screen);
   }
   else
   {
-    screen->rectangle(xstart(wm),y,xend(wm),yend(wm),wm->dark_color());
-    draw_cur(wm->dark_color(),screen,wm);
-  }
-}
-
-void text_field::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+    screen->rectangle(xstart(),y,xend(),yend(),wm->dark_color());
+    draw_cur(wm->dark_color(),screen);
+  }
+}
+
+void text_field::area(int &x1, int &y1, int &x2, int &y2)
 {
   x1=x; y1=y; 
-  x2=xend(wm);
-  y2=yend(wm);
+  x2=xend();
+  y2=yend();
 }
 
@@ -361 +361 @@
 { up=!up; }
 
-void button::handle_event(event &ev, image *screen, window_manager *wm, input_manager *im)
+void button::handle_event(event &ev, image *screen, input_manager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -367 +367 @@
   {
     int  x1,y1,x2,y2;
-    area(x1,y1,x2,y2,wm);
+    area(x1,y1,x2,y2);
     up=!up;
-    draw_first(screen,wm);
-    draw(act,screen,wm);
+    draw_first(screen);
+    draw(act,screen);
     wm->push_event(new event(id,(char *)this));
   }
 }
 
-void button::draw(int active, image *screen, window_manager *wm)
+void button::draw(int active, image *screen)
 {
   int x1,y1,x2,y2,color=(active ? wm->bright_color() : wm->medium_color());  
-  area(x1,y1,x2,y2,wm); 
+  area(x1,y1,x2,y2); 
   if (active!=act  && act_id!=-1 && active)
     wm->push_event(new event(act_id,NULL));
@@ -399 +399 @@
 }
 
-void button::draw_first(image *screen, window_manager *wm)
+void button::draw_first(image *screen)
 {
   if (pressed)  
-    draw(0,screen,wm);
+    draw(0,screen);
   else
   {
 
     int x1,y1,x2,y2;
-    area(x1,y1,x2,y2,wm);
+    area(x1,y1,x2,y2);
     
 
@@ -439 +439 @@
 }
 
-void text_field::draw_first(image *screen, window_manager *wm)
+void text_field::draw_first(image *screen)
 {
   wm->font()->put_string(screen,x,y+3,prompt);
-  screen->bar(xstart(wm),y,xend(wm),yend(wm),wm->dark_color());
-  wm->font()->put_string(screen,xstart(wm)+1,y+3,data);
-}
-
-
-void text_field::draw_cur(int color, image *screen, window_manager *wm)
-{
-  screen->bar(xstart(wm)+cur*wm->font()->width()+1,
-                      yend(wm)-2,
-                      xstart(wm)+(cur+1)*wm->font()->width(),
-                      yend(wm)-1,color);
+  screen->bar(xstart(),y,xend(),yend(),wm->dark_color());
+  wm->font()->put_string(screen,xstart()+1,y+3,data);
+}
+
+
+void text_field::draw_cur(int color, image *screen)
+{
+  screen->bar(xstart()+cur*wm->font()->width()+1,
+                      yend()-2,
+                      xstart()+(cur+1)*wm->font()->width(),
+                      yend()-1,color);
 }
 
@@ -465 +465 @@
 
 
-void info_field::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void info_field::area(int &x1, int &y1, int &x2, int &y2)
 {
   if (w==-1)     // if we haven't calculated this yet
@@ -509 +509 @@
 }
 
-void info_field::draw_first(image *screen, window_manager *wm)
+void info_field::draw_first(image *screen)
 {
   put_para(screen,text,x+1,y+1,wm->font()->width(),wm->font()->height(),wm->font(),wm->black());

abuse/trunk/src/imlib/input.hpp

@@ -13 +13 @@
 #include "filter.hpp"
 
+extern window_manager *wm; /* FIXME: get rid of this if possible */
 
 class button : public ifield
@@ -25 +26 @@
   button(int X, int Y, int ID, image *Depressed, image *Pressed, image *active, ifield *Next);
 
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm);
-  virtual void draw(int active, image *screen, window_manager *wm); 
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen);
+  virtual void draw(int active, image *screen); 
+  virtual void handle_event(event &ev, image *screen, input_manager *im);
   void change_visual(image *new_visual);
   virtual void remap(filter *f);
@@ -47 +48 @@
   void press_button(int id);      // if button box doesn't contain id, nothing happens
   virtual void remap(filter *f);
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm);
-  virtual void draw(int active, image *screen, window_manager *wm); 
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);  
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen);
+  virtual void draw(int active, image *screen); 
+  virtual void handle_event(event &ev, image *screen, input_manager *im);  
   virtual ~button_box();
   virtual char *read();   // return pointer to first button which is depressed
   virtual ifield *find(int search_id);  // should return pointer to item you control with this id
-  void arrange_left_right(window_manager *wm);
-  void arrange_up_down(window_manager *wm);
+  void arrange_left_right();
+  void arrange_up_down();
 } ;
 
@@ -62 +63 @@
   int cur;
   char *prompt,*data,*format;
-  int xstart(window_manager *wm) { return x+wm->font()->width()*(strlen(prompt)+1)+3; }
-  int xend(window_manager *wm) { return x+wm->font()->width()*(strlen(prompt)+1+strlen(format))+7; }
-  int yend(window_manager *wm) { return y+wm->font()->height()+5; }
-  void draw_cur(int color, image *screen, window_manager *wm);
+  int xstart() { return x+wm->font()->width()*(strlen(prompt)+1)+3; }
+  int xend() { return x+wm->font()->width()*(strlen(prompt)+1+strlen(format))+7; }
+  int yend() { return y+wm->font()->height()+5; }
+  void draw_cur(int color, image *screen);
   int last_spot() { int x=strlen(data); while (x && data[x-1]==' ') x--; return x; }
-  void draw_text(image *screen, window_manager *wm)
+  void draw_text(image *screen)
   {
-    screen->bar(xstart(wm)+1,y+1,xend(wm)-1,yend(wm)-1,wm->dark_color());
-    wm->font()->put_string(screen,xstart(wm)+1,y+3,data);
+    screen->bar(xstart()+1,y+1,xend()-1,yend()-1,wm->dark_color());
+    wm->font()->put_string(screen,xstart()+1,y+3,data);
   }
 public : 
@@ -78 +79 @@
                                double Data, ifield *Next);
 
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm);
-  virtual void draw(int active, image *screen, window_manager *wm); 
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen);
+  virtual void draw(int active, image *screen); 
+  virtual void handle_event(event &ev, image *screen, input_manager *im);
   
   virtual ~text_field() { jfree(prompt); jfree(format); jfree(data); }
   virtual char *read();
   void change_data(char const *new_data, int new_cursor,       // cursor==-1, does not change it.
-                   int active, image *screen, window_manager *wm);
+                   int active, image *screen);
 } ;
 
@@ -98 +99 @@
 public : 
   info_field(int X, int Y, int ID, char const *info, ifield *Next);
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm);
-  virtual void draw(int active, image *screen, window_manager *wm) { ; }
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im) { ; }
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen);
+  virtual void draw(int active, image *screen) { ; }
+  virtual void handle_event(event &ev, image *screen, input_manager *im) { ; }
   virtual char *read() { return text; }
   virtual int selectable() { return 0; } 

abuse/trunk/src/imlib/jwindow.cpp

@@ -12 +12 @@
 #include "video.hpp"
 #include "image.hpp"
+#include "input.hpp"
 #include "event.hpp"
 #include "filter.hpp"
@@ -201 +202 @@
         ev.type=EV_SPURIOUS;
       } else if (ev.window)
-        ev.window->inm->handle_event(ev,ev.window,this);
+        ev.window->inm->handle_event(ev,ev.window);
     }
   } else if (state==dragging)
@@ -274 +275 @@
   if (y>screen->height()-4) y=screen->height()-10;
   
-  jwindow *j=new jwindow(x,y,l,h,this,fields,Name),*k;
+  jwindow *j=new jwindow(x,y,l,h,fields,Name),*k;
   j->property.hidden=0;
   if (!first)
@@ -350 +351 @@
 }
 
-jwindow::jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char const *Name)
+jwindow::jwindow(int X, int Y, int L, int H, ifield *fields, char const *Name)
 {
   ifield *i;
@@ -359 +360 @@
     for (i=fields;i;i=i->next)
     {
-      i->area(x1,y1,x2,y2,wm);
+      i->area(x1,y1,x2,y2);
       if ((int)y2>(int)h) 
         h=y2+1;
@@ -384 +385 @@
   screen->clear(backg);
   next=NULL;
-  inm=new input_manager(screen,wm,fields);
+  inm=new input_manager(screen,fields);
   if (Name==NULL)
     name=strcpy((char *)jmalloc(strlen(" ")+1,"jwindow::window name")," ");  
@@ -469 +470 @@
 {
   if (active)
-    active->draw(0,screen,wm);
+    active->draw(0,screen);
 
   active=NULL;
 }
 
-void input_manager::handle_event(event &ev, jwindow *j, window_manager *wm)
+void input_manager::handle_event(event &ev, jwindow *j)
 {
   ifield *i,*in_area=NULL;
@@ -491 +492 @@
       for (i=first;i;i=i->next)
       {
-        i->area(x1,y1,x2,y2,wm);
+        i->area(x1,y1,x2,y2);
         if (ev.mouse_move.x>=x1 && ev.mouse_move.y>=y1 &&
             ev.mouse_move.x<=x2 && ev.mouse_move.y<=y2)
@@ -499 +500 @@
       {
         if (active)
-          active->draw(0,screen,wm);
+          active->draw(0,screen);
 
         active=in_area; 
 
         if (active)
-          active->draw(1,screen,wm);
+          active->draw(1,screen);
       }
     } 
     if (ev.type==EV_KEY && ev.key==JK_TAB && active)
     { 
-      active->draw(0,screen,wm);
+      active->draw(0,screen);
       do
       {
@@ -515 +516 @@
         if (!active) active=first;
       } while (active && !active->selectable());
-      active->draw(1,screen,wm);
+      active->draw(1,screen);
     }
   } else active=grab;
@@ -522 +523 @@
   {
     if (ev.type!=EV_MOUSE_MOVE && ev.type!=EV_MOUSE_BUTTON)
-      active->handle_event(ev,screen,wm,this);
+      active->handle_event(ev,screen,this);
     else
     {
-      active->area(x1,y1,x2,y2,wm);
+      active->area(x1,y1,x2,y2);
       if (grab || (ev.mouse_move.x>=x1 && ev.mouse_move.y>=y1 &&
           ev.mouse_move.x<=x2 && ev.mouse_move.y<=y2))
       {
         if (j)
-          active->handle_event(ev,screen,wm,j->inm);
-        else active->handle_event(ev,screen,wm,this);
+          active->handle_event(ev,screen,j->inm);
+        else active->handle_event(ev,screen,this);
       }
     }
@@ -552 +553 @@
   ifield *i;
   for (i=first;i;i=i->next)
-    i->draw_first(screen,wm);
+    i->draw_first(screen);
   if (active)
-    active->draw(1,screen,wm);
-}
-
-input_manager::input_manager(image *Screen, window_manager *WM, ifield *First)
+    active->draw(1,screen);
+}
+
+input_manager::input_manager(image *Screen, ifield *First)
 {
   no_selections_allowed=0;
@@ -563 +564 @@
   grab=NULL;
   screen=Screen;
-  wm=WM;
   active=first=First;
   while (active && !active->selectable()) active=active->next;

abuse/trunk/src/imlib/jwindow.hpp

@@ -38 +38 @@
   image *screen;
   ifield *first,*active,*grab;
-  window_manager *wm;
   jwindow *cur;
   int no_selections_allowed;
 public :
-  input_manager(image *Screen, window_manager *WM, ifield *First);
-  void handle_event(event &ev, jwindow *j, window_manager *wm);
+  input_manager(image *Screen, ifield *First);
+  void handle_event(event &ev, jwindow *j);
   ifield *get(int id);
   void redraw();
@@ -64 +63 @@
   int id;
   ifield *next;
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm) = 0;
-  virtual void draw_first(image *screen, window_manager *wm)              = 0;
-  virtual void draw(int active, image *screen, window_manager *wm)        = 0;
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im) = 0;
+  virtual void area(int &x1, int &y1, int &x2, int &y2) = 0;
+  virtual void draw_first(image *screen)              = 0;
+  virtual void draw(int active, image *screen)        = 0;
+  virtual void handle_event(event &ev, image *screen, input_manager *im) = 0;
   virtual int selectable() { return 1; }
   virtual void remap(filter *f) { ; }
@@ -93 +92 @@
   input_manager *inm;
   void *local_info;     // pointer to info block for local system (may support windows)
-  jwindow(int X, int Y, int L, int H, window_manager *wm, ifield *fields, char const *Name=NULL);
+  jwindow(int X, int Y, int L, int H, ifield *fields, char const *Name=NULL);
   void redraw(int hi, int med, int low, JCFont *fnt);
   void resize(int L, int H);

abuse/trunk/src/imlib/pmenu.cpp

@@ -17 +17 @@
 }
 
-pmenu::pmenu(int X, int Y, pmenu_item *first, image *screen, window_manager *wmanager)
+pmenu::pmenu(int X, int Y, pmenu_item *first, image *screen)
 { 
   top=first; 
   active=NULL; 
-  wm=wmanager;
 
   short cx1,cy1,cx2,cy2;
@@ -46 +45 @@
 
   for (p=top;p;p=p->next,tx+=tw) 
-    p->draw_self(bar,itemx(p,wm),1,itemw(p,wm),1,wm,p==active);      
+    p->draw_self(bar,itemx(p),1,itemw(p),1,p==active);      
 /*  }
   else
   {
     for (p=top;p;p=p->next,tx+=tw) 
-      p->draw(bar,itemx(p,wm),1,itemw(p,wm),1,wm,p==active);
+      p->draw(bar,itemx(p),1,itemw(p),1,p==active);
   }*/
   
@@ -139 +138 @@
 
 
-void psub_menu::hide(jwindow *parent, int x, int y, window_manager* wm)
+void psub_menu::hide(jwindow *parent, int x, int y)
 {
   int w,h;
-  calc_size(w,h,wm);
+  calc_size(w,h);
   short cx1,cy1,cx2,cy2;
   screen->get_clip(cx1,cy1,cx2,cy2);
@@ -154 +153 @@
     {
       int w,h;
-      calc_size(w,h,wm);
-      item_num(active)->draw(win,x+3,y+3+active*(wm->font()->height()+1),w-6,0,wm,0);
+      calc_size(w,h);
+      item_num(active)->draw(win,x+3,y+3+active*(wm->font()->height()+1),w-6,0,0);
     }
     wm->close_window(win);
@@ -162 +161 @@
 }
 
-void psub_menu::calc_size(int &w, int &h, window_manager *wm)
+void psub_menu::calc_size(int &w, int &h)
 {
   int tw=wm->font()->width(),th=wm->font()->height();
@@ -179 +178 @@
 }
 
-void psub_menu::draw(jwindow *parent, int x, int y, window_manager *wmanager)
+void psub_menu::draw(jwindow *parent, int x, int y)
 {
   if (win) wm->close_window(win);
-  wm=wmanager;
-
 
   int w,h,i=0;
-  calc_size(w,h,wm);
+  calc_size(w,h);
   short cx1,cy1,cx2,cy2;
   screen->get_clip(cx1,cy1,cx2,cy2);
@@ -210 +207 @@
  
   for (p=first;p;p=p->next,i++,y+=wm->font()->height()+1)
-    p->draw(win,x,y,w-6,0,wm,i==active);
-
-}
-
-void pmenu_item::draw_self(jwindow *parent, int x, int y, int w, int top, window_manager *wm, int active)
+    p->draw(win,x,y,w-6,0,i==active);
+
+}
+
+void pmenu_item::draw_self(jwindow *parent, int x, int y, int w, int top, int active)
 {
   int bx=x;
@@ -250 +247 @@
 
 void pmenu_item::draw(jwindow *parent, int x, int y, int w, int top,
-                      window_manager *wm, int active)
+                      int active)
 {  
   if (n)
@@ -256 +253 @@
     if (active)
     {      
-      draw_self(parent,x,y,w,top,wm,active);
+      draw_self(parent,x,y,w,top,active);
       if (sub)
       {
         if (top)
-          sub->draw(parent,x,y+wm->font()->height()+2,wm);
+          sub->draw(parent,x,y+wm->font()->height()+2);
         else
-          sub->draw(parent,x+w,y,wm);
+          sub->draw(parent,x+w,y);
       }
     }
@@ -270 +267 @@
       {
         if (top)
-          sub->hide(parent,x,y+wm->font()->height()+2,wm);
+          sub->hide(parent,x,y+wm->font()->height()+2);
         else
-          sub->hide(parent,x+w,y,wm);
-      }
-      draw_self(parent,x,y,w,top,wm,active);
-
-    }
-
-  } else draw_self(parent,x,y,w,top,wm,active);
-}
-
-int pmenu::itemx(pmenu_item *p, window_manager *wm)
+          sub->hide(parent,x+w,y);
+      }
+      draw_self(parent,x,y,w,top,active);
+
+    }
+
+  } else draw_self(parent,x,y,w,top,active);
+}
+
+int pmenu::itemx(pmenu_item *p)
 {
   if (p->xp!=-1) return p->xp;
@@ -299 +296 @@
 
 
-void pmenu::draw(image *screen, window_manager *wm, int top_only)
-{
-
-}
-
-
-int psub_menu::handle_event(jwindow *parent, int x, int y, window_manager *wm, event &ev)
+void pmenu::draw(image *screen, int top_only)
+{
+
+}
+
+
+int psub_menu::handle_event(jwindow *parent, int x, int y, event &ev)
 {
   int w,h;
-  calc_size(w,h,wm);
+  calc_size(w,h);
   short cx1,cy1,cx2,cy2;
   screen->get_clip(cx1,cy1,cx2,cy2);
@@ -328 +325 @@
     {
       if (active!=-1)
-        item_num(active)->draw(win,dx,3+active*(th+1),w-6,0,wm,0);
+        item_num(active)->draw(win,dx,3+active*(th+1),w-6,0,0);
       active=new_active;
       if (active!=-1)
-        item_num(active)->draw(win,dx,3+active*(th+1),w-6,0,wm,1);
+        item_num(active)->draw(win,dx,3+active*(th+1),w-6,0,1);
     }
     if (ev.type==EV_MOUSE_BUTTON)
     {
       if (active!=-1)
-        return item_num(active)->handle_event(win,dx,3+active*(th+1),w-6,0,wm,ev);
+        return item_num(active)->handle_event(win,dx,3+active*(th+1),w-6,0,ev);
       else return 0;
     } else return 1;
   } else if (active!=-1)
-    return item_num(active)->handle_event(win,win->x+dx,win->y+3+active*(th+1),w-6,0,wm,ev);
+    return item_num(active)->handle_event(win,win->x+dx,win->y+3+active*(th+1),w-6,0,ev);
   else return 0;
 
@@ -347 +344 @@
 
 int pmenu_item::handle_event(jwindow *parent, int x, int y, int w, int top, 
-                             window_manager *wm, event &ev)
+                             event &ev)
 {
   x+=parent->x;
@@ -364 +361 @@
   { 
     if (top)
-      return sub->handle_event(parent,x,y+wm->font()->height()+2,wm,ev);
-    else return sub->handle_event(parent,x+w,y,wm,ev);
+      return sub->handle_event(parent,x,y+wm->font()->height()+2,ev);
+    else return sub->handle_event(parent,x+w,y,ev);
   } else return 0;
 }
 
-pmenu_item *pmenu::inarea(int mx, int my, image *screen, window_manager *wm) 
+pmenu_item *pmenu::inarea(int mx, int my, image *screen) 
 { 
   short cx1,cy1,cx2,cy2;
@@ -381 +378 @@
     {
       if (!p->next) return p;
-      else if (itemx(p->next,wm)>mx) return p;
+      else if (itemx(p->next)>mx) return p;
     }
     return NULL;
@@ -407 +404 @@
 }
 
-int pmenu::handle_event(event &ev, image *screen, window_manager *wm)
+int pmenu::handle_event(event &ev, image *screen)
 {
   if (!active && ev.window!=bar) return 0;
@@ -438 +435 @@
     case EV_MOUSE_MOVE :
     {
-      pmenu_item *new_selection=inarea(ev.mouse_move.x,ev.mouse_move.y,screen,wm);
+      pmenu_item *new_selection=inarea(ev.mouse_move.x,ev.mouse_move.y,screen);
       if (!new_selection && active && 
-          active->handle_event(bar,itemx(active,wm),1,itemw(active,wm),1,wm,ev))
+          active->handle_event(bar,itemx(active),1,itemw(active),1,ev))
         return 1;
       else if (active!=new_selection)
       {
         if (active)
-          active->draw(bar,itemx(active,wm),1,itemw(active,wm),1,wm,0);
+          active->draw(bar,itemx(active),1,itemw(active),1,0);
         active=new_selection;
         if (active)
-          active->draw(bar,itemx(active,wm),1,itemw(active,wm),1,wm,1);
+          active->draw(bar,itemx(active),1,itemw(active),1,1);
       }
       if (active) return 1;
@@ -457 +454 @@
       if (active) 
       {
-        if (active->handle_event(bar,itemx(active,wm),1,itemw(active,wm),1,wm,ev))
+        if (active->handle_event(bar,itemx(active),1,itemw(active),1,ev))
         {
-          active->draw(bar,itemx(active,wm),1,itemw(active,wm),1,wm,0);
+          active->draw(bar,itemx(active),1,itemw(active),1,0);
           active=NULL;
           return 1;

abuse/trunk/src/imlib/pmenu.hpp

@@ -31 +31 @@
   pmenu_item *find_id(int search_id);
   pmenu_item *find_key(int key);
-  void draw       (jwindow *parent, int x, int y, int w, int top, window_manager *wm, int active);
-  void draw_self  (jwindow *parent, int x, int y, int w, int top, window_manager *wm, int active);
-  int handle_event(jwindow *parent, int x, int y, int w, int top, window_manager *wm, event &ev);
+  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);
   ~pmenu_item();
@@ -44 +44 @@
   psub_menu *next;
   int active;
-  window_manager *wm;
   jwindow *win;
   pmenu_item *item_num(int x) { pmenu_item *p=first; while (x-- && p) p=p->next; return p; }
 public :
-  void calc_size(int &w, int &h, window_manager *wm);
+  void calc_size(int &w, int &h);
   pmenu_item *find_id(int search_id);
   pmenu_item *find_key(int key);
   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, window_manager *wm, event &ev);
-  void draw(jwindow *parent, int x, int y, window_manager *wm);
-  void hide(jwindow *parent, int x, int y, window_manager *wm);
+  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);
   ~psub_menu();
@@ -62 +61 @@
 class pmenu
 {
-  window_manager *wm;
   jwindow *bar;
   pmenu_item *top,*active;
-  int itemw(pmenu_item *p, window_manager *wm) 
+  int itemw(pmenu_item *p) 
   { return strlen(p->name())*wm->font()->width()+2; }
-  int itemx(pmenu_item *p, window_manager *wm);
-  pmenu_item *inarea(int mx, int my, image *screen, window_manager *wm);
+  int itemx(pmenu_item *p);
+  pmenu_item *inarea(int mx, int my, image *screen);
 public :
   ~pmenu();
-  pmenu(int X, int Y, pmenu_item *first, image *screen, window_manager *wm);
+  pmenu(int X, int Y, pmenu_item *first, image *screen);
   void move(int new_x, int new_y);
-  void draw(image *screen, window_manager *wm, int top_only=0);
-  int handle_event(event &ev, image *screen, window_manager *wm);  
+  void draw(image *screen, int top_only=0);
+  int handle_event(event &ev, image *screen);  
 
 } ;

abuse/trunk/src/imlib/scroller.cpp

@@ -50 +50 @@
     0, 0, 0, 0, 0};
 
-void show_icon(image *screen, window_manager *wm, int x, int y, int icw, int ich, uint8_t *buf)
+void show_icon(image *screen, int x, int y, int icw, int ich, uint8_t *buf)
 {
   short cx1,cy1,cx2,cy2;
@@ -79 +79 @@
 
 
-void scroller::area(int &x1, int &y1, int &x2, int &y2, window_manager *wm)
+void scroller::area(int &x1, int &y1, int &x2, int &y2)
 {  
-  area_config(wm);
+  area_config();
   x1=x-1; y1=y-1;  
   if (vert)
@@ -112 +112 @@
 
 
-void scroller::draw_first(image *screen, window_manager *wm)
+void scroller::draw_first(image *screen)
 {
   if (sx>=t) sx=t-1;
-  draw(0,screen,wm);
+  draw(0,screen);
   screen->wiget_bar(b1x(),b1y(),b1x()+bw()-1,b1y()+bh()-1,
                     wm->bright_color(),wm->medium_color(),wm->dark_color());
   screen->wiget_bar(b2x(),b2y(),b2x()+bw()-1,b2y()+bh()-1,
                     wm->bright_color(),wm->medium_color(),wm->dark_color());
-  show_icon(screen,wm,b1x()+2,b1y()+2,bw()-4,bh()-4,b1());
-  show_icon(screen,wm,b2x()+2,b2y()+2,bw()-4,bh()-4,b2());
+  show_icon(screen,b1x()+2,b1y()+2,bw()-4,bh()-4,b1());
+  show_icon(screen,b2x()+2,b2y()+2,bw()-4,bh()-4,b2());
 
   int x1,y1,x2,y2;
@@ -127 +127 @@
   screen->bar(x1,y1,x2,y2,wm->black());
   screen->bar(x1+1,y1+1,x2-1,y2-1,wm->medium_color());   
-  draw_wiget(screen,wm,0);
-  scroll_event(sx,screen,wm);
+  draw_wiget(screen,0);
+  scroll_event(sx,screen);
 }
 
@@ -154 +154 @@
 
 
-void scroller::draw_wiget(image *screen, window_manager *wm, int erase)
+void scroller::draw_wiget(image *screen, int erase)
 { 
   int x1,y1,x2,y2;
@@ -165 +165 @@
 }
 
-void scroller::draw(int active, image *screen, window_manager *wm)
+void scroller::draw(int active, image *screen)
 {
   int x1,y1,x2,y2;
-  area(x1,y1,x2,y2,wm);
+  area(x1,y1,x2,y2);
   screen->rectangle(x1,y1,x2,y2,active ? wm->bright_color() : wm->dark_color());
 }
 
 
-void scroller::handle_event(event &ev, image *screen, window_manager *wm, input_manager *inm)
+void scroller::handle_event(event &ev, image *screen, input_manager *inm)
 {
   int mx=ev.mouse_move.x,my=ev.mouse_move.y;
@@ -186 +186 @@
           if (sx>0)
           {
-            draw_wiget(screen,wm,1);
+            draw_wiget(screen,1);
             sx--;
-            draw_wiget(screen,wm,0);
-            scroll_event(sx,screen,wm);
+            draw_wiget(screen,0);
+            scroll_event(sx,screen);
           }
         } else if (mx>=b2x() && mx<b2x()+bw() && my>=b2y() && my<=b2y()+bh())
@@ -195 +195 @@
           if (sx<t-1)
           {
-            draw_wiget(screen,wm,1);
+            draw_wiget(screen,1);
             sx++;
-            draw_wiget(screen,wm,0);
-            scroll_event(sx,screen,wm);
+            draw_wiget(screen,0);
+            scroll_event(sx,screen);
           }         
         }
@@ -219 +219 @@
               if (nx!=sx && nx>=0 && nx<t)
               {
-                draw_wiget(screen,wm,1);
+                draw_wiget(screen,1);
                 sx=nx;
-                draw_wiget(screen,wm,0);
-                scroll_event(sx,screen,wm);             
+                draw_wiget(screen,0);
+                scroll_event(sx,screen);                
               }         
             }
-          } else handle_inside_event(ev,screen,wm,inm);
+          } else handle_inside_event(ev,screen,inm);
         }
       } else if (!ev.mouse_button && drag!=-1)
@@ -242 +242 @@
         if (nx!=sx)
         {
-          draw_wiget(screen,wm,1);
+          draw_wiget(screen,1);
           sx=nx;
-          draw_wiget(screen,wm,0);
-          scroll_event(sx,screen,wm);
+          draw_wiget(screen,0);
+          scroll_event(sx,screen);
         }
       } else if ( activate_on_mouse_move())
@@ -252 +252 @@
         wig_area(x1,y1,x2,y2);
         if (mx>=x && mx<=x+l-1 && my>=y && my<=y+h-1)
-          handle_inside_event(ev,screen,wm,inm);
+          handle_inside_event(ev,screen,inm);
       }
 
@@ -261 +261 @@
       {
         case JK_LEFT : 
-        { handle_left(screen,wm,inm); } break;
+        { handle_left(screen,inm); } break;
         case JK_RIGHT : 
-        { handle_right(screen,wm,inm); } break;
+        { handle_right(screen,inm); } break;
         case JK_UP : 
-        { handle_up(screen,wm,inm); } break;
+        { handle_up(screen,inm); } break;
         case JK_DOWN : 
-        { handle_down(screen,wm,inm); } break;
+        { handle_down(screen,inm); } break;
 
         default :
-          handle_inside_event(ev,screen,wm,inm);
+          handle_inside_event(ev,screen,inm);
       }
     } break;
@@ -277 +277 @@
 
 
-void scroller::handle_right(image *screen, window_manager *wm, input_manager *inm)
+void scroller::handle_right(image *screen, input_manager *inm)
 {
   if (!vert && sx<t-1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx++;
-    draw_wiget(screen,wm,0);
-    scroll_event(sx,screen,wm);     
-  }
-}
-
-void scroller::handle_left(image *screen, window_manager *wm, input_manager *inm)
+    draw_wiget(screen,0);
+    scroll_event(sx,screen);        
+  }
+}
+
+void scroller::handle_left(image *screen, input_manager *inm)
 {
   if (!vert && sx>1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx--;
-    draw_wiget(screen,wm,0);
-    scroll_event(sx,screen,wm);     
-  }
-}
-
-void scroller::handle_up(image *screen, window_manager *wm, input_manager *inm)
+    draw_wiget(screen,0);
+    scroll_event(sx,screen);        
+  }
+}
+
+void scroller::handle_up(image *screen, input_manager *inm)
 { 
   if (vert && sx>1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx--;
-    draw_wiget(screen,wm,0);
-    scroll_event(sx,screen,wm);     
-  }
-}
-
-void scroller::handle_down(image *screen, window_manager *wm, input_manager *inm)
+    draw_wiget(screen,0);
+    scroll_event(sx,screen);        
+  }
+}
+
+void scroller::handle_down(image *screen, input_manager *inm)
 {
   if (vert && sx<t-1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx++;
-    draw_wiget(screen,wm,0);
-    scroll_event(sx,screen,wm);     
-  }
-}
-
-void scroller::set_x (int x, image *screen, window_manager *wm)
+    draw_wiget(screen,0);
+    scroll_event(sx,screen);        
+  }
+}
+
+void scroller::set_x (int x, image *screen)
 {
   if (x<0) x=0;
@@ -327 +327 @@
   if (x!=sx)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx=x;
-    draw_wiget(screen,wm,0);
-    scroll_event(sx,screen,wm);     
+    draw_wiget(screen,0);
+    scroll_event(sx,screen);        
   }
 }
@@ -356 +356 @@
 
 
-void scroller::scroll_event(int newx, image *screen, window_manager *wm)
+void scroller::scroll_event(int newx, image *screen)
 {
   screen->bar(x,y,x+l-1,y+h-1,wm->black());
@@ -370 +370 @@
 }
 
-void pick_list::area_config(window_manager *wm)
+void pick_list::area_config()
 {
   l=wid*wm->font()->width();
@@ -407 +407 @@
 }
 
-void pick_list::handle_inside_event(event &ev, image *screen, window_manager *wm, input_manager *inm)
+void pick_list::handle_inside_event(event &ev, image *screen, input_manager *inm)
 {
   if (ev.type==EV_MOUSE_MOVE && activate_on_mouse_move())
@@ -415 +415 @@
     {
       cur_sel=sel;
-      scroll_event(last_sel,screen,wm);
+      scroll_event(last_sel,screen);
     }    
   }
@@ -428 +428 @@
       {
         cur_sel=sel;
-        scroll_event(last_sel,screen,wm);
+        scroll_event(last_sel,screen);
       }      
     }
@@ -448 +448 @@
       sx=found;
       cur_sel=found;
-      scroll_event(sx,screen,wm);
+      scroll_event(sx,screen);
     } else key_hist_total=0;
   }
 }
 
-void pick_list::handle_up(image *screen, window_manager *wm, input_manager *inm)
+void pick_list::handle_up(image *screen, input_manager *inm)
 {
   if (cur_sel>0)
@@ -460 +460 @@
   if (cur_sel<sx)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx=cur_sel;
-    draw_wiget(screen,wm,0);
-  }
-  scroll_event(sx,screen,wm);             
-}
-
-void pick_list::handle_down(image *screen, window_manager *wm, input_manager *inm)
+    draw_wiget(screen,0);
+  }
+  scroll_event(sx,screen);                
+}
+
+void pick_list::handle_down(image *screen, input_manager *inm)
 {
   if (cur_sel<t-1)
@@ -474 +474 @@
   if (cur_sel>sx+th-1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     sx=cur_sel-th+1;
-    draw_wiget(screen,wm,0);
-  }
-  scroll_event(sx,screen,wm);             
-}
-
-void pick_list::scroll_event(int newx, image *screen, window_manager *wm)
+    draw_wiget(screen,0);
+  }
+  scroll_event(sx,screen);                
+}
+
+void pick_list::scroll_event(int newx, image *screen)
 {
   last_sel=newx;
@@ -569 +569 @@
 }
 
-void spicker::draw_background(window_manager *wm, image *screen)
+void spicker::draw_background(image *screen)
 {
   screen->bar(x,y,x+l-1,y+h-1,wm->dark_color());
@@ -575 +575 @@
 
 
-void spicker::area_config(window_manager *wm)
+void spicker::area_config()
 {
   if (vert)
-    l=item_width(wm)+4;
+    l=item_width()+4;
   else
-    l=item_width(wm)*c+4;
+    l=item_width()*c+4;
 
   if (vert)
-    h=item_height(wm)*r+4;
+    h=item_height()*r+4;
   else
-    h=item_height(wm)+4;
-
-}
-
-void spicker::set_x(int x, image *screen, window_manager *wm)
+    h=item_height()+4;
+
+}
+
+void spicker::set_x(int x, image *screen)
 {
   cur_sel=x;
   sx=x;
-  scroll_event(x,screen,wm);
-}
-
-
-void spicker::scroll_event(int newx, image *screen, window_manager *wm)
+  scroll_event(x,screen);
+}
+
+
+void spicker::scroll_event(int newx, image *screen)
 {
   last_sel=newx;
@@ -603 +603 @@
   xo=x+2;
   yo=y+2;
-  if (vert) { xa=0; ya=item_height(wm); }
-  else { xa=item_width(wm); ya=0; }
-  draw_background(wm,screen);
+  if (vert) { xa=0; ya=item_height(); }
+  else { xa=item_width(); ya=0; }
+  draw_background(screen);
 
   for (int i=newx;i<newx+vis();i++)
@@ -612 +612 @@
     {
       if (m)      
-        draw_item(wm,screen,xo,yo,i,get_select(i));
+        draw_item(screen,xo,yo,i,get_select(i));
       else
-        draw_item(wm,screen,xo,yo,i,i==cur_sel);
+        draw_item(screen,xo,yo,i,i==cur_sel);
     }
     xo+=xa; yo+=ya;
@@ -621 +621 @@
 
 
-void spicker::handle_inside_event(event &ev, image *screen, window_manager *wm, input_manager *inm)
+void spicker::handle_inside_event(event &ev, image *screen, input_manager *inm)
 {
   switch (ev.type)
@@ -631 +631 @@
         int me;      
         if (vert)
-          me=last_sel+(ev.mouse_move.y-y)/item_height(wm);
+          me=last_sel+(ev.mouse_move.y-y)/item_height();
         else
-          me=last_sel+(ev.mouse_move.x-x)/item_width(wm);
+          me=last_sel+(ev.mouse_move.x-x)/item_width();
         if (me<t && me>=0)
         {
@@ -639 +639 @@
           {
             cur_sel=me;
-            scroll_event(last_sel,screen,wm);
-            note_new_current(wm,screen,inm,me);
+            scroll_event(last_sel,screen);
+            note_new_current(screen,inm,me);
           }
         }
@@ -649 +649 @@
       int me;      
       if (vert)
-        me=last_sel+(ev.mouse_move.y-y)/item_height(wm);
+        me=last_sel+(ev.mouse_move.y-y)/item_height();
       else
-        me=last_sel+(ev.mouse_move.x-x)/item_width(wm);
+        me=last_sel+(ev.mouse_move.x-x)/item_width();
       if (me<t && me>=0)
       {
@@ -661 +661 @@
             {
               set_select(me,!get_select(me));
-              scroll_event(last_sel,screen,wm);
+              scroll_event(last_sel,screen);
               inm->grab_focus(this);
             }
@@ -669 +669 @@
         {
           if (cur_sel==me)          
-            note_selection(wm,screen,inm,me);
+            note_selection(screen,inm,me);
           else
           {
             cur_sel=me;
-            scroll_event(last_sel,screen,wm);
-            note_new_current(wm,screen,inm,me);
+            scroll_event(last_sel,screen);
+            note_new_current(screen,inm,me);
           }
         }
@@ -684 +684 @@
 
 
-void spicker::handle_up(image *screen, window_manager *wm, input_manager *inm)
+void spicker::handle_up(image *screen, input_manager *inm)
 {
   if (vert && cur_sel>0)
@@ -692 +692 @@
     if (cur_sel<sx)
     {
-      draw_wiget(screen,wm,1);
+      draw_wiget(screen,1);
       last_sel=sx=cur_sel;
-      draw_wiget(screen,wm,0);
+      draw_wiget(screen,0);
     }
-    scroll_event(last_sel,screen,wm);
-    note_new_current(wm,screen,inm,cur_sel);    
-  }
-}
-
-void spicker::handle_down(image *screen, window_manager *wm, input_manager *inm)
+    scroll_event(last_sel,screen);
+    note_new_current(screen,inm,cur_sel);    
+  }
+}
+
+void spicker::handle_down(image *screen, input_manager *inm)
 {
   if (vert && cur_sel<t-1)
@@ -708 +708 @@
   if (cur_sel>sx+r-1)
   {
-    draw_wiget(screen,wm,1);
+    draw_wiget(screen,1);
     last_sel=sx=cur_sel-r+1;
-    draw_wiget(screen,wm,0);
-  }
-  scroll_event(sx,screen,wm);
-  note_new_current(wm,screen,inm,cur_sel);    
-}
-
-void spicker::handle_left(image *screen, window_manager *wm, input_manager *inm)
-{
-}
-
-void spicker::handle_right(image *screen, window_manager *wm, input_manager *inm)
-{
-}
-
-
-
-
+    draw_wiget(screen,0);
+  }
+  scroll_event(sx,screen);
+  note_new_current(screen,inm,cur_sel);    
+}
+
+void spicker::handle_left(image *screen, input_manager *inm)
+{
+}
+
+void spicker::handle_right(image *screen, input_manager *inm)
+{
+}
+
+
+
+

abuse/trunk/src/imlib/scroller.hpp

@@ -33 +33 @@
   int wig_x();
   int darea() { return (l-bw()-2)-bw()-bw(); }
-  void draw_wiget(image *screen, window_manager *wm, int erase);
+  void draw_wiget(image *screen, int erase);
   int mouse_to_drag(int mx,int my);
 public :
   int t,sx;
   scroller(int X, int Y, int ID, int L, int H, int Vert, int Total_items, ifield *Next);
-  virtual void area(int &x1, int &y1, int &x2, int &y2, window_manager *wm);
-  virtual void draw_first(image *screen, window_manager *wm);
-  virtual void draw(int active, image *screen, window_manager *wm);
-  virtual void handle_event(event &ev, image *screen, window_manager *wm, input_manager *im);
+  virtual void area(int &x1, int &y1, int &x2, int &y2);
+  virtual void draw_first(image *screen);
+  virtual void draw(int active, image *screen);
+  virtual void handle_event(event &ev, image *screen, input_manager *im);
   virtual char *read() { return (char *)&sx; }
 
   virtual int activate_on_mouse_move() { return 1; }
-  virtual void handle_inside_event(event &ev, image *screen, window_manager *wm, input_manager *inm) {;}
-  virtual void scroll_event(int newx, image *screen, window_manager *wm);
-  virtual void handle_up(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_down(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_left(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_right(image *screen, window_manager *wm, input_manager *inm);
-  virtual void area_config(window_manager *wm) { ; }
+  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm) {;}
+  virtual void scroll_event(int newx, image *screen);
+  virtual void handle_up(image *screen, input_manager *inm);
+  virtual void handle_down(image *screen, input_manager *inm);
+  virtual void handle_left(image *screen, input_manager *inm);
+  virtual void handle_right(image *screen, input_manager *inm);
+  virtual void area_config() { ; }
   void set_size(int width, int height) { l=width; h=height; }
-  virtual void set_x(int x, image *screen, window_manager *wm);
+  virtual void set_x(int x, image *screen);
 } ;
 
@@ -64 +64 @@
   spicker(int X, int Y, int ID, int Rows, int Cols, int Vert, int MultiSelect, ifield *Next);
   int vis() { if (vert) return r; else return c; }
-  virtual void area_config(window_manager *wm);
+  virtual void area_config();
   void set_select(int x, int on);
   int get_select(int x);
   int first_selected();
-  virtual void scroll_event(int newx, image *screen, window_manager *wm);
-  virtual void handle_inside_event(event &ev, image *screen, window_manager *wm, input_manager *inm);
+  virtual void scroll_event(int newx, image *screen);
+  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm);
 
   // you should define \/
-  virtual void draw_background(window_manager *wm, image *screen);
-  virtual void draw_item(window_manager *wm, image *screen, int x, int y, int num, int active) = 0;
+  virtual void draw_background(image *screen);
+  virtual void draw_item(image *screen, int x, int y, int num, int active) = 0;
   virtual int total() = 0;
-  virtual int item_width(window_manager *wm) = 0;
-  virtual int item_height(window_manager *wm) = 0;
-  virtual void note_selection(window_manager *wm, image *screen, input_manager *inm, int x) { ; }
-  virtual void note_new_current(window_manager *wm, image *screen, input_manager *inm, int x) { ; }
+  virtual int item_width() = 0;
+  virtual int item_height() = 0;
+  virtual void note_selection(image *screen, input_manager *inm, int x) { ; }
+  virtual void note_new_current(image *screen, input_manager *inm, int x) { ; }
   virtual int ok_to_select(int num) { return 1; }
-  virtual void handle_up(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_down(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_left(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_right(image *screen, window_manager *wm, input_manager *inm);
-  virtual void set_x(int x, image *screen, window_manager *wm);
+  virtual void handle_up(image *screen, input_manager *inm);
+  virtual void handle_down(image *screen, input_manager *inm);
+  virtual void handle_left(image *screen, input_manager *inm);
+  virtual void handle_right(image *screen, input_manager *inm);
+  virtual void set_x(int x, image *screen);
   void reconfigure();   // should be called by constructor after class is ready to take virtual calls
   ~spicker() { if (select) jfree(select); }
@@ -104 +104 @@
   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, window_manager *wm, input_manager *inm);
-  virtual void scroll_event(int newx, image *screen, window_manager *wm);
+  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm);
+  virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }
-  virtual void area_config(window_manager *wm);
-  virtual void handle_up(image *screen, window_manager *wm, input_manager *inm);
-  virtual void handle_down(image *screen, window_manager *wm, input_manager *inm);
+  virtual void area_config();
+  virtual void handle_up(image *screen, input_manager *inm);
+  virtual void handle_down(image *screen, input_manager *inm);
   int get_selection() { return lis[cur_sel].number; }
   ~pick_list() { jfree(lis); }

abuse/trunk/src/imlib/tools.cpp

@@ -21 +21 @@
 }
 
-void tool_picker::remap(palette *pal, window_manager *wm, image *screen)
+void tool_picker::remap(palette *pal, image *screen)
 {
   delete map;
   map=new filter(old_pal,pal);
-  draw_first(screen,wm);
+  draw_first(screen);
 }
 
 tool_picker::tool_picker(int X, int Y, int ID, 
               int show_h, visual_object **Icons, int *Ids, int total_ic, 
-                         palette *icon_palette, palette *pal, window_manager *wm, ifield *Next) :
+                         palette *icon_palette, palette *pal, ifield *Next) :
   spicker(X,Y,ID,show_h,1,1,0,Next)
 {
@@ -39 +39 @@
   for (int i=0;i<total_ic;i++)
   {
-    if (icons[i]->width(wm)>iw) iw=icons[i]->width(wm);
-    if (icons[i]->height(wm)>ih) ih=icons[i]->height(wm);
+    if (icons[i]->width()>iw) iw=icons[i]->width();
+    if (icons[i]->height()>ih) ih=icons[i]->height();
   }
   map=new filter(icon_palette,pal);
@@ -47 +47 @@
 }
 
-void tool_picker::draw_item(window_manager *wm, image *screen, int x, int y, int num, int active)
+void tool_picker::draw_item(image *screen, int x, int y, int num, int active)
 {
   if (!active)
@@ -53 +53 @@
   else
     screen->bar(x,y,x+iw-1,y+ih-1,wm->bright_color());
-  icons[num]->draw(screen,x,y,wm,map);
+  icons[num]->draw(screen,x,y,map);
 }
 

abuse/trunk/src/imlib/tools.hpp

@@ -31 +31 @@
   tool_picker(int X, int Y, int ID, 
               int show_h, visual_object **Icons, int *Ids, int total_ic, 
-              palette *icon_palette, palette *pal, window_manager *wm, ifield *Next);
+              palette *icon_palette, palette *pal, ifield *Next);
 
-  virtual void draw_item(window_manager *wm, image *screen, int x, int y, int num, int active);
+  virtual void draw_item(image *screen, int x, int y, int num, int active);
   virtual int total() { return total_icons; }
-  virtual int item_width(window_manager *wm) { return iw; } 
-  virtual int item_height(window_manager *wm) { return ih; }
-  virtual void note_new_current(window_manager *wm, image *screen, input_manager *inm, int x) 
+  virtual int item_width() { return iw; } 
+  virtual int item_height() { return ih; }
+  virtual void note_new_current(image *screen, input_manager *inm, int x) 
   { wm->push_event(new event(ids[x],NULL)); }
 
-  void remap(palette *pal, window_manager *wm, image *screen);
+  void remap(palette *pal, image *screen);
   ~tool_picker();
 } ;

abuse/trunk/src/imlib/visobj.cpp

@@ -10 +10 @@
 #include "config.h"
 
+#include "input.hpp"
 #include "visobj.hpp"
 
 void image_visual::draw(image *screen, int x, int y, 
-                    window_manager *wm, filter *f)
+                    filter *f)
 { 
   if (f)
@@ -30 +31 @@
 
 
-int string_visual::width(window_manager *wm)
+int string_visual::width()
 {
   if (w==-1)  // not calculated yet
@@ -51 +52 @@
 }
 
-int string_visual::height(window_manager *wm)
+int string_visual::height()
 { 
-  if (w==-1) width(wm);
+  if (w==-1) width();
   return h;
 }
@@ -78 +79 @@
 }
 
-void string_visual::draw(image *screen, int x, int y, 
-                    window_manager *wm, filter *f)
+void string_visual::draw(image *screen, int x, int y, filter *f)
 
 { 

abuse/trunk/src/imlib/visobj.hpp

@@ -17 +17 @@
 {
   public :
-  virtual void draw(image *screen, int x, int y, window_manager *wm, filter *f) = 0;
-  virtual int width(window_manager *wm) = 0;
-  virtual int height(window_manager *wm) = 0;
+  virtual void draw(image *screen, int x, int y, filter *f) = 0;
+  virtual int width() = 0;
+  virtual int height() = 0;
   virtual ~visual_object() {}
 } ;
@@ -31 +31 @@
 
   image_visual(image *img) { im=img; }
-  virtual void draw(image *screen, int x, int y, 
-                    window_manager *wm, filter *f);
-  virtual int width(window_manager *wm) { return im->width(); }
-  virtual int height(window_manager *wm) { return im->height(); }
+  virtual void draw(image *screen, int x, int y, filter *f);
+  virtual int width() { return im->width(); }
+  virtual int height() { return im->height(); }
 } ;
 
@@ -45 +44 @@
   public :
   string_visual(char *string, int Color);
-  virtual void draw(image *screen, int x, int y, 
-                    window_manager *wm, filter *f);
-  virtual int width(window_manager *wm); 
-  virtual int height(window_manager *wm);
+  virtual void draw(image *screen, int x, int y, filter *f);
+  virtual int width(); 
+  virtual int height();
 } ;
 

abuse/trunk/src/innet.cpp

@@ -542 +542 @@
 
 
-      jwindow *j=eh->new_window(0,yres/2,-1,-1,new info_field(WINDOW_FRAME_LEFT,
+      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(WINDOW_FRAME_LEFT,
                                                                    WINDOW_FRAME_TOP,
                                                                    0,symbol_str("resync"),
                                               new button(WINDOW_FRAME_LEFT,
-                                                         WINDOW_FRAME_TOP+eh->font()->height()+5,ID_NET_DISCONNECT,
+                                                         WINDOW_FRAME_TOP+wm->font()->height()+5,ID_NET_DISCONNECT,
                                                          symbol_str("slack"),NULL)),symbol_str("hold!"))
 ;
@@ -552 +552 @@
   
 
-      eh->flush_screen();
+      wm->flush_screen();
       if (!reload_start()) return ;
 
@@ -561 +561 @@
       { 
                                 service_net_request();
-                                if (eh->event_waiting())
+                                if (wm->event_waiting())
                                 {
                                   event ev;
                                   do
                                   {
-                                    eh->get_event(ev);
+                                    wm->get_event(ev);
                                     if (ev.type==EV_MESSAGE && ev.message.id==ID_NET_DISCONNECT)
                                     {
@@ -573 +573 @@
                                     }
                         
-                                  } while (eh->event_waiting()); 
+                                  } while (wm->event_waiting()); 
                         
-                                  eh->flush_screen();
+                                  wm->flush_screen();
                                 }
 
       } while (!reload_end());
-      eh->close_window(j);
+      wm->close_window(j);
       unlink(NET_STARTFILE);
 
@@ -651 +651 @@
         if (total_retry==12000)    // 2 minutes and nothing
         {
-          abort=eh->new_window(0,yres/2,-1,eh->font()->height()*4,
+          abort=wm->new_window(0,yres/2,-1,wm->font()->height()*4,
                                new info_field(WINDOW_FRAME_LEFT,
                                               WINDOW_FRAME_TOP,
                                               0,symbol_str("waiting"),
                                               new button(WINDOW_FRAME_LEFT,
-                                                         WINDOW_FRAME_TOP+eh->font()->height()+5,ID_NET_DISCONNECT,
+                                                         WINDOW_FRAME_TOP+wm->font()->height()+5,ID_NET_DISCONNECT,
                                                          symbol_str("slack"),NULL)),symbol_str("Error"));         
-          eh->flush_screen();
+          wm->flush_screen();
         }
       }
       if (abort)
       {
-        if (eh->event_waiting())
+        if (wm->event_waiting())
         {
           event ev;
           do
           {
-            eh->get_event(ev);
+            wm->get_event(ev);
             if (ev.type==EV_MESSAGE && ev.message.id==ID_NET_DISCONNECT)
             {
@@ -674 +674 @@
               base->input_state=INPUT_PROCESSING; 
             }
-          } while (eh->event_waiting());
-
-          eh->flush_screen();
+          } while (wm->event_waiting());
+
+          wm->flush_screen();
         }
       }
@@ -683 +683 @@
     if (abort)
     {
-      eh->close_window(abort);
+      wm->close_window(abort);
       the_game->reset_keymap();
 

abuse/trunk/src/level.cpp

@@ -787 +787 @@
     {
       c1=morph_sel_frame_color;
-      c2=eh->bright_color();
+      c2=wm->bright_color();
     } else 
     {
       c2=morph_sel_frame_color;
-      c1=eh->bright_color();
+      c1=wm->bright_color();
     }
     
@@ -1630 +1630 @@
     sd.add_by_hand(new spec_entry(SPEC_DATA_ARRAY,"player_names",NULL,name_len,0));
 
-    sd.add_by_hand(new spec_entry(SPEC_IMAGE,"thumb nail",NULL,4+160*(100+eh->font()->height()*2),0));
+    sd.add_by_hand(new spec_entry(SPEC_IMAGE,"thumb nail",NULL,4+160*(100+wm->font()->height()*2),0));
   }
 
@@ -1642 +1642 @@
 void level::write_thumb_nail(bFILE *fp, image *im)
 {
-  image *i=new image(160,100+eh->font()->height()*2);
+  image *i=new image(160,100+wm->font()->height()*2);
   i->clear();
   scale_put(im,i,0,0,160,100);
   if (first_name)
-    eh->font()->put_string(i,80-strlen(first_name)*eh->font()->width()/2,100,first_name);
+    wm->font()->put_string(i,80-strlen(first_name)*wm->font()->width()/2,100,first_name);
 
   time_t t;
@@ -1653 +1653 @@
 
   strftime(buf,80,"%T %A %B %d",localtime(&t));  
-  eh->font()->put_string(i,80-strlen(buf)*eh->font()->width()/2,100+eh->font()->height(),buf);
+  wm->font()->put_string(i,80-strlen(buf)*wm->font()->width()/2,100+wm->font()->height(),buf);
 
   fp->write_uint16(i->width());

abuse/trunk/src/loadgame.cpp

@@ -73 +73 @@
     buts[i]->next=buts[i+1];
 
-  return eh->new_window(mx,yres/2-(WINDOW_FRAME_TOP+ih*5)/2,-1,-1,buts[0]);
+  return wm->new_window(mx,yres/2-(WINDOW_FRAME_TOP+ih*5)/2,-1,-1,buts[0]);
 }
 
@@ -103 +103 @@
   do
   {
-    eh->flush_screen();
-    eh->get_event(ev);
+    wm->flush_screen();
+    wm->get_event(ev);
     if (ev.type==EV_MESSAGE && ev.message.id>=ID_LOAD_GAME_NUMBER && ev.message.id<ID_LOAD_GAME_PREVIEW)
       got_level=ev.message.id-ID_LOAD_GAME_NUMBER+1;
@@ -113 +113 @@
   } while (!got_level && !quit);
 
-  eh->close_window(l_win);
+  wm->close_window(l_win);
   the_game->reset_keymap();
   return got_level;
@@ -220 +220 @@
 
         jwindow *l_win=create_num_window(0,total_saved,thumb_nails);
-        jwindow *preview=eh->new_window(l_win->x+l_win->l+5,l_win->y,max_w,max_h,NULL,title);
+        jwindow *preview=wm->new_window(l_win->x+l_win->l+5,l_win->y,max_w,max_h,NULL,title);
 
         first->put_image(preview->screen,preview->x1(),preview->y1());
@@ -229 +229 @@
         do
         {
-                eh->flush_screen();
-                eh->get_event(ev);
+                wm->flush_screen();
+                wm->get_event(ev);
                 if (ev.type==EV_MESSAGE && ev.message.id>=ID_LOAD_GAME_NUMBER && ev.message.id<ID_LOAD_GAME_PREVIEW)
                         got_level=ev.message.id-ID_LOAD_GAME_NUMBER+1;
@@ -245 +245 @@
         } while (!got_level && !quit);
 
-        eh->close_window(l_win);
-        eh->close_window(preview);
+        wm->close_window(l_win);
+        wm->close_window(preview);
 
         for (i=0;i<total_saved;i++)

abuse/trunk/src/menu.cpp

@@ -148 +148 @@
     int tl=strlen(title)*font->width();
     int tx=screen->width()/2-tl/2;
-    dark_wiget(tx-2,my-font->height()-4,tx+tl+2,my-2,eh->medium_color(),eh->dark_color(),180);
-    font->put_string(screen,tx+1,my-font->height()-2,title,eh->bright_color());
+    dark_wiget(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());
   }
   
-  dark_wiget(mx,my,mx+mw-1,my+mh-1,eh->medium_color(),eh->dark_color(),200);
+  dark_wiget(mx,my,mx+mw-1,my+mh-1,wm->medium_color(),wm->dark_color(),200);
 
 
@@ -159 +159 @@
   {
     char *ms=men_str(CAR(c));
-    font->put_string(screen,mx+10+1,y+1,ms,eh->black());
-    font->put_string(screen,mx+10,y,ms,eh->bright_color());
+    font->put_string(screen,mx+10+1,y+1,ms,wm->black());
+    font->put_string(screen,mx+10,y,ms,wm->bright_color());
     y+=font->height()+1;
   }
 
-  eh->flush_screen();
+  wm->flush_screen();
   event ev;
   int choice=0,done=0;
@@ -176 +176 @@
   do
   {
-    eh->flush_screen();
-    if (eh->event_waiting())
-    {
-      eh->get_event(ev);
+    wm->flush_screen();
+    if (wm->event_waiting())
+    {
+      wm->get_event(ev);
       if (ev.type==EV_KEY)
       {
@@ -228 +228 @@
 
       char *cur=men_str(nth(choice,args));
-      font->put_string(screen,mx+10+1,by1+3,cur,eh->black());
-      font->put_string(screen,mx+10,by1+2,cur,eh->bright_color());
-      screen->rectangle(mx+1,by1,mx+mw-2,by2,eh->bright_color());
+      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());
 
       color+=cdir;
@@ -239 +239 @@
         color+=cdir;
       }
-      eh->flush_screen();
+      wm->flush_screen();
       save->put_image(screen,mx+1,by1);
     } else milli_wait(10);
@@ -287 +287 @@
 static void create_volume_window()
 {
-/*  int vx=WINDOW_FRAME_LEFT,vy=WINDOW_FRAME_TOP+eh->font()->height()*2,scroller_height=130,bh=eh->font()->height()+5;
-
-  volume_window=eh->new_window(prop->getd("volume_x",xres/2-20),
+/*  int vx=WINDOW_FRAME_LEFT,vy=WINDOW_FRAME_TOP+wm->font()->height()*2,scroller_height=130,bh=wm->font()->height()+5;
+
+  volume_window=wm->new_window(prop->getd("volume_x",xres/2-20),
                                prop->getd("volume_y",yres/2-50),
                                -1,
@@ -299 +299 @@
   do
   {
-    eh->flush_screen();
-    eh->get_event(ev);
+    wm->flush_screen();
+    wm->get_event(ev);
     if (ev.type==EV_CLOSE_WINDOW && ev.window==volume_window) done=1;    
   } while (!done);
-  eh->close_window(volume_window);
+  wm->close_window(volume_window);
   volume_window=NULL; */
 
@@ -320 +320 @@
       slider=cash.reg(ff,"volume_slide",t,1);
   
-  volume_window=eh->new_window(prop->getd("volume_x",xres/2-20),
+  volume_window=wm->new_window(prop->getd("volume_x",xres/2-20),
                                prop->getd("volume_y",yres/2-50),
                                41-WINDOW_FRAME_LEFT-WINDOW_FRAME_RIGHT-2,
@@ -337 +337 @@
   draw_sfx_vol(slider);
   volume_window->inm->redraw();
-  eh->grab_focus(volume_window);
-  eh->flush_screen();
+  wm->grab_focus(volume_window);
+  wm->flush_screen();
 
   volume_window->inm->allow_no_selections();
@@ -346 +346 @@
   do
   {
-    do { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-    eh->flush_screen();
+    do { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+    wm->flush_screen();
     if (ev.type==EV_MESSAGE)
     {
@@ -396 +396 @@
     } else if (ev.type==EV_CLOSE_WINDOW || (ev.type==EV_KEY && ev.key==JK_ESC))
     {
-      eh->close_window(volume_window);
+      wm->close_window(volume_window);
       volume_window=NULL;
     }
@@ -448 +448 @@
   {
     image blank(2,2); blank.clear();
-    eh->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
+    wm->set_mouse_shape(blank.copy(),0,0);      // don't show mouse
 
     ss=symbol_value(ss);
@@ -459 +459 @@
       event ev;
       do
-      { eh->flush_screen();
-        eh->get_event(ev);
+      { wm->flush_screen();
+        wm->get_event(ev);
       } while (ev.type!=EV_KEY);
       if (ev.key==JK_ESC && abortable)
@@ -467 +467 @@
       ss=CDR(ss);
     }
-    eh->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
+    wm->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
   }
 }
@@ -572 +572 @@
           inm->redraw();
           fade_in(NULL,8);
-          eh->flush_screen(); 
+          wm->flush_screen(); 
 
         } break;
@@ -580 +580 @@
     {
       if (ev.window==volume_window)
-      { eh->close_window(volume_window); volume_window=NULL; }
+      { wm->close_window(volume_window); volume_window=NULL; }
     } break;
   }
@@ -708 +708 @@
         list=make_default_buttons(xres-33,y,list);
 
-        input_manager *inm=new input_manager(screen,eh,list);
+        input_manager *inm=new input_manager(screen,list);
         inm->allow_no_selections();
         inm->clear_current();
@@ -718 +718 @@
         int stop_menu=0;
         time_marker start;
-        eh->flush_screen(); 
+        wm->flush_screen(); 
         do
         {
                 time_marker new_time;
 
-                if (eh->event_waiting())
+                if (wm->event_waiting())
                 {
                         do
                         {
-                                eh->get_event(ev);
-                        } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-                        inm->handle_event(ev,NULL,eh);
+                                wm->get_event(ev);
+                        } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+                        inm->handle_event(ev,NULL);
                         if (ev.type==EV_KEY && ev.key==JK_ESC)
-                                eh->push_event(new event(ID_QUIT,NULL));
+                                wm->push_event(new event(ID_QUIT,NULL));
 
                         menu_handler(ev,inm);
                         start.get_time();
 
-                        eh->flush_screen();
+                        wm->flush_screen();
                 }
                 else

abuse/trunk/src/net/gserver.cpp

@@ -29 +29 @@
 #include "input.hpp"
 #include "dev.hpp"
+#include "game.hpp"
 
 extern base_memory_struct *base;
@@ -35 +36 @@
 extern net_protocol *prot;
 extern join_struct *join_array;
-extern window_manager *eh;
 extern void service_net_request();
 
@@ -66 +66 @@
     if (last_count!=total_players())
     {
-      if (stat) eh->close_window(stat);
+      if (stat) wm->close_window(stat);
       char msg[100];
       sprintf(msg,symbol_str("min_wait"),main_net_cfg->min_players-total_players());
-      stat=eh->new_window(100,50,-1,-1,new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,msg,
-                                       new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+eh->font()->height()*2,
+      stat=wm->new_window(100,50,-1,-1,new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,ID_NULL,msg,
+                                       new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*2,
                                                   ID_CANCEL,symbol_str("cancel_button"),NULL)  ));
-      eh->flush_screen();
+      wm->flush_screen();
       last_count=total_players();
     }
 
-    if (eh->event_waiting())
-    {
-      do { eh->get_event(ev); }  while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-      eh->flush_screen();
+    if (wm->event_waiting())
+    {
+      do { wm->get_event(ev); }  while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+      wm->flush_screen();
       if (ev.type==EV_MESSAGE && ev.message.id==ID_CANCEL)
         abort=1;
@@ -88 +88 @@
   if (stat)
   {
-    eh->close_window(stat);
-    eh->flush_screen();  
+    wm->close_window(stat);
+    wm->flush_screen();  
   }
 }

abuse/trunk/src/netcfg.cpp

@@ -53 +53 @@
 void net_configuration::cfg_error(char const *msg)
 {
-  jwindow *j=eh->new_window(-1,0,-1,-1,new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,0,msg,
+  jwindow *j=wm->new_window(-1,0,-1,-1,new info_field(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,0,msg,
       new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+30,CFG_ERR_OK,symbol_str("ok_button"),NULL)),symbol_str("input_error"));
   event ev;
   do
   {
-    eh->flush_screen();
-    do { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
+    wm->flush_screen();
+    do { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
   } while (ev.type!=EV_MESSAGE || ev.message.id!=CFG_ERR_OK || ev.type==EV_CLOSE_WINDOW || (ev.type==EV_KEY && ev.key==JK_ESC));
-  eh->close_window(j);
-  eh->flush_screen();
+  wm->close_window(j);
+  wm->flush_screen();
 }
 
@@ -171 +171 @@
   int x=WINDOW_FRAME_LEFT,y=WINDOW_FRAME_TOP;
   
-  jwindow *sv=eh->new_window(50,80,-1,-1,new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,NET_SERVER,symbol_str("server"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+eh->font()->height()*2,NET_CLIENT,symbol_str("client"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+eh->font()->height()*4,NET_SINGLE,symbol_str("single_play"),
-                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+eh->font()->height()*6,NET_CANCEL,symbol_str("cancel_net"),
+  jwindow *sv=wm->new_window(50,80,-1,-1,new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP,NET_SERVER,symbol_str("server"),
+                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*2,NET_CLIENT,symbol_str("client"),
+                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*4,NET_SINGLE,symbol_str("single_play"),
+                                     new button(WINDOW_FRAME_LEFT,WINDOW_FRAME_TOP+wm->font()->height()*6,NET_CANCEL,symbol_str("cancel_net"),
                                                 NULL)))),symbol_str("Networking"));
 
@@ -181 +181 @@
   do
   {
-    eh->flush_screen();
-    do { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
+    wm->flush_screen();
+    do { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
     if (ev.type==EV_MESSAGE)
     {
@@ -193 +193 @@
   } while (!done);
 
-  eh->close_window(sv);
-  eh->flush_screen();
+  wm->close_window(sv);
+  wm->flush_screen();
            
   if (state==RESTART_SINGLE) 
@@ -228 +228 @@
     i->y=y;
     int x1,y1,x2,y2;
-    i->area(x1,y1,x2,y2,eh);
+    i->area(x1,y1,x2,y2);
     y=y2+2;
   }
 
 
-  jwindow *nw=eh->new_window(0,0,-1,-1,ilist,symbol_str("Networking"));
+  jwindow *nw=wm->new_window(0,0,-1,-1,ilist,symbol_str("Networking"));
 
   done=0;
   do
   {
-    eh->flush_screen();
-    do { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
+    wm->flush_screen();
+    do { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
     if (ev.type==EV_MESSAGE && ev.message.id==NET_OK && confirm_inputs(nw,state==RESTART_SERVER))
       done=1;
@@ -248 +248 @@
 
   } while (!done);
-  eh->close_window(nw);
-  eh->flush_screen();
+  wm->close_window(nw);
+  wm->flush_screen();
 
   return ev.message.id==NET_OK;
@@ -265 +265 @@
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
   ns->put_image(screen,x,y);
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
 
   uint8_t *remap=white_light+30*256;
@@ -276 +276 @@
     fy=y+ns_h/2-fnt->height();
 
-  fnt->put_string(screen,fx+1,fy+1,message,eh->black());
-  fnt->put_string(screen,fx,fy,message,eh->bright_color());
+  fnt->put_string(screen,fx+1,fy+1,message,wm->black());
+  fnt->put_string(screen,fx,fy,message,wm->bright_color());
 
   
@@ -288 +288 @@
     button *sb=new button(bx,by,NET_SERVER,ok,NULL);
 
-    input_manager inm(screen,eh,sb);
+    input_manager inm(screen,sb);
     inm.allow_no_selections();
     inm.clear_current();
@@ -296 +296 @@
     do
     {
-      eh->flush_screen();
-      do  { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-      inm.handle_event(ev,NULL,eh);
+      wm->flush_screen();
+      do  { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+      inm.handle_event(ev,NULL);
       if ((ev.type==EV_KEY && (ev.key==JK_ESC || ev.key==JK_ENTER)) ||
           ev.type==EV_MESSAGE) done=1;
@@ -305 +305 @@
 
   screen_backup->put_image(screen,0,0);
-  eh->flush_screen();
+  wm->flush_screen();
   delete screen_backup;
 }
@@ -313 +313 @@
 {
   int X1,Y1,X2,Y2;
-  i->area(X1,Y1,X2,Y2,eh);
+  i->area(X1,Y1,X2,Y2);
   i->x=(x1+x2)/2-(X2-X1)/2;
 
   if (place_below)
   {
-    place_below->area(X1,Y1,X2,Y2,eh);
+    place_below->area(X1,Y1,X2,Y2);
     i->y=Y2+2;
   }
@@ -330 +330 @@
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
   ns->put_image(screen,x,y);
-  JCFont *fnt=eh->font();
+  JCFont *fnt=wm->font();
   image *ok_image=cash.img(cash.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(),
     *cancel_image=cash.img(cash.reg("art/frame.spe","cancel",SPEC_IMAGE,1))->copy();
@@ -356 +356 @@
 
 
-    b->arrange_left_right(eh);
+    b->arrange_left_right();
     center_ifield(b,x,x+ns_w,list);
-    b->arrange_left_right(eh);
+    b->arrange_left_right();
     list=b;
 
@@ -372 +372 @@
     b->add_button(new button(0,0,MAX_3,"3",NULL));
     b->add_button(new button(0,0,MAX_2,"2",NULL));
-    b->arrange_left_right(eh);
+    b->arrange_left_right();
     center_ifield(b,x,x+ns_w,list);
-    b->arrange_left_right(eh);    
+    b->arrange_left_right();    
     list=b;
 
@@ -386 +386 @@
     b->add_button(q);
 
-    b->arrange_left_right(eh);
+    b->arrange_left_right();
     center_ifield(b,x,x+ns_w,list);
-    b->arrange_left_right(eh);    
+    b->arrange_left_right();    
     list=b;
 
@@ -408 +408 @@
 
   {
-    input_manager inm(screen,eh,list);
+    input_manager inm(screen,list);
     inm.allow_no_selections();
     inm.clear_current();
@@ -416 +416 @@
     do
     {
-      eh->flush_screen();
-      do { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-      inm.handle_event(ev,NULL,eh);
+      wm->flush_screen();
+      do { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+      inm.handle_event(ev,NULL);
       if (ev.type==EV_MESSAGE)
       {
@@ -450 +450 @@
   ns->put_image(screen,x,y);
   char const *nw_s = symbol_str("Networking");
-  JCFont *fnt=eh->font();
-
-
-  eh->font()->put_string(screen,x+ns_w/2-strlen(nw_s)*fnt->width()/2,y+21/2-fnt->height()/2,
-      nw_s,eh->medium_color());
+  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,
+      nw_s,wm->medium_color());
   {
 
@@ -463 +463 @@
       sb=new button(x+40,y+ns_h-9-fnt->height(),NET_SINGLE,symbol_str("single_play"),sb);
 
-    input_manager inm(screen,eh,sb);
+    input_manager inm(screen,sb);
 
     inm.allow_no_selections();
@@ -479 +479 @@
     do
     {
-      if (eh->event_waiting())
+      if (wm->event_waiting())
       {
-        do  { eh->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && eh->event_waiting()); 
-        inm.handle_event(ev,NULL,eh);
+        do  { wm->get_event(ev); } while (ev.type==EV_MOUSE_MOVE && wm->event_waiting()); 
+        inm.handle_event(ev,NULL);
         if (ev.type==EV_MESSAGE)
         {
@@ -509 +509 @@
         }
 
-      eh->flush_screen();
+      wm->flush_screen();
       char name[256];
 

abuse/trunk/src/oldhelp.cpp

@@ -55 +55 @@
 void make_help_page(int page, image *s)
 {
-  int x=0,y=0,fw=eh->font()->width(),fh=eh->font()->height(),ya;
+  int x=0,y=0,fw=wm->font()->width(),fh=wm->font()->height(),ya;
   char *h,*ho,imname[30],*inp;
   h=ho=get_page(page);
@@ -64 +64 @@
   if (fp->open_failure())
   {
-    eh->font()->put_string(s,10,10,"Help file missing!");
+    wm->font()->put_string(s,10,10,"Help file missing!");
     return ;
     
@@ -82 +82 @@
         if (*h=='@')
         {         
-          eh->font()->put_char(s,x,y,*h);
+          wm->font()->put_char(s,x,y,*h);
           x+=fw;          
           h++;    
@@ -122 +122 @@
           if (!sd.find(imname))
           {         
-            eh->font()->put_string(s,0,yres-10,"Missing image!");
+            wm->font()->put_string(s,0,yres-10,"Missing image!");
             delete fp;
             jfree(ho);      
@@ -160 +160 @@
       else
       {
-        eh->font()->put_char(s,x,y,*h);
+        wm->font()->put_char(s,x,y,*h);
         x+=fw;    
         h++;    
@@ -198 +198 @@
     screen->scroll(0,0,xres,yres,0,scroll_step);
     h->put_part(screen,0,helpy,0,0,xres,-helpy+scroll_step);
-    eh->flush_screen();    
+    wm->flush_screen();    
   }
   delete h;       

abuse/trunk/src/profile.cpp

@@ -56 +56 @@
 
   
-  prof_win=eh->new_window(prop->getd("profile x",-1),
+  prof_win=wm->new_window(prop->getd("profile x",-1),
                           prop->getd("profile y",-1),
                           20*console_font->width(),
@@ -81 +81 @@
   if (prof_list) jfree(prof_list);
   prof_list=NULL;
-  if (prof_win) { eh->close_window(prof_win); prof_win=NULL; }
+  if (prof_win) { wm->close_window(prof_win); prof_win=NULL; }
 }
 
@@ -125 +125 @@
     prof_win->screen->bar(spliter-1-(int)(prof_list[i].total_time*time_scaler),dy+1,
                           spliter-1,
-                          dy+console_font->height()-1,eh->bright_color());
+                          dy+console_font->height()-1,wm->bright_color());
     dy+=console_font->height()+1;
   }

abuse/trunk/src/scene.cpp

@@ -650 +650 @@
             if (!text_loaded) done=1;
             
-          eh->flush_screen();     
-          while (eh->event_waiting())
+          wm->flush_screen();     
+          while (wm->event_waiting())
           {     
             event ev;       
-            eh->get_event(ev);
+            wm->get_event(ev);
             if (ev.type==EV_KEY)
             {

abuse/trunk/src/statbar.cpp

@@ -246 +246 @@
     {
       if ((current_level->tick_counter()&4)==0)
-        eh->set_mouse_shape(cash.img(c_mouse1)->copy(),4,4);
-      else eh->set_mouse_shape(cash.img(c_mouse2)->copy(),4,4);   
+        wm->set_mouse_shape(cash.img(c_mouse1)->copy(),4,4);
+      else wm->set_mouse_shape(cash.img(c_mouse2)->copy(),4,4);   
       changed_cursor=1;
     } else if (changed_cursor)
     {
       if (!(dev&EDIT_MODE))
-        eh->set_mouse_shape(cash.img(c_target)->copy(),8,8);
+        wm->set_mouse_shape(cash.img(c_target)->copy(),8,8);
       else
-        eh->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
+        wm->set_mouse_shape(cash.img(c_normal)->copy(),1,1);
       changed_cursor=0;      
     }

abuse/trunk/src/unixnfc.cpp

@@ -487 +487 @@
 
 
-      jwindow *j=eh->new_window(0,yres/2,-1,-1,new info_field(WINDOW_FRAME_LEFT,
+      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(WINDOW_FRAME_LEFT,
                                                                    WINDOW_FRAME_TOP,
                                                                    0,"Clients are re-syncing, please wait...",NULL));
-      eh->flush_screen();
+      wm->flush_screen();
       if (!reload_start()) return ;
 
@@ -498 +498 @@
         next_process();
       } while (!reload_end());
-      eh->close_window(j);
+      wm->close_window(j);
 
     }      
@@ -564 +564 @@
         if (total_retry==10)    // 2 seconds and nothing
         {
-          abort=eh->new_window(0,yres/2,-1,eh->font()->height()*4,
+          abort=wm->new_window(0,yres/2,-1,wm->font()->height()*4,
                                new info_field(WINDOW_FRAME_LEFT,
                                               WINDOW_FRAME_TOP,
                                               0,"Waiting for data...",
                                               new button(WINDOW_FRAME_LEFT,
-                                                         WINDOW_FRAME_TOP+eh->font()->height()+5,ID_NET_DISCONNECT,
+                                                         WINDOW_FRAME_TOP+wm->font()->height()+5,ID_NET_DISCONNECT,
                                                          "Disconnect slackers",NULL)),"Error");   
-          eh->flush_screen();
+          wm->flush_screen();
         }
       }
       if (abort)
       {
-        if (eh->event_waiting())
+        if (wm->event_waiting())
         {
           event ev;
           do
           {
-            eh->get_event(ev);
+            wm->get_event(ev);
             if (ev.type==EV_MESSAGE && ev.message.id==ID_NET_DISCONNECT)
             kill_slackers();
@@ -590 +590 @@
               input.add_front(e);
             } 
-          } while (eh->event_waiting());
-
-          eh->flush_screen();
+          } while (wm->event_waiting());
+
+          wm->flush_screen();
         }
       }
@@ -599 +599 @@
     if (abort)
     {
-      eh->close_window(abort);
+      wm->close_window(abort);
       while (input.first())               // push all the key events
       {
         event *ev=(event *)input.first();
         input.unlink((linked_node *)ev);
-        eh->push_event(ev);
+        wm->push_event(ev);
       }
     }