[Emacs-diffs] Changes to emacs/oldXMenu/Create.c

[Miles Bader]

Index: emacs/oldXMenu/Create.c
diff -c emacs/oldXMenu/Create.c:1.1 emacs/oldXMenu/Create.c:1.2
*** emacs/oldXMenu/Create.c:1.1 Sun Oct  3 15:34:56 1999
--- emacs/oldXMenu/Create.c     Tue Feb  4 09:19:01 2003
***************
*** 1,4 ****
! /* $Header: /cvsroot/emacs/emacs/oldXMenu/Create.c,v 1.1 1999/10/03 19:34:56 
fx Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1985 */
  
  #include "copyright.h"
--- 1,4 ----
! /* $Header: /cvsroot/emacs/emacs/oldXMenu/Create.c,v 1.2 2003/02/04 14:19:01 
lektu Exp $ */
  /* Copyright    Massachusetts Institute of Technology    1985 */
  
  #include "copyright.h"
***************
*** 98,104 ****
  
  
  
! static Status 
  XAllocDisplayColor(display, map, colorName, color, junk)
      Display *display;
      Colormap map;
--- 98,104 ----
  
  
  
! static Status
  XAllocDisplayColor(display, map, colorName, color, junk)
      Display *display;
      Colormap map;
***************
*** 189,195 ****
    Pixmap stipple_pixmap;      /* Stipple mask for half-tone text. */
    unsigned long valuemask;
    XGCValues *values;
!     
    Window root = RootWindow (display, DefaultScreen (display));
  
    /*
--- 189,195 ----
    Pixmap stipple_pixmap;      /* Stipple mask for half-tone text. */
    unsigned long valuemask;
    XGCValues *values;
! 
    Window root = RootWindow (display, DefaultScreen (display));
  
    /*
***************
*** 205,212 ****
      _XMErrorCode = XME_CALLOC;
      return(NULL);
    }
!     
!   /* 
     * Create the XAssocTable
     */
    assoc_tab = (XAssocTable *)XCreateAssocTable(XASSOC_TABLE_SIZE);
--- 205,212 ----
      _XMErrorCode = XME_CALLOC;
      return(NULL);
    }
! 
!   /*
     * Create the XAssocTable
     */
    assoc_tab = (XAssocTable *)XCreateAssocTable(XASSOC_TABLE_SIZE);
***************
*** 266,279 ****
      if (strcmp(def_val, "box") == 0) menu_mode = BOX;
      else if (strcmp(def_val, "invert") == 0) menu_mode = INVERT;
    }
!     
    def_val = x_get_resource_string ("menuMouse", "MenuMouse");
    if (
        def_val != NULL &&
        DisplayCells(display, DefaultScreen(display)) > 2 &&
!       XAllocDisplayColor(display, 
!                        DefaultColormap(display, DefaultScreen(display)), 
!                        def_val, 
                         &mouse_color, &color_def)
        );
    else if (reverse &&
--- 266,279 ----
      if (strcmp(def_val, "box") == 0) menu_mode = BOX;
      else if (strcmp(def_val, "invert") == 0) menu_mode = INVERT;
    }
! 
    def_val = x_get_resource_string ("menuMouse", "MenuMouse");
    if (
        def_val != NULL &&
        DisplayCells(display, DefaultScreen(display)) > 2 &&
!       XAllocDisplayColor(display,
!                        DefaultColormap(display, DefaultScreen(display)),
!                        def_val,
                         &mouse_color, &color_def)
        );
    else if (reverse &&
***************
*** 282,294 ****
                              "white",
                              &mouse_color, &color_def)
           );
!     
    else if (XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
!                             "black", 
                              &mouse_color, &color_def)
           );
!     
    else ;
  
    def_val = x_get_resource_string ("menuBackground", "MenuBackground");
--- 282,294 ----
                              "white",
                              &mouse_color, &color_def)
           );
! 
    else if (XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
!                             "black",
                              &mouse_color, &color_def)
           );
! 
    else ;
  
    def_val = x_get_resource_string ("menuBackground", "MenuBackground");
***************
*** 335,349 ****
    def_val = x_get_resource_string ("paneForeground", "PaneForeground");
    if (
        def_val != NULL &&
!       DisplayCells(display, DefaultScreen(display)) > 2 
        )
      XAllocDisplayColor(display, DefaultColormap(display,
                                                DefaultScreen(display)),
                       def_val,
                       &p_frg_color, &color_def);
!         
    else if (reverse) XAllocDisplayColor(display,
!                                      DefaultColormap(display, 
                                                       DefaultScreen(display)),
                                       "white",
                                       &p_frg_color, &color_def);
--- 335,349 ----
    def_val = x_get_resource_string ("paneForeground", "PaneForeground");
    if (
        def_val != NULL &&
!       DisplayCells(display, DefaultScreen(display)) > 2
        )
      XAllocDisplayColor(display, DefaultColormap(display,
                                                DefaultScreen(display)),
                       def_val,
                       &p_frg_color, &color_def);
! 
    else if (reverse) XAllocDisplayColor(display,
!                                      DefaultColormap(display,
                                                       DefaultScreen(display)),
                                       "white",
                                       &p_frg_color, &color_def);
***************
*** 362,380 ****
                         &p_bdr_color, &color_def)
        );
    else if (reverse &&
!          XAllocDisplayColor(display, 
                              DefaultColormap(display, DefaultScreen(display)),
                              "white",
                              &p_bdr_color, &color_def)
           );
!   else XAllocDisplayColor(display, 
                          DefaultColormap(display, DefaultScreen(display)),
                          "black",
                          &p_bdr_color, &color_def);
!     
    def_val = x_get_resource_string ("paneBorderWidth", "PaneBorderWidth");
    if (def_val != NULL) p_bdr_width = atoi(def_val);
!     
    def_val = x_get_resource_string ("paneSpread", "PaneSpread");
    if (def_val != NULL) p_spread = atof(def_val);
  
--- 362,380 ----
                         &p_bdr_color, &color_def)
        );
    else if (reverse &&
!          XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
                              "white",
                              &p_bdr_color, &color_def)
           );
!   else XAllocDisplayColor(display,
                          DefaultColormap(display, DefaultScreen(display)),
                          "black",
                          &p_bdr_color, &color_def);
! 
    def_val = x_get_resource_string ("paneBorderWidth", "PaneBorderWidth");
    if (def_val != NULL) p_bdr_width = atoi(def_val);
! 
    def_val = x_get_resource_string ("paneSpread", "PaneSpread");
    if (def_val != NULL) p_spread = atof(def_val);
  
***************
*** 396,402 ****
                         DefaultColormap(display, DefaultScreen(display)),
                         def_val,
                         &s_frg_color, &color_def)
!       ); 
    else if (reverse &&
           XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
--- 396,402 ----
                         DefaultColormap(display, DefaultScreen(display)),
                         def_val,
                         &s_frg_color, &color_def)
!       );
    else if (reverse &&
           XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
***************
*** 409,415 ****
                              &s_frg_color, &color_def)
           ) ;
    else ;
!     
  
    def_val = x_get_resource_string ("selectionBorder", "SelectionBorder");
    if (
--- 409,415 ----
                              &s_frg_color, &color_def)
           ) ;
    else ;
! 
  
    def_val = x_get_resource_string ("selectionBorder", "SelectionBorder");
    if (
***************
*** 421,427 ****
                         &s_bdr_color, &color_def)
        ) ;
    else if (reverse &&
!          XAllocDisplayColor(display, 
                              DefaultColormap(display, DefaultScreen(display)),
                              "white",
                              &s_bdr_color, &color_def)
--- 421,427 ----
                         &s_bdr_color, &color_def)
        ) ;
    else if (reverse &&
!          XAllocDisplayColor(display,
                              DefaultColormap(display, DefaultScreen(display)),
                              "white",
                              &s_bdr_color, &color_def)
***************
*** 435,441 ****
  
    def_val = x_get_resource_string ("selectionBorderWidth", 
"SelectionBorderWidth");
    if (def_val != NULL) s_bdr_width = atoi(def_val);
!     
    def_val = x_get_resource_string ("selectionSpread", "SelectionSpread");
    if (def_val != NULL) s_spread = atof(def_val);
  
--- 435,441 ----
  
    def_val = x_get_resource_string ("selectionBorderWidth", 
"SelectionBorderWidth");
    if (def_val != NULL) s_bdr_width = atoi(def_val);
! 
    def_val = x_get_resource_string ("selectionSpread", "SelectionSpread");
    if (def_val != NULL) s_spread = atof(def_val);
  
***************
*** 446,452 ****
      char *data = NULL;
      int width, height;
  
!     switch (inact_pnum) 
        {
        case 0:
        data = (char *)dimple1_bits;
--- 446,452 ----
      char *data = NULL;
      int width, height;
  
!     switch (inact_pnum)
        {
        case 0:
        data = (char *)dimple1_bits;
***************
*** 495,501 ****
    /*
     * Load the mouse cursor.
     */
!         
    switch (menu_style) {
    case LEFT:
      cursor = XCreateBitmapFromData(display,
--- 495,501 ----
    /*
     * Load the mouse cursor.
     */
! 
    switch (menu_style) {
    case LEFT:
      cursor = XCreateBitmapFromData(display,
***************
*** 510,522 ****
                                        left_ptrmsk_height);
      mouse_cursor = XCreatePixmapCursor(
                                       display,
!                                      cursor, cursor_mask, 
                                       &mouse_color, &bkgnd_color,
                                       left_ptr_x_hot,
                                       left_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);            
      break;
    case RIGHT:
      cursor = XCreateBitmapFromData(display,
--- 510,522 ----
                                        left_ptrmsk_height);
      mouse_cursor = XCreatePixmapCursor(
                                       display,
!                                      cursor, cursor_mask,
                                       &mouse_color, &bkgnd_color,
                                       left_ptr_x_hot,
                                       left_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);
      break;
    case RIGHT:
      cursor = XCreateBitmapFromData(display,
***************
*** 537,543 ****
                                       right_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);            
      break;
    case CENTER:
      cursor = XCreateBitmapFromData(display,
--- 537,543 ----
                                       right_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);
      break;
    case CENTER:
      cursor = XCreateBitmapFromData(display,
***************
*** 558,564 ****
                                       cntr_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);            
      break;
    default:
      /* Error! Invalid style parameter. */
--- 558,564 ----
                                       cntr_ptr_y_hot
                                       );
      XFreePixmap(display, cursor);
!     XFreePixmap(display, cursor_mask);
      break;
    default:
      /* Error! Invalid style parameter. */
***************
*** 573,584 ****
    /*
     * Open the pane and selection fonts.
     */
!     
    p_fnt_info = XLoadQueryFont(display, p_fnt_name);
    if (p_fnt_info == NULL) {
      _XMErrorCode = XME_OPEN_FONT;
      return(NULL);
!       
    }
  
    s_fnt_info = XLoadQueryFont(display, s_fnt_name);
--- 573,584 ----
    /*
     * Open the pane and selection fonts.
     */
! 
    p_fnt_info = XLoadQueryFont(display, p_fnt_name);
    if (p_fnt_info == NULL) {
      _XMErrorCode = XME_OPEN_FONT;
      return(NULL);
! 
    }
  
    s_fnt_info = XLoadQueryFont(display, s_fnt_name);
***************
*** 619,625 ****
     * Initialize the internal pane and selection creation queues.
     */
    _XMWinQueInit();
!     
    /*
     * Create pane, active, and inactive GC's.
     */
--- 619,625 ----
     * Initialize the internal pane and selection creation queues.
     */
    _XMWinQueInit();
! 
    /*
     * Create pane, active, and inactive GC's.
     */
***************
*** 634,642 ****
    values->background = bkgnd_color.pixel;
    values->font = p_fnt_info->fid;
    values->line_width = p_bdr_width;
!     
    pane_GC = XCreateGC(
!                     display, 
                      root,
                      valuemask,
                      values);
--- 634,642 ----
    values->background = bkgnd_color.pixel;
    values->font = p_fnt_info->fid;
    values->line_width = p_bdr_width;
! 
    pane_GC = XCreateGC(
!                     display,
                      root,
                      valuemask,
                      values);
***************
*** 648,654 ****
    values->background = bkgnd_color.pixel;
    values->font = s_fnt_info->fid;
    values->line_width = s_bdr_width;
!   normal_select_GC = XCreateGC(display, 
                               root,
                               valuemask,
                               values);
--- 648,654 ----
    values->background = bkgnd_color.pixel;
    values->font = s_fnt_info->fid;
    values->line_width = s_bdr_width;
!   normal_select_GC = XCreateGC(display,
                               root,
                               valuemask,
                               values);
***************
*** 656,675 ****
     * Inverse video selection.
     */
  
!   values->foreground = bkgnd_color.pixel;             
    values->background = s_frg_color.pixel;
    values->font = s_fnt_info->fid;
    values->line_width = s_bdr_width;
!   inverse_select_GC = XCreateGC(display, 
                                root,
                                valuemask,
                                values);
    stipple_pixmap = XCreateBitmapFromData(display,
                                         root,
!                                        stipple_bits,          
!                                        stipple_width,         
!                                        stipple_height);       
!     
    /*
     * Finally, inactive pane header and selections
     */
--- 656,675 ----
     * Inverse video selection.
     */
  
!   values->foreground = bkgnd_color.pixel;
    values->background = s_frg_color.pixel;
    values->font = s_fnt_info->fid;
    values->line_width = s_bdr_width;
!   inverse_select_GC = XCreateGC(display,
                                root,
                                valuemask,
                                values);
    stipple_pixmap = XCreateBitmapFromData(display,
                                         root,
!                                        stipple_bits,
!                                        stipple_width,
!                                        stipple_height);
! 
    /*
     * Finally, inactive pane header and selections
     */
***************
*** 680,694 ****
    values->line_width = s_bdr_width;
    values->fill_style = FillStippled;
    values->stipple = stipple_pixmap;
!       
!   inact_GC = XCreateGC(display, 
                       root,
                       valuemask,
                       values);
  
    valuemask |= (GCGraphicsExposures);
    values->graphics_exposures = False;
!   inact_GC_noexpose = XCreateGC (display, 
                                 root,
                                 valuemask, values);
  
--- 680,694 ----
    values->line_width = s_bdr_width;
    values->fill_style = FillStippled;
    values->stipple = stipple_pixmap;
! 
!   inact_GC = XCreateGC(display,
                       root,
                       valuemask,
                       values);
  
    valuemask |= (GCGraphicsExposures);
    values->graphics_exposures = False;
!   inact_GC_noexpose = XCreateGC (display,
                                 root,
                                 valuemask, values);