Changeset 644Tweet

Timestamp:

May 13, 2011, 9:13:58 AM (11 years ago)

Author:

Sam Hocevar

Message:

imlib: reverse the image::put_image logic.

Location:

abuse/trunk/src

Files:

• ant.cpp (modified) (1 diff)
• automap.cpp (modified) (6 diffs)
• clisp.cpp (modified) (1 diff)
• console.cpp (modified) (4 diffs)
• cop.cpp (modified) (5 diffs)
• dev.cpp (modified) (8 diffs)
• endgame.cpp (modified) (4 diffs)
• game.cpp (modified) (11 diffs)
• gui.cpp (modified) (1 diff)
• help.cpp (modified) (1 diff)
• imlib/fonts.cpp (modified) (2 diffs)
• imlib/guistat.cpp (modified) (2 diffs)
• imlib/image.cpp (modified) (17 diffs)
• imlib/image.h (modified) (1 diff)
• imlib/input.cpp (modified) (3 diffs)
• imlib/jwindow.cpp (modified) (27 diffs)
• imlib/jwindow.h (modified) (6 diffs)
• imlib/pmenu.cpp (modified) (6 diffs)
• imlib/scroller.cpp (modified) (1 diff)
• imlib/sprite.cpp (modified) (1 diff)
• loadgame.cpp (modified) (8 diffs)
• menu.cpp (modified) (3 diffs)
• netcfg.cpp (modified) (4 diffs)
• profile.cpp (modified) (1 diff)
• ui/volumewindow.cpp (modified) (4 diffs)

abuse/trunk/src/ant.cpp

@@ -451 +451 @@
     main_screen->clear();
     image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
-    im->put_image(main_screen,0,0);
+    main_screen->PutImage(im, 0, 0);
 
 

abuse/trunk/src/automap.cpp

@@ -23 +23 @@
 {
   if (!automap_window) return ;
-  image *screen=automap_window->screen;
+  image *screen=automap_window->m_surf;
 
   long sx,ex,sy,ey,x,y,window_xstart,window_ystart,
@@ -64 +64 @@
   if (draw_xstart==old_dx && draw_ystart==old_dy)
   {
-   automap_window->screen->Lock();
-   automap_window->screen->AddDirty(centerx,centery,centerx + 1,centery + 1);
+   automap_window->m_surf->Lock();
+   automap_window->m_surf->AddDirty(centerx,centery,centerx + 1,centery + 1);
     if ((tick++)&4)
-      automap_window->screen->PutPixel(vec2i(centerx,centery),255);
+      automap_window->m_surf->PutPixel(vec2i(centerx,centery),255);
     else
-      automap_window->screen->PutPixel(vec2i(centerx,centery),27);
-   automap_window->screen->Unlock();
+      automap_window->m_surf->PutPixel(vec2i(centerx,centery),27);
+   automap_window->m_surf->Unlock();
     return ;
   }
@@ -103 +103 @@
 
 
-  // draw the tiles that will be around the border of the automap with put_image
+  // draw the tiles that will be around the border of the automap with PutImage
   // because it handles clipping, but for ths reason is slower, the rest
   // we will slam on as fast as possible
 
-  screen->SetClip(window_xstart,window_ystart,window_xend+1,window_yend+1);
-/*  for (i=draw_xstart,j=draw_ystart,x=sx,y=sy; y<=ey; j+=AUTOTILE_HEIGHT,y++)
-    foretiles[cur_lev->get_fg(x,y)]->micro_image->put_image(screen,i,j,0);
+  screen->SetClip(window_xstart, window_ystart, window_xend+1, window_yend+1);
+#if 0
+  for (i=draw_xstart,j=draw_ystart,x=sx,y=sy; y<=ey; j+=AUTOTILE_HEIGHT,y++)
+    screen->PutImage(foretiles[cur_lev->get_fg(x, y)]->micro_image, i, j, 0);
 
   for (i=draw_xstart+ex*AUTOTILE_WIDTH,j=draw_ystart,y=sy,x=ex; y<=ey; j+=AUTOTILE_HEIGHT,y++)
-    foretiles[cur_lev->get_fg(x,y)]->micro_image->put_image(screen,i,j,0);
+    screen->PutImage(foretiles[cur_lev->get_fg(x, y)]->micro_image, i, j, 0);
 
   for (i=draw_xstart,j=draw_ystart,x=sx,y=sy; x<=ex; i+=AUTOTILE_WIDTH,x++)
-    foretiles[cur_lev->get_fg(x,y)]->micro_image->put_image(screen,i,j,0);
+    screen->PutImage(foretiles[cur_lev->get_fg(x, y)]->micro_image, i, j, 0);
 
   for (i=draw_xstart,j=draw_ystart+ey*AUTOTILE_HEIGHT,x=sx,y=ex; x<=ex; i+=AUTOTILE_WIDTH,x++)
-    foretiles[cur_lev->get_fg(x,y)]->micro_image->put_image(screen,i,j,0); */
-
-
+    screen->PutImage(foretiles[cur_lev->get_fg(x, y)]->micro_image, i, j, 0);
+#endif
 
   unsigned short *fgline;
@@ -132 +132 @@
     int id=foretiles[ (*fgline)&0x7fff];
     if (id>=0)
-          cache.foret(id)->micro_image->put_image(screen,i,j,0);
+          screen->PutImage(cache.foret(id)->micro_image, i, j, 0);
     else
-          cache.foret(foretiles[0])->micro_image->put_image(screen,i,j,0);
+          screen->PutImage(cache.foret(foretiles[0])->micro_image, i, j, 0);
       }
       else
@@ -143 +143 @@
   // draw the person as a dot, no need to add a dirty because we marked the
   // whole screen already
-  automap_window->screen->Lock();
+  automap_window->m_surf->Lock();
   if ((tick++)&4)
-    automap_window->screen->PutPixel(vec2i(centerx,centery),255);
+    automap_window->m_surf->PutPixel(vec2i(centerx,centery),255);
   else
-    automap_window->screen->PutPixel(vec2i(centerx,centery),27);
-  automap_window->screen->Unlock();
+    automap_window->m_surf->PutPixel(vec2i(centerx,centery),27);
+  automap_window->m_surf->Unlock();
 
   // set the clip back to full window size because soemthing else could mess with the area
-  automap_window->screen->SetClip(0,0,screen->Size().x,screen->Size().y);
+  automap_window->m_surf->SetClip(0,0,screen->Size().x,screen->Size().y);
 }
 
@@ -168 +168 @@
         automap_window = wm->new_window(0, 0, w * AUTOTILE_WIDTH,
                                         h * AUTOTILE_HEIGHT, NULL, "Map");
-        automap_window->screen->bar(17, 1, 17 + 8 * 6 + 3, 6,
+        automap_window->m_surf->bar(17, 1, 17 + 8 * 6 + 3, 6,
                                     wm->medium_color());
-        wm->font()->put_string(automap_window->screen, 20, 2, "Automap",
+        wm->font()->put_string(automap_window->m_surf, 20, 2, "Automap",
                                wm->dark_color());
         draw();

abuse/trunk/src/clisp.cpp

@@ -1844 +1844 @@
       int32_t y1=lnumber_value(CAR(args)); args=lcdr(args);
       int32_t id=lnumber_value(CAR(args));
-      cache.img(id)->put_image(main_screen,x1,y1,1);
+      main_screen->PutImage(cache.img(id), x1, y1, 1);
     } break;
     case 217 :

abuse/trunk/src/console.cpp

@@ -45 +45 @@
       {
     if (*s)
-      fnt->put_char(con_win->screen,dx,dy,*s);
+      fnt->put_char(con_win->m_surf,dx,dy,*s);
       }
     }
-    fnt->put_char(con_win->screen,wx()+cx*xa,wy()+cy*ya,'_');
+    fnt->put_char(con_win->m_surf,wx()+cx*xa,wy()+cy*ya,'_');
   }
 }
@@ -58 +58 @@
     con_win=wm->new_window(lastx,lasty,screen_w(),screen_h(),NULL,name);
     redraw();
-    con_win->screen->SetClip(con_win->x1(),con_win->y1(),con_win->x2()+1,con_win->y2()+1);
+    con_win->m_surf->SetClip(con_win->x1(),con_win->y1(),con_win->x2()+1,con_win->y2()+1);
   }
 }
@@ -98 +98 @@
 {
   if (con_win)
-    fnt->put_char(con_win->screen,cx*fnt->width()+wx(),cy*fnt->height()+wy(),'_');
+    fnt->put_char(con_win->m_surf,cx*fnt->width()+wx(),cy*fnt->height()+wy(),'_');
 }
 
@@ -108 +108 @@
     int fw=fnt->width(),fh=fnt->height();
     int dx=wx()+x*fw,dy=wy()+y*fh;
-    con_win->screen->bar(dx,dy,dx+fw-1,dy+fh-1,wm->black());
-    fnt->put_char(con_win->screen,dx,dy,ch);
+    con_win->m_surf->bar(dx,dy,dx+fw-1,dy+fh-1,wm->black());
+    fnt->put_char(con_win->m_surf,dx,dy,ch);
   }
 }

abuse/trunk/src/cop.cpp

@@ -829 +829 @@
     player_draw(just_fired,o->get_tint());
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_health_image)->put_image(main_screen,o->controller()->cx2-20,
-                        o->controller()->cy1+5,1);
+      main_screen->PutImage(cache.img(S_health_image), o->controller()->cx2-20,
+                            o->controller()->cy1+5,1);
       } break;
       case FAST_POWER :
@@ -850 +850 @@
     o->state=(character_state)old_state;
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_fast_image)->put_image(main_screen,o->controller()->cx2-20,
-                        o->controller()->cy1+5,1);
+      main_screen->PutImage(cache.img(S_fast_image), o->controller()->cx2-20,
+                            o->controller()->cy1+5,1);
       } break;
       case FLY_POWER :
@@ -871 +871 @@
 
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_fly_image)->put_image(main_screen,o->controller()->cx2-20,
-                        o->controller()->cy1+5,1);
+      main_screen->PutImage(cache.img(S_fly_image), o->controller()->cx2-20,
+                            o->controller()->cy1+5,1);
       } break;
       case SNEAKY_POWER :
@@ -884 +884 @@
 
     if (o->controller() && o->controller()->local_player())
-      cache.img(S_sneaky_image)->put_image(main_screen,o->controller()->cx2-20,
-                        o->controller()->cy1+5,1);
+      main_screen->PutImage(cache.img(S_sneaky_image), o->controller()->cx2-20,
+                            o->controller()->cy1+5,1);
       } break;
     }
@@ -1048 +1048 @@
   main_screen->clear();
   image *im=cache.img(cache.reg("art/frame.spe","end_level_screen",SPEC_IMAGE,1));
-  im->put_image(main_screen,0,0);
+  main_screen->PutImage(im, 0, 0);
   int x1=im->Size().x+1,y1=0,y2=main_screen->Size().y;
   JCFont *fnt=wm->font();

abuse/trunk/src/dev.cpp

@@ -110 +110 @@
       f->PutImage(screen, cache.img(id), vec2i(x, y));
     else
-      cache.img(id)->put_image(screen,x,y);
+      screen->PutImage(cache.img(id), x, y);
   }
   virtual int width() { return cache.img(id)->Size().x; }
@@ -481 +481 @@
     if (f->x-vx>=0 && f->x-vx<=(v->cx2-v->cx1+1) && f->y-vy>=0 && f->y-vy<=(v->cy2-v->cy1+1))
     {
-      image *im=cache.img(light_buttons[f->type]);
-      im->put_image(main_screen,f->x-vx+v->cx1-im->Size().x/2,f->y-vy+v->cy1-im->Size().y/2,1);
-      main_screen->rectangle(f->x1-vx+v->cx1,f->y1-vy+v->cy1,f->x2-vx+v->cx1,f->y2-vy+v->cy1,
-                wm->medium_color());
+      image *im = cache.img(light_buttons[f->type]);
+      main_screen->PutImage(im, f->x - vx + v->cx1 - im->Size().x / 2,
+                                f->y - vy + v->cy1 - im->Size().y / 2, 1);
+      main_screen->rectangle(f->x1 - vx + v->cx1, f->y1 - vy + v->cy1,
+                             f->x2 - vx + v->cx1, f->y2 - vy + v->cy1,
+                             wm->medium_color());
     }
       }
@@ -599 +601 @@
     tbw=wm->new_window(prop->getd("toolbar x",-1),
                prop->getd("toolbar y",-1),-1,-1,tp);
-    tp->set_x(setx,tbw->screen);
+    tp->set_x(setx,tbw->m_surf);
   }
 }
@@ -758 +760 @@
     music_window=wm->new_window(-1,30,0,0,
              new pick_list(0,0,DEV_MUSIC_PICKLIST,10,song_list,total_songs,0,NULL));
-    wm->fnt->put_string(music_window->screen,0,1,"songs");
+    wm->fnt->put_string(music_window->m_surf,0,1,"songs");
   } else
   {
@@ -1225 +1227 @@
       cur_fg=current_level->get_fg(x,y);
       if (forew)
-    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);
+    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->m_surf);
       the_game->need_refresh();
     }
@@ -1249 +1251 @@
 
       if (forew)
-    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->screen);
+    ((tile_picker *)forew->read(DEV_FG_PICKER))->recenter(forew->m_surf);
     }
   }
@@ -3010 +3012 @@
       im->clear();
       the_game->get_fg(pat[i])->im->PutImage(im,vec2i(0,0));
-      scale_put(im,me->screen,me->x1()+(i%w)*tw,
+      scale_put(im,me->m_surf,me->x1()+(i%w)*tw,
         me->y1()+(i/w)*th,tw,th);
       if (d==pat[i])
       {
     find=i;
-    me->screen->rectangle(me->x1()+(i%w)*tw,
-              me->y1()+(i/w)*th,
-              me->x1()+(i%w)*tw+tw-1,
-              me->y1()+(i/w)*th+th-1,wm->bright_color());
+    me->m_surf->rectangle(me->x1()+(i%w)*tw,
+                            me->y1()+(i/w)*th,
+                            me->x1()+(i%w)*tw+tw-1,
+                            me->y1()+(i/w)*th+th-1,wm->bright_color());
       }
     }
@@ -3057 +3059 @@
         if (dev_cont->forew)
           ((tile_picker *)dev_cont->forew->
-           read(DEV_FG_PICKER))->recenter(dev_cont->forew->screen);
+           read(DEV_FG_PICKER))->recenter(dev_cont->forew->m_surf);
       }
     } else if (ev.mouse_button==2)

abuse/trunk/src/endgame.cpp

@@ -238 +238 @@
       if (i>=30 && i<=37)
       {
-    cache.img(planet)->put_image(tcopy,0,0);
+    tcopy->PutImage(cache.img(planet), 0, 0);
     cache.fig(explo_frames1[i-30])->forward->PutImage(tcopy,vec2i(100,50));
         scan_map(main_screen,ex,ey,tcopy,
@@ -437 +437 @@
 
   int dx=(xres+1)/2-im->Size().x/2,dy=(yres+1)/2-im->Size().y/2;
-  im->put_image(main_screen,dx,dy);
+  main_screen->PutImage(im, dx, dy);
   console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2,
                lstring_value(to_be));
@@ -451 +451 @@
   for (i=0; i<320 && ev.type!=EV_KEY; i++)
   {
-    im->put_image(main_screen,dx,dy);
+    main_screen->PutImage(im, dx, dy);
     console_font->put_string(main_screen,xres/2+35,yres/2+100-console_font->height()-2,
                lstring_value(to_be));
@@ -503 +503 @@
   for (i=0; i<320 && ev.type!=EV_KEY; i++)
   {
-    im->put_image(main_screen,dx,dy);
+    main_screen->PutImage(im, dx, dy);
 
     text_draw(205-i,dx+10,dy,dx+319-10,dy+199,lstring_value(end_plot),wm->font(),cmap,wm->bright_color());

abuse/trunk/src/game.cpp

@@ -476 +476 @@
         int dx = 20, dy = 5;
         image *jim = cache.img(joy_picts[but * 9+(y + 1)*3 + x + 1]);
-        joy_win->screen->bar(dx, dy, dx + jim->Size().x+6, dy + jim->Size().y+6, wm->black());
-        jim->put_image(joy_win->screen, dx + 3, dy + 3);
+        joy_win->m_surf->bar(dx, dy, dx + jim->Size().x+6, dy + jim->Size().y+6, wm->black());
+        joy_win->m_surf->PutImage(jim, dx + 3, dy + 3);
 
         if(but)
@@ -605 +605 @@
       main_screen->GetClip(cx1, cy1, cx2, cy2);
       main_screen->SetClip(viewx1, viewy1, viewx2 + 1, viewy2 + 1);
-      im->put_image(main_screen, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),
+      main_screen->PutImage(im, (x - xo / btile_width())*btile_width()+viewx1 - xo % btile_width(),
             (y - yo / btile_height())*btile_height()+viewy1 - yo % btile_height(), 0);
       main_screen->SetClip(cx1, cy1, cx2, cy2);
@@ -720 +720 @@
         main_screen->SetClip(v->cx1, v->cy1, v->cx2 + 1, v->cy2 + 1);
       image *tit = cache.img(title_screen);
-      tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2,
+      main_screen->PutImage(tit, main_screen->Size().x/2 - tit->Size().x/2,
                     main_screen->Size().y/2 - tit->Size().y/2);
       if(state == SCENE_STATE)
@@ -828 +828 @@
     else bt = get_bg(0);
 
-        bt->im->put_image(main_screen, draw_x, draw_y);
+        main_screen->PutImage(bt->im, draw_x, draw_y);
 //        if(!(dev & EDIT_MODE) && bt->next)
 //      current_level->put_bg(x, y, bt->next);
@@ -1079 +1079 @@
     dev_cont->dev_draw(v);
     if(cache.in_use())
-    cache.img(vmm_image)->put_image(main_screen, v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1);
+    main_screen->PutImage(cache.img(vmm_image), v->cx1, v->cy2 - cache.img(vmm_image)->Size().y+1);
 
     if(dev & DRAW_LIGHTS)
@@ -1172 +1172 @@
     {
         main_screen->clear();
-        im->put_image(main_screen, (xres + 1) / 2 - im->Size().x / 2,
-                              (yres + 1) / 2 - im->Size().y / 2);
+        main_screen->PutImage(im, (xres + 1) / 2 - im->Size().x / 2,
+                                  (yres + 1) / 2 - im->Size().y / 2);
     }
 
@@ -1272 +1272 @@
 
         int dx = (xres + 1) / 2 - gray->Size().x / 2, dy = (yres + 1) / 2 - gray->Size().y / 2;
-        gray->put_image(main_screen, dx, dy);
-        smoke[0]->put_image(main_screen, dx + 24, dy + 5);
+        main_screen->PutImage(gray, dx, dy);
+        main_screen->PutImage(smoke[0], dx + 24, dy + 5);
 
         fade_in(NULL, 16);
@@ -1293 +1293 @@
                 break;
 
-            gray->put_image(main_screen, dx, dy);
-            smoke[i % 5]->put_image(main_screen, dx + 24, dy + 5);
+            main_screen->PutImage(gray, dx, dy);
+            main_screen->PutImage(smoke[i % 5], dx + 24, dy + 5);
             text_draw(205 - i, dx + 15, dy, dx + 320 - 15, dy + 199, str, wm->font(), cmap, wm->bright_color());
             wm->flush_screen();
@@ -1500 +1500 @@
     {
       image *tit = cache.img(title_screen);
-      tit->put_image(main_screen, main_screen->Size().x/2 - tit->Size().x/2,
-                    main_screen->Size().y/2 - tit->Size().y/2);
+      main_screen->PutImage(tit, main_screen->Size().x/2 - tit->Size().x/2,
+                            main_screen->Size().y/2 - tit->Size().y/2);
     }
     set_state(MENU_STATE);   // then go to menu state so windows will turn off
@@ -1573 +1573 @@
     {
       for(view *f = first_view; f; f = f->next)
-        cache.img(pause_image)->put_image(main_screen, (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2,
+        main_screen->PutImage(cache.img(pause_image), (f->cx1 + f->cx2)/2 - cache.img(pause_image)->Size().x/2,
                    f->cy1 + 5, 1);
     }
@@ -1897 +1897 @@
                                         ((button *)ev.message.data)->push();
 /*                                        volume_window->inm->redraw();
-                                        draw_value(volume_window->screen, 2, 43,
+                                        draw_value(volume_window->m_surf, 2, 43,
                                                 (volume_window->x2()-volume_window->x1()-1), 8, sfx_volume, 127);
-                                        draw_value(volume_window->screen, 2, 94,
+                                        draw_value(volume_window->m_surf, 2, 94,
                                                 (volume_window->x2()-volume_window->x1()-1), 8, music_volume, 127);
 */

abuse/trunk/src/gui.cpp

@@ -88 +88 @@
 void ico_button::draw(int active, image *screen)
 {
-  int x1,y1,x2,y2;
-  area(x1,y1,x2,y2);
+    int x1, y1, x2, y2;
+    area(x1, y1, x2, y2);
 
-  if (active!=act  && activate_id!=-1 && active)
-    wm->Push(new Event(activate_id,NULL));
+    if (active != act && activate_id != -1 && active)
+        wm->Push(new Event(activate_id, NULL));
 
-  if (up && !active)
-    cache.img(u)->put_image(screen,x1,y1);
-  else if (up && active)
-    cache.img(ua)->put_image(screen,x1,y1);
-  else if (!up && !active)
-    cache.img(d)->put_image(screen,x1,y1);
-  else cache.img(da)->put_image(screen,x1,y1);
+    screen->PutImage(cache.img((up && !active) ? u :
+                               (up && active) ? ua :
+                               (!up && !active) ? d : da), x1, y1);
 
-  if (act!=active && active && activate_id!=-1)
-    wm->Push(new Event(activate_id,NULL));
-  act=active;
+    if (act != active && active && activate_id != -1)
+        wm->Push(new Event(activate_id, NULL));
+    act = active;
 
-  if (active && key[0])
-  {
-    int g=80;
-    screen->bar(0,0,144,20,0);
-    wm->font()->put_string(screen,0,0,symbol_str(key),color_table->Lookup(g>>3,g>>3,g>>3));
-  } else if (!active && key[0])
-  {
-    screen->bar(0,0,144,20,0);
-  }
-
+    if (active && key[0])
+    {
+        int g=80;
+        screen->bar(0, 0, 144, 20, 0);
+        wm->font()->put_string(screen, 0, 0, symbol_str(key),
+                               color_table->Lookup(g>>3, g>>3, g>>3));
+    }
+    else if (!active && key[0])
+    {
+        screen->bar(0, 0, 144, 20, 0);
+    }
 }
 

abuse/trunk/src/help.cpp

@@ -31 +31 @@
   int x1=xres/2-im->Size().x/2,y1=yres/2-im->Size().y/2;
   int x2=x1+im->Size().x,y2=y1+im->Size().y;
-  im->put_image(main_screen,x1,y1);
+  main_screen->PutImage(im, x1, y1);
   main_screen->bar(0,0,x1-1,yres,0);
   main_screen->bar(0,0,xres,y1-1,0);

abuse/trunk/src/imlib/fonts.cpp

@@ -28 +28 @@
 void texture_font::put_char(image *screen,  int x, int y, char ch)
 { if (fntpat)
-    fntpat->put_part_masked(screen,let, x,y,
+    screen->PutPartMasked(fntpat, let, x,y,
        ((int)ch%32)*tl,((int)ch/32)*th,0,0,tl-1,th-1);
-  else let->put_part(screen,x,y,((int)ch%32)*tl,((int)ch/32)*th,
-     ((int)ch%32)*tl+tl-1,((int)ch/32)*th+th-1,1);
+  else screen->PutPart(let, x, y, ((int)ch%32)*tl, ((int)ch/32)*th,
+     ((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1, 1);
 }
 
@@ -74 +74 @@
   {
     tmp.clear();
-    letters->put_part(&tmp,0,0,((int)ch%32)*tl,((int)ch/32)*th,
-              ((int)ch%32)*tl+tl-1,((int)ch/32)*th+th-1,1);
-    let[ch]=new TransImage(&tmp,"JCfont");
+    tmp.PutPart(letters, 0, 0, ((int)ch%32)*tl, ((int)ch/32)*th,
+                ((int)ch%32)*tl+tl-1, ((int)ch/32)*th+th-1, 1);
+    let[ch] = new TransImage(&tmp, "JCfont");
   }
 }

abuse/trunk/src/imlib/guistat.cpp

@@ -59 +59 @@
   long h=wm->font()->height();
 
-  whom->stat_win->screen->bar(whom->stat_win->x1()+1,whom->stat_win->y2()-h-1,whom->stat_win->x2()-1,
+  whom->stat_win->m_surf->bar(whom->stat_win->x1()+1,whom->stat_win->y2()-h-1,whom->stat_win->x2()-1,
               whom->stat_win->y2()-1,wm->black());
-  whom->stat_win->screen->bar(whom->stat_win->x1()+2,whom->stat_win->y2()-h,whom->stat_win->x2()-2,
+  whom->stat_win->m_surf->bar(whom->stat_win->x1()+2,whom->stat_win->y2()-h,whom->stat_win->x2()-2,
               whom->stat_win->y2()-2,wm->dark_color());
   if (perc)
-    whom->stat_win->screen->bar(whom->stat_win->x1()+3,whom->stat_win->y2()-h+1,
+    whom->stat_win->m_surf->bar(whom->stat_win->x1()+3,whom->stat_win->y2()-h+1,
                 whom->stat_win->x1()+l*perc/100,
                 whom->stat_win->y2()-3,wm->bright_color());
@@ -106 +106 @@
     int my = first->stat_win->y1() + wm->font()->height() / 2;
     first->stat_win=wm->new_window(wx, wy, len3, h1*2+h2, NULL, "status");
-    wm->font()->put_string(first->stat_win->screen, mx, my, first->name, wm->black());
-    wm->font()->put_string(first->stat_win->screen, mx, my, first->name, wm->bright_color());
+    wm->font()->put_string(first->stat_win->m_surf, mx, my, first->name, wm->black());
+    wm->font()->put_string(first->stat_win->m_surf, mx, my, first->name, wm->bright_color());
     if (first->show)
-      first->show->draw(first->stat_win->screen, (first->stat_win->x2()-first->stat_win->x1())/2-
+      first->show->draw(first->stat_win->m_surf, (first->stat_win->x2()-first->stat_win->x1())/2-
                 first->show->width()/2, my+h1, NULL);
 

abuse/trunk/src/imlib/image.cpp

@@ -319 +319 @@
 
 
-void image::put_image(image *screen, int16_t x, int16_t y, char transparent)
+void image::PutImage(image *im, int16_t x, int16_t y, char transparent)
 {
     int16_t i, j, xl, yl;
@@ -325 +325 @@
 
     // the screen is clipped then we only want to put part of the image
-    if(screen->m_special)
-    {
-        put_part(screen, x, y, 0, 0, m_size.x-1, m_size.y-1, transparent);
+    if(m_special)
+    {
+        PutPart(im, x, y, 0, 0, im->m_size.x-1, im->m_size.y-1, transparent);
         return;
     }
 
-    if(x < screen->Size().x && y < screen->Size().y)
-    {
-        xl = m_size.x;
-        if(x + xl > screen->Size().x) // clip to the border of the screen
-            xl = screen->Size().x - x;
-        yl = m_size.y;
-        if(y + yl > screen->Size().y)
-            yl = screen->Size().y - y;
+    if(x < m_size.x && y < m_size.y)
+    {
+        xl = im->m_size.x;
+        if(x + xl > m_size.x) // clip to the border of the screen
+            xl = m_size.x - x;
+        yl = im->m_size.y;
+        if(y + yl > m_size.y)
+            yl = m_size.y - y;
 
         int startx = 0, starty = 0;
@@ -355 +355 @@
             return;
 
-        screen->AddDirty(x, y, x + xl, y + yl);
-        screen->Lock();
+        AddDirty(x, y, x + xl, y + yl);
         Lock();
+        im->Lock();
         for(j = starty; j < yl; j++, y++)
         {
-            pg1 = screen->scan_line(y);
-            pg2 = scan_line(j);
+            pg1 = scan_line(y);
+            pg2 = im->scan_line(j);
             if(transparent)
             {
@@ -375 +375 @@
                 memcpy(&pg1[x], pg2, xl); // straight copy
         }
+        im->Unlock();
         Unlock();
-        screen->Unlock();
     }
 }
@@ -434 +434 @@
 
 
-void image::put_part(image *screen, int16_t x, int16_t y,
-        int16_t x1, int16_t y1, int16_t x2, int16_t y2, char transparent)
+void image::PutPart(image *im, int16_t x, int16_t y, int16_t x1, int16_t y1,
+                    int16_t x2, int16_t y2, char transparent)
 {
   int16_t xlen, ylen, j, i;
@@ -442 +442 @@
 
   int cx1, cy1, cx2, cy2;
-  screen->GetClip(cx1, cy1, cx2, cy2);
-
+  GetClip(cx1, cy1, cx2, cy2);
 
   // see if the are to be put is outside of actual image, if so adjust
@@ -449 +448 @@
   if (x1<0) { x+=-x1; x1=0; }
   if (y1<0) { y+=-y1; y1=0; }
-  if (x2>=m_size.x) x2=m_size.x-1;
-  if (y2>=m_size.y) y2=m_size.y-1;
+  if (x2>=im->m_size.x) x2=im->m_size.x-1;
+  if (y2>=im->m_size.y) y2=im->m_size.y-1;
   if (x1>x2 || y1>y2) return ;      // return if it was adjusted so that nothing will be put
-
 
   // see if the image gets clipped off the screen
   if (x >= cx2 || y >= cy2 || x + (x2 - x1) < cx1 || y + (y2 - y1) < cy1)
     return ;
-
 
   if (x<cx1)
@@ -471 +468 @@
   if (x1>x2 || y1>y2) return ;
 
-
-
-
   xlen=x2-x1+1;
   ylen=y2-y1+1;
 
-  screen->AddDirty(x, y, x + xlen, y + ylen);
-
-  screen->Lock();
+  AddDirty(x, y, x + xlen, y + ylen);
+
   Lock();
-  pg1=screen->scan_line(y);
-  pg2=scan_line(y1);
+  im->Lock();
+  pg1 = scan_line(y);
+  pg2 = im->scan_line(y1);
 
   if (transparent)
@@ -490 +484 @@
       for (i=0, source=&pg2[x1], dest=&pg1[x]; i<xlen; i++, source++, dest++)
         if (*source) *dest=*source;
-      pg1=screen->next_line(y+j, pg1);
-      pg2=next_line(y1+j, pg2);
+      pg1=next_line(y+j, pg1);
+      pg2=im->next_line(y1+j, pg2);
     }
   }
@@ -498 +492 @@
   {
     memcpy(&pg1[x], &pg2[x1], xlen);   // strait copy
-    pg1=screen->next_line(y+j, pg1);
-    pg2=next_line(y1+j, pg2);
-  }
+    pg1 = next_line(y+j, pg1);
+    pg2 = im->next_line(y1+j, pg2);
+  }
+  im->Unlock();
   Unlock();
-  screen->Unlock();
-}
-
-void image::put_part_xrev(image *screen, int16_t x, int16_t y,
-        int16_t x1, int16_t y1, int16_t x2, int16_t y2, char transparent)
+}
+
+void image::PutPartXrev(image *im, int16_t x, int16_t y, int16_t x1,
+                        int16_t y1, int16_t x2, int16_t y2, char transparent)
 {
   int16_t xl, yl, j, i;
@@ -512 +506 @@
   CHECK(x1<=x2 && y1<=y2);
 
-  i=x1; x1=m_size.x-x2-1;  // reverse the x locations
-  x2=m_size.x-i-1;
+  i=x1; x1=im->m_size.x-x2-1;  // reverse the x locations
+  x2=im->m_size.x-i-1;
 
   if (x1<0)
@@ -520 +514 @@
   { y-=y1; y1=0; }
 
-  if (screen->m_special)
+  if (m_special)
   {
     int cx1, cy1, cx2, cy2;
-    screen->m_special->GetClip(cx1, cy1, cx2, cy2);
+    m_special->GetClip(cx1, cy1, cx2, cy2);
     // FIXME: don't we need < cx1 instead of < 0 here?
     if (x >= cx2 || y >= cy2 || x + (x2 - x1) < 0 || y + (y2 - y1) < 0)
@@ -536 +530 @@
     { y2 = cy2 - 1 - y + y1; }
   }
-  else  if (x>screen->Size().x || y>screen->Size().y || x+x2<0 || y+y2<0)
+  else  if (x > m_size.x || y > m_size.y || x+x2<0 || y+y2<0)
     return ;
 
-  if (x<screen->Size().x && y<screen->Size().y && x1<m_size.x && y1<m_size.y &&
+  if (x<m_size.x && y<m_size.y && x1<im->m_size.x && y1<im->m_size.y &&
       x1<=x2 && y1<=y2)
   {
-    if (x2>=m_size.x)
-      x2=m_size.x-1;
-    if (y2>=m_size.y)
-      y2=m_size.y-1;
+    if (x2>=im->m_size.x)
+      x2=im->m_size.x-1;
+    if (y2>=im->m_size.y)
+      y2=im->m_size.y-1;
     xl=x2-x1+1;
-    if (x+xl>screen->Size().x)
-      xl=screen->Size().x-x;
+    if (x+xl>m_size.x)
+      xl=m_size.x-x;
     yl=y2-y1+1;
-    if (y+yl>screen->Size().y)
-      yl=screen->Size().y-y;
-    screen->AddDirty(x, y, x + xl, y + yl);
-    screen->Lock();
+    if (y+yl>m_size.y)
+      yl=m_size.y-y;
+    AddDirty(x, y, x + xl, y + yl);
     Lock();
+    im->Lock();
     for (j=0; j<yl; j++)
     {
-      pg1=screen->scan_line(y+j);
-      pg2=scan_line(y1+j);
+      pg1=scan_line(y+j);
+      pg2=im->scan_line(y1+j);
       if (transparent)
       {
@@ -569 +563 @@
     }
     Unlock();
-    screen->Unlock();
-  }
-}
-
-
-void image::put_part_masked(image *screen, image *mask, int16_t x, int16_t y,
-        int16_t maskx, int16_t masky,
-        int16_t x1, int16_t y1, int16_t x2, int16_t y2)
+    im->Unlock();
+  }
+}
+
+void image::PutPartMasked(image *im, image *mask, int16_t x, int16_t y,
+                          int16_t maskx, int16_t masky,
+                          int16_t x1, int16_t y1, int16_t x2, int16_t y2)
 {
   int16_t xl, yl, j, i, ml, mh;
@@ -582 +575 @@
   CHECK(x1<=x2 && y1<=y2);
 
-  if (screen->m_special)
+  if (m_special)
   {
     int cx1, cy1, cx2, cy2;
-    screen->m_special->GetClip(cx1, cy1, cx2, cy2);
+    m_special->GetClip(cx1, cy1, cx2, cy2);
     if (x >= cx2 || y >= cy2 || x+(x2-x1)<0 || y+(y2-y1)<0) return ;
     if (x<cx1)
@@ -596 +589 @@
     { y2 = cy2 - 1 + y1 - y; }
   }
-  else  if (x>screen->Size().x || y>screen->Size().y || x+x1<0 || y+y1<0)
+  else  if (x>m_size.x || y>m_size.y || x+x1<0 || y+y1<0)
     return ;
 
   ml=mask->Size().x;
   mh=mask->Size().y;
-  if (x<screen->Size().x && y<screen->Size().y && x1<m_size.x && y1<m_size.y &&
+  if (x<m_size.x && y<m_size.y && x1<im->m_size.x && y1<im->m_size.y &&
       maskx<ml && masky<mh && x1<=x2 && y1<=y2)
   {
 
-    if (x2>=m_size.x)
-      x2=m_size.x-1;
-    if (y2>=m_size.y)
-      y2=m_size.y-1;
+    if (x2>=im->m_size.x)
+      x2=im->m_size.x-1;
+    if (y2>=im->m_size.y)
+      y2=im->m_size.y-1;
     xl=x2-x1+1;
-    if (x+xl>screen->Size().x)
-      xl=screen->Size().x-x-1;
+    if (x+xl>m_size.x)
+      xl=m_size.x-x-1;
     yl=y2-y1+1;
-    if (y+yl>screen->Size().y)
-      yl=screen->Size().y-y-1;
-    screen->AddDirty(x, y, x + xl, y + yl);
-    screen->Lock();
+    if (y+yl>m_size.y)
+      yl=m_size.y-y-1;
+    AddDirty(x, y, x + xl, y + yl);
+    Lock();
     mask->Lock();
-    Lock();
+    im->Lock();
     for (j=0; j<yl; j++)
     {
-      pg1=screen->scan_line(y+j);
-      pg2=scan_line(y1+j);
+      pg1=scan_line(y+j);
+      pg2=im->scan_line(y1+j);
       pg3=mask->scan_line(masky++);
       if (masky>=mh)           // wrap the mask around if out of bounds
@@ -634 +627 @@
       }
     }
+    im->Unlock();
+    mask->Unlock();
     Unlock();
-    mask->Unlock();
-    screen->Unlock();
   }
 }

abuse/trunk/src/imlib/image.h

@@ -119 +119 @@
     void fill_image(image *screen, int16_t x1, int16_t y1,
                     int16_t x2, int16_t y2, int16_t align = 1);
-    void put_image(image *screen, int16_t x, int16_t y, char transparent = 0);
-    void put_part(image *screen, int16_t x, int16_t y, int16_t x1, int16_t y1,
-                  int16_t x2, int16_t y2, char transparent = 0);
-    void put_part_xrev(image *screen, int16_t x, int16_t y,
-                       int16_t x1, int16_t y1, int16_t x2, int16_t y2,
-                       char transparent = 0);
-    void put_part_masked(image *screen, image *mask, int16_t x, int16_t y,
-                         int16_t maskx, int16_t masky, int16_t x1, int16_t y1,
-                         int16_t x2, int16_t y2);
+    void PutImage(image *screen, int16_t x, int16_t y, char transparent = 0);
+    void PutPart(image *screen, int16_t x, int16_t y, int16_t x1, int16_t y1,
+                 int16_t x2, int16_t y2, char transparent = 0);
+    void PutPartXrev(image *screen, int16_t x, int16_t y,
+                     int16_t x1, int16_t y1, int16_t x2, int16_t y2,
+                     char transparent = 0);
+    void PutPartMasked(image *screen, image *mask, int16_t x, int16_t y,
+                       int16_t maskx, int16_t masky, int16_t x1, int16_t y1,
+                       int16_t x2, int16_t y2);
     image *copy_part_dithered(int16_t x1, int16_t y1, int16_t x2, int16_t y2);
     void bar(int16_t x1, int16_t y1, int16_t x2, int16_t y2, uint8_t color);

abuse/trunk/src/imlib/input.cpp

@@ -392 +392 @@
     {
       if (!active)
-        visual->put_image(screen,x,y);
+        screen->PutImage(visual, x, y);
       else
-        pressed->put_image(screen,x,y);
-    } else act_pict->put_image(screen,x,y);
+        screen->PutImage(pressed, x, y);
+    } else screen->PutImage(act_pict, x, y);
   }
   else
@@ -425 +425 @@
         wm->font()->put_string(screen,x+3,y+4,text);
       }
-      else visual->put_image(screen,x+3,y+3,1);
+      else screen->PutImage(visual, x + 3, y + 3, 1);
     } else
     {
@@ -434 +434 @@
       screen->bar(x1+1,y1+1,x2-1,y2-1,wm->medium_color());
       if (visual)
-        visual->put_image(screen,x1+3,y1+3,1);
+        screen->PutImage(visual, x1 + 3, y1 + 3, 1);
       else
       {

abuse/trunk/src/imlib/jwindow.cpp

@@ -72 +72 @@
         {
             p->hide();
-            m_screen->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h);
+            m_surf->AddDirty(p->x, p->y, p->x + p->l, p->y + p->h);
         }
     }
@@ -93 +93 @@
         Jwindow *k;
         for (k = first; k->next != j; k = k->next)
-            k->screen->AddDirty(j->x - k->x, j->y - k->y,
-                                j->x + j->l - k->x, j->y + j->h - k->y);
-        k->screen->AddDirty(j->x - k->x, j->y - k->y,
-                            j->x + j->l - k->x, j->y + j->h - k->y);
+            k->m_surf->AddDirty(j->x - k->x, j->y - k->y,
+                                  j->x + j->l - k->x, j->y + j->h - k->y);
+        k->m_surf->AddDirty(j->x - k->x, j->y - k->y,
+                              j->x + j->l - k->x, j->y + j->h - k->y);
         k->next = j->next;
     }
-    m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+    m_surf->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
     j->hide();
 }
@@ -108 +108 @@
     {
         j->show();
-        j->screen->AddDirty(0, 0, j->l, j->h);
+        j->m_surf->AddDirty(0, 0, j->l, j->h);
     }
 }
@@ -180 +180 @@
     {
       Jwindow *j=ev.window;
-/*      m_screen->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h);
+/*      m_surf->AddDirty(j->x,j->y,j->x+j->l,j->y+j->h);
       for (p=first; p!=j; p=p->next)
-        p->screen->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */
-      j->screen->AddDirty(0, 0, j->l, j->h);
+        p->m_surf->AddDirty(j->x-p->x,j->y-p->y,j->x+j->l-p->x,j->y+j->h-p->y); */
+      j->m_surf->AddDirty(0, 0, j->l, j->h);
       flush_screen();
     }
@@ -214 +214 @@
   {
     for (Jwindow *j = first; j; j = j->next)
-       j->screen->AddDirty(ev.redraw.x1 - j->x, ev.redraw.y1 - j->y,
-                           ev.redraw.x2 + 1 - j->x, ev.redraw.y2 + 1 - j->y);
-    m_screen->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);
+       j->m_surf->AddDirty(ev.redraw.x1 - j->x, ev.redraw.y1 - j->y,
+                             ev.redraw.x2 + 1 - j->x, ev.redraw.y2 + 1 - j->y);
+    m_surf->AddDirty(ev.redraw.x1, ev.redraw.y1, ev.redraw.x2 + 1, ev.redraw.y2 + 1);
     flush_screen();
     ev.type=EV_SPURIOUS;   // we took care of this one by ourselves.
@@ -224 +224 @@
 void Jwindow::resize(int L, int H)
 {
-  screen->SetSize(vec2i(L,H));
+  m_surf->SetSize(vec2i(L,H));
   l=L; h=H;
 }
@@ -231 +231 @@
 {
   Jwindow *p;
-  m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+  m_surf->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
   for (p=first; p!=j; p=p->next)
-    p->screen->AddDirty(j->x - p->x, j->y - p->y, j->x + j->l - p->x, j->y + j->h - p->y);
+    p->m_surf->AddDirty(j->x - p->x, j->y - p->y, j->x + j->l - p->x, j->y + j->h - p->y);
   j->resize(l,h);
   if (!frame_suppress)
@@ -241 +241 @@
 void WindowManager::move_window(Jwindow *j, int x, int y)
 {
-    m_screen->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
+    m_surf->AddDirty(j->x, j->y, j->x + j->l, j->y + j->h);
     for(Jwindow *p = first; p != j; p = p->next)
-        p->screen->AddDirty(j->x - p->x, j->y - p->y,
-                            j->x + j->l - p->x, j->y + j->h - p->y);
+        p->m_surf->AddDirty(j->x - p->x, j->y - p->y,
+                              j->x + j->l - p->x, j->y + j->h - p->y);
     j->x = x;
     j->y = y;
-    j->screen->AddDirty(0, 0, j->l, j->h);
+    j->m_surf->AddDirty(0, 0, j->l, j->h);
 }
 
@@ -255 +255 @@
 {
     wm = this;
-    m_screen = screen;
+    m_surf = screen;
     hi = Hi; low = Low; med = Med; first = NULL; m_pal = pal; grab = NULL;
     bk = pal->find_closest(0, 0, 0);
@@ -299 +299 @@
         Jwindow * search;
         for(search = first; search->next != win; search = search->next)
-            search->screen->AddDirty(win->x - search->x,
-                                     win->y - search->y,
-                                     win->x + win->l - search->x,
-                                     win->y + win->h - search->y);
-        search->screen->AddDirty(win->x - search->x, win->y - search->y,
-                                 win->x + win->l - search->x,
-                                 win->y + win->h - search->y);
+            search->m_surf->AddDirty(win->x - search->x,
+                                       win->y - search->y,
+                                       win->x + win->l - search->x,
+                                       win->y + win->h - search->y);
+        search->m_surf->AddDirty(win->x - search->x, win->y - search->y,
+                                   win->x + win->l - search->x,
+                                   win->y + win->h - search->y);
         search->next = win->next;
     }
 
-    m_screen->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h);
+    m_surf->AddDirty(win->x, win->y, win->x + win->l, win->y + win->h);
 }
 
@@ -315 +315 @@
                                      ifield * fields, char const *name)
 {
-    if(x > m_screen->Size().x - 4)
-        x = m_screen->Size().x - 25;
-    if(y > m_screen->Size().y - 4)
-        y = m_screen->Size().y - 10;
+    if(x > m_surf->Size().x - 4)
+        x = m_surf->Size().x - 25;
+    if(y > m_surf->Size().y - 4)
+        y = m_surf->Size().y - 10;
 
     Jwindow * j = new Jwindow (x, y, l, h, fields, name);
@@ -340 +340 @@
         my = mouse->drawy();
 
-        m_screen->put_part(mouse_save, 0, 0, mx, my,
-                         mx + mouse_pic->Size().x - 1,
-                         my + mouse_pic->Size().y - 1);
-        mouse_pic->put_image(m_screen, mx, my, 1);
+        mouse_save->PutPart(m_surf, 0, 0, mx, my,
+                            mx + mouse_pic->Size().x - 1,
+                            my + mouse_pic->Size().y - 1);
+        m_surf->PutImage(mouse_pic, mx, my, 1);
     }
 
     for(p = first; p; p = p->next)
         if(!p->is_hidden())
-            m_screen->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);
-    update_dirty(m_screen);
+            m_surf->delete_dirty(p->x, p->y, p->x + p->l, p->y + p->h);
+    update_dirty(m_surf);
 
     if(has_mouse())
-        mouse_save->put_image(m_screen, mx, my);
+        m_surf->PutImage(mouse_save, mx, my);
 
     for(p = first; p; p = p->next)
@@ -361 +361 @@
         if(has_mouse())
         {
-            p->screen->put_part(mouse_save, 0, 0, mx - p->x, my - p->y,
+            mouse_save->PutPart(p->m_surf, 0, 0, mx - p->x, my - p->y,
                                 mx - p->x + mouse_pic->Size().x - 1,
                                 my - p->y + mouse_pic->Size().y - 1);
-            if(has_mouse())
-                mouse_pic->put_image(p->screen, mx - p->x, my - p->y, 1);
+            p->m_surf->PutImage(mouse_pic, mx - p->x, my - p->y, 1);
         }
 
-//          m_screen->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);
+//          m_surf->delete_dirty(p->x, p->y, p->x+p->l, p->y+p->h);
         for(q = p->next; q; q = q->next)
             if(!q->is_hidden())
-                p->screen->delete_dirty(q->x - p->x, q->y - p->y,
-                                        q->x + q->l - p->x, q->y + q->h - p->y);
-        update_dirty(p->screen, p->x, p->y);
+                p->m_surf->delete_dirty(q->x - p->x, q->y - p->y,
+                                          q->x + q->l - p->x,
+                                          q->y + q->h - p->y);
+        update_dirty(p->m_surf, p->x, p->y);
         if(has_mouse())
-            mouse_save->put_image(p->screen, mx - p->x, my - p->y, 0);
+            p->m_surf->PutImage(mouse_save, mx - p->x, my - p->y, 0);
     }
 }
@@ -392 +392 @@
     reconfigure();
 
-    screen = NULL;
+    m_surf = NULL;
     next = NULL;
 
@@ -411 +411 @@
     _y1 = name ? top_border() : jw_top + 5;
 
-    screen = NULL;
-    inm = new InputManager(screen, f);
+    m_surf = NULL;
+    inm = new InputManager(m_surf, f);
     reconfigure(); /* FIXME: TODO */
 
@@ -433 +433 @@
         if(h < top_border() + bottom_border())
             h = top_border() + bottom_border();
-    screen = new image(vec2i(l, h), NULL, 2);
-    screen->clear(backg);
+    m_surf = new image(vec2i(l, h), NULL, 2);
+    m_surf->clear(backg);
     // Keep this from getting destroyed when image list is cleared
-    image_list.unlink(screen);
-    inm->screen = screen;
+    image_list.unlink(m_surf);
+    inm->m_surf = m_surf;
 
     next = NULL;
@@ -454 +454 @@
     wm->remove_window(this);
     local_close();
-    if(screen)
-        delete screen;
+    delete m_surf;
     delete inm;
     if(_name)
@@ -494 +493 @@
         if (right_border() >= 1)
         {
-            screen->widget_bar (0, 0, l - 1, h - 1, hi, med, low);
+            m_surf->widget_bar (0, 0, l - 1, h - 1, hi, med, low);
             if (right_border() >= 3)
-                screen->widget_bar (right_border() - 1, top_border() - 1,
+                m_surf->widget_bar(right_border() - 1, top_border() - 1,
+                                     l - left_border(), h - bottom_border(),
+                                     low, med, hi);
+
+          else
+            m_surf->line (left_border() - 1, top_border() - 1,
+                           right_border() - 1, top_border() - 1, low);
+        }
+      m_surf->rectangle (2, 2, top_border() - 2, top_border() - 3,
+                           wm->black ());
+      m_surf->widget_bar (3, 3, top_border() - 3, top_border() - 4, hi, med, low);     // draws the 'close' button
+    }
+
+  else
+    {
+      if (right_border() >= 1)
+        {
+          m_surf->widget_bar (0, 0, l - 1, h - 1, hi, med, low);
+          if (right_border() >= 3)
+            m_surf->widget_bar (right_border() - 1, jw_top + 4,
                                 l - left_border(), h - bottom_border(), low,
                                 med, hi);
 
           else
-            screen->line (left_border() - 1, top_border() - 1,
-                           right_border() - 1, top_border() - 1, low);
-        }
-      screen->rectangle (2, 2, top_border() - 2, top_border() - 3,
-                           wm->black ());
-      screen->widget_bar (3, 3, top_border() - 3, top_border() - 4, hi, med, low);     // draws the 'close' button
-    }
-
-  else
-    {
-      if (right_border() >= 1)
-        {
-          screen->widget_bar (0, 0, l - 1, h - 1, hi, med, low);
-          if (right_border() >= 3)
-            screen->widget_bar (right_border() - 1, jw_top + 4,
-                                l - left_border(), h - bottom_border(), low,
-                                med, hi);
-
-          else
-            screen->line (left_border() - 1, jw_top + 4, right_border() - 1,
+            m_surf->line (left_border() - 1, jw_top + 4, right_border() - 1,
                            jw_top + 4, low);
         }
-      screen->rectangle (1, 1, 4, 4, wm->black ());
-      screen->widget_bar (2, 2, 3, 3, hi, med, low);   // draws the 'close' button
+      m_surf->rectangle (1, 1, 4, 4, wm->black ());
+      m_surf->widget_bar (2, 2, 3, 3, hi, med, low);   // draws the 'close' button
     }
   if (_name && _name[0])
     {
-      screen->bar (top_border(), 1,
+      m_surf->bar (top_border(), 1,
                     top_border() + fnt->width() * strlen (_name) + 1,
                     top_border() - 2, med);
-      fnt->put_string (screen, top_border() + 1, 1, _name, low);
-    }
-  screen->bar (x1 (), y1 (), x2 (), y2 (), backg);  // clear 'client' region
+      fnt->put_string (m_surf, top_border() + 1, 1, _name, low);
+    }
+  m_surf->bar (x1 (), y1 (), x2 (), y2 (), backg);  // clear 'client' region
   inm->redraw ();
 }
@@ -591 +590 @@
 {
     if(owner)
-        screen = owner->screen;
+        m_surf = owner->m_surf;
     if(active)
-        active->draw(0, screen);
+        active->draw(0, m_surf);
     active = NULL;
 }
@@ -603 +602 @@
 
   if(owner)
-      screen = owner->screen;
+      m_surf = owner->m_surf;
 
   if (j)
@@ -626 +625 @@
       {
     if (active)
-          active->draw(0,screen);
+          active->draw(0,m_surf);
 
     active=in_area;
 
     if (active)
-      active->draw(1,screen);
+      active->draw(1,m_surf);
       }
     }
     if (ev.type==EV_KEY && ev.key==JK_TAB && active)
     {
-      active->draw(0,screen);
+      active->draw(0,m_surf);
       do
       {
@@ -642 +641 @@
     if (!active) active=first;
       } while (active && !active->selectable());
-      active->draw(1,screen);
+      active->draw(1,m_surf);
     }
   } else active=grab;
@@ -649 +648 @@
   {
     if (ev.type!=EV_MOUSE_MOVE && ev.type!=EV_MOUSE_BUTTON)
-      active->handle_event(ev,screen,this);
+      active->handle_event(ev,m_surf,this);
     else
     {
@@ -657 +656 @@
       {
     if (j)
-      active->handle_event(ev,screen,j->inm);
-    else active->handle_event(ev,screen,this);
+      active->handle_event(ev,m_surf,j->inm);
+    else active->handle_event(ev,m_surf,this);
       }
     }
@@ -679 +678 @@
     ifield *i;
     if(owner)
-        screen = owner->screen;
+        m_surf = owner->m_surf;
     for(i = first; i; i = i->next)
-        i->draw_first(screen);
+        i->draw_first(m_surf);
     if(active)
-        active->draw(1, screen);
-}
-
-InputManager::InputManager(image *Screen, ifield *First)
+        active->draw(1, m_surf);
+}
+
+InputManager::InputManager(image *screen, ifield *First)
 {
     no_selections_allowed = 0;
@@ -692 +691 @@
     grab = NULL;
     owner = NULL;
-    screen = Screen;
+    m_surf = screen;
     active = first = First;
     while(active && !active->selectable())
         active = active->next;
-    if(screen)
+    if(m_surf)
         redraw();
 }
@@ -706 +705 @@
     grab = NULL;
     owner = Owner;
-    screen = NULL;
+    m_surf = NULL;
     active = first = First;
     while(active && !active->selectable())

abuse/trunk/src/imlib/jwindow.h

@@ -31 +31 @@
 class InputManager
 {
-  friend class Jwindow;
+    friend class Jwindow;
+
+public:
+    InputManager(image *screen, ifield *first);
+    InputManager(Jwindow *owner, ifield *first);
+    ~InputManager();
+
+    void handle_event(Event &ev, Jwindow *j);
+    ifield *get(int id);
+    void redraw();
+    void add(ifield *i);
+    void remap(Filter *f);
+    ifield *unlink(int id);     // unlinks ID from fields list and return the pointer to it
+    void clear_current();
+    void grab_focus(ifield *i);
+    void release_focus();
+    void allow_no_selections();
 
 private:
-  image *screen;
-  ifield *first, *active, *grab;
-  Jwindow *cur, *owner;
-  int no_selections_allowed;
-
-public:
-  InputManager(image *screen, ifield *first);
-  InputManager(Jwindow *owner, ifield *first);
-  void handle_event(Event &ev, Jwindow *j);
-  ifield *get(int id);
-  void redraw();
-  void add(ifield *i);
-  void remap(Filter *f);
-  ifield *unlink(int id);     // unlinks ID from fields list and return the pointer to it
-  void clear_current();
-  void grab_focus(ifield *i);
-  void release_focus();
-  void allow_no_selections();
-  ~InputManager();
-} ;
+    image *m_surf;
+    ifield *first, *active, *grab;
+    Jwindow *cur, *owner;
+    int no_selections_allowed;
+};
 
 class ifield
@@ -87 +88 @@
     friend class InputManager;
 
-private:
-    char *_name;
-    bool _hidden;
-    bool _moveable;
-
-    void reconfigure();
-
-protected:
-    Jwindow *owner;
-    int _x1, _y1, _x2, _y2;
-
 public:
     Jwindow *next;
     int x, y, l, h, backg;
-    image *screen;
     InputManager *inm;
     void *local_info;  // pointer to info block for local system (may support windows)
@@ -111 +100 @@
     virtual void redraw();
     void resize(int L, int H);
-    void clear(int color = 0) { screen->bar(x1(), y1(), x2(), y2(), color); }
+    void clear(int color = 0) { m_surf->bar(x1(), y1(), x2(), y2(), color); }
     void show() { _hidden = false; }
     void hide() { _hidden = true; }
@@ -122 +111 @@
     int x2() { return _x2; }
     int y2() { return _y2; }
-    void clip_in() { screen->SetClip(x1(), y1(), x2() + 1, y2() + 1); }
-    void clip_out() { screen->SetClip(0, 0, l, h); }
+    void clip_in() { m_surf->SetClip(x1(), y1(), x2() + 1, y2() + 1); }
+    void clip_out() { m_surf->SetClip(0, 0, l, h); }
     char *read(int id) { return inm->get(id)->read(); }
     void local_close();
@@ -131 +120 @@
     static int top_border();
     static int bottom_border();
+
+    image *m_surf;
+
+protected:
+    Jwindow *owner;
+    int _x1, _y1, _x2, _y2;
+
+private:
+    char *_name;
+    bool _hidden;
+    bool _moveable;
+
+    void reconfigure();
 };
 
@@ -183 +185 @@
 private:
     palette *m_pal;
-    image *m_screen;
+    image *m_surf;
 };
 

abuse/trunk/src/imlib/pmenu.cpp

@@ -37 +37 @@
   bar=wm->new_window(X, Y, w, 0, NULL);
   bar->freeze();  // can't drag this window
-  bar->screen->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),
+  bar->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),
             wm->dark_color());
 
@@ -207 +207 @@
                      NULL);
   win->freeze();
-  win->screen->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),wm->dark_color());
+  win->m_surf->widget_bar(0,0,w-1,h-1,wm->bright_color(),wm->medium_color(),wm->dark_color());
 
   int has_flags=0;
@@ -228 +228 @@
   {
     int h=wm->font()->height();
-    parent->screen->widget_bar(x,y+h/2-1,x+w-1,y+h/2,wm->dark_color(),wm->medium_color(),wm->bright_color());
+    parent->m_surf->widget_bar(x,y+h/2-1,x+w-1,y+h/2,wm->dark_color(),wm->medium_color(),wm->bright_color());
   } else
   {
@@ -234 +234 @@
     {
       if (xp!=-1)
-        parent->screen->xor_bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
+        parent->m_surf->xor_bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
       else
       {
-    parent->screen->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
-    wm->font()->put_string(parent->screen,x+1,y+1,n,wm->medium_color());
-    if (on_off && *on_off) wm->font()->put_string(parent->screen,bx+1,y+1,"*",wm->medium_color());
+    parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
+    wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->medium_color());
+    if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->medium_color());
       }
     } else
     {
       if (xp!=-1)
-        parent->screen->xor_bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
+        parent->m_surf->xor_bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->dark_color());
       else
       {
-    parent->screen->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->medium_color());
-    wm->font()->put_string(parent->screen,x+1,y+1,n,wm->bright_color());
-    if (on_off && *on_off) wm->font()->put_string(parent->screen,bx+1,y+1,"*",wm->bright_color());
+    parent->m_surf->bar(bx,y,x+w-1,y+wm->font()->height()+1,wm->medium_color());
+    wm->font()->put_string(parent->m_surf,x+1,y+1,n,wm->bright_color());
+    if (on_off && *on_off) wm->font()->put_string(parent->m_surf,bx+1,y+1,"*",wm->bright_color());
       }
     }
@@ -290 +290 @@
 {
   if (p->xp!=-1) return p->xp;
-  int w=bar->screen->Size().x;
+  int w=bar->m_surf->Size().x;
 
 
@@ -381 +381 @@
   mx-=bar->x;
   my-=bar->y;
-  if (mx<0 || my<0 || mx>=bar->screen->Size().x || my>=bar->screen->Size().y) return NULL;
+  if (mx<0 || my<0 || mx>=bar->m_surf->Size().x || my>=bar->m_surf->Size().y) return NULL;
   else
   {

abuse/trunk/src/imlib/scroller.cpp

@@ -501 +501 @@
     for (int j=0; j<th; j++,dy+=tex->Size().y)
       for (int i=0,dx=x; i<tw; i++,dx+=tex->Size().x)
-        tex->put_image(screen,dx,dy);
+        screen->PutImage(tex, dx, dy);
 
     screen->SetClip(cx1, cy1, cx2, cy2);

abuse/trunk/src/imlib/sprite.cpp

@@ -26 +26 @@
 void sprite::restore_background()
 { if (x+save->Size().x>=0 && y+save->Size().y>=0 && x<=xres && y<=yres)
-      save->put_image(screen,x,y); }
+      screen->PutImage(save, x, y); }
 
 void sprite::get_background()
 { if (x+visual->Size().x>=0 && y+visual->Size().y>=0 && x<=xres && y<=yres)
-   screen->put_part(save,0,0,x,y,x+save->Size().x-1,y+save->Size().y-1); }
+   save->PutPart(screen,0,0,x,y,x+save->Size().x-1,y+save->Size().y-1); }
 
 void sprite::draw()
 { if (x+visual->Size().x>=0 && y+visual->Size().y>=0 && x<=xres && y<=yres)
-   visual->put_image(screen,x,y,1); }
+   screen->PutImage(visual, x, y, 1); }
 
 sprite::sprite(image *Screen, image *Visual, int X, int Y)

abuse/trunk/src/loadgame.cpp

@@ -60 +60 @@
 }
 
-Jwindow *create_num_window(int mx, int total_saved, int lines, image **thumb_nails)
+Jwindow *create_num_window(int mx, int total_saved, int lines, image **thumbnails)
 {
   ico_button *buts[MAX_SAVE_GAMES];
@@ -77 +77 @@
         x += iw;
     }
-    if (thumb_nails) { while (!thumb_nails[n]) n++; }
+    if (thumbnails) { while (!thumbnails[n]) n++; }
     buts[i]=new ico_button(x, y, ID_LOAD_GAME_NUMBER + n,
                save_buts[n*3+0],save_buts[n*3+0],save_buts[n*3+1],save_buts[n*3+2],NULL);
@@ -167 +167 @@
 {
     int total_saved=0;
-    image *thumb_nails[MAX_SAVE_GAMES];
+    image *thumbnails[MAX_SAVE_GAMES];
     int start_num=0;
     int max_w=160,max_h=100;
-    memset(thumb_nails,0,sizeof(thumb_nails));
+    memset(thumbnails,0,sizeof(thumbnails));
 
     image *first=NULL;
@@ -191 +191 @@
             if (se && se->type==SPEC_IMAGE)
             {
-                thumb_nails[start_num] = new image(fp, se);
-                if (thumb_nails[start_num]->Size().x>max_w) max_w=thumb_nails[start_num]->Size().x;
-                if (thumb_nails[start_num]->Size().y>max_h) max_h=thumb_nails[start_num]->Size().y;
-                if (!first) first=thumb_nails[start_num];
+                thumbnails[start_num] = new image(fp, se);
+                if (thumbnails[start_num]->Size().x>max_w) max_w=thumbnails[start_num]->Size().x;
+                if (thumbnails[start_num]->Size().y>max_h) max_h=thumbnails[start_num]->Size().y;
+                if (!first) first=thumbnails[start_num];
                 total_saved++;
             }
@@ -202 +202 @@
         if (fail && show_all)
         {
-            thumb_nails[start_num] = new image(vec2i(160, 100));
-            thumb_nails[start_num]->clear();
-            console_font->put_string(thumb_nails[start_num],0,0,symbol_str("no_saved"));
+            thumbnails[start_num] = new image(vec2i(160, 100));
+            thumbnails[start_num]->clear();
+            console_font->put_string(thumbnails[start_num],0,0,symbol_str("no_saved"));
             total_saved++;
-            if (!first) first=thumb_nails[start_num];
+            if (!first) first=thumbnails[start_num];
         }
         delete fp;
@@ -233 +233 @@
 
 
-    Jwindow *l_win=create_num_window(0,total_saved,MAX_SAVE_LINES,thumb_nails);
+    Jwindow *l_win=create_num_window(0,total_saved,MAX_SAVE_LINES,thumbnails);
     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());
+    preview->m_surf->PutImage(first, preview->x1(), preview->y1());
 
     Event ev;
@@ -252 +252 @@
             int draw_num=ev.message.id-ID_LOAD_GAME_PREVIEW;
             preview->clear();
-            thumb_nails[draw_num]->put_image(preview->screen,preview->x1(),preview->y1());
+            preview->m_surf->PutImage(thumbnails[draw_num], preview->x1(), preview->y1());
         }
 
@@ -263 +263 @@
 
     for (i=0; i<total_saved; i++)
-        if (thumb_nails[i])
-            delete thumb_nails[i];
+        delete thumbnails[i];
 
     return got_level;

abuse/trunk/src/menu.cpp

@@ -240 +240 @@
       int by2=by1+bh-1;
 
-      main_screen->put_part(save,0,0,mx+1,by1,mx+mw-2,by2);
+      save->PutPart(main_screen, 0, 0, mx + 1, by1, mx + mw - 2, by2);
       tint_area(mx+1,by1,mx+mw-2,by2,63,63,63,color);
 
@@ -256 +256 @@
       }
       wm->flush_screen();
-      save->put_image(main_screen,mx+1,by1);
+      main_screen->PutImage(save, mx + 1, by1);
     } else { Timer tmp; tmp.WaitMs(10); }
 
@@ -520 +520 @@
       {
         image *tit=cache.img(title_screen);
-          tit->put_image(main_screen,main_screen->Size().x/2-tit->Size().x/2,
-                          main_screen->Size().y/2-tit->Size().y/2);
+          main_screen->PutImage(tit, main_screen->Size().x/2-tit->Size().x/2,
+                                main_screen->Size().y/2-tit->Size().y/2);
       }
       inm->redraw();

abuse/trunk/src/netcfg.cpp

@@ -275 +275 @@
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(main_screen,x,y);
+  main_screen->PutImage(ns, x, y);
   JCFont *fnt=wm->font();
 
@@ -315 +315 @@
   }
 
-  screen_backup->put_image(main_screen, 0, 0);
+  main_screen->PutImage(screen_backup, 0, 0);
   wm->flush_screen();
   delete screen_backup;
@@ -340 +340 @@
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(main_screen,x,y);
+  main_screen->PutImage(ns, x, y);
   JCFont *fnt=wm->font();
   image *ok_image=cache.img(cache.reg("art/frame.spe","dev_ok",SPEC_IMAGE,1))->copy(),
@@ -460 +460 @@
   int ns_w=ns->Size().x,ns_h=ns->Size().y;
   int x=(xres+1)/2-ns_w/2,y=(yres+1)/2-ns_h/2;
-  ns->put_image(main_screen, x, y);
+  main_screen->PutImage(ns, x, y);
   char const *nw_s = symbol_str("Networking");
   JCFont *fnt=wm->font();

abuse/trunk/src/profile.cpp

@@ -122 +122 @@
   float time_scaler=(float)max_bar_length/prof_list[0].total_time;
 
-  prof_win->screen->bar(0,prof_win->y1(),prof_win->screen->Size().x-1,prof_win->screen->Size().y,0);
+  prof_win->m_surf->bar(0,prof_win->y1(),prof_win->m_surf->Size().x-1,prof_win->m_surf->Size().y,0);
   int dy = 0;
   for (; i<prof_height; i++)
   {
-    console_font->put_string(prof_win->screen,spliter+1,dy,object_names[prof_list[i].otype]);
-    prof_win->screen->bar(spliter-1-(int)(prof_list[i].total_time*time_scaler),dy+1,
+    console_font->put_string(prof_win->m_surf,spliter+1,dy,object_names[prof_list[i].otype]);
+    prof_win->m_surf->bar(spliter-1-(int)(prof_list[i].total_time*time_scaler),dy+1,
               spliter-1,
               dy+console_font->height()-1,wm->bright_color());

abuse/trunk/src/ui/volumewindow.cpp

@@ -44 +44 @@
     l = cache.img(bg)->Size().x;
     h = cache.img(bg)->Size().y;
-    screen = new image(cache.img(bg)->Size(), NULL, 2);
+    m_surf = new image(cache.img(bg)->Size(), NULL, 2);
     redraw();
 }
@@ -50 +50 @@
 void VolumeWindow::redraw()
 {
-    cache.img(bg)->put_image(screen, 0, 0);
+    m_surf->PutImage(cache.img(bg), 0, 0);
     draw_music_vol();
     draw_sfx_vol();
@@ -62 +62 @@
     if(t != 0)
     {
-        cache.img(slider)->put_image(screen, x1, y1);
-//      screen->bar(x1,y1,dx,y2,c1);
+        m_surf->PutImage(cache.img(slider), x1, y1);
+//      m_surf->bar(x1,y1,dx,y2,c1);
     }
     else
@@ -69 +69 @@
 
     if(dx < x2)
-        screen->bar(dx + 1, y1, x2, y2, c2);
+        m_surf->bar(dx + 1, y1, x2, y2, c2);
 }