ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.132 by root, Thu Feb 3 07:18:30 2005 UTC vs.
Revision 1.138 by root, Wed Feb 16 20:32:05 2005 UTC

… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "main.intpro" /* PROTOS for internal routines */
36 35
37#include <csignal> 36#include <csignal>
38#include <cstring> 37#include <cstring>
39 38
40#ifdef TTY_GID_SUPPORT 39#ifdef TTY_GID_SUPPORT
… …
181 if (!keyboard) 180 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n"); 181 rxvt_fatal ("out of memory, aborting.\n");
183#endif 182#endif
184} 183}
185 184
186rxvt_term::~rxvt_term () 185// clean up the most important stuff, do *not* call x or free mem etc.
186// for use before an emergency exit
187void rxvt_term::emergency_cleanup ()
187{ 188{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
190 if (cmd_pid) 189 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 190 kill (-cmd_pid, SIGHUP);
192 191
193#ifdef UTMP_SUPPORT 192#ifdef UTMP_SUPPORT
194 privileged_utmp (RESTORE); 193 privileged_utmp (RESTORE);
195#endif 194#endif
196 195
197 pty.put (); 196 pty.put ();
197}
198
199rxvt_term::~rxvt_term ()
200{
201 termlist.erase (find (termlist.begin (), termlist.end(), this));
202
203 emergency_cleanup ();
198 204
199#if ENABLE_STYLES 205#if ENABLE_STYLES
200 for (int i = RS_styleCount; --i; ) 206 for (int i = RS_styleCount; --i; )
201 if (TermWin.fontset[i] != TermWin.fontset[0]) 207 if (TermWin.fontset[i] != TermWin.fontset[0])
202 delete TermWin.fontset[i]; 208 delete TermWin.fontset[i];
203#endif 209#endif
204 delete TermWin.fontset[0]; 210 delete TermWin.fontset[0];
205 211
206 if (display) 212 if (display)
207 { 213 {
214 dDisp;
215
208 selection_clear (); 216 selection_clear ();
209 217
210#ifdef USE_XIM 218#ifdef USE_XIM
211 im_destroy (); 219 im_destroy ();
212#endif 220#endif
213#ifdef MENUBAR 221#ifdef MENUBAR
214 if (menubarGC) XFreeGC (display->display, menubarGC); 222 if (menubarGC) XFreeGC (disp, menubarGC);
215#endif 223#endif
216#ifdef XTERM_SCROLLBAR 224#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 225 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
218 if (ShadowGC) XFreeGC (display->display, ShadowGC); 226 if (ShadowGC) XFreeGC (disp, ShadowGC);
219#endif 227#endif
220#ifdef PLAIN_SCROLLBAR 228#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 229 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
222#endif 230#endif
223#ifdef NEXT_SCROLLBAR 231#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (display->display, blackGC); 232 if (blackGC) XFreeGC (disp, blackGC);
225 if (whiteGC) XFreeGC (display->display, whiteGC); 233 if (whiteGC) XFreeGC (disp, whiteGC);
226 if (grayGC) XFreeGC (display->display, grayGC); 234 if (grayGC) XFreeGC (disp, grayGC);
227 if (darkGC) XFreeGC (display->display, darkGC); 235 if (darkGC) XFreeGC (disp, darkGC);
228 if (stippleGC) XFreeGC (display->display, stippleGC); 236 if (stippleGC) XFreeGC (disp, stippleGC);
229 if (dimple) XFreePixmap (display->display, dimple); 237 if (dimple) XFreePixmap (disp, dimple);
230 if (upArrow) XFreePixmap (display->display, upArrow); 238 if (upArrow) XFreePixmap (disp, upArrow);
231 if (downArrow) XFreePixmap (display->display, downArrow); 239 if (downArrow) XFreePixmap (disp, downArrow);
232 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 240 if (upArrowHi) XFreePixmap (disp, upArrowHi);
233 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 241 if (downArrowHi) XFreePixmap (disp, downArrowHi);
234#endif 242#endif
235#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 243#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
236 if (topShadowGC) XFreeGC (display->display, topShadowGC); 244 if (topShadowGC) XFreeGC (disp, topShadowGC);
237 if (botShadowGC) XFreeGC (display->display, botShadowGC); 245 if (botShadowGC) XFreeGC (disp, botShadowGC);
238 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 246 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
239#endif 247#endif
240 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 248 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
241 249
242#if defined(MENUBAR) && (MENUBAR_MAX > 1) 250#if defined(MENUBAR) && (MENUBAR_MAX > 1)
243 delete menuBar.drawable; 251 delete menuBar.drawable;
244 //if (menuBar.win) 252 //if (menuBar.win)
245 // XDestroyWindow (display->display, menuBar.win); 253 // XDestroyWindow (disp, menuBar.win);
246#endif 254#endif
247 delete TermWin.drawable; 255 delete TermWin.drawable;
248 // destroy all windows 256 // destroy all windows
249 if (TermWin.parent[0]) 257 if (TermWin.parent[0]
258#if ENABLE_FRILLS
259 && !rs[Rs_embed]
260#endif
261 )
250 XDestroyWindow (display->display, TermWin.parent[0]); 262 XDestroyWindow (disp, TermWin.parent[0]);
251 } 263 }
252 264
253 // TODO: free pixcolours, colours should become part of rxvt_display 265 // TODO: free pixcolours, colours should become part of rxvt_display
254 266
255 delete pix_colors_focused; 267 delete pix_colors_focused;
… …
261 273
262 scr_release (); 274 scr_release ();
263 275
264 /* clear all resources */ 276 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 277 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 278 free (allocated [i]);
267 279
268 free (selection.text); 280 free (selection.text);
269 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
270 free (env_windowid); 282 free (env_windowid);
271 free (env_display); 283 free (env_display);
… …
277 289
278 delete envv; 290 delete envv;
279 delete argv; 291 delete argv;
280 292
281#ifdef KEYSYM_RESOURCE 293#ifdef KEYSYM_RESOURCE
282 delete keyboard; 294 delete keyboard;
283#endif 295#endif
284} 296}
285 297
286void 298void
287rxvt_term::destroy () 299rxvt_term::destroy ()
… …
340 352
341 delete this; 353 delete this;
342} 354}
343 355
344/*----------------------------------------------------------------------*/ 356/*----------------------------------------------------------------------*/
357/*
358 * Exit gracefully, clearing the utmp entry and restoring tty attributes
359 * TODO: if debugging, this should free up any known resources if we can
360 */
361static XErrorHandler old_xerror_handler;
362
363static void
364rxvt_emergency_cleanup ()
365{
366 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
367 (*t)->emergency_cleanup ();
368}
369
370#if ENABLE_FRILLS
371static void
372print_x_error (Display *dpy, XErrorEvent *event)
373{
374 char buffer[BUFSIZ];
375 char mesg[BUFSIZ];
376 char number[32];
377 char *mtype = "XlibMessage";
378 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
379 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
380 rxvt_warn ("An X Error occured, trying to continue after report.\n");
381 rxvt_warn ("%s: %s\n", mesg, buffer);
382 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
383 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
384 sprintf(number, "%d", event->request_code);
385 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
386 rxvt_warn ("(which is %s)\n", buffer);
387 if (event->request_code >= 128) {
388 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
389 mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
391 }
392 if ((event->error_code == BadWindow) ||
393 (event->error_code == BadPixmap) ||
394 (event->error_code == BadCursor) ||
395 (event->error_code == BadFont) ||
396 (event->error_code == BadDrawable) ||
397 (event->error_code == BadColor) ||
398 (event->error_code == BadGC) ||
399 (event->error_code == BadIDChoice) ||
400 (event->error_code == BadValue) ||
401 (event->error_code == BadAtom)) {
402 if (event->error_code == BadValue)
403 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
404 mesg, BUFSIZ);
405 else if (event->error_code == BadAtom)
406 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
407 mesg, BUFSIZ);
408 else
409 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
410 mesg, BUFSIZ);
411 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
412 }
413 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
416}
417#endif
418
419int
420rxvt_xerror_handler (Display *display, XErrorEvent *event)
421{
422 if (GET_R->allowedxerror == -1)
423 GET_R->allowedxerror = event->error_code;
424 else
425 {
426 //TODO: GET_R is most likely not the terminal which caused the error
427 //TODO: maybe just output the error and continue?
428#if ENABLE_FRILLS
429 print_x_error (display, event);
430#else
431 old_xerror_handler (display, event);
432#endif
433 }
434
435 return 0;
436}
437
438int
439rxvt_xioerror_handler (Display *display)
440{
441 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
442 DisplayString (display));
443 rxvt_emergency_cleanup ();
444 _exit (EXIT_FAILURE);
445}
446
447/*
448 * Catch a fatal signal and tidy up before quitting
449 */
450void
451rxvt_term::sig_term (sig_watcher &w)
452{
453#ifdef DEBUG_CMD
454 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
455#endif
456 rxvt_emergency_cleanup ();
457 signal (w.signum, SIG_DFL);
458 kill (getpid (), w.signum);
459}
460
461/*----------------------------------------------------------------------*/
345/* rxvt_init () */ 462/* rxvt_init () */
346bool 463bool
347rxvt_term::init (int argc, const char *const *argv) 464rxvt_term::init (int argc, const char *const *argv)
348{ 465{
349 SET_R (this); 466 SET_R (this);
… …
369 scrollBar.setIdle (); /* set existence for size calculations */ 486 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 487#endif
371 488
372 create_windows (argc, argv); 489 create_windows (argc, argv);
373 490
491 dDisp;
492
374 init_xlocale (); 493 init_xlocale ();
375 494
376 scr_reset (); /* initialize screen */ 495 scr_reset (); /* initialize screen */
377 496
378#if 0 497#if 0
379 XSynchronize (display->display, True); 498 XSynchronize (disp, True);
380#endif 499#endif
381 500
382#ifdef HAVE_SCROLLBARS 501#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 502 if (options & Opt_scrollBar)
384 resize_scrollbar (); /* create and map scrollbar */ 503 resize_scrollbar (); /* create and map scrollbar */
385#endif 504#endif
386#if (MENUBAR_MAX) 505#if (MENUBAR_MAX)
387 if (menubar_visible ()) 506 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 507 XMapWindow (disp, menuBar.win);
389#endif 508#endif
390#ifdef TRANSPARENT 509#ifdef TRANSPARENT
391 if (options & Opt_transparent) 510 if (options & Opt_transparent)
392 { 511 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 512 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 513 check_our_parents ();
395 rootwin_ev.start (display, display->root); 514 rootwin_ev.start (display, display->root);
396 } 515 }
397#endif 516#endif
398 517
399 XMapWindow (display->display, TermWin.vt); 518 XMapWindow (disp, TermWin.vt);
400 XMapWindow (display->display, TermWin.parent[0]); 519 XMapWindow (disp, TermWin.parent[0]);
401 520
402 set_colorfgbg (); 521 set_colorfgbg ();
403 522
404 init_command (cmd_argv); 523 init_command (cmd_argv);
405 524
… …
409 528
410 check_ev.start (); 529 check_ev.start ();
411 530
412 return true; 531 return true;
413} 532}
414
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
416 533
417void 534void
418rxvt_init () 535rxvt_init ()
419{ 536{
420 /* 537 /*
… …
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 550 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 551 /* signal (SIGURG, SIG_DFL); */
435 552
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 553 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 554 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 555 XSetIOErrorHandler (rxvt_xioerror_handler);
439} 556}
440 557
441/* ------------------------------------------------------------------------- * 558/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER * 559 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */ 560 * ------------------------------------------------------------------------- */
… …
456 if (pid == (*t)->cmd_pid) 573 if (pid == (*t)->cmd_pid)
457 { 574 {
458 (*t)->destroy (); 575 (*t)->destroy ();
459 break; 576 break;
460 } 577 }
461}
462
463/*----------------------------------------------------------------------*/
464/*
465 * Exit gracefully, clearing the utmp entry and restoring tty attributes
466 * TODO: if debugging, this should free up any known resources if we can
467 */
468void
469rxvt_destroy_all ()
470{
471 // TODO: rxvtd should clean up all ressources
472 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
473 (*t)->destroy ();
474}
475
476/*
477 * Catch a fatal signal and tidy up before quitting
478 */
479void
480rxvt_term::sig_term (sig_watcher &w)
481{
482#ifdef DEBUG_CMD
483 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
484#endif
485 rxvt_destroy_all ();
486 signal (w.signum, SIG_DFL);
487 kill (getpid (), w.signum);
488}
489
490/* INTPROTO */
491int
492rxvt_xerror_handler (Display *display, XErrorEvent *event)
493{
494 if (GET_R->allowedxerror == -1)
495 GET_R->allowedxerror = event->error_code;
496 else
497 {
498 old_xerror_handler (display, event);
499 GET_R->destroy ();
500 }
501
502 return 0;
503} 578}
504 579
505/* ------------------------------------------------------------------------- * 580/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 581 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 582 * ------------------------------------------------------------------------- */
… …
620 * if width/height are non-zero then override calculated width/height 695 * if width/height are non-zero then override calculated width/height
621 */ 696 */
622void 697void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 698rxvt_term::window_calc (unsigned int width, unsigned int height)
624{ 699{
625 short recalc_x, recalc_y; 700 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 701 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 702 unsigned int w, h;
628 unsigned int max_width, max_height; 703 unsigned int max_width, max_height;
704 dDisp;
629 705
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 706 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 707 TermWin.ncol, TermWin.nrow, szHint.width,
632 szHint.height)); 708 szHint.height));
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 709 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
639 if (!parsed_geometry) 715 if (!parsed_geometry)
640 { 716 {
641 parsed_geometry = 1; 717 parsed_geometry = 1;
642 if (rs[Rs_geometry]) 718 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720
644 if (flags & WidthValue) 721 if (flags & WidthValue)
645 { 722 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 723 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
647 szHint.flags |= USSize; 724 szHint.flags |= USSize;
648 } 725 }
726
649 if (flags & HeightValue) 727 if (flags & HeightValue)
650 { 728 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 729 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
652 szHint.flags |= USSize; 730 szHint.flags |= USSize;
653 } 731 }
732
654 if (flags & XValue) 733 if (flags & XValue)
655 { 734 {
656 szHint.x = x; 735 szHint.x = x;
657 szHint.flags |= USPosition; 736 szHint.flags |= USPosition;
658 if (flags & XNegative) 737 if (flags & XNegative)
659 { 738 {
660 recalc_x = 1; 739 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 740 szHint.win_gravity = NorthEastGravity;
662 } 741 }
663 } 742 }
743
664 if (flags & YValue) 744 if (flags & YValue)
665 { 745 {
666 szHint.y = y; 746 szHint.y = y;
667 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
668 if (flags & YNegative) 748 if (flags & YNegative)
… …
731 811
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 812 if (scrollbar_visible () && (options & Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 813 window_sb_x = szHint.width - sb_w;
734 814
735 if (recalc_x) 815 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 816 szHint.x += (DisplayWidth (disp, display->screen)
737 - szHint.width - 2 * TermWin.ext_bwidth); 817 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 818 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 819 szHint.y += (DisplayHeight (disp, display->screen)
740 - szHint.height - 2 * TermWin.ext_bwidth); 820 - szHint.height - 2 * TermWin.ext_bwidth);
741 821
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 822 TermWin.ncol = TermWin.width / TermWin.fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 823 TermWin.nrow = TermWin.height / TermWin.fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 824 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
909 989
910 /* handle color aliases */ 990 /* handle color aliases */
911 if (isdigit (*color)) 991 if (isdigit (*color))
912 { 992 {
913 i = atoi (color); 993 i = atoi (color);
994
914 if (i >= 8 && i <= 15) 995 if (i >= 8 && i <= 15)
915 { /* bright colors */ 996 { /* bright colors */
916 i -= 8; 997 i -= 8;
917# ifndef NO_BRIGHTCOLOR 998# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 999 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 1000 SET_PIXCOLOR (idx);
920 goto Done; 1001 goto Done;
921# endif 1002# endif
922
923 } 1003 }
1004
924 if (i >= 0 && i <= 7) 1005 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1006 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1007 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1008 SET_PIXCOLOR (idx);
928 goto Done; 1009 goto Done;
929 } 1010 }
930 } 1011 }
931 1012
932 if (!rXParseAllocColor (& xcol, color)) 1013 if (!rXParseAllocColor (&xcol, color))
933 return; 1014 return;
934 1015
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1016 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1017
937 /* 1018 /*
… …
1040 * -------------------------------------------------------------------- */ 1121 * -------------------------------------------------------------------- */
1041void 1122void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1123rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1043{ 1124{
1044 int fix_screen; 1125 int fix_screen;
1045
1046#ifdef SMART_RESIZE 1126#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1127 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1128#endif
1129 dDisp;
1049 1130
1050 window_calc (width, height); 1131 window_calc (width, height);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1052 1133
1053 if (!ignoreparent) 1134 if (!ignoreparent)
1054 { 1135 {
1055#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1056 /* 1137 /*
… …
1060 int x, y, x1, y1; 1141 int x, y, x1, y1;
1061 int dx, dy; 1142 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1144 Window unused_cr;
1064 1145
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1150 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1151 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1072 */ 1153 */
… …
1074 { 1155 {
1075 x -= x1; 1156 x -= x1;
1076 y -= y1; 1157 y -= y1;
1077 } 1158 }
1078 1159
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1162 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1163 dy = old_height - szHint.height;
1083 1164
1084 /* Check position of the center of the window */ 1165 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1166 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1090 dy = 0; 1171 dy = 0;
1091 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1092 dy /= 2; 1173 dy /= 2;
1093 1174
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1096#else 1177#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1098#endif 1179#endif
1099 } 1180 }
1100 1181
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1102 1183
1103 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || width != old_width || height != old_height)
1104 { 1185 {
1105 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1106 { 1187 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1189 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1190 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1191 resize_scrollbar ();
1111 } 1192 }
1112 1193
1113 if (menubar_visible ()) 1194 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1196 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1117 1198
1118 XMoveResizeWindow (display->display, TermWin.vt, 1199 XMoveResizeWindow (disp, TermWin.vt,
1119 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1121 1202
1122 scr_clear (); 1203 scr_clear ();
1123#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
… …
1478{ 1559{
1479 int i, found, had_im; 1560 int i, found, had_im;
1480 const char *p; 1561 const char *p;
1481 char **s; 1562 char **s;
1482 char buf[IMBUFSIZ]; 1563 char buf[IMBUFSIZ];
1564
1565 SET_R (this);
1483 1566
1484 im_destroy (); 1567 im_destroy ();
1485 1568
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1569 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1570 if (Input_Context)

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines