emacs: src/msdos.c comparison

comparison src/msdos.c @ 27462:a4cddf1245d7

(IT_clear_end_of_line): Print the extent of the cleared part of the line to the termscript file. (IT_clear_to_end): Clear the entire line, not just its beginning. (menu_help_message, prev_menu_help_message): New variables. (IT_menu_make_room): Make room for the help_text member. (IT_menu_display): New argument disp_help; all callers changed. If disp_help is non-zero, store the help text of the active menu item in menu_help_message. (XMenuAddPane): Initialize the help_text member to NULL. (XMenuAddSelection): New argument help_text. Store it in the XMenu structure. (XMenuActivate): New argument help_callback. If the value of menu_help_message has changed since the last time, display the menu help message text while waiting for the mouse to move. Clear the echo area before exiting. (XMenuDestroy): Free the help_text member.

author	Eli Zaretskii <eliz@gnu.org>
date	Thu, 27 Jan 2000 17:07:27 +0000
parents	4df4f3866b55
children	4ce3be69ca1f

comparison

equal deleted inserted replaced

-:9de1087abd5a
+:a4cddf1245d7
 if (new_pos_X >= first_unused || fatal_error_in_progress)
 return;
 IT_set_face (0);
+i = (j = first_unused - new_pos_X) * 2;
 if (termscript)
-fprintf (termscript, "<CLR:EOL>");
+fprintf (termscript, "<CLR:EOL[%d..%d)>", new_pos_X, first_unused);
-i = (j = first_unused - new_pos_X) * 2;
 spaces = sp = alloca (i);
 while (--j >= 0)
 {
 *sp++ = ' ';
 if (termscript)
 fprintf (termscript, "<CLR:EOS>");
 while (new_pos_Y < screen_size_Y) {
 new_pos_X = 0;
-IT_clear_end_of_line (0);
+IT_clear_end_of_line (screen_size_X);
 new_pos_Y++;
 }
 }
 static void
 Actually, I don't know the meaning of all the parameters of the functions
 here -- I only know how they are called by xmenu.c.  I could of course
 grab the nearest Xlib manual (down the hall, second-to-last door on the
 left), but I don't think it's worth the effort.  */
+static char *menu_help_message, *prev_menu_help_message;
 static XMenu *
 IT_menu_create ()
 {
 XMenu *menu;
 {
 int count = menu->allocated = 10;
 menu->text = (char **) xmalloc (count * sizeof (char *));
 menu->submenu = (XMenu **) xmalloc (count * sizeof (XMenu *));
 menu->panenumber = (int *) xmalloc (count * sizeof (int));
+menu->help_text = (char **) xmalloc (count * sizeof (char *));
 }
 else if (menu->allocated == menu->count)
 {
 int count = menu->allocated = menu->allocated + 10;
 menu->text
 	= (char **) xrealloc (menu->text, count * sizeof (char *));
 menu->submenu
 	= (XMenu **) xrealloc (menu->submenu, count * sizeof (XMenu *));
 menu->panenumber
 	= (int *) xrealloc (menu->panenumber, count * sizeof (int));
+menu->help_text
+	= (char **) xrealloc (menu->help_text, count * sizeof (char *));
 }
 }
 /* Search the given menu structure for a given pane number.  */
 }
 /* Display MENU at (X,Y) using FACES.  */
 static void
-IT_menu_display (XMenu *menu, int y, int x, int *faces)
+IT_menu_display (XMenu *menu, int y, int x, int *faces, int disp_help)
 {
 int i, j, face, width;
 struct glyph *text, *p;
 char *q;
 int mx, my;
 int enabled, mousehere;
 int row, col;
 struct frame *sf = SELECTED_FRAME();
+menu_help_message = NULL;
 width = menu->width;
 text = (struct glyph *) xmalloc ((width + 2) * sizeof (struct glyph));
 ScreenGetCursor (&row, &col);
 mouse_get_xy (&mx, &my);
 IT_update_begin (sf);
 IT_cursor_to (y + i, x);
 enabled
 	= (!menu->submenu[i] && menu->panenumber[i]) || (menu->submenu[i]);
 mousehere = (y + i == my && x <= mx && mx < x + width + 2);
 face = faces[enabled + mousehere * 2];
+if (disp_help && enabled + mousehere * 2 >= 2)
+	menu_help_message = menu->help_text[i];
 p = text;
 SET_CHAR_GLYPH (*p, ' ', face, 0);
 p++;
 for (j = 0, q = menu->text[i]; *q; j++)
 	{
 IT_menu_make_room (menu);
 menu->submenu[menu->count] = IT_menu_create ();
 menu->text[menu->count] = txt;
 menu->panenumber[menu->count] = ++menu->panecount;
+menu->help_text[menu->count] = NULL;
 menu->count++;
 /* Adjust length for possible control characters (which will
 be written as ^x).  */
 for (len = strlen (txt), p = txt; *p; p++)
 /* Create a new item in a menu pane.  */
 int
 XMenuAddSelection (Display *bar, XMenu *menu, int pane,
-		   int foo, char *txt, int enable)
+		   int foo, char *txt, int enable, char *help_text)
 {
 int len;
 char *p;
 if (pane)
 return XM_FAILURE;
 IT_menu_make_room (menu);
 menu->submenu[menu->count] = (XMenu *) 0;
 menu->text[menu->count] = txt;
 menu->panenumber[menu->count] = enable;
+menu->help_text[menu->count] = help_text;
 menu->count++;
 /* Adjust length for possible control characters (which will
 be written as ^x).  */
 for (len = strlen (txt), p = txt; *p; p++)
 /* Display menu, wait for user's response, and return that response.  */
 int
 XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
-	       int x0, int y0, unsigned ButtonMask, char **txt)
+	       int x0, int y0, unsigned ButtonMask, char **txt,
+	       void (*help_callback)(char *))
 {
 struct IT_menu_state *state;
 int statecount;
 int x, y, i, b;
 int screensize;
 /* Turn off the cursor.  Otherwise it shows through the menu
 panes, which is ugly.  */
 IT_display_cursor (0);
-IT_menu_display (menu, y0 - 1, x0 - 1, title_faces); /* display menu title */
+/* Display the menu title.  */
+IT_menu_display (menu, y0 - 1, x0 - 1, title_faces, 0);
 if (buffers_num_deleted)
 menu->text[0][7] = ' ';
 if ((onepane = menu->count == 1 && menu->submenu[0]))
 {
 menu->width = menu->submenu[0]->width;
 		    if (i == statecount - 1 && state[i].menu->submenu[dy])
 		      {
 			IT_menu_display (state[i].menu,
 					 state[i].y,
 					 state[i].x,
-					 faces);
+					 faces, 1);
 			state[statecount].menu = state[i].menu->submenu[dy];
 			state[statecount].pane = state[i].menu->panenumber[dy];
 			mouse_off ();
 			ScreenRetrieve (state[statecount].screen_behind
 					= xmalloc (screensize));
 		  }
 	      }
 	  IT_menu_display (state[statecount - 1].menu,
 			   state[statecount - 1].y,
 			   state[statecount - 1].x,
-			   faces);
+			   faces, 1);
 	}
 else
-	/* We are busy-waiting for the mouse to move, so let's be nice
+	{
-	   to other Windows applications by releasing our time slice.  */
+	  if ((menu_help_message || prev_menu_help_message)
-	__dpmi_yield ();
+	      && menu_help_message != prev_menu_help_message)
+	    {
+	      help_callback (menu_help_message);
+	      prev_menu_help_message = menu_help_message;
+	    }
+	  /* We are busy-waiting for the mouse to move, so let's be nice
+	     to other Windows applications by releasing our time slice.  */
+	  __dpmi_yield ();
+	}
 for (b = 0; b < mouse_button_count && !leave; b++)
 	{
 	  /* Only leave if user both pressed and released the mouse, and in
 	     that order.  This avoids popping down the menu pane unless
 	     the user is really done with it.  */
 mouse_off ();
 ScreenUpdate (state[0].screen_behind);
 if (screen_virtual_segment)
 dosv_refresh_virtual_screen (0, screen_size);
+message (0);
 while (statecount--)
 xfree (state[statecount].screen_behind);
 IT_display_cursor (1);	/* turn cursor back on */
 /* Clean up any mouse events that are waiting inside Emacs event queue.
 These events are likely to be generated before the menu was even
 	if (menu->submenu[i])
 	  XMenuDestroy (foo, menu->submenu[i]);
 xfree (menu->text);
 xfree (menu->submenu);
 xfree (menu->panenumber);
+xfree (menu->help_text);
 }
 xfree (menu);
+menu_help_message = prev_menu_help_message = NULL;
 }
 int
 x_pixel_width (struct frame *f)
 {

Mercurial > emacs

comparison src/msdos.c @ 27462:a4cddf1245d7