Changeset 120 for abuse/trunk/src/imlib/jwindow.cppTweet

Timestamp:

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

Author:

Sam Hocevar

Message:

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

File:

• abuse/trunk/src/imlib/jwindow.cpp (modified) (43 diffs)

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)