aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarl Heuer1995-05-25 15:18:16 +0000
committerKarl Heuer1995-05-25 15:18:16 +0000
commitc32cdd9a11eb985a8004ea9e2a8e0d80d7f5955c (patch)
tree81659fb8b749d8a6676cbcf30e1f7a0adb06ef98 /src
parenta1d789d0f966b6fc95e7b53b3b3f177e9d59134f (diff)
downloademacs-c32cdd9a11eb985a8004ea9e2a8e0d80d7f5955c.tar.gz
emacs-c32cdd9a11eb985a8004ea9e2a8e0d80d7f5955c.zip
(XTflash): Use pointers as args to select.
(XTread_socket, x_set_offset, x_set_window_size) (x_make_frame_invisible): Cast 2nd arg to x_wm_set_size_hint. (XTclear_end_of_line): Don't specify return type. (note_mouse_highlight): Declare args x and y. (x_icon_type): New declaration. (flashback): Declaration deleted.
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/xterm.c b/src/xterm.c
index da83bf51b89..8ea2810c78c 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -215,9 +215,10 @@ static Lisp_Object Qvendor_specific_keysyms;
215 215
216extern XrmDatabase x_load_resources (); 216extern XrmDatabase x_load_resources ();
217 217
218extern Lisp_Object x_icon_type ();
219
218void x_delete_display (); 220void x_delete_display ();
219 221
220static void flashback ();
221static void redraw_previous_char (); 222static void redraw_previous_char ();
222static void redraw_following_char (); 223static void redraw_following_char ();
223static unsigned int x_x_to_emacs_modifiers (); 224static unsigned int x_x_to_emacs_modifiers ();
@@ -755,7 +756,7 @@ XTwrite_glyphs (start, len)
755 to column FIRST_UNUSED (exclusive). The idea is that everything 756 to column FIRST_UNUSED (exclusive). The idea is that everything
756 from FIRST_UNUSED onward is already erased. */ 757 from FIRST_UNUSED onward is already erased. */
757 758
758static int 759static
759XTclear_end_of_line (first_unused) 760XTclear_end_of_line (first_unused)
760 register int first_unused; 761 register int first_unused;
761{ 762{
@@ -1083,7 +1084,7 @@ XTflash (f)
1083 break; 1084 break;
1084 1085
1085 /* Try to wait that long--but we might wake up sooner. */ 1086 /* Try to wait that long--but we might wake up sooner. */
1086 select (0, 0, 0, 0, &timeout); 1087 select (0, NULL, NULL, NULL, &timeout);
1087 } 1088 }
1088 } 1089 }
1089 1090
@@ -1761,7 +1762,6 @@ static void
1761note_mouse_movement (frame, event) 1762note_mouse_movement (frame, event)
1762 FRAME_PTR frame; 1763 FRAME_PTR frame;
1763 XMotionEvent *event; 1764 XMotionEvent *event;
1764
1765{ 1765{
1766 last_mouse_movement_time = event->time; 1766 last_mouse_movement_time = event->time;
1767 1767
@@ -1832,6 +1832,7 @@ static int disable_mouse_highlight;
1832static void 1832static void
1833note_mouse_highlight (f, x, y) 1833note_mouse_highlight (f, x, y)
1834 FRAME_PTR f; 1834 FRAME_PTR f;
1835 int x, y;
1835{ 1836{
1836 int row, column, portion; 1837 int row, column, portion;
1837 XRectangle new_glyph; 1838 XRectangle new_glyph;
@@ -3872,7 +3873,7 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
3872 /* Since the WM decorations come below top_pos now, 3873 /* Since the WM decorations come below top_pos now,
3873 we must put them below top_pos in the future. */ 3874 we must put them below top_pos in the future. */
3874 f->display.x->win_gravity = NorthWestGravity; 3875 f->display.x->win_gravity = NorthWestGravity;
3875 x_wm_set_size_hint (f, 0, 0); 3876 x_wm_set_size_hint (f, (long) 0, 0);
3876 } 3877 }
3877/* #endif */ 3878/* #endif */
3878 } 3879 }
@@ -4824,7 +4825,7 @@ x_set_offset (f, xoff, yoff, change_gravity)
4824 x_calc_absolute_position (f); 4825 x_calc_absolute_position (f);
4825 4826
4826 BLOCK_INPUT; 4827 BLOCK_INPUT;
4827 x_wm_set_size_hint (f, 0, 0); 4828 x_wm_set_size_hint (f, (long) 0, 0);
4828 4829
4829 /* It is a mystery why we need to add the border_width here 4830 /* It is a mystery why we need to add the border_width here
4830 when the frame is already visible, but experiment says we do. */ 4831 when the frame is already visible, but experiment says we do. */
@@ -4889,7 +4890,7 @@ x_set_window_size (f, change_gravity, cols, rows)
4889 pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows); 4890 pixelheight = CHAR_TO_PIXEL_HEIGHT (f, rows);
4890 4891
4891 f->display.x->win_gravity = NorthWestGravity; 4892 f->display.x->win_gravity = NorthWestGravity;
4892 x_wm_set_size_hint (f, 0, 0); 4893 x_wm_set_size_hint (f, (long) 0, 0);
4893 4894
4894 XSync (FRAME_X_DISPLAY (f), False); 4895 XSync (FRAME_X_DISPLAY (f), False);
4895 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), 4896 XResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
@@ -5155,7 +5156,7 @@ x_make_frame_invisible (f)
5155 program-specified, so that when the window is mapped again, it will be 5156 program-specified, so that when the window is mapped again, it will be
5156 placed at the same location, without forcing the user to position it 5157 placed at the same location, without forcing the user to position it
5157 by hand again (they have already done that once for this window.) */ 5158 by hand again (they have already done that once for this window.) */
5158 x_wm_set_size_hint (f, 0, 1); 5159 x_wm_set_size_hint (f, (long) 0, 1);
5159 5160
5160#ifdef HAVE_X11R4 5161#ifdef HAVE_X11R4
5161 5162