aboutsummaryrefslogtreecommitdiffstats
path: root/src/widget.c
diff options
context:
space:
mode:
authorGerd Moellmann1999-09-15 12:58:42 +0000
committerGerd Moellmann1999-09-15 12:58:42 +0000
commitccce60568f5dbff973b92a30f740d83f8915388f (patch)
treed411b162498e07b3c463b3c545580f9c19f4843f /src/widget.c
parentb0f61f15254553b1a177059254d2ed3c7bafd9d4 (diff)
downloademacs-ccce60568f5dbff973b92a30f740d83f8915388f.tar.gz
emacs-ccce60568f5dbff973b92a30f740d83f8915388f.zip
(set_frame_size, EmacsFrameSetCharSize): Remove
unused variables. (mark_shell_size_user_specified): Put in #if 0 because not used. (create_frame_gcs): Put in #if 0 because currently unused. (first_frame_p): Ditto.
Diffstat (limited to 'src/widget.c')
-rw-r--r--src/widget.c33
1 files changed, 11 insertions, 22 deletions
diff --git a/src/widget.c b/src/widget.c
index e65ee014bd3..65947754dae 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -238,6 +238,8 @@ get_wm_shell (w)
238 return wmshell; 238 return wmshell;
239} 239}
240 240
241#if 0 /* Currently not used. */
242
241static void 243static void
242mark_shell_size_user_specified (wmshell) 244mark_shell_size_user_specified (wmshell)
243 Widget wmshell; 245 Widget wmshell;
@@ -248,6 +250,8 @@ mark_shell_size_user_specified (wmshell)
248 ((WMShellWidget) wmshell)->wm.size_hints.flags |= USSize; 250 ((WMShellWidget) wmshell)->wm.size_hints.flags |= USSize;
249} 251}
250 252
253#endif
254
251 255
252/* Can't have static frame locals because of some broken compilers. 256/* Can't have static frame locals because of some broken compilers.
253 Normally, initializing a variable like this doesn't work in emacs, 257 Normally, initializing a variable like this doesn't work in emacs,
@@ -255,7 +259,9 @@ mark_shell_size_user_specified (wmshell)
255 thus have its data not go into text space) because Xt needs to 259 thus have its data not go into text space) because Xt needs to
256 write to initialized data objects too. 260 write to initialized data objects too.
257 */ 261 */
262#if 0
258static Boolean first_frame_p = True; 263static Boolean first_frame_p = True;
264#endif
259 265
260static void 266static void
261set_frame_size (ew) 267set_frame_size (ew)
@@ -296,30 +302,12 @@ set_frame_size (ew)
296 302
297 */ 303 */
298 304
299 /* Geometry of the AppShell */
300 int app_flags = 0;
301 int app_x = 0;
302 int app_y = 0;
303 unsigned int app_w = 0;
304 unsigned int app_h = 0;
305
306 /* Geometry of the EmacsFrame */
307 int frame_flags = 0;
308 int frame_x = 0;
309 int frame_y = 0;
310 unsigned int frame_w = 0;
311 unsigned int frame_h = 0;
312
313 /* Hairily merged geometry */ 305 /* Hairily merged geometry */
314 int x = 0;
315 int y = 0;
316 unsigned int w = ew->emacs_frame.frame->width; 306 unsigned int w = ew->emacs_frame.frame->width;
317 unsigned int h = ew->emacs_frame.frame->height; 307 unsigned int h = ew->emacs_frame.frame->height;
318 int flags = 0;
319 308
320 Widget wmshell = get_wm_shell ((Widget) ew); 309 Widget wmshell = get_wm_shell ((Widget) ew);
321 /* Each Emacs shell is now independent and top-level. */ 310 /* Each Emacs shell is now independent and top-level. */
322 Widget app_shell = wmshell;
323 311
324 if (! XtIsSubclass (wmshell, shellWidgetClass)) abort (); 312 if (! XtIsSubclass (wmshell, shellWidgetClass)) abort ();
325 313
@@ -432,7 +420,6 @@ set_frame_size (ew)
432 { 420 {
433 struct frame* frame = ew->emacs_frame.frame; 421 struct frame* frame = ew->emacs_frame.frame;
434 Dimension pixel_width, pixel_height; 422 Dimension pixel_width, pixel_height;
435 char shell_position [32];
436 423
437 /* Take into account the size of the scrollbar. Always use the 424 /* Take into account the size of the scrollbar. Always use the
438 number of columns occupied by the scroll bar here otherwise we 425 number of columns occupied by the scroll bar here otherwise we
@@ -546,6 +533,8 @@ update_wm_hints (ew)
546 0); 533 0);
547} 534}
548 535
536#if 0
537
549static void 538static void
550create_frame_gcs (ew) 539create_frame_gcs (ew)
551 EmacsFrame ew; 540 EmacsFrame ew;
@@ -565,6 +554,8 @@ create_frame_gcs (ew)
565 s->output_data.x->white_relief.gc = 0; 554 s->output_data.x->white_relief.gc = 0;
566} 555}
567 556
557#endif /* 0 */
558
568static char setup_frame_cursor_bits[] = 559static char setup_frame_cursor_bits[] =
569{ 560{
570 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 561 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -906,12 +897,10 @@ EmacsFrameSetCharSize (widget, columns, rows)
906 int rows; 897 int rows;
907{ 898{
908 EmacsFrame ew = (EmacsFrame) widget; 899 EmacsFrame ew = (EmacsFrame) widget;
909 Dimension pixel_width, pixel_height, granted_width, granted_height; 900 Dimension pixel_width, pixel_height;
910 XtGeometryResult result;
911 struct frame *f = ew->emacs_frame.frame; 901 struct frame *f = ew->emacs_frame.frame;
912 Arg al[10]; 902 Arg al[10];
913 int ac = 0; 903 int ac = 0;
914 Dimension border_width;
915 904
916 if (columns < 3) columns = 3; /* no way buddy */ 905 if (columns < 3) columns = 3; /* no way buddy */
917 906