[Emacs-diffs] Changes to emacs/src/xfns.c

[Jan Djärv]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.637 emacs/src/xfns.c:1.638
*** emacs/src/xfns.c:1.637      Fri Mar 18 21:20:29 2005
--- emacs/src/xfns.c    Sun Mar 20 22:28:55 2005
***************
*** 2835,2855 ****
       struct frame *f;
  {
    XGCValues gc_values;
! 
    BLOCK_INPUT;
  
    /* Create the GCs of this frame.
       Note that many default values are used.  */
  
    /* Normal video */
    gc_values.font = FRAME_FONT (f)->fid;
    gc_values.foreground = f->output_data.x->foreground_pixel;
    gc_values.background = f->output_data.x->background_pixel;
    gc_values.line_width = 0;   /* Means 1 using fast algorithm.  */
    f->output_data.x->normal_gc
      = XCreateGC (FRAME_X_DISPLAY (f),
                 FRAME_X_WINDOW (f),
!                GCLineWidth | GCFont | GCForeground | GCBackground,
                 &gc_values);
  
    /* Reverse video style.  */
--- 2835,2859 ----
       struct frame *f;
  {
    XGCValues gc_values;
!   unsigned mask;
    BLOCK_INPUT;
  
    /* Create the GCs of this frame.
       Note that many default values are used.  */
  
    /* Normal video */
+   mask = GCLineWidth | GCForeground | GCBackground;
+ #ifndef HAVE_XFT
    gc_values.font = FRAME_FONT (f)->fid;
+   mask |= GCFont;
+ #endif
    gc_values.foreground = f->output_data.x->foreground_pixel;
    gc_values.background = f->output_data.x->background_pixel;
    gc_values.line_width = 0;   /* Means 1 using fast algorithm.  */
    f->output_data.x->normal_gc
      = XCreateGC (FRAME_X_DISPLAY (f),
                 FRAME_X_WINDOW (f),
!                mask,
                 &gc_values);
  
    /* Reverse video style.  */
***************
*** 2858,2864 ****
    f->output_data.x->reverse_gc
      = XCreateGC (FRAME_X_DISPLAY (f),
                 FRAME_X_WINDOW (f),
!                GCFont | GCForeground | GCBackground | GCLineWidth,
                 &gc_values);
  
    /* Cursor has cursor-color background, background-color foreground.  */
--- 2862,2868 ----
    f->output_data.x->reverse_gc
      = XCreateGC (FRAME_X_DISPLAY (f),
                 FRAME_X_WINDOW (f),
!                mask,
                 &gc_values);
  
    /* Cursor has cursor-color background, background-color foreground.  */
***************
*** 2869,2878 ****
      = XCreateBitmapFromData (FRAME_X_DISPLAY (f),
                             FRAME_X_DISPLAY_INFO (f)->root_window,
                             cursor_bits, 16, 16);
    f->output_data.x->cursor_gc
      = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                (GCFont | GCForeground | GCBackground
!                 | GCFillStyle /* | GCStipple */ | GCLineWidth),
                 &gc_values);
  
    /* Reliefs.  */
--- 2873,2886 ----
      = XCreateBitmapFromData (FRAME_X_DISPLAY (f),
                             FRAME_X_DISPLAY_INFO (f)->root_window,
                             cursor_bits, 16, 16);
+   mask = GCForeground | GCBackground
+     | GCFillStyle /* | GCStipple */ | GCLineWidth;
+ #ifndef HAVE_XFT
+     mask |= GCFont;
+ #endif
    f->output_data.x->cursor_gc
      = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
!                mask,
                 &gc_values);
  
    /* Reliefs.  */
***************
*** 3178,3185 ****
--- 3186,3196 ----
  #ifdef USE_LUCID
    /* Prevent lwlib/xlwmenu.c from crashing because of a bug
       whereby it fails to get any font.  */
+ #warning "xlwmenu_default_font??"
+ #if 0
    xlwmenu_default_font = FRAME_FONT (f);
  #endif
+ #endif
  
    x_default_parameter (f, parms, Qborder_width, make_number (2),
                       "borderWidth", "BorderWidth", RES_TYPE_NUMBER);