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.128 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.135 by root, Sun Feb 13 11:07:57 2005 UTC

… …
159#endif 159#endif
160#ifdef USE_XIM 160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 161 im_ev (this, &rxvt_term::im_cb),
162#endif 162#endif
163 sw_term (this, &rxvt_term::sig_term), 163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld), 165 sw_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 166 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 167 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 168 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 169 flush_ev (this, &rxvt_term::flush_cb),
… …
180 if (!keyboard) 181 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n"); 182 rxvt_fatal ("out of memory, aborting.\n");
182#endif 183#endif
183} 184}
184 185
185rxvt_term::~rxvt_term () 186// clean up the most important stuff, do *not* call x or free mem etc.
187// for use before an emergency exit
188void rxvt_term::emergency_cleanup ()
186{ 189{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
189 if (cmd_pid) 190 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 191 kill (-cmd_pid, SIGHUP);
191 192
192 pty.put ();
193
194#ifdef UTMP_SUPPORT 193#ifdef UTMP_SUPPORT
195 privileged_utmp (RESTORE); 194 privileged_utmp (RESTORE);
196#endif 195#endif
196
197 pty.put ();
198}
199
200rxvt_term::~rxvt_term ()
201{
202 termlist.erase (find (termlist.begin (), termlist.end(), this));
203
204 emergency_cleanup ();
197 205
198#if ENABLE_STYLES 206#if ENABLE_STYLES
199 for (int i = RS_styleCount; --i; ) 207 for (int i = RS_styleCount; --i; )
200 if (TermWin.fontset[i] != TermWin.fontset[0]) 208 if (TermWin.fontset[i] != TermWin.fontset[0])
201 delete TermWin.fontset[i]; 209 delete TermWin.fontset[i];
202#endif 210#endif
203 delete TermWin.fontset[0]; 211 delete TermWin.fontset[0];
204 212
205 if (display) 213 if (display)
206 { 214 {
215 dDisp;
216
207 selection_clear (); 217 selection_clear ();
208 218
209#ifdef USE_XIM 219#ifdef USE_XIM
210 im_destroy (); 220 im_destroy ();
211#endif 221#endif
212#ifdef MENUBAR 222#ifdef MENUBAR
213 if (menubarGC) XFreeGC (display->display, menubarGC); 223 if (menubarGC) XFreeGC (disp, menubarGC);
214#endif 224#endif
215#ifdef XTERM_SCROLLBAR 225#ifdef XTERM_SCROLLBAR
216 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
217 if (ShadowGC) XFreeGC (display->display, ShadowGC); 227 if (ShadowGC) XFreeGC (disp, ShadowGC);
218#endif 228#endif
219#ifdef PLAIN_SCROLLBAR 229#ifdef PLAIN_SCROLLBAR
220 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
221#endif 231#endif
222#ifdef NEXT_SCROLLBAR 232#ifdef NEXT_SCROLLBAR
223 if (blackGC) XFreeGC (display->display, blackGC); 233 if (blackGC) XFreeGC (disp, blackGC);
224 if (whiteGC) XFreeGC (display->display, whiteGC); 234 if (whiteGC) XFreeGC (disp, whiteGC);
225 if (grayGC) XFreeGC (display->display, grayGC); 235 if (grayGC) XFreeGC (disp, grayGC);
226 if (darkGC) XFreeGC (display->display, darkGC); 236 if (darkGC) XFreeGC (disp, darkGC);
227 if (stippleGC) XFreeGC (display->display, stippleGC); 237 if (stippleGC) XFreeGC (disp, stippleGC);
228 if (dimple) XFreePixmap (display->display, dimple); 238 if (dimple) XFreePixmap (disp, dimple);
229 if (upArrow) XFreePixmap (display->display, upArrow); 239 if (upArrow) XFreePixmap (disp, upArrow);
230 if (downArrow) XFreePixmap (display->display, downArrow); 240 if (downArrow) XFreePixmap (disp, downArrow);
231 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 241 if (upArrowHi) XFreePixmap (disp, upArrowHi);
232 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 242 if (downArrowHi) XFreePixmap (disp, downArrowHi);
233#endif 243#endif
234#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 244#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
235 if (topShadowGC) XFreeGC (display->display, topShadowGC); 245 if (topShadowGC) XFreeGC (disp, topShadowGC);
236 if (botShadowGC) XFreeGC (display->display, botShadowGC); 246 if (botShadowGC) XFreeGC (disp, botShadowGC);
237 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 247 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
238#endif 248#endif
239 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 249 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
240 250
241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 251#if defined(MENUBAR) && (MENUBAR_MAX > 1)
242 delete menuBar.drawable; 252 delete menuBar.drawable;
243 //if (menuBar.win) 253 //if (menuBar.win)
244 // XDestroyWindow (display->display, menuBar.win); 254 // XDestroyWindow (disp, menuBar.win);
245#endif 255#endif
246 delete TermWin.drawable; 256 delete TermWin.drawable;
247 // destroy all windows 257 // destroy all windows
248 if (TermWin.parent[0]) 258 if (TermWin.parent[0])
249 XDestroyWindow (display->display, TermWin.parent[0]); 259 XDestroyWindow (disp, TermWin.parent[0]);
250 } 260 }
251 261
252 // TODO: free pixcolours, colours should become part of rxvt_display 262 // TODO: free pixcolours, colours should become part of rxvt_display
253 263
254 delete pix_colors_focused; 264 delete pix_colors_focused;
… …
260 270
261 scr_release (); 271 scr_release ();
262 272
263 /* clear all resources */ 273 /* clear all resources */
264 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
265 free (allocated[i]); 275 free (allocated [i]);
266 276
267 free (selection.text); 277 free (selection.text);
268 // TODO: manage env vars in child only(!) 278 // TODO: manage env vars in child only(!)
269 free (env_windowid); 279 free (env_windowid);
270 free (env_display); 280 free (env_display);
… …
276 286
277 delete envv; 287 delete envv;
278 delete argv; 288 delete argv;
279 289
280#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
281 delete keyboard; 291 delete keyboard;
282#endif 292#endif
283} 293}
284 294
285void 295void
286rxvt_term::destroy () 296rxvt_term::destroy ()
… …
339 349
340 delete this; 350 delete this;
341} 351}
342 352
343/*----------------------------------------------------------------------*/ 353/*----------------------------------------------------------------------*/
354/*
355 * Exit gracefully, clearing the utmp entry and restoring tty attributes
356 * TODO: if debugging, this should free up any known resources if we can
357 */
358static XErrorHandler old_xerror_handler;
359
360static void
361rxvt_emergency_cleanup ()
362{
363 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
364 (*t)->emergency_cleanup ();
365}
366
367#if ENABLE_FRILLS
368static void
369print_x_error (Display *dpy, XErrorEvent *event)
370{
371 char buffer[BUFSIZ];
372 char mesg[BUFSIZ];
373 char number[32];
374 char *mtype = "XlibMessage";
375 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
376 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
377 rxvt_warn ("An X Error occured, trying to continue after report.\n");
378 rxvt_warn ("%s: %s\n", mesg, buffer);
379 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
380 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
381 sprintf(number, "%d", event->request_code);
382 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
383 rxvt_warn ("(which is %s)\n", buffer);
384 if (event->request_code >= 128) {
385 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
386 mesg, BUFSIZ);
387 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
388 }
389 if ((event->error_code == BadWindow) ||
390 (event->error_code == BadPixmap) ||
391 (event->error_code == BadCursor) ||
392 (event->error_code == BadFont) ||
393 (event->error_code == BadDrawable) ||
394 (event->error_code == BadColor) ||
395 (event->error_code == BadGC) ||
396 (event->error_code == BadIDChoice) ||
397 (event->error_code == BadValue) ||
398 (event->error_code == BadAtom)) {
399 if (event->error_code == BadValue)
400 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
401 mesg, BUFSIZ);
402 else if (event->error_code == BadAtom)
403 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
404 mesg, BUFSIZ);
405 else
406 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
407 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
409 }
410 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
413}
414#endif
415
416int
417rxvt_xerror_handler (Display *display, XErrorEvent *event)
418{
419 if (GET_R->allowedxerror == -1)
420 GET_R->allowedxerror = event->error_code;
421 else
422 {
423 //TODO: GET_R is most likely not the terminal which caused the error
424 //TODO: maybe just output the error and continue?
425#if ENABLE_FRILLS
426 print_x_error (display, event);
427#else
428 old_xerror_handler (display, event);
429#endif
430 }
431
432 return 0;
433}
434
435int
436rxvt_xioerror_handler (Display *display)
437{
438 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
439 DisplayString (display));
440 rxvt_emergency_cleanup ();
441 _exit (EXIT_FAILURE);
442}
443
444/*
445 * Catch a fatal signal and tidy up before quitting
446 */
447void
448rxvt_term::sig_term (sig_watcher &w)
449{
450#ifdef DEBUG_CMD
451 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
452#endif
453 rxvt_emergency_cleanup ();
454 signal (w.signum, SIG_DFL);
455 kill (getpid (), w.signum);
456}
457
458/*----------------------------------------------------------------------*/
344/* rxvt_init () */ 459/* rxvt_init () */
345bool 460bool
346rxvt_term::init (int argc, const char *const *argv) 461rxvt_term::init (int argc, const char *const *argv)
347{ 462{
348 SET_R (this); 463 SET_R (this);
… …
368 scrollBar.setIdle (); /* set existence for size calculations */ 483 scrollBar.setIdle (); /* set existence for size calculations */
369#endif 484#endif
370 485
371 create_windows (argc, argv); 486 create_windows (argc, argv);
372 487
488 dDisp;
489
373 init_xlocale (); 490 init_xlocale ();
374 491
375 scr_reset (); /* initialize screen */ 492 scr_reset (); /* initialize screen */
376 493
377#if 0 494#if 0
378 XSynchronize (display->display, True); 495 XSynchronize (disp, True);
379#endif 496#endif
380 497
381#ifdef HAVE_SCROLLBARS 498#ifdef HAVE_SCROLLBARS
382 if (options & Opt_scrollBar) 499 if (options & Opt_scrollBar)
383 resize_scrollbar (); /* create and map scrollbar */ 500 resize_scrollbar (); /* create and map scrollbar */
384#endif 501#endif
385#if (MENUBAR_MAX) 502#if (MENUBAR_MAX)
386 if (menubar_visible ()) 503 if (menubar_visible ())
387 XMapWindow (display->display, menuBar.win); 504 XMapWindow (disp, menuBar.win);
388#endif 505#endif
389#ifdef TRANSPARENT 506#ifdef TRANSPARENT
390 if (options & Opt_transparent) 507 if (options & Opt_transparent)
391 { 508 {
392 XSelectInput (display->display, display->root, PropertyChangeMask); 509 XSelectInput (disp, display->root, PropertyChangeMask);
393 check_our_parents (); 510 check_our_parents ();
394 rootwin_ev.start (display, display->root); 511 rootwin_ev.start (display, display->root);
395 } 512 }
396#endif 513#endif
397 514
398 XMapWindow (display->display, TermWin.vt); 515 XMapWindow (disp, TermWin.vt);
399 XMapWindow (display->display, TermWin.parent[0]); 516 XMapWindow (disp, TermWin.parent[0]);
400 517
401 set_colorfgbg (); 518 set_colorfgbg ();
402 519
403 init_command (cmd_argv); 520 init_command (cmd_argv);
404 521
… …
408 525
409 check_ev.start (); 526 check_ev.start ();
410 527
411 return true; 528 return true;
412} 529}
413
414static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
415 530
416void 531void
417rxvt_init () 532rxvt_init ()
418{ 533{
419 /* 534 /*
… …
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 547 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */ 548 /* signal (SIGURG, SIG_DFL); */
434 549
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 550 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 // TODO: handle this with exceptions and tolerate the memory loss 551 // TODO: handle this with exceptions and tolerate the memory loss
437 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 552 XSetIOErrorHandler (rxvt_xioerror_handler);
438} 553}
439 554
440/* ------------------------------------------------------------------------- * 555/* ------------------------------------------------------------------------- *
441 * SIGNAL HANDLING & EXIT HANDLER * 556 * SIGNAL HANDLING & EXIT HANDLER *
442 * ------------------------------------------------------------------------- */ 557 * ------------------------------------------------------------------------- */
… …
455 if (pid == (*t)->cmd_pid) 570 if (pid == (*t)->cmd_pid)
456 { 571 {
457 (*t)->destroy (); 572 (*t)->destroy ();
458 break; 573 break;
459 } 574 }
460}
461
462/*----------------------------------------------------------------------*/
463/*
464 * Exit gracefully, clearing the utmp entry and restoring tty attributes
465 * TODO: if debugging, this should free up any known resources if we can
466 */
467void
468rxvt_destroy_all ()
469{
470 // TODO: rxvtd should clean up all ressources
471 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
472 (*t)->destroy ();
473}
474
475/*
476 * Catch a fatal signal and tidy up before quitting
477 */
478void
479rxvt_term::sig_term (sig_watcher &w)
480{
481#ifdef DEBUG_CMD
482 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
483#endif
484 rxvt_destroy_all ();
485 signal (w.signum, SIG_DFL);
486 kill (getpid (), w.signum);
487}
488
489/* INTPROTO */
490int
491rxvt_xerror_handler (Display *display, XErrorEvent *event)
492{
493 if (GET_R->allowedxerror == -1)
494 GET_R->allowedxerror = event->error_code;
495 else
496 {
497 old_xerror_handler (display, event);
498 GET_R->destroy ();
499 }
500
501 return 0;
502} 575}
503 576
504/* ------------------------------------------------------------------------- * 577/* ------------------------------------------------------------------------- *
505 * MEMORY ALLOCATION WRAPPERS * 578 * MEMORY ALLOCATION WRAPPERS *
506 * ------------------------------------------------------------------------- */ 579 * ------------------------------------------------------------------------- */
… …
619 * if width/height are non-zero then override calculated width/height 692 * if width/height are non-zero then override calculated width/height
620 */ 693 */
621void 694void
622rxvt_term::window_calc (unsigned int width, unsigned int height) 695rxvt_term::window_calc (unsigned int width, unsigned int height)
623{ 696{
624 short recalc_x, recalc_y; 697 short recalc_x, recalc_y;
625 int x, y, sb_w, mb_h, flags; 698 int x, y, sb_w, mb_h, flags;
626 unsigned int w, h; 699 unsigned int w, h;
627 unsigned int max_width, max_height; 700 unsigned int max_width, max_height;
701 dDisp;
628 702
629 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 703 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
630 TermWin.ncol, TermWin.nrow, szHint.width, 704 TermWin.ncol, TermWin.nrow, szHint.width,
631 szHint.height)); 705 szHint.height));
632 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 706 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
730 804
731 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 805 if (scrollbar_visible () && (options & Opt_scrollBar_right))
732 window_sb_x = szHint.width - sb_w; 806 window_sb_x = szHint.width - sb_w;
733 807
734 if (recalc_x) 808 if (recalc_x)
735 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 809 szHint.x += (DisplayWidth (disp, display->screen)
736 - szHint.width - 2 * TermWin.ext_bwidth); 810 - szHint.width - 2 * TermWin.ext_bwidth);
737 if (recalc_y) 811 if (recalc_y)
738 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 812 szHint.y += (DisplayHeight (disp, display->screen)
739 - szHint.height - 2 * TermWin.ext_bwidth); 813 - szHint.height - 2 * TermWin.ext_bwidth);
740 814
741 TermWin.ncol = TermWin.width / TermWin.fwidth; 815 TermWin.ncol = TermWin.width / TermWin.fwidth;
742 TermWin.nrow = TermWin.height / TermWin.fheight; 816 TermWin.nrow = TermWin.height / TermWin.fheight;
743 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 817 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
908 982
909 /* handle color aliases */ 983 /* handle color aliases */
910 if (isdigit (*color)) 984 if (isdigit (*color))
911 { 985 {
912 i = atoi (color); 986 i = atoi (color);
987
913 if (i >= 8 && i <= 15) 988 if (i >= 8 && i <= 15)
914 { /* bright colors */ 989 { /* bright colors */
915 i -= 8; 990 i -= 8;
916# ifndef NO_BRIGHTCOLOR 991# ifndef NO_BRIGHTCOLOR
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
918 SET_PIXCOLOR (idx); 993 SET_PIXCOLOR (idx);
919 goto Done; 994 goto Done;
920# endif 995# endif
921
922 } 996 }
997
923 if (i >= 0 && i <= 7) 998 if (i >= 0 && i <= 7)
924 { /* normal colors */ 999 { /* normal colors */
925 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
926 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
927 goto Done; 1002 goto Done;
928 } 1003 }
929 } 1004 }
930 1005
931 if (!rXParseAllocColor (& xcol, color)) 1006 if (!rXParseAllocColor (&xcol, color))
932 return; 1007 return;
933 1008
934 /* XStoreColor (display->display, display->cmap, XColor*); */ 1009 /* XStoreColor (display->display, display->cmap, XColor*); */
935 1010
936 /* 1011 /*
… …
1039 * -------------------------------------------------------------------- */ 1114 * -------------------------------------------------------------------- */
1040void 1115void
1041rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1116rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1042{ 1117{
1043 int fix_screen; 1118 int fix_screen;
1044
1045#ifdef SMART_RESIZE 1119#ifdef SMART_RESIZE
1046 int old_width = szHint.width, old_height = szHint.height; 1120 int old_width = szHint.width, old_height = szHint.height;
1047#endif 1121#endif
1122 dDisp;
1048 1123
1049 window_calc (width, height); 1124 window_calc (width, height);
1050 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1125 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1051 1126
1052 if (!ignoreparent) 1127 if (!ignoreparent)
1053 { 1128 {
1054#ifdef SMART_RESIZE 1129#ifdef SMART_RESIZE
1055 /* 1130 /*
… …
1059 int x, y, x1, y1; 1134 int x, y, x1, y1;
1060 int dx, dy; 1135 int dx, dy;
1061 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1136 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1062 Window unused_cr; 1137 Window unused_cr;
1063 1138
1064 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1139 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1065 0, 0, &x, &y, &unused_cr); 1140 0, 0, &x, &y, &unused_cr);
1066 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1141 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1067 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1142 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1068 /* 1143 /*
1069 * if display->root isn't the parent window, a WM will probably have offset 1144 * if display->root isn't the parent window, a WM will probably have offset
1070 * our position for handles and decorations. Counter it 1145 * our position for handles and decorations. Counter it
1071 */ 1146 */
… …
1073 { 1148 {
1074 x -= x1; 1149 x -= x1;
1075 y -= y1; 1150 y -= y1;
1076 } 1151 }
1077 1152
1078 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1153 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1079 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1154 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1080 dx = old_width - szHint.width; 1155 dx = old_width - szHint.width;
1081 dy = old_height - szHint.height; 1156 dy = old_height - szHint.height;
1082 1157
1083 /* Check position of the center of the window */ 1158 /* Check position of the center of the window */
1084 if (x < x1) /* left half */ 1159 if (x < x1) /* left half */
… …
1088 if (y < y1) /* top half */ 1163 if (y < y1) /* top half */
1089 dy = 0; 1164 dy = 0;
1090 else if (y == y1) /* exact center */ 1165 else if (y == y1) /* exact center */
1091 dy /= 2; 1166 dy /= 2;
1092 1167
1093 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1168 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1094 szHint.width, szHint.height); 1169 szHint.width, szHint.height);
1095#else 1170#else
1096 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1171 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1097#endif 1172#endif
1098 } 1173 }
1099 1174
1100 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1175 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1101 1176
1102 if (fix_screen || width != old_width || height != old_height) 1177 if (fix_screen || width != old_width || height != old_height)
1103 { 1178 {
1104 if (scrollbar_visible ()) 1179 if (scrollbar_visible ())
1105 { 1180 {
1106 XMoveResizeWindow (display->display, scrollBar.win, 1181 XMoveResizeWindow (disp, scrollBar.win,
1107 window_sb_x, 0, 1182 window_sb_x, 0,
1108 scrollbar_TotalWidth (), szHint.height); 1183 scrollbar_TotalWidth (), szHint.height);
1109 resize_scrollbar (); 1184 resize_scrollbar ();
1110 } 1185 }
1111 1186
1112 if (menubar_visible ()) 1187 if (menubar_visible ())
1113 XMoveResizeWindow (display->display, menuBar.win, 1188 XMoveResizeWindow (disp, menuBar.win,
1114 window_vt_x, 0, 1189 window_vt_x, 0,
1115 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1190 TermWin_TotalWidth (), menuBar_TotalHeight ());
1116 1191
1117 XMoveResizeWindow (display->display, TermWin.vt, 1192 XMoveResizeWindow (disp, TermWin.vt,
1118 window_vt_x, window_vt_y, 1193 window_vt_x, window_vt_y,
1119 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1194 TermWin_TotalWidth (), TermWin_TotalHeight ());
1195
1120 scr_clear (); 1196 scr_clear ();
1121#ifdef XPM_BACKGROUND 1197#ifdef XPM_BACKGROUND
1122 resize_pixmap (); 1198 resize_pixmap ();
1123#endif 1199#endif
1124 } 1200 }
… …
1146 } 1222 }
1147 } 1223 }
1148 1224
1149 old_width = szHint.width; 1225 old_width = szHint.width;
1150 old_height = szHint.height; 1226 old_height = szHint.height;
1227
1228#ifdef XPM_BACKGROUND
1229 if (TermWin.pixmap)
1230 scr_touch (false);
1231#endif
1151 1232
1152#ifdef USE_XIM 1233#ifdef USE_XIM
1153 IMSetStatusPosition (); 1234 IMSetStatusPosition ();
1154#endif 1235#endif
1155} 1236}
… …
1385 "*", 1466 "*",
1386 TermWin.fheight, 1467 TermWin.fheight,
1387 TermWin.fheight + 1, TermWin.fheight - 1, 1468 TermWin.fheight + 1, TermWin.fheight - 1,
1388 TermWin.fheight - 2, TermWin.fheight + 2); 1469 TermWin.fheight - 2, TermWin.fheight + 2);
1389 1470
1390 fs = XCreateFontSet (display->display, pat, 1471 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1391 &missing_charset_list, &missing_charset_count, &def_string); 1472 &missing_charset_list, &missing_charset_count, &def_string);
1392 1473
1393 if (missing_charset_list) 1474 if (missing_charset_list)
1394 XFreeStringList (missing_charset_list); 1475 XFreeStringList (missing_charset_list);
1395 1476
… …
1471{ 1552{
1472 int i, found, had_im; 1553 int i, found, had_im;
1473 const char *p; 1554 const char *p;
1474 char **s; 1555 char **s;
1475 char buf[IMBUFSIZ]; 1556 char buf[IMBUFSIZ];
1557
1558 SET_R (this);
1476 1559
1477 im_destroy (); 1560 im_destroy ();
1478 1561
1479 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1562 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1480 if (Input_Context) 1563 if (Input_Context)

Diff Legend

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