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.143 by root, Sun Feb 20 00:09:25 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])
250 XDestroyWindow (display->display, TermWin.parent[0]); 258 XDestroyWindow (disp, TermWin.parent[0]);
251 } 259 }
252 260
253 // TODO: free pixcolours, colours should become part of rxvt_display 261 // TODO: free pixcolours, colours should become part of rxvt_display
254 262
255 delete pix_colors_focused; 263 delete pix_colors_focused;
… …
261 269
262 scr_release (); 270 scr_release ();
263 271
264 /* clear all resources */ 272 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 274 free (allocated [i]);
267 275
268 free (selection.text); 276 free (selection.text);
269 // TODO: manage env vars in child only(!) 277 // TODO: manage env vars in child only(!)
270 free (env_windowid); 278 free (env_windowid);
271 free (env_display); 279 free (env_display);
… …
277 285
278 delete envv; 286 delete envv;
279 delete argv; 287 delete argv;
280 288
281#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
282 delete keyboard; 290 delete keyboard;
283#endif 291#endif
284} 292}
285 293
286void 294void
287rxvt_term::destroy () 295rxvt_term::destroy ()
… …
340 348
341 delete this; 349 delete this;
342} 350}
343 351
344/*----------------------------------------------------------------------*/ 352/*----------------------------------------------------------------------*/
353/*
354 * Exit gracefully, clearing the utmp entry and restoring tty attributes
355 * TODO: if debugging, this should free up any known resources if we can
356 */
357static XErrorHandler old_xerror_handler;
358
359static void
360rxvt_emergency_cleanup ()
361{
362 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
363 (*t)->emergency_cleanup ();
364}
365
366#if ENABLE_FRILLS
367static void
368print_x_error (Display *dpy, XErrorEvent *event)
369{
370 char buffer[BUFSIZ];
371 char mesg[BUFSIZ];
372 char number[32];
373 char *mtype = "XlibMessage";
374 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
375 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
376 rxvt_warn ("An X Error occured, trying to continue after report.\n");
377 rxvt_warn ("%s: %s\n", mesg, buffer);
378 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
379 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
380 sprintf(number, "%d", event->request_code);
381 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
382 rxvt_warn ("(which is %s)\n", buffer);
383 if (event->request_code >= 128) {
384 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
385 mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
387 }
388 if ((event->error_code == BadWindow) ||
389 (event->error_code == BadPixmap) ||
390 (event->error_code == BadCursor) ||
391 (event->error_code == BadFont) ||
392 (event->error_code == BadDrawable) ||
393 (event->error_code == BadColor) ||
394 (event->error_code == BadGC) ||
395 (event->error_code == BadIDChoice) ||
396 (event->error_code == BadValue) ||
397 (event->error_code == BadAtom)) {
398 if (event->error_code == BadValue)
399 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
400 mesg, BUFSIZ);
401 else if (event->error_code == BadAtom)
402 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
403 mesg, BUFSIZ);
404 else
405 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
406 mesg, BUFSIZ);
407 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
408 }
409 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
410 mesg, BUFSIZ);
411 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
412}
413#endif
414
415int
416rxvt_xerror_handler (Display *display, XErrorEvent *event)
417{
418 if (GET_R->allowedxerror == -1)
419 GET_R->allowedxerror = event->error_code;
420 else
421 {
422 //TODO: GET_R is most likely not the terminal which caused the error
423 //TODO: maybe just output the error and continue?
424#if ENABLE_FRILLS
425 print_x_error (display, event);
426#else
427 old_xerror_handler (display, event);
428#endif
429 }
430
431 return 0;
432}
433
434int
435rxvt_xioerror_handler (Display *display)
436{
437 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
438 DisplayString (display));
439 rxvt_emergency_cleanup ();
440 _exit (EXIT_FAILURE);
441}
442
443/*
444 * Catch a fatal signal and tidy up before quitting
445 */
446void
447rxvt_term::sig_term (sig_watcher &w)
448{
449#ifdef DEBUG_CMD
450 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
451#endif
452 rxvt_emergency_cleanup ();
453 signal (w.signum, SIG_DFL);
454 kill (getpid (), w.signum);
455}
456
457/*----------------------------------------------------------------------*/
345/* rxvt_init () */ 458/* rxvt_init () */
346bool 459bool
347rxvt_term::init (int argc, const char *const *argv) 460rxvt_term::init (int argc, const char *const *argv)
348{ 461{
349 SET_R (this); 462 SET_R (this);
… …
369 scrollBar.setIdle (); /* set existence for size calculations */ 482 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 483#endif
371 484
372 create_windows (argc, argv); 485 create_windows (argc, argv);
373 486
487 dDisp;
488
374 init_xlocale (); 489 init_xlocale ();
375 490
376 scr_reset (); /* initialize screen */ 491 scr_reset (); /* initialize screen */
377 492
378#if 0 493#if 0
379 XSynchronize (display->display, True); 494 XSynchronize (disp, True);
380#endif 495#endif
381 496
382#ifdef HAVE_SCROLLBARS 497#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 498 if (options & Opt_scrollBar)
384 resize_scrollbar (); /* create and map scrollbar */ 499 resize_scrollbar (); /* create and map scrollbar */
385#endif 500#endif
386#if (MENUBAR_MAX) 501#if (MENUBAR_MAX)
387 if (menubar_visible ()) 502 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 503 XMapWindow (disp, menuBar.win);
389#endif 504#endif
390#ifdef TRANSPARENT 505#ifdef TRANSPARENT
391 if (options & Opt_transparent) 506 if (options & Opt_transparent)
392 { 507 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 508 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 509 check_our_parents ();
395 rootwin_ev.start (display, display->root); 510 rootwin_ev.start (display, display->root);
396 } 511 }
397#endif 512#endif
398 513
399 XMapWindow (display->display, TermWin.vt); 514 XMapWindow (disp, TermWin.vt);
400 XMapWindow (display->display, TermWin.parent[0]); 515 XMapWindow (disp, TermWin.parent[0]);
401 516
402 set_colorfgbg (); 517 set_colorfgbg ();
403 518
404 init_command (cmd_argv); 519 init_command (cmd_argv);
405 520
… …
409 524
410 check_ev.start (); 525 check_ev.start ();
411 526
412 return true; 527 return true;
413} 528}
414
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
416 529
417void 530void
418rxvt_init () 531rxvt_init ()
419{ 532{
420 /* 533 /*
… …
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 546 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 547 /* signal (SIGURG, SIG_DFL); */
435 548
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 549 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 550 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 551 XSetIOErrorHandler (rxvt_xioerror_handler);
439} 552}
440 553
441/* ------------------------------------------------------------------------- * 554/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER * 555 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */ 556 * ------------------------------------------------------------------------- */
… …
458 (*t)->destroy (); 571 (*t)->destroy ();
459 break; 572 break;
460 } 573 }
461} 574}
462 575
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}
504
505/* ------------------------------------------------------------------------- * 576/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 577 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 578 * ------------------------------------------------------------------------- */
508void * 579void *
509rxvt_malloc (size_t size) 580rxvt_malloc (size_t size)
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 585 rxvt_fatal ("memory allocation failure. aborting.\n");
515 586
516 return p; 587 return p;
517} 588}
518 589
519/* INTPROTO */
520void * 590void *
521rxvt_calloc (size_t number, size_t size) 591rxvt_calloc (size_t number, size_t size)
522{ 592{
523 void *p = calloc (number, size); 593 void *p = calloc (number, size);
524 594
… …
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 596 rxvt_fatal ("memory allocation failure. aborting.\n");
527 597
528 return p; 598 return p;
529} 599}
530 600
531/* INTPROTO */
532void * 601void *
533rxvt_realloc (void *ptr, size_t size) 602rxvt_realloc (void *ptr, size_t size)
534{ 603{
535 void *p = realloc (ptr, size); 604 void *p = realloc (ptr, size);
536 605
… …
620 * if width/height are non-zero then override calculated width/height 689 * if width/height are non-zero then override calculated width/height
621 */ 690 */
622void 691void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 692rxvt_term::window_calc (unsigned int width, unsigned int height)
624{ 693{
625 short recalc_x, recalc_y; 694 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 695 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 696 unsigned int w, h;
628 unsigned int max_width, max_height; 697 unsigned int max_width, max_height;
698 dDisp;
629 699
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 700 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 701 TermWin.ncol, TermWin.nrow, szHint.width,
632 szHint.height)); 702 szHint.height));
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 703 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
639 if (!parsed_geometry) 709 if (!parsed_geometry)
640 { 710 {
641 parsed_geometry = 1; 711 parsed_geometry = 1;
642 if (rs[Rs_geometry]) 712 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 713 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
714
644 if (flags & WidthValue) 715 if (flags & WidthValue)
645 { 716 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 717 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
647 szHint.flags |= USSize; 718 szHint.flags |= USSize;
648 } 719 }
720
649 if (flags & HeightValue) 721 if (flags & HeightValue)
650 { 722 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 723 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
652 szHint.flags |= USSize; 724 szHint.flags |= USSize;
653 } 725 }
726
654 if (flags & XValue) 727 if (flags & XValue)
655 { 728 {
656 szHint.x = x; 729 szHint.x = x;
657 szHint.flags |= USPosition; 730 szHint.flags |= USPosition;
658 if (flags & XNegative) 731 if (flags & XNegative)
659 { 732 {
660 recalc_x = 1; 733 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 734 szHint.win_gravity = NorthEastGravity;
662 } 735 }
663 } 736 }
737
664 if (flags & YValue) 738 if (flags & YValue)
665 { 739 {
666 szHint.y = y; 740 szHint.y = y;
667 szHint.flags |= USPosition; 741 szHint.flags |= USPosition;
668 if (flags & YNegative) 742 if (flags & YNegative)
… …
731 805
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 806 if (scrollbar_visible () && (options & Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 807 window_sb_x = szHint.width - sb_w;
734 808
735 if (recalc_x) 809 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 810 szHint.x += (DisplayWidth (disp, display->screen)
737 - szHint.width - 2 * TermWin.ext_bwidth); 811 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 812 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 813 szHint.y += (DisplayHeight (disp, display->screen)
740 - szHint.height - 2 * TermWin.ext_bwidth); 814 - szHint.height - 2 * TermWin.ext_bwidth);
741 815
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 816 TermWin.ncol = TermWin.width / TermWin.fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 817 TermWin.nrow = TermWin.height / TermWin.fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 818 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 841 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 842
769#if 0 843#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 844 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 845 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 846 kill (-cmd_pid, SIGWINCH);
773#endif 847#endif
774} 848}
775 849
776/*----------------------------------------------------------------------*/ 850/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 851/* set_fonts () - load and set the various fonts
… …
909 983
910 /* handle color aliases */ 984 /* handle color aliases */
911 if (isdigit (*color)) 985 if (isdigit (*color))
912 { 986 {
913 i = atoi (color); 987 i = atoi (color);
988
914 if (i >= 8 && i <= 15) 989 if (i >= 8 && i <= 15)
915 { /* bright colors */ 990 { /* bright colors */
916 i -= 8; 991 i -= 8;
917# ifndef NO_BRIGHTCOLOR 992# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 993 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 994 SET_PIXCOLOR (idx);
920 goto Done; 995 goto Done;
921# endif 996# endif
922
923 } 997 }
998
924 if (i >= 0 && i <= 7) 999 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1000 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1001 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1002 SET_PIXCOLOR (idx);
928 goto Done; 1003 goto Done;
929 } 1004 }
930 } 1005 }
931 1006
932 if (!rXParseAllocColor (& xcol, color)) 1007 if (!rXParseAllocColor (&xcol, color))
933 return; 1008 return;
934 1009
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1010 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1011
937 /* 1012 /*
… …
1040 * -------------------------------------------------------------------- */ 1115 * -------------------------------------------------------------------- */
1041void 1116void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1117rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1043{ 1118{
1044 int fix_screen; 1119 int fix_screen;
1045
1046#ifdef SMART_RESIZE 1120#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1121 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1122#endif
1123 dDisp;
1049 1124
1050 window_calc (width, height); 1125 window_calc (width, height);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1126 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1052 1127
1053 if (!ignoreparent) 1128 if (!ignoreparent)
1054 { 1129 {
1055#ifdef SMART_RESIZE 1130#ifdef SMART_RESIZE
1056 /* 1131 /*
… …
1060 int x, y, x1, y1; 1135 int x, y, x1, y1;
1061 int dx, dy; 1136 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1137 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1138 Window unused_cr;
1064 1139
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1140 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1141 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1142 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1143 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1144 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1145 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1146 * our position for handles and decorations. Counter it
1072 */ 1147 */
… …
1074 { 1149 {
1075 x -= x1; 1150 x -= x1;
1076 y -= y1; 1151 y -= y1;
1077 } 1152 }
1078 1153
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1154 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1155 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1156 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1157 dy = old_height - szHint.height;
1083 1158
1084 /* Check position of the center of the window */ 1159 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1160 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1164 if (y < y1) /* top half */
1090 dy = 0; 1165 dy = 0;
1091 else if (y == y1) /* exact center */ 1166 else if (y == y1) /* exact center */
1092 dy /= 2; 1167 dy /= 2;
1093 1168
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1169 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1170 szHint.width, szHint.height);
1096#else 1171#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1172 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1098#endif 1173#endif
1099 } 1174 }
1100 1175
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1176 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1102 1177
1103 if (fix_screen || width != old_width || height != old_height) 1178 if (fix_screen || width != old_width || height != old_height)
1104 { 1179 {
1105 if (scrollbar_visible ()) 1180 if (scrollbar_visible ())
1106 { 1181 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1182 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1183 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1184 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1185 resize_scrollbar ();
1111 } 1186 }
1112 1187
1113 if (menubar_visible ()) 1188 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1189 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1190 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1191 TermWin_TotalWidth (), menuBar_TotalHeight ());
1117 1192
1118 XMoveResizeWindow (display->display, TermWin.vt, 1193 XMoveResizeWindow (disp, TermWin.vt,
1119 window_vt_x, window_vt_y, 1194 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1195 TermWin_TotalWidth (), TermWin_TotalHeight ());
1121 1196
1122 scr_clear (); 1197 scr_clear ();
1123#ifdef XPM_BACKGROUND 1198#ifdef XPM_BACKGROUND
… …
1171 XWindowAttributes wattr; 1246 XWindowAttributes wattr;
1172 1247
1173 if (width == 0 || height == 0) 1248 if (width == 0 || height == 0)
1174 { 1249 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1250 XGetWindowAttributes (display->display, display->root, &wattr);
1251
1176 if (width == 0) 1252 if (width == 0)
1177 width = wattr.width - szHint.base_width; 1253 width = wattr.width - szHint.base_width;
1178 if (height == 0) 1254 if (height == 0)
1179 height = wattr.height - szHint.base_height; 1255 height = wattr.height - szHint.base_height;
1180 } 1256 }
… …
1478{ 1554{
1479 int i, found, had_im; 1555 int i, found, had_im;
1480 const char *p; 1556 const char *p;
1481 char **s; 1557 char **s;
1482 char buf[IMBUFSIZ]; 1558 char buf[IMBUFSIZ];
1559
1560 SET_R (this);
1483 1561
1484 im_destroy (); 1562 im_destroy ();
1485 1563
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1564 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1565 if (Input_Context)

Diff Legend

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