Changeset 106 for abuse/trunk/src/menu.cppTweet

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.

File:

• abuse/trunk/src/menu.cpp (modified) (18 diffs)

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