diff src/msdos.c @ 83505:57e924639750

Fix previous commit. * src/frame.c (make_terminal_frame): Use FRAME_BACKGROUND_PIXEL and FRAME_FOREGROUND_PIXEL. * src/gtkutil.c (xg_create_frame_widgets): Ditto. * src/macfns.c (x_set_mouse_color): Ditto. * src/macfns.c (x_make_gc): Ditto. * src/msdos.c (ScreenVisualBell): Ditto. * src/msdos.c (internal_terminal_init): Ditto. * src/w32term.c (x_free_frame_resources): Ditto. * src/xfns.c (x_window): Ditto. * src/xterm.c (x_scroll_bar_create): Ditto. * src/xterm.c (x_scroll_bar_set_handle): Ditto. git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-545

--- a/src/msdos.c	Sat Apr 01 16:11:29 2006 +0000
+++ b/src/msdos.c	Sat Apr 01 16:37:26 2006 +0000
@@ -508,8 +508,8 @@
 {
   /* This creates an xor-mask that will swap the default fore- and
      background colors.  */
-  do_visible_bell (((the_only_x_display.foreground_pixel
-		     ^ the_only_x_display.background_pixel)
+  do_visible_bell (((FRAME_FOREGROUND_PIXEL (SELECTED_FRAME ())
+		     ^ FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()))
 		    * 0x11) & 0x7f);
 }
 #endif
@@ -2531,8 +2531,8 @@
   initial_screen_colors[0] = initial_screen_colors[1] = -1;
 
   bzero (&the_only_x_display, sizeof the_only_x_display);
-  the_only_x_display.background_pixel = 7; /* White */
-  the_only_x_display.foreground_pixel = 0; /* Black */
+  FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = 7; /* White */
+  FRAME_FOREGROUND_PIXEL (SELECTED_FRAME ()) = 0; /* Black */
   bright_bg ();
   colors = getenv ("EMACSCOLORS");
   if (colors && strlen (colors) >= 2)
@@ -2543,13 +2543,13 @@
       else if (isxdigit (colors[0]))
         colors[0] -= (isupper (colors[0]) ? 'A' : 'a') - 10;
       if (colors[0] >= 0 && colors[0] < 16)
-        the_only_x_display.foreground_pixel = colors[0];
+        FRAME_FOREGROUND_PIXEL (SELECTED_FRAME ()) = colors[0];
       if (isdigit (colors[1]))
         colors[1] -= '0';
       else if (isxdigit (colors[1]))
         colors[1] -= (isupper (colors[1]) ? 'A' : 'a') - 10;
       if (colors[1] >= 0 && colors[1] < 16)
-        the_only_x_display.background_pixel = colors[1];
+        FRAME_BACKGROUND_PIXEL (SELECTED_FRAME ()) = colors[1];
     }
   the_only_x_display.font = (XFontStruct *)1;   /* must *not* be zero */
   the_only_x_display.display_info.mouse_face_mouse_frame = NULL;