Difference for crossedit/Defines.h from version 1.1 to 1.2


version 1.1 version 1.2
Line 10
 
Line 10
 #define CrossEdit  #define CrossEdit
 #endif  #endif
   
 /*** kludge ***/  extern int FontSize;
 #ifdef FONTSIZE   
 #undef FONTSIZE  
 #endif  
 #define FONTSIZE 24  
   
 #define WIZARD_MODE  #define WIZARD_MODE
   
Line 74
 
Line 70
 typedef XChar2b XChar;   typedef XChar2b XChar;
 #endif  #endif
   
 /*  enum DisplayMode {Dm_Font, Dm_Bitmap, Dm_Pixmap, Dm_Png};
  * Made this a macro since it's mostly used in time-critical areas:  
  * (Hopefully a good optimizer will be able to move the if() out of  
  * any loop where this macro is used.  That wouldn't have been possible  
  * if this was a function!)  
  */  
   
 /*  
  * Have two version of this macro.  One if Xpm_Pix is defined, another  
  * if Xpm_Pix is not defined.  IT would be better to actually have the  
  * #ifdef's inside the macro itself, instead of having two versions, but  
  * I was not able to get that to work.  
  * Mark Wedel (mark@pyramid.com)  
  */  
   
 #ifdef HAVE_LIBXPM  
 #define draw_face(pl,win,gc,x,y,face) \  
 { \  
   if (pl->color_pixmaps) \  
   { \  
     XSetClipMask(pl->gdisp, gc, pl->masks[(face)]); \  
     XSetClipOrigin(pl->gdisp, gc, x, (y) - 24); \  
     XCopyArea(pl->gdisp, pl->pixmaps[(face)], win, gc, 0, 0, 24, 24, \  
  (unsigned int) (x), (unsigned int) ((y) - 24)); \  
   } \  
   else if(pl->use_pixmaps) \  
   { \  
     XCopyPlane(pl->gdisp,pl->pixmaps[(face)],win,gc,0,0,24,24, \  
                (unsigned int) (x),(unsigned int) ((y) - 24),1); \  
   } \  
   else \  
   { \  
     XChar buf; \  
     buf = FontindexToXChar((Fontindex) (face)); \  
     XDRAWIMAGESTRING(pl->gdisp,win,gc,x,y,&buf,1); \  
   } \  
 }  
 #else  
 #define draw_face(pl,win,gc,x,y,face) \  
 { \  
   if(pl->use_pixmaps) \  
   { \  
     XCopyPlane(pl->gdisp,pl->pixmaps[(face)],win,gc,0,0,24,24, \  
                (unsigned int) (x),(unsigned int) ((y) - 24),1); \  
   } \  
   else \  
   { \  
     XChar buf; \  
     buf = FontindexToXChar((Fontindex) (face)); \  
     XDRAWIMAGESTRING(pl->gdisp,win,gc,x,y,&buf,1); \  
   } \  
 }  
 #endif  
 /* Useful macro */  /* Useful macro */
 #define HAS_COLOUR(widg) (PlanesOfScreen(XtScreen(widg)) > 1)  #define HAS_COLOUR(widg) (PlanesOfScreen(XtScreen(widg)) > 1)
   


Legend:
line(s) removed in v.1.1 
line(s) changed
 line(s) added in v.1.2

File made using version 1.98 of cvs2html by leaf at 2011-07-21 19:49