comparison src/msdos.c @ 109117:240177dc47d7

Fix menu bar display on MS-DOS. msdos.c (IT_set_frame_parameters): Set menu-bar-lines according to menu-bar-mode, if not set in the frame parameters or in default-frame-alist.

109116:e723dd7c9121

  int redraw = 0, fg_set = 0, bg_set = 0;
  unsigned long orig_fg, orig_bg;
  Lisp_Object frame_bg, frame_fg;
  extern Lisp_Object Qdefault, QCforeground, QCbackground;
  struct tty_display_info *tty = FRAME_TTY (f);

  /* If we are creating a new frame, begin with the original screen colors
     used for the initial frame.  */
  if (EQ (alist, Vdefault_frame_alist)
      && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1)

      prop = parms[i];
      val  = values[i];

      if (EQ (prop, Qreverse))
	reverse = EQ (val, Qt);
    }

  need_to_reverse = reverse && !was_reverse;
  if (tty->termscript && need_to_reverse)
    fprintf (tty->termscript, "<INVERSE-VIDEO>\n");

	  if (tty->termscript)
	    fprintf (tty->termscript, "<TERM_INIT done, TTY_TYPE: %.*s>\n",
		     SBYTES (val), SDATA (val));
	}
      store_frame_param (f, prop, val);
    }

  /* If they specified "reverse", but not the colors, we need to swap
     the current frame colors.  */
  if (need_to_reverse)

109117:240177dc47d7

  int redraw = 0, fg_set = 0, bg_set = 0;
  unsigned long orig_fg, orig_bg;
  Lisp_Object frame_bg, frame_fg;
  extern Lisp_Object Qdefault, QCforeground, QCbackground;
  struct tty_display_info *tty = FRAME_TTY (f);
  extern Lisp_Object Qmenu_bar_lines;
  extern Lisp_Object Vmenu_bar_mode;
  int menu_bar_lines_defined =
    !NILP (Fassq (Qmenu_bar_lines, Vdefault_frame_alist));

  /* If we are creating a new frame, begin with the original screen colors
     used for the initial frame.  */
  if (EQ (alist, Vdefault_frame_alist)
      && initial_screen_colors[0] != -1 && initial_screen_colors[1] != -1)

      prop = parms[i];
      val  = values[i];

      if (EQ (prop, Qreverse))
	reverse = EQ (val, Qt);
      else if (!menu_bar_lines_defined && EQ (prop, Qmenu_bar_lines))
	menu_bar_lines_defined = 1;
    }

  need_to_reverse = reverse && !was_reverse;
  if (tty->termscript && need_to_reverse)
    fprintf (tty->termscript, "<INVERSE-VIDEO>\n");

	  if (tty->termscript)
	    fprintf (tty->termscript, "<TERM_INIT done, TTY_TYPE: %.*s>\n",
		     SBYTES (val), SDATA (val));
	}
      store_frame_param (f, prop, val);
    }

  /* If menu-bar-lines is neither in the frame parameters nor in
     default-frame-alist, set it according to menu-bar-mode.  */
  if (!menu_bar_lines_defined)
    {
      store_frame_param (f, Qmenu_bar_lines,
			 NILP (Vmenu_bar_mode)
			 ? make_number (0) : make_number (1));
      if (tty->termscript)
	fprintf (tty->termscript, "<MENU BAR LINES DEFAULTED: %d\n",
		 !NILP (Vmenu_bar_mode));
    }

  /* If they specified "reverse", but not the colors, we need to swap
     the current frame colors.  */
  if (need_to_reverse)