Changeset 120Tweet

Timestamp:

Mar 17, 2008, 3:25:09 AM (11 years ago)

Author:

Sam Hocevar

Message:

• Cosmetic: rename window into Jwindow, window_manager into WindowManager? and input_manager into InputManager?.

Location:

abuse/trunk/src

Files:

• automap.hpp (modified) (1 diff)
• console.hpp (modified) (1 diff)
• dev.cpp (modified) (3 diffs)
• dev.hpp (modified) (3 diffs)
• devsel.cpp (modified) (1 diff)
• devsel.hpp (modified) (1 diff)
• game.cpp (modified) (3 diffs)
• game.hpp (modified) (2 diffs)
• gamma.cpp (modified) (1 diff)
• go.cpp (modified) (3 diffs)
• go.hpp (modified) (3 diffs)
• gui.cpp (modified) (2 diffs)
• gui.hpp (modified) (2 diffs)
• imlib/event.hpp (modified) (2 diffs)
• imlib/filesel.cpp (modified) (4 diffs)
• imlib/filesel.hpp (modified) (1 diff)
• imlib/guistat.cpp (modified) (1 diff)
• imlib/input.cpp (modified) (3 diffs)
• imlib/input.hpp (modified) (5 diffs)
• imlib/jwindow.cpp (modified) (43 diffs)
• imlib/jwindow.hpp (modified) (9 diffs)
• imlib/pmenu.cpp (modified) (8 diffs)
• imlib/pmenu.hpp (modified) (4 diffs)
• imlib/scroller.cpp (modified) (12 diffs)
• imlib/scroller.hpp (modified) (4 diffs)
• imlib/tools.hpp (modified) (1 diff)
• innet.cpp (modified) (2 diffs)
• loadgame.cpp (modified) (4 diffs)
• menu.cpp (modified) (2 diffs)
• net/gserver.cpp (modified) (1 diff)
• netcfg.cpp (modified) (7 diffs)
• netcfg.hpp (modified) (2 diffs)
• objects.hpp (modified) (1 diff)
• profile.cpp (modified) (1 diff)
• ui/volumewindow.cpp (modified) (1 diff)
• ui/volumewindow.hpp (modified) (1 diff)
• unixnfc.cpp (modified) (2 diffs)

abuse/trunk/src/automap.hpp

@@ -16 +16 @@
 class automap
 { 
-  jwindow *automap_window;
+  Jwindow *automap_window;
   level *cur_lev;
   int tick,w,h;                // used to draw your position as a blinking spot

abuse/trunk/src/console.hpp

@@ -18 +18 @@
   JCFont *fnt;
   char *screen;
-  jwindow *con_win;
+  Jwindow *con_win;
   char *name;
   public :

abuse/trunk/src/dev.cpp

@@ -84 +84 @@
 
 pmenu *dev_menu=NULL;
-jwindow *mess_win=NULL,*warn_win=NULL;
+Jwindow *mess_win=NULL,*warn_win=NULL;
 
 game_object *edit_object;
@@ -155 +155 @@
 int confirm_quit()
 {
-    jwindow *quitw;
+    Jwindow *quitw;
     image *ok_image, *cancel_image;
 
@@ -3269 +3269 @@
 }
 
-int dev_controll::is_pal_win(jwindow *win)
+int dev_controll::is_pal_win(Jwindow *win)
 {
   int i;

abuse/trunk/src/dev.hpp

@@ -36 +36 @@
 
 public : 
-  jwindow *me;
+  Jwindow *me;
   void close_window();
   void open_window();
@@ -77 +77 @@
   time_marker last_area_click;
 public :
-  jwindow *backw,*forew,*commandw,*modew,*omenu,*oedit,*ledit,
+  Jwindow *backw,*forew,*commandw,*modew,*omenu,*oedit,*ledit,
           *music_window,*pmenu,*show_menu,*lightw,*aiw,*ambw,*tbw,*area_win,
           *search_window,*memprof;
@@ -103 +103 @@
   void handle_event(event &ev);
   void do_command(char const *st, event &ev);
-  int is_pal_win(jwindow *win);
+  int is_pal_win(Jwindow *win);
   void dev_draw(view *v);
   void load_stuff();

abuse/trunk/src/devsel.cpp

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

abuse/trunk/src/devsel.hpp

@@ -18 +18 @@
   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, input_manager *inm);
+  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
   virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }

abuse/trunk/src/game.cpp

@@ -60 +60 @@
 extern crc_manager *net_crcs;
 game *the_game;
-window_manager *wm = NULL;
+WindowManager *wm = NULL;
 int dev, shift_down = SHIFT_DOWN_DEFAULT, shift_right = SHIFT_RIGHT_DEFAULT;
 double sum_diffs = 1, total_diffs = 12;
@@ -110 +110 @@
                                      no_space_msg, NULL);
     button *b = new button(0, 0, ID_QUIT_OK, "Quit", inf);
-    jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR");
+    Jwindow *no_space = wm->new_window(0, 0, -1, -1, b, "ERROR");
 
     event ev;
@@ -1483 +1483 @@
   console_font = new JCFont(cash.img(console_font_pict));
 
-  wm = new window_manager(screen, pal, bright_color,
-                                   med_color,
-                                   dark_color,
-                                   game_font);
+  wm = new WindowManager(screen, pal, bright_color,
+                         med_color, dark_color, game_font);
 
   delete stat_man;  // move to a graphical status manager

abuse/trunk/src/game.hpp

@@ -46 +46 @@
 
 /* Cleaned-up externs */
-extern window_manager *wm;
+extern WindowManager *wm;
 
 
@@ -77 +77 @@
 
 
-  jwindow *top_menu,*joy_win,*last_input;
+  Jwindow *top_menu,*joy_win,*last_input;
   JCFont *game_font;
   uint8_t keymap[512/8];

abuse/trunk/src/gamma.cpp

@@ -137 +137 @@
         gp->set_pos(dg / 4);
 
-        jwindow *gw = wm->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;

abuse/trunk/src/go.cpp

@@ -38 +38 @@
 }  
 
-void elevator::gather_input(input_manager *inm) 
+void elevator::gather_input(InputManager *inm) 
 { 
   dir=atoi(inm->get(ELEVATOR_DIR)->read());  
@@ -54 +54 @@
 }
 
-void elcontrol::gather_input(input_manager *inm)
+void elcontrol::gather_input(InputManager *inm)
 {
   allow_dir=atoi(inm->get(ELCONTROL_ALLOW_DIR)->read());  
@@ -354 +354 @@
 
 
-void sensor::gather_input(input_manager *inm)
+void sensor::gather_input(InputManager *inm)
 {
   xrange=atoi(inm->get(SENSOR_XRANGE)->read());

abuse/trunk/src/go.hpp

@@ -21 +21 @@
   virtual game_objects type() { return O_elcontrol; }  
   virtual ifield *make_fields(int ystart, ifield *Next);
-  virtual void gather_input(input_manager *inm);
+  virtual void gather_input(InputManager *inm);
   virtual void save(FILE *fp) { game_object::save(fp); write_short(fp,allow_dir); }
   virtual int decide() { return 1; }  // not dead
@@ -41 +41 @@
   virtual game_objects type() { return O_elevator; }
   virtual ifield *make_fields(int ystart, ifield *Next);  
-  virtual void gather_input(input_manager *inm);  
+  virtual void gather_input(InputManager *inm);  
   virtual void save(FILE *fp);
   virtual int can_block(game_object *who);
@@ -57 +57 @@
   virtual game_objects type() { return O_sensor; }
   virtual ifield *make_fields(int ystart, ifield *Next);
-  virtual void gather_input(input_manager *inm);  
+  virtual void gather_input(InputManager *inm);  
   virtual void save(FILE *fp);
 

abuse/trunk/src/gui.cpp

@@ -68 +68 @@
 }
 
-void ico_switch_button::handle_event(event &ev, image *screen, input_manager *im)
+void ico_switch_button::handle_event(event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&
@@ -116 +116 @@
 extern int sfx_volume;
 
-void ico_button::handle_event(event &ev, image *screen, input_manager *im)
+void ico_button::handle_event(event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&

abuse/trunk/src/gui.hpp

@@ -24 +24 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);
 
   virtual char *read() { return (char *)&up; }
@@ -43 +43 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);
   virtual ifield *unlink(int id);
   virtual char *read() { return cur_but->read(); }

abuse/trunk/src/imlib/event.hpp

@@ -29 +29 @@
 #include "mouse.hpp"
 
-class jwindow;
+class Jwindow;
 
 class event : public linked_node
@@ -41 +41 @@
   struct { int x1,y1,x2,y2;
            void *start; }         redraw;
-  jwindow                        *window;      // NULL is root
+  Jwindow                        *window;      // NULL is root
   struct { int x,y; }             window_position;
   struct { int id; char *data; }  message;

abuse/trunk/src/imlib/filesel.cpp

@@ -26 +26 @@
   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);
+  virtual void note_selection(image *screen, InputManager *inm, int x);
   void free_up();
   ~file_picker() { free_up(); }
@@ -42 +42 @@
 }
 
-void file_picker::note_selection(image *screen, input_manager *inm, int x)
+void file_picker::note_selection(image *screen, InputManager *inm, int x)
 {
   if (x<td)
@@ -116 +116 @@
 }
 
-jwindow *file_dialog(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,
@@ -123 +123 @@
   int wh2 = 5 + wm->font()->height() + 5;
   int wh3 = wh2 + wm->font()->height() + 12;
-  jwindow *j=wm->new_window(0,0,-1,-1,
+  Jwindow *j=wm->new_window(0,0,-1,-1,
                             new info_field(5, 5, 0, prompt,
                             new text_field(0, wh2, filename_id,

abuse/trunk/src/imlib/filesel.hpp

@@ -13 +13 @@
 #include "jwindow.hpp"
 
-jwindow *file_dialog(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

@@ -21 +21 @@
   gui_status_node *next;
   visual_object *show;
-  jwindow *stat_win;
+  Jwindow *stat_win;
   int last_update;
   time_marker last_time;

abuse/trunk/src/imlib/input.cpp

@@ -108 +108 @@
 }
 
-void button_box::handle_event(event &ev, image *screen, input_manager *im)
+void button_box::handle_event(event &ev, image *screen, InputManager *im)
 {
   switch (ev.type)
@@ -263 +263 @@
 }
 
-void text_field::handle_event(event &ev, image *screen, input_manager *im)
+void text_field::handle_event(event &ev, image *screen, InputManager *im)
 {
   int xx;
@@ -361 +361 @@
 { up=!up; }
 
-void button::handle_event(event &ev, image *screen, input_manager *im)
+void button::handle_event(event &ev, image *screen, InputManager *im)
 {
   if ((ev.type==EV_KEY && ev.key==13) || (ev.type==EV_MOUSE_BUTTON &&

abuse/trunk/src/imlib/input.hpp

@@ -13 +13 @@
 #include "filter.hpp"
 
-extern window_manager *wm; /* FIXME: get rid of this if possible */
+extern WindowManager *wm; /* FIXME: get rid of this if possible */
 
 class button : public ifield
@@ -29 +29 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);
   void change_visual(image *new_visual);
   virtual void remap(filter *f);
@@ -52 +52 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);  
   virtual ~button_box();
   virtual char *read();   // return pointer to first button which is depressed
@@ -83 +83 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);
   
   virtual ~text_field() { jfree(prompt); jfree(format); jfree(data); }
@@ -103 +103 @@
   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 void handle_event(event &ev, image *screen, InputManager *im) { ; }
   virtual char *read() { return text; }
   virtual int selectable() { return 0; } 

abuse/trunk/src/imlib/jwindow.cpp

@@ -39 +39 @@
 
  // true if a window lies in this area
-int window_manager::window_in_area(int x1, int y1, int x2, int y2)
-{
-  for (jwindow *f=first;f;f=f->next) 
+int WindowManager::window_in_area(int x1, int y1, int x2, int y2)
+{
+  for (Jwindow *f=first;f;f=f->next) 
     if (f->x<=x2 && f->y<=y2 && f->x+f->l-1>=x1 && f->y+f->h-1>=y1)
       return 1;
@@ -47 +47 @@
 }
 
-void window_manager::grab_focus(jwindow *j)
+void WindowManager::grab_focus(Jwindow *j)
 { grab=j; }
 
-void window_manager::release_focus()
+void WindowManager::release_focus()
 { grab=NULL; }
 
 
-void window_manager::close_window(jwindow *j)
+void WindowManager::close_window(Jwindow *j)
 {
     delete j;
 }
 
-void window_manager::hide_windows()
-{
-  jwindow *p;
+void WindowManager::hide_windows()
+{
+  Jwindow *p;
   for (p=first;p;p=p->next)
   {
@@ -72 +72 @@
 }
 
-void window_manager::show_windows()
-{
-  jwindow *p;
+void WindowManager::show_windows()
+{
+  Jwindow *p;
   for (p=first;p;p=p->next)
     if (p->is_hidden())
@@ -80 +80 @@
 }
 
-void window_manager::hide_window(jwindow *j)
-{
-  jwindow *k;
+void WindowManager::hide_window(Jwindow *j)
+{
+  Jwindow *k;
   if (j==first)
     first=first->next;
@@ -98 +98 @@
 }
 
-void window_manager::show_window(jwindow *j)
+void WindowManager::show_window(Jwindow *j)
 {
   if (j->is_hidden())
@@ -107 +107 @@
 }
 
-void window_manager::get_event(event &ev)
-{
-  jwindow *j;
+void WindowManager::get_event(event &ev)
+{
+  Jwindow *j;
   eh->get_event(ev);
   if (ev.type==EV_KEY)
@@ -156 +156 @@
         else
         {
-          jwindow *last=first;
+          Jwindow *last=first;
           for (;last->next!=ev.window;last=last->next);
           if (ev.window->next)
@@ -166 +166 @@
         else
         {
-          jwindow *last=first;
+          Jwindow *last=first;
           for (;last->next;last=last->next);
           last->next=ev.window;
@@ -173 +173 @@
         if (red)
         {
-          jwindow *j=ev.window;
+          Jwindow *j=ev.window;
 /*        screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
           for (p=first;p!=j;p=p->next)
@@ -216 +216 @@
 }
 
-void jwindow::resize(int L, int H)
+void Jwindow::resize(int L, int H)
 {
   screen->change_size(L,H);
@@ -222 +222 @@
 }
 
-void window_manager::resize_window(jwindow *j, int l, int h)
-{
-  jwindow *p;
+void WindowManager::resize_window(Jwindow *j, int l, int h)
+{
+  Jwindow *p;
   screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
   for (p=first;p!=j;p=p->next)
@@ -233 +233 @@
 }
 
-void window_manager::move_window(jwindow *j, int x, int y)
+void WindowManager::move_window(Jwindow *j, int x, int y)
 {
     screen->add_dirty(j->x, j->y, j->x + j->l - 1, j->y + j->h - 1);
-    for(jwindow *p = first; p != j; p = p->next)
+    for(Jwindow *p = first; p != j; p = p->next)
         p->screen->add_dirty(j->x - p->x, j->y - p->y, j->x + j->l - 1 - p->x,
                              j->y + j->h - 1 - p->y);
@@ -244 +244 @@
 }
 
-window_manager::window_manager(image *Screen, palette *Pal, int Hi, 
-                               int Med, int Low, JCFont *Font)
+WindowManager::WindowManager(image *Screen, palette *Pal, int Hi, 
+                              int Med, int Low, JCFont *Font)
 {
     wm = this;
@@ -257 +257 @@
 }
 
-window_manager::~window_manager()
+WindowManager::~WindowManager()
 {
     delete eh;
@@ -265 +265 @@
 }
 
-void window_manager::add_window(jwindow *win)
+void WindowManager::add_window(Jwindow *win)
 {
     if(!first)
@@ -271 +271 @@
     else
     {
-        jwindow *tmp = first;
+        Jwindow *tmp = first;
         while(tmp->next)
             tmp = tmp->next;
@@ -279 +279 @@
 }
 
-void window_manager::remove_window(jwindow *win)
+void WindowManager::remove_window(Jwindow *win)
 {
     if(grab == win)
@@ -292 +292 @@
     else
     {
-        jwindow * search;
+        Jwindow * search;
         for(search = first; search->next != win; search = search->next)
             search->screen->add_dirty(win->x - search->x,
@@ -308 +308 @@
 }
 
-jwindow * window_manager::new_window(int x, int y, int l, int h,
+Jwindow * WindowManager::new_window(int x, int y, int l, int h,
                                      ifield * fields, char const *name)
 {
@@ -316 +316 @@
         y = screen->height () - 10;
  
-    jwindow * j = new jwindow (x, y, l, h, fields, name);
+    Jwindow * j = new Jwindow (x, y, l, h, fields, name);
     j->show();
 
@@ -322 +322 @@
 }
 
-void window_manager::flush_screen()
-{
-  jwindow *p,*q;
+void WindowManager::flush_screen()
+{
+  Jwindow *p,*q;
 
   int mx=0,my=0;
@@ -377 +377 @@
 }
 
-jwindow::jwindow(char const *name)
+Jwindow::Jwindow(char const *name)
 {
     _x1 = left_border();
@@ -387 +387 @@
     // property.flags = JWINDOW_NOAUTOHIDE_FLAG;
 
-    inm = new input_manager(this, NULL);
+    inm = new InputManager(this, NULL);
     reconfigure();
 
@@ -396 +396 @@
     if(name)
         _name = strcpy((char *)jmalloc(strlen(name) + 1,
-                                       "jwindow::window name"), name);
+                                       "Jwindow::window name"), name);
     wm->add_window(this);
 }
 
-jwindow::jwindow(int X, int Y, int L, int H, ifield *f, char const *name)
+Jwindow::Jwindow(int X, int Y, int L, int H, ifield *f, char const *name)
 {
     l = 0;
@@ -411 +411 @@
 
     screen = NULL;
-    inm = new input_manager(screen, f);
+    inm = new InputManager(screen, f);
     reconfigure(); /* FIXME: TODO */
 
@@ -443 +443 @@
     if(name)
         _name = strcpy((char *)jmalloc(strlen(name) + 1,
-                                       "jwindow::window name"), name);
+                                       "Jwindow::window name"), name);
 
     wm->add_window(this);
@@ -450 +450 @@
 }
 
-jwindow::~jwindow()
+Jwindow::~Jwindow()
 {
     wm->remove_window(this);
@@ -461 +461 @@
 }
 
-void jwindow::reconfigure()
+void Jwindow::reconfigure()
 {
     int x1, y1, x2, y2;
@@ -478 +478 @@
 }
 
-void jwindow::local_close()
+void Jwindow::local_close()
 {
     ;
 }
 
-void jwindow::redraw()
+void Jwindow::redraw()
 {
     int hi = wm->bright_color ();
@@ -537 +537 @@
 }
 
-int jwindow::left_border()
+int Jwindow::left_border()
 {
     return frame_left();
 }
 
-int jwindow::right_border()
+int Jwindow::right_border()
 {
     return frame_right();
 }
 
-int jwindow::top_border()
+int Jwindow::top_border()
 {
     return wm->font()->height() + frame_top();
 }
 
-int jwindow::bottom_border()
+int Jwindow::bottom_border()
 {
     return frame_bottom();
@@ -558 +558 @@
 
 
-ifield *input_manager::unlink(int id)     // unlinks ID from fields list and return the pointer to it
+ifield *InputManager::unlink(int id)     // unlinks ID from fields list and return the pointer to it
 { 
   for (ifield *i=first,*last=NULL;i;i=i->next)
@@ -579 +579 @@
 }
 
-input_manager::~input_manager() 
+InputManager::~InputManager() 
 { ifield *i; 
   while (first) 
@@ -588 +588 @@
 } 
 
-void input_manager::clear_current()
+void InputManager::clear_current()
 {
     if(owner)
@@ -597 +597 @@
 }
 
-void input_manager::handle_event(event &ev, jwindow *j)
+void InputManager::handle_event(event &ev, Jwindow *j)
 {
   ifield *i,*in_area=NULL;
@@ -670 +670 @@
 }
 
-void input_manager::allow_no_selections()
+void InputManager::allow_no_selections()
 {
   no_selections_allowed=1;
 }
 
-void input_manager::redraw()
+void InputManager::redraw()
 {
     ifield *i;
@@ -686 +686 @@
 }
 
-input_manager::input_manager(image *Screen, ifield *First)
+InputManager::InputManager(image *Screen, ifield *First)
 {
     no_selections_allowed = 0;
@@ -700 +700 @@
 }
 
-input_manager::input_manager(jwindow *Owner, ifield *First)
+InputManager::InputManager(Jwindow *Owner, ifield *First)
 {
     no_selections_allowed = 0;
@@ -712 +712 @@
 }
 
-void input_manager::grab_focus(ifield *i)
+void InputManager::grab_focus(ifield *i)
 { grab=i; 
   if (cur)
@@ -718 +718 @@
 }
 
-void input_manager::release_focus()
+void InputManager::release_focus()
 { grab=NULL; 
   if (cur)
@@ -724 +724 @@
 }
 
-void input_manager::remap(filter *f)
+void InputManager::remap(filter *f)
 {
   for (ifield *i=first;i;i=i->next)
@@ -731 +731 @@
 }
 
-void input_manager::add(ifield *i) 
+void InputManager::add(ifield *i) 
 { ifield *f=first;
   if (i->selectable())
@@ -745 +745 @@
 }
 
-ifield *input_manager::get(int id)
+ifield *InputManager::get(int id)
 {
   ifield *f;
@@ -771 +771 @@
 
 /* re-position the control with respect to the "client" area of the window */
-void ifield::set_owner(jwindow * newowner)
+void ifield::set_owner(Jwindow * newowner)
 {
     if(owner)

abuse/trunk/src/imlib/jwindow.hpp

@@ -18 +18 @@
 
 class ifield;
-class window_manager;
-class jwindow;
+class WindowManager;
+class Jwindow;
 
 extern int frame_top();
@@ -28 +28 @@
 void set_frame_size(int x);
 
-class input_manager
+class InputManager
 {
-  friend class jwindow;
+  friend class Jwindow;
 
 private:
   image *screen;
   ifield *first, *active, *grab;
-  jwindow *cur, *owner;
+  Jwindow *cur, *owner;
   int no_selections_allowed;
 
 public:
-  input_manager(image *Screen, ifield *First);
-  input_manager(jwindow *owner, ifield *First);
-  void handle_event(event &ev, jwindow *j);
+  InputManager(image *Screen, ifield *First);
+  InputManager(Jwindow *owner, ifield *First);
+  void handle_event(event &ev, Jwindow *j);
   ifield *get(int id);
   void redraw();
@@ -52 +52 @@
   void release_focus();
   void allow_no_selections();
-  ~input_manager(); 
+  ~InputManager(); 
 } ;
 
 class ifield
 {
-    friend class jwindow;
-    friend class input_manager;
+    friend class Jwindow;
+    friend class InputManager;
 
 protected:
-    jwindow *owner;
+    Jwindow *owner;
 
 public :
@@ -69 +69 @@
     int id;
     ifield *next;
-    virtual void set_owner(jwindow *owner);
+    virtual void set_owner(Jwindow *owner);
     virtual void move(int newx, int newy) { x = newx; y = newy; }
     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 void handle_event(event &ev, image *screen, InputManager *im) = 0;
     virtual int selectable() { return 1; }
     virtual void remap(filter *f) { ; }
@@ -83 +83 @@
 } ;
 
-class jwindow
+class Jwindow
 {
-    friend class input_manager;
+    friend class InputManager;
 
 private:
@@ -95 +95 @@
 
 protected:
-    jwindow *owner;
+    Jwindow *owner;
     int _x1, _y1, _x2, _y2;
 
 public:
-    jwindow *next;
+    Jwindow *next;
     int x, y, l, h, backg;
     image *screen;
-    input_manager *inm;
+    InputManager *inm;
     void *local_info;  // pointer to info block for local system (may support windows)
 
-    jwindow(char const *name = NULL);
-    jwindow(int X, int Y, int L, int H, ifield *f, char const *name = NULL);
-    ~jwindow();
+    Jwindow(char const *name = NULL);
+    Jwindow(int X, int Y, int L, int H, ifield *f, char const *name = NULL);
+    ~Jwindow();
 
     virtual void redraw();
@@ -133 +133 @@
 };
 
-class window_manager
+class WindowManager
 {
-    friend class jwindow;
+    friend class Jwindow;
 
 protected:
-    void add_window(jwindow *);
-    void remove_window(jwindow *);
+    void add_window(Jwindow *);
+    void remove_window(Jwindow *);
 
 public:
     event_handler *eh;
-    jwindow *first, *grab;
+    Jwindow *first, *grab;
     image *screen, *mouse_pic, *mouse_save;
     palette *pal;
@@ -150 +150 @@
     enum { inputing, dragging } state;
     int drag_mousex, drag_mousey, frame_suppress;
-    jwindow *drag_window;
+    Jwindow *drag_window;
     JCFont *fnt, *wframe_fnt;
 
-    window_manager(image *, palette *, int hi, int med, int low, JCFont *); 
-    ~window_manager();
+    WindowManager(image *, palette *, int hi, int med, int low, JCFont *); 
+    ~WindowManager();
 
-    jwindow *new_window(int x, int y, int l, int h,
+    Jwindow *new_window(int x, int y, int l, int h,
                         ifield *fields = NULL, char const *Name = NULL);
 
     void set_frame_font(JCFont *fnt) { wframe_fnt = fnt; }
     JCFont *frame_font() { return wframe_fnt; }
-    void close_window(jwindow *j);
-    void resize_window(jwindow *j, int l, int h);
-    void move_window(jwindow *j, int x, int y);
+    void close_window(Jwindow *j);
+    void resize_window(Jwindow *j, int l, int h);
+    void move_window(Jwindow *j, int x, int y);
     void get_event(event &ev);
     void push_event(event *ev) { eh->push_event(ev); }
@@ -185 +185 @@
     void hide_windows();
     void show_windows();
-    void hide_window(jwindow *j);
-    void show_window(jwindow *j);
+    void hide_window(Jwindow *j);
+    void show_window(Jwindow *j);
     void set_frame_suppress(int x) { frame_suppress=x; }
-    void grab_focus(jwindow *j);
+    void grab_focus(Jwindow *j);
     void release_focus();
     int window_in_area(int x1, int y1, int x2, int y2); // true if a window lies in this area

abuse/trunk/src/imlib/pmenu.cpp

@@ -25 +25 @@
   screen->get_clip(cx1,cy1,cx2,cy2);
   if (cx1<X) cx1=X;
-  int w = cx2 - cx1 - jwindow::left_border() - jwindow::right_border() + 1;
-  int h = jwindow::top_border() + jwindow::bottom_border();
+  int w = cx2 - cx1 - Jwindow::left_border() - Jwindow::right_border() + 1;
+  int h = Jwindow::top_border() + Jwindow::bottom_border();
 
   bar=wm->new_window(X, Y, w, 0, NULL);
@@ -136 +136 @@
 
 
-void psub_menu::hide(jwindow *parent, int x, int y)
+void psub_menu::hide(Jwindow *parent, int x, int y)
 {
   int w,h;
@@ -176 +176 @@
 }
 
-void psub_menu::draw(jwindow *parent, int x, int y)
+void psub_menu::draw(Jwindow *parent, int x, int y)
 {
   if (win) wm->close_window(win);
@@ -193 +193 @@
 
   win=wm->new_window(parent->x+x,parent->y+y,
-                     w - jwindow::left_border() - jwindow::right_border(),
-                     h - jwindow::top_border() - jwindow::bottom_border(),
+                     w - Jwindow::left_border() - Jwindow::right_border(),
+                     h - Jwindow::top_border() - Jwindow::bottom_border(),
                      NULL);
   win->freeze();
@@ -210 +210 @@
 }
 
-void pmenu_item::draw_self(jwindow *parent, int x, int y, int w, int top, int active)
+void pmenu_item::draw_self(Jwindow *parent, int x, int y, int w, int top, int active)
 {
   int bx=x;
@@ -245 +245 @@
 }
 
-void pmenu_item::draw(jwindow *parent, int x, int y, int w, int top,
+void pmenu_item::draw(Jwindow *parent, int x, int y, int w, int top,
                       int active)
 {  
@@ -301 +301 @@
 
 
-int psub_menu::handle_event(jwindow *parent, int x, int y, event &ev)
+int psub_menu::handle_event(Jwindow *parent, int x, int y, event &ev)
 {
   int w,h;
@@ -342 +342 @@
 }
 
-int pmenu_item::handle_event(jwindow *parent, int x, int y, int w, int top, 
+int pmenu_item::handle_event(Jwindow *parent, int x, int y, int w, int top, 
                              event &ev)
 {

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, 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);
+  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;
-  jwindow *win;
+  Jwindow *win;
   pmenu_item *item_num(int x) { pmenu_item *p=first; while (x-- && p) p=p->next; return p; }
 public :
@@ -52 +52 @@
   psub_menu(pmenu_item *First, psub_menu *Next) 
   { first=First; Next=Next; win=0; active=0; }
-  int handle_event(jwindow *parent, int x, int y, event &ev);
-  void draw(jwindow *parent, int x, int y);
-  void hide(jwindow *parent, int x, int y);
+  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();
@@ -61 +61 @@
 class pmenu
 {
-  jwindow *bar;
+  Jwindow *bar;
   pmenu_item *top,*active;
   int itemw(pmenu_item *p) 

abuse/trunk/src/imlib/scroller.cpp

@@ -175 +175 @@
 
 
-void scroller::handle_event(event &ev, image *screen, input_manager *inm)
+void scroller::handle_event(event &ev, image *screen, InputManager *inm)
 {
   int mx=ev.mouse_move.x,my=ev.mouse_move.y;
@@ -279 +279 @@
 
 
-void scroller::handle_right(image *screen, input_manager *inm)
+void scroller::handle_right(image *screen, InputManager *inm)
 {
   if (!vert && sx<t-1)
@@ -290 +290 @@
 }
 
-void scroller::handle_left(image *screen, input_manager *inm)
+void scroller::handle_left(image *screen, InputManager *inm)
 {
   if (!vert && sx>1)
@@ -301 +301 @@
 }
 
-void scroller::handle_up(image *screen, input_manager *inm)
+void scroller::handle_up(image *screen, InputManager *inm)
 { 
   if (vert && sx>1)
@@ -312 +312 @@
 }
 
-void scroller::handle_down(image *screen, input_manager *inm)
+void scroller::handle_down(image *screen, InputManager *inm)
 {
   if (vert && sx<t-1)
@@ -409 +409 @@
 }
 
-void pick_list::handle_inside_event(event &ev, image *screen, input_manager *inm)
+void pick_list::handle_inside_event(event &ev, image *screen, InputManager *inm)
 {
   if (ev.type==EV_MOUSE_MOVE && activate_on_mouse_move())
@@ -455 +455 @@
 }
 
-void pick_list::handle_up(image *screen, input_manager *inm)
+void pick_list::handle_up(image *screen, InputManager *inm)
 {
   if (cur_sel>0)
@@ -469 +469 @@
 }
 
-void pick_list::handle_down(image *screen, input_manager *inm)
+void pick_list::handle_down(image *screen, InputManager *inm)
 {
   if (cur_sel<t-1)
@@ -623 +623 @@
 
 
-void spicker::handle_inside_event(event &ev, image *screen, input_manager *inm)
+void spicker::handle_inside_event(event &ev, image *screen, InputManager *inm)
 {
   switch (ev.type)
@@ -686 +686 @@
 
 
-void spicker::handle_up(image *screen, input_manager *inm)
+void spicker::handle_up(image *screen, InputManager *inm)
 {
   if (vert && cur_sel>0)
@@ -703 +703 @@
 }
 
-void spicker::handle_down(image *screen, input_manager *inm)
+void spicker::handle_down(image *screen, InputManager *inm)
 {
   if (vert && cur_sel<t-1)
@@ -718 +718 @@
 }
 
-void spicker::handle_left(image *screen, input_manager *inm)
-{
-}
-
-void spicker::handle_right(image *screen, input_manager *inm)
-{
-}
-
-
-
-
+void spicker::handle_left(image *screen, InputManager *inm)
+{
+}
+
+void spicker::handle_right(image *screen, InputManager *inm)
+{
+}
+
+
+
+

abuse/trunk/src/imlib/scroller.hpp

@@ -41 +41 @@
   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 void handle_event(event &ev, image *screen, InputManager *im);
   virtual char *read() { return (char *)&sx; }
 
   virtual int activate_on_mouse_move() { return 1; }
-  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm) {;}
+  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm) {;}
   virtual void scroll_event(int newx, image *screen);
-  virtual void handle_up(image *screen, 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 handle_up(image *screen, InputManager *inm);
+  virtual void handle_down(image *screen, InputManager *inm);
+  virtual void handle_left(image *screen, InputManager *inm);
+  virtual void handle_right(image *screen, InputManager *inm);
   virtual void area_config() { ; }
   void set_size(int width, int height) { l=width; h=height; }
@@ -69 +69 @@
   int first_selected();
   virtual void scroll_event(int newx, image *screen);
-  virtual void handle_inside_event(event &ev, image *screen, input_manager *inm);
+  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
 
   // you should define \/
@@ -77 +77 @@
   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 void note_selection(image *screen, InputManager *inm, int x) { ; }
+  virtual void note_new_current(image *screen, InputManager *inm, int x) { ; }
   virtual int ok_to_select(int num) { return 1; }
-  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 handle_up(image *screen, InputManager *inm);
+  virtual void handle_down(image *screen, InputManager *inm);
+  virtual void handle_left(image *screen, InputManager *inm);
+  virtual void handle_right(image *screen, InputManager *inm);
   virtual void set_x(int x, image *screen);
   void reconfigure();   // should be called by constructor after class is ready to take virtual calls
@@ -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, input_manager *inm);
+  virtual void handle_inside_event(event &ev, image *screen, InputManager *inm);
   virtual void scroll_event(int newx, image *screen);
   virtual char *read() { return (char *)this; }
   virtual void area_config();
-  virtual void handle_up(image *screen, input_manager *inm);
-  virtual void handle_down(image *screen, input_manager *inm);
+  virtual void handle_up(image *screen, InputManager *inm);
+  virtual void handle_down(image *screen, InputManager *inm);
   int get_selection() { return lis[cur_sel].number; }
   ~pick_list() { jfree(lis); }

abuse/trunk/src/imlib/tools.hpp

@@ -37 +37 @@
   virtual int item_width() { return iw; } 
   virtual int item_height() { return ih; }
-  virtual void note_new_current(image *screen, input_manager *inm, int x) 
+  virtual void note_new_current(image *screen, InputManager *inm, int x) 
   { wm->push_event(new event(ids[x],NULL)); }
 

abuse/trunk/src/innet.cpp

@@ -542 +542 @@
 
 
-      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(0, 0, 0, symbol_str("resync"),
+      Jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(0, 0, 0, symbol_str("resync"),
                                               new button(0, wm->font()->height() + 5, ID_NET_DISCONNECT,
                                                          symbol_str("slack"),NULL)),symbol_str("hold!"))
@@ -623 +623 @@
 
     int total_retry=0;
-    jwindow *abort=NULL;
+    Jwindow *abort=NULL;
 
     while (base->input_state!=INPUT_PROCESSING)

abuse/trunk/src/loadgame.cpp

@@ -55 +55 @@
 }
 
-jwindow *create_num_window(int mx, int total_saved, image **thumb_nails)
+Jwindow *create_num_window(int mx, int total_saved, image **thumb_nails)
 {
   ico_button *buts[MAX_SAVE_GAMES];
@@ -73 +73 @@
     buts[i]->next=buts[i+1];
 
-  return wm->new_window(mx,yres/2-(jwindow::top_border()+ih*5)/2,-1,-1,buts[0]);
+  return wm->new_window(mx,yres/2-(Jwindow::top_border()+ih*5)/2,-1,-1,buts[0]);
 }
 
@@ -97 +97 @@
   if( mx < 0) mx = 0;
 
-  jwindow *l_win=create_num_window(mx,MAX_SAVE_GAMES,NULL);
+  Jwindow *l_win=create_num_window(mx,MAX_SAVE_GAMES,NULL);
   event ev;
   int got_level=0;
@@ -219 +219 @@
 
 
-        jwindow *l_win=create_num_window(0,total_saved,thumb_nails);
-        jwindow *preview=wm->new_window(l_win->x+l_win->l+5,l_win->y,max_w,max_h,NULL,title);
+        Jwindow *l_win=create_num_window(0,total_saved,thumb_nails);
+        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());

abuse/trunk/src/menu.cpp

@@ -416 +416 @@
 
 
-void menu_handler(event &ev, input_manager *inm)
+void menu_handler(event &ev, InputManager *inm)
 {
   switch (ev.type)
@@ -652 +652 @@
         list=make_default_buttons(xres-33,y,list);
 
-        input_manager *inm=new input_manager(screen,list);
+        InputManager *inm=new InputManager(screen,list);
         inm->allow_no_selections();
         inm->clear_current();

abuse/trunk/src/net/gserver.cpp

@@ -59 +59 @@
 {
   int last_count=0;
-  jwindow *stat=NULL;
+  Jwindow *stat=NULL;
   event ev;
   int abort=0;

abuse/trunk/src/netcfg.cpp

@@ -53 +53 @@
 void net_configuration::cfg_error(char const *msg)
 {
-  jwindow *j=wm->new_window(-1,0,-1,-1,new info_field(0, 0, 0, msg,
+  Jwindow *j=wm->new_window(-1,0,-1,-1,new info_field(0, 0, 0, msg,
       new button(0, 30,CFG_ERR_OK,symbol_str("ok_button"),NULL)),symbol_str("input_error"));
   event ev;
@@ -94 +94 @@
 
 
-int net_configuration::confirm_inputs(input_manager *i, int server)
+int net_configuration::confirm_inputs(InputManager *i, int server)
 {
   if (server)
@@ -171 +171 @@
   int x=0,y=0;
   
-  jwindow *sv=wm->new_window(50,80,-1,-1,new button(0,0,NET_SERVER,symbol_str("server"),
+  Jwindow *sv=wm->new_window(50,80,-1,-1,new button(0,0,NET_SERVER,symbol_str("server"),
                                      new button(0,wm->font()->height()*2,NET_CLIENT,symbol_str("client"),
                                      new button(0,wm->font()->height()*4,NET_SINGLE,symbol_str("single_play"),
@@ -233 +233 @@
 
 
-  jwindow *nw=wm->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;
@@ -288 +288 @@
     button *sb=new button(bx,by,NET_SERVER,ok,NULL);
 
-    input_manager inm(screen,sb);
+    InputManager inm(screen,sb);
     inm.allow_no_selections();
     inm.clear_current();
@@ -408 +408 @@
 
   {
-    input_manager inm(screen,list);
+    InputManager inm(screen,list);
     inm.allow_no_selections();
     inm.clear_current();
@@ -463 +463 @@
       sb=new button(x+40,y+ns_h-9-fnt->height(),NET_SINGLE,symbol_str("single_play"),sb);
 
-    input_manager inm(screen,sb);
+    InputManager inm(screen,sb);
 
     inm.allow_no_selections();

abuse/trunk/src/netcfg.hpp

@@ -10 +10 @@
 #ifndef __NETCFG_HPP_
 #define __NETCFG_HPP_
+
 #include "jwindow.hpp"
-
 
 class net_configuration
@@ -34 +34 @@
   int input();   // pulls up dialog box and input fileds
   void cfg_error(char const *msg);
-  int confirm_inputs(jwindow *j, int server);
+  int confirm_inputs(Jwindow *j, int server);
   void error(char const *message);
-  int confirm_inputs(input_manager *i, int server);
+  int confirm_inputs(InputManager *i, int server);
   ifield *center_ifield(ifield *i,int x1, int x2, ifield *place_below);
   int get_options(int server);

abuse/trunk/src/objects.hpp

@@ -63 +63 @@
   int type() { return otype; }
   ifield *make_fields(int ystart, ifield *Next) { return NULL ; }
-  void gather_input(input_manager *inm) { ; }
+  void gather_input(InputManager *inm) { ; }
   int hurt_all() { return figures[otype]->get_cflag(CFLAG_HURT_ALL); }
   int stoppable() { return figures[otype]->get_cflag(CFLAG_STOPPABLE); }

abuse/trunk/src/profile.cpp

@@ -19 +19 @@
 
 
-jwindow *prof_win=NULL;
+Jwindow *prof_win=NULL;
 int prof_height=10;
 

abuse/trunk/src/ui/volumewindow.cpp

@@ -14 +14 @@
 #include "gui.hpp"          // ico_button
 
-VolumeWindow::VolumeWindow() : jwindow("Volume")
+VolumeWindow::VolumeWindow() : Jwindow("Volume")
 {
     char const *ff = "art/frame.spe";

abuse/trunk/src/ui/volumewindow.hpp

@@ -12 +12 @@
 #include "dev.hpp"
 
-class VolumeWindow : public jwindow
+class VolumeWindow : public Jwindow
 {
 private:

abuse/trunk/src/unixnfc.cpp

@@ -487 +487 @@
 
 
-      jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(0, 0, 0, "Clients are re-syncing, please wait...",NULL));
+      Jwindow *j=wm->new_window(0,yres/2,-1,-1,new info_field(0, 0, 0, "Clients are re-syncing, please wait...",NULL));
       wm->flush_screen();
       if (!reload_start()) return ;
@@ -538 +538 @@
 
     int total_retry=0;
-    jwindow *abort=NULL;
+    Jwindow *abort=NULL;
     linked_list input;
     while (base->input_state!=INPUT_PROCESSING)