emacs: src/xterm.c comparison

comparison src/xterm.c @ 25716:e2d5cd96727b

(x_scroll_bar_handle_click): Compile only if not USE_TOOLKIT_SCROLL_BARS. (x_scroll_bar_set_handle, x_scroll_bar_note_movement): Ditto. (x_produce_glyphs): Remove unused variable(s). (x_alloc_nearest_color_for_widget, note_tool_bar_highlight, x_set_toolkit_scroll_bar_thumb): Ditto. (x_scroll_bar_create): Move local variable to the conditionally compiled section of code where it is used. (x_scroll_bar_create): Remove unused variable(s). (x_scroll_bar_remove, XTread_socket): Ditto. (XTread_socket) <ConfigureNotify>: Move variables used for non-toolkit case into conditionally compiled section of code.

author	Gerd Moellmann <gerd@gnu.org>
date	Tue, 14 Sep 1999 13:09:49 +0000
parents	121bd925411f
children	84921c27b2b5

comparison

equal deleted inserted replaced

-:feaedc03dbc8
+:e2d5cd96727b
 static void x_encode_char P_ ((int, XChar2b *, struct font_info *));
 static void x_append_glyph P_ ((struct it *));
 static void x_append_stretch_glyph P_ ((struct it *it, Lisp_Object,
 					int, int, double));
 static void x_produce_glyphs P_ ((struct it *));
-static void x_produce_special_glyphs P_ ((struct it *, enum display_element_type));
 static void x_produce_image_glyph P_ ((struct it *it));
 /* Return a pointer to per-char metric information in FONT of a
 character pointed by B which is a pointer to an XChar2b.  */
 {
 XChar2b char2b;
 XFontStruct *font;
 struct face *face;
 XCharStruct *pcm;
-struct it ci;
 int font_not_found_p;
-int c;
 /* Maybe translate single-byte characters to multibyte.  */
 it->char_to_display = it->c;
 if (unibyte_display_via_language_environment
 	  && SINGLE_BYTE_CHAR_P (it->c)
 struct glyph_string *next, *prev;
 };
-#if GLYPH_DEBUG
+#if 0
 static void
 x_dump_glyph_string (s)
 struct glyph_string *s;
 {
 static void x_set_glyph_string_clipping P_ ((struct glyph_string *));
 static void x_set_glyph_string_gc P_ ((struct glyph_string *));
 static void x_draw_glyph_string_background P_ ((struct glyph_string *,
 						int));
 static void x_draw_glyph_string_foreground P_ ((struct glyph_string *));
-static void x_draw_glyph_string_underline P_ ((struct glyph_string *));
 static void x_draw_glyph_string_box P_ ((struct glyph_string *));
 static void x_draw_glyph_string  P_ ((struct glyph_string *));
 static void x_compute_glyph_string_overhangs P_ ((struct glyph_string *));
 static void x_set_cursor_gc P_ ((struct glyph_string *));
 static void x_set_mode_line_face_gc P_ ((struct glyph_string *));
 Colormap cmap;
 XColor *color;
 {
 struct frame *f;
 struct x_display_info *dpyinfo;
-Lisp_Object tail, frame;
+Lisp_Object tail;
-Widget parent;
 dpyinfo = x_display_info_for_display (XtDisplay (widget));
 /* Find the top-level shell of the widget.  Note that this function
 can be called when the widget is not yet realized, so XtWindow
 struct window *w = XWINDOW (window);
 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
 int hpos, vpos;
 struct glyph *glyph;
 struct glyph_row *row;
-int i, j, area;
+int i;
 Lisp_Object enabled_p;
 int prop_idx;
 enum draw_glyphs_face draw = DRAW_IMAGE_RAISED;
-int on_highlight_p, mouse_down_p, rc;
+int mouse_down_p, rc;
 /* Function note_mouse_highlight is called with negative x(y
 values when mouse moves outside of the frame.  */
 if (x <= 0 || y <= 0)
 {
 x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
 struct scroll_bar *bar;
 int portion, position, whole;
 {
 float top, shown;
-Arg av[2];
 Widget widget = SCROLL_BAR_X_WIDGET (bar);
 if (whole == 0)
 top = 0, shown = 1;
 else
 x_scroll_bar_create (w, top, left, width, height)
 struct window *w;
 int top, left, width, height;
 {
 struct frame *f = XFRAME (w->frame);
-#ifdef USE_X_TOOLKIT
-Arg av[10];
-#endif
-int ac = 0;
-Window window;
 struct scroll_bar *bar
 = XSCROLL_BAR (Fmake_vector (make_number (SCROLL_BAR_VEC_SIZE), Qnil));
 BLOCK_INPUT;
 x_create_toolkit_scroll_bar (f, bar);
 #else /* not USE_TOOLKIT_SCROLL_BARS */
 {
 XSetWindowAttributes a;
 unsigned long mask;
+Window window;
 a.background_pixel = f->output_data.x->scroll_bar_background_pixel;
 if (a.background_pixel == -1)
 a.background_pixel = f->output_data.x->background_pixel;
 fit inside its rectangle, but if the user is dragging the scroll
 bar handle, we want to let them drag it down all the way, so that
 the bar's top is as far down as it goes; otherwise, there's no way
 to move to the very end of the buffer.  */
+#ifndef USE_TOOLKIT_SCROLL_BARS
 static void
 x_scroll_bar_set_handle (bar, start, end, rebuild)
 struct scroll_bar *bar;
 int start, end;
 int rebuild;
 {
-#ifndef USE_TOOLKIT_SCROLL_BARS
 int dragging = ! NILP (bar->dragging);
 Window w = SCROLL_BAR_X_WINDOW (bar);
 FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
 GC gc = f->output_data.x->normal_gc;
 		  False);
 }
 UNBLOCK_INPUT;
-#endif /* not USE_TOOLKIT_SCROLL_BARS */
+}
-}
+#endif /* !USE_TOOLKIT_SCROLL_BARS */
 /* Destroy scroll bar BAR, and set its Emacs window's scroll bar to
 nil.  */
 static void
 x_scroll_bar_remove (bar)
 struct scroll_bar *bar;
 {
-FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
 BLOCK_INPUT;
 #if USE_TOOLKIT_SCROLL_BARS
 XtDestroyWidget (SCROLL_BAR_X_WIDGET (bar));
 #else /* not USE_TOOLKIT_SCROLL_BARS */
-XDestroyWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar));
+{
+FRAME_PTR f = XFRAME (WINDOW_FRAME (XWINDOW (bar->window)));
+XDestroyWindow (FRAME_X_DISPLAY (f), SCROLL_BAR_X_WINDOW (bar));
+}
 #endif /* not USE_TOOLKIT_SCROLL_BARS */
 /* Disassociate this scroll bar from its window.  */
 XWINDOW (bar->window)->vertical_scroll_bar = Qnil;
 is set to something other than no_event, it is enqueued.
 This may be called from a signal handler, so we have to ignore GC
 mark bits.  */
+#ifndef USE_TOOLKIT_SCROLL_BARS
 static void
 x_scroll_bar_handle_click (bar, event, emacs_event)
 struct scroll_bar *bar;
 XEvent *event;
 struct input_event *emacs_event;
 	  x_scroll_bar_set_handle (bar, new_start, new_end, 0);
 	}
 }
 }
+#endif /* !USE_TOOLKIT_SCROLL_BARS */
 /* Return information to the user about the current position of the mouse
 on the scroll bar.  */
 static void
 		  {
 		    /* Ghostview job completed.  Kill it.  We could
 		       reply with "Next" if we received "Page", but we
 		       currently never do because we are interested in
 		       images, only, which should have 1 page.  */
-		    Window gs_window = (Window) event.xclient.data.l[0];
 		    Pixmap pixmap = (Pixmap) event.xclient.data.l[1];
 		    struct frame *f
 		      = x_window_to_frame (dpyinfo, event.xclient.window);
 		    x_kill_gs_process (pixmap, f);
 		    expose_frame (f, 0, 0, 0, 0);
 	    case ConfigureNotify:
 	      f = x_top_window_to_frame (dpyinfo, event.xconfigure.window);
 	      if (f)
 		{
+#ifndef USE_X_TOOLKIT
 		  int rows = PIXEL_TO_CHAR_HEIGHT (f, event.xconfigure.height);
 		  int columns = PIXEL_TO_CHAR_WIDTH (f, event.xconfigure.width);
-#ifndef USE_X_TOOLKIT
 		  /* In the toolkit version, change_frame_size
 		     is called by the code that handles resizing
 		     of the EmacsFrame widget.  */
 		  /* Even if the number of character rows and columns has

Mercurial > emacs

comparison src/xterm.c @ 25716:e2d5cd96727b