Changeset 109Tweet

Timestamp:

Mar 15, 2008, 10:19:47 PM (11 years ago)

Author:

Sam Hocevar

Message:

• Started cleaning up jwindow.cpp, preparing everything for future Abuse Win32 merges.

Location:

abuse/trunk/src/imlib

Files:

• input.cpp (modified) (1 diff)
• input.hpp (modified) (1 diff)
• jwindow.cpp (modified) (15 diffs)
• jwindow.hpp (modified) (2 diffs)
• pmenu.cpp (modified) (2 diffs)

abuse/trunk/src/imlib/input.cpp

@@ -88 +88 @@
 {
   return ;
+}
+
+void button_box::move(int newx, int newy)
+{
+    for(button * b = buttons; b; b = (button *)b->next)
+        b->move(newx + b->x, newy + b->y);
+    x = newx;
+    y = newy;
 }
 

abuse/trunk/src/imlib/input.hpp

@@ -43 +43 @@
   button *buttons;
   int maxdown;
-  public :
+public :
   button_box(int X, int Y, int ID, int MaxDown, button *Buttons, ifield *Next);
   void add_button(button *b);
   void press_button(int id);      // if button box doesn't contain id, nothing happens
   virtual void remap(filter *f);
+  virtual void move(int newx, int newy);
   virtual void area(int &x1, int &y1, int &x2, int &y2);
   virtual void draw_first(image *screen);

abuse/trunk/src/imlib/jwindow.cpp

@@ -25 +25 @@
 int frame_right() { return jw_right; }
 
-ifield::~ifield() { ; }
-
 void set_frame_size(int x)
 {  
@@ -79 +77 @@
   for (p=first;p;p=p->next)
   {
-    if (!p->property.hidden)
-    {
-      p->property.hidden=1;
+    if (!p->is_hidden())
+    {
+      p->hide();
       screen->add_dirty(p->x,p->y,p->x+p->l-1,p->y+p->h-1);
     }
@@ -91 +89 @@
   jwindow *p;
   for (p=first;p;p=p->next)
-    if (p->property.hidden)
+    if (p->is_hidden())
       show_window(p);      
 }
@@ -110 +108 @@
   }
   screen->add_dirty(j->x,j->y,j->x+j->l-1,j->y+j->h-1);
-  j->property.hidden=1;
+  j->hide();
 }
 
 void window_manager::show_window(jwindow *j)
 {
-  if (j->property.hidden)
-  {
-    j->property.hidden=0;
+  if (j->is_hidden())
+  {
+    j->show();
     j->screen->add_dirty(0,0,j->l-1,j->h-1);
   }
@@ -134 +132 @@
   {
     for (ev.window=NULL,j=first;j;j=j->next)
-      if (!j->property.hidden && ev.mouse_move.x>=j->x && ev.mouse_move.y>=j->y &&
+      if (!j->is_hidden() && ev.mouse_move.x>=j->x && ev.mouse_move.y>=j->y &&
           ev.mouse_move.x<j->x+j->l && ev.mouse_move.y<j->y+j->h)
         ev.window=j;
@@ -149 +147 @@
       {
         if (ev.mouse_move.x-ev.window->x<11) closew=1;
-        else if (ev.window->property.moveable) movew=1;
+        else if (ev.window->is_moveable()) movew=1;
       } else if (grab)
         ev.window=grab;
@@ -276 +274 @@
   
   jwindow *j=new jwindow(x,y,l,h,fields,Name),*k;
-  j->property.hidden=0;
+  j->show();
   if (!first)
     first=j;
@@ -310 +308 @@
   
   for (p=first;p;p=p->next)
-    if (!p->property.hidden)
+    if (!p->is_hidden())
        screen->delete_dirty(p->x,p->y,p->x+p->l-1,p->y+p->h-1);
   update_dirty(screen);
@@ -320 +318 @@
   for (p=first;p;p=p->next)
   {
-    if (!p->property.hidden)
+    if (!p->is_hidden())
     {
       if (has_mouse())
@@ -334 +332 @@
 //      screen->delete_dirty(p->x,p->y,p->x+p->l-1,p->y+p->h-1);
       for (q=p->next;q;q=q->next)
-        if (!q->property.hidden)
+        if (!q->is_hidden())
           p->screen->delete_dirty(q->x-p->x,
                               q->y-p->y,
@@ -346 +344 @@
 }
 
-void jwindow::set_moveability(int x)
-{
-  property.moveable=x;
-}
-
 jwindow::jwindow(int X, int Y, int L, int H, ifield *fields, char const *Name)
 {
-  ifield *i;
-  int x1,y1,x2,y2;
-  l=0; h=0; 
-  property.moveable=1;
-  if (fields)
-    for (i=fields;i;i=i->next)
-    {
-      i->area(x1,y1,x2,y2);
-      if ((int)y2>(int)h) 
-        h=y2+1;
-      if ((int)x2>(int)l) 
-        l=x2+1;
-    }
-  else { l=2; h=2; }
-
-  if (L<=0) { l=l-L; } else l=L+jw_left;
-  if (H<=0) { h=h-H; } else h=H+jw_top;
-
- if (Y<0) y=yres-h+Y-WINDOW_FRAME_TOP-WINDOW_FRAME_BOTTOM-1; else y=Y;
- if (X<0) x=xres-l+X-WINDOW_FRAME_LEFT-WINDOW_FRAME_RIGHT-1; else x=X;
-
-  backg=wm->medium_color();
-  l+=WINDOW_FRAME_RIGHT; h+=WINDOW_FRAME_BOTTOM;
-//  if (!fields) { l+=WINDOW_FRAME_LEFT; h+=WINDOW_FRAME_TOP; }
-
-  if (l<18) l=18;
-  if (h<12) h=12;
-  screen=new image(l,h,NULL,2);
-  l=screen->width();
-  h=screen->height();
-  screen->clear(backg);
-  next=NULL;
-  inm=new input_manager(screen,fields);
-  if (Name==NULL)
-    name=strcpy((char *)jmalloc(strlen(" ")+1,"jwindow::window name")," ");  
-  else
-    name=strcpy((char *)jmalloc(strlen(Name)+1,"jwindow::window name"),Name);
-}
-
-void jwindow::local_close() { ; }
+    ifield *i;
+    int x1, y1, x2, y2;
+
+    l = 0; h = 0; 
+    hidden = false;
+    moveable = true;
+    if(fields)
+        for(i = fields; i; i = i->next)
+        {
+            i->area(x1, y1, x2, y2);
+            if ((int)y2 > (int)h) 
+                h = y2 + 1;
+            if ((int)x2 > (int)l) 
+                l = x2 + 1;
+        }
+    else
+    {
+        l = 2;
+        h = 2;
+    }
+
+    l = L > 0 ? L + jw_left : l - L;
+    l += WINDOW_FRAME_RIGHT;
+    if(l < 18)
+        l = 18;
+    h = H > 0 ? H + jw_top : h - h;
+    h += WINDOW_FRAME_BOTTOM;
+    if(h < 12)
+        h = 12;
+    //if (!fields) { l+=WINDOW_FRAME_LEFT; h+=WINDOW_FRAME_TOP; }
+    y = Y >= 0 ? Y : yres - h + Y - WINDOW_FRAME_TOP - WINDOW_FRAME_BOTTOM - 1;
+    x = X >= 0 ? X : xres - l + X - WINDOW_FRAME_LEFT - WINDOW_FRAME_RIGHT - 1;
+
+    backg = wm->medium_color();
+
+    screen=new image(l,h,NULL,2);
+    l = screen->width();
+    h = screen->height();
+    screen->clear(backg);
+    next = NULL;
+    inm = new input_manager(screen, fields);
+    if(Name == NULL)
+        name = strcpy((char *)jmalloc(strlen(" ") + 1, "jwindow::window name"), " ");  
+    else
+        name = strcpy((char *)jmalloc(strlen(Name) + 1, "jwindow::window name"), Name);
+}
+
+void jwindow::local_close()
+{
+    ;
+}
 
 void jwindow::redraw(int hi, int med, int low, JCFont *fnt)
@@ -469 +473 @@
 void input_manager::clear_current()
 {
-  if (active)
-    active->draw(0,screen);
-
-  active=NULL;
+    if(owner)
+        screen = owner->screen;
+    if(active)
+        active->draw(0, screen);
+    active = NULL;
 }
 
@@ -479 +484 @@
   ifield *i,*in_area=NULL;
   int x1,y1,x2,y2;
+
+  if(owner)
+      screen = owner->screen;
+
   if (j)
   {
@@ -551 +560 @@
 void input_manager::redraw()
 {
-  ifield *i;
-  for (i=first;i;i=i->next)
-    i->draw_first(screen);
-  if (active)
-    active->draw(1,screen);
+    ifield *i;
+    if(owner)
+        screen = owner->screen;
+    for(i = first; i; i = i->next)
+        i->draw_first(screen);
+    if(active)
+        active->draw(1, screen);
 }
 
 input_manager::input_manager(image *Screen, ifield *First)
 {
-  no_selections_allowed=0;
-  cur=NULL;
-  grab=NULL;
-  screen=Screen;
-  active=first=First;
-  while (active && !active->selectable()) active=active->next;
-  redraw();
+    no_selections_allowed = 0;
+    cur = NULL;
+    grab = NULL;
+    owner = NULL;
+    screen = Screen;
+    active = first = First;
+    while(active && !active->selectable())
+        active = active->next;
+    if(screen)
+        redraw();
+}
+
+input_manager::input_manager(jwindow *Owner, ifield *First)
+{
+    no_selections_allowed = 0;
+    cur = NULL;
+    grab = NULL;
+    owner = Owner;
+    screen = NULL;
+    active = first = First;
+    while(active && !active->selectable())
+        active = active->next;
 }
 
@@ -613 +639 @@
 }
 
-
-
+ifield::ifield()
+{
+    owner = NULL;
+    x = 0;
+    y = 0;
+    next = NULL;
+    id = 0;
+}
+
+ifield::~ifield()
+{
+    ;
+}
+
+/* re-position the control with respect to the "client" area of the window */
+void ifield::set_owner(jwindow * newowner)
+{
+    if(owner)
+        move(x - owner->x1(), y - owner->y1());
+    owner = newowner;
+    if(owner)
+        move(x + owner->x1(), y + owner->y1());
+}
+

abuse/trunk/src/imlib/jwindow.hpp

@@ -33 +33 @@
 #define WINDOW_FRAME_RIGHT frame_right()
 
-
 class input_manager
 {
+  friend class jwindow;
+
+private:
   image *screen;
-  ifield *first,*active,*grab;
-  jwindow *cur;
+  ifield *first, *active, *grab;
+  jwindow *cur, *owner;
   int no_selections_allowed;
-public :
+
+public:
   input_manager(image *Screen, ifield *First);
+  input_manager(jwindow *owner, ifield *First);
   void handle_event(event &ev, jwindow *j);
   ifield *get(int id);
@@ -58 +62 @@
 class ifield
 {
+    friend class jwindow;
+    friend class input_manager;
+
+protected:
+    jwindow *owner;
+
 public :
-  int x,y;
+    ifield();
+    int x, y;
 
-  int id;
-  ifield *next;
-  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) { ; }
-  virtual char *read() = 0;
-  virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }
-  virtual ifield *unlink(int id) { return NULL; } 
-  virtual ~ifield();
+    int id;
+    ifield *next;
+    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 int selectable() { return 1; }
+    virtual void remap(filter *f) { ; }
+    virtual char *read() = 0;
+    virtual ifield *find(int search_id) { if (id==search_id) return this; else return NULL; }
+    virtual ifield *unlink(int id) { return NULL; } 
+    virtual ~ifield();
 } ;
 
 struct jwindow_properties
 {
-  uint8_t moveable,
-          hidden;
-} ;
-
+    bool moveable, hidden;
+};
 
 class jwindow
 {
-public :
-  jwindow_properties property;
-  jwindow *next;
-  char *name;
-  int x,y,l,h,backg;
-  image *screen;
-  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, ifield *fields, char const *Name=NULL);
-  void redraw(int hi, int med, int low, JCFont *fnt);
-  void resize(int L, int H);
-  void clear(int color=0) { screen->bar(x1(),y1(),x2(),y2(),color); }
-  int x1() { return WINDOW_FRAME_LEFT; }
-  int y1() { return WINDOW_FRAME_TOP; } 
-  int x2() { return l-WINDOW_FRAME_RIGHT-1; }
-  int y2() { return h-WINDOW_FRAME_BOTTOM-1; } 
-  void clip_in() { screen->set_clip(x1(),y1(),x2(),y2()); }
-  void clip_out() { screen->set_clip(0,0,l-1,h-1); }
-  char *read(int id) { return inm->get(id)->read(); }  
-  void local_close();
-  void set_moveability(int x);
-  ~jwindow() { local_close(); delete screen; delete inm; jfree(name); }
+    friend class input_manager;
+
+private:
+    bool hidden;
+    bool moveable;
+
+protected:
+    jwindow *owner;
+
+public:
+    jwindow *next;
+    char *name;
+    int x, y, l, h, backg;
+    image *screen;
+    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, ifield *fields, char const *Name = NULL);
+    void redraw(int hi, int med, int low, JCFont *fnt);
+    void resize(int L, int H);
+    void clear(int color = 0) { screen->bar(x1(), y1(), x2(), y2(), color); }
+    void show() { hidden = false; }
+    void hide() { hidden = true; }
+    bool is_hidden() { return hidden; }
+    void freeze() { moveable = false; }
+    void thaw() { moveable = true; }
+    bool is_moveable() { return moveable; }
+    int x1() { return WINDOW_FRAME_LEFT; }
+    int y1() { return WINDOW_FRAME_TOP; } 
+    int x2() { return l-WINDOW_FRAME_RIGHT-1; }
+    int y2() { return h-WINDOW_FRAME_BOTTOM-1; } 
+    void clip_in() { screen->set_clip(x1(),y1(),x2(),y2()); }
+    void clip_out() { screen->set_clip(0,0,l-1,h-1); }
+    char *read(int id) { return inm->get(id)->read(); }  
+    void local_close();
+    ~jwindow() { local_close(); delete screen; delete inm; jfree(name); }
 } ;
 
 class window_manager
 {
-public :
+  friend class jwindow;
+
+public:
   event_handler *eh;
   jwindow *first,*grab;

abuse/trunk/src/imlib/pmenu.cpp

@@ -31 +31 @@
   bar=wm->new_window(X,Y,w-WINDOW_FRAME_LEFT-WINDOW_FRAME_RIGHT,
                      h-WINDOW_FRAME_TOP-WINDOW_FRAME_BOTTOM,NULL);
-  bar->set_moveability(0);  // can't drag this window
+  bar->freeze();  // can't drag this window
   bar->screen->wiget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),
                     wm->dark_color());
@@ -197 +197 @@
                      w-WINDOW_FRAME_LEFT-WINDOW_FRAME_RIGHT,
                      h-WINDOW_FRAME_TOP-WINDOW_FRAME_BOTTOM,NULL);
-  win->set_moveability(0);
+  win->freeze();
   win->screen->wiget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),wm->dark_color());