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.148 by root, Wed Nov 30 21:05:39 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
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 157 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 158#endif
160#ifdef USE_XIM 159#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 160 im_ev (this, &rxvt_term::im_cb),
162#endif 161#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_int (this, &rxvt_term::sig_term),
165 sw_chld (this, &rxvt_term::sig_chld),
166 termwin_ev (this, &rxvt_term::x_cb), 162 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 165 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
… …
181 if (!keyboard) 177 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n"); 178 rxvt_fatal ("out of memory, aborting.\n");
183#endif 179#endif
184} 180}
185 181
186rxvt_term::~rxvt_term () 182// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit
184void rxvt_term::emergency_cleanup ()
187{ 185{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
190 if (cmd_pid) 186 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 187 kill (-cmd_pid, SIGHUP);
192 188
193#ifdef UTMP_SUPPORT 189#ifdef UTMP_SUPPORT
194 privileged_utmp (RESTORE); 190 privileged_utmp (RESTORE);
195#endif 191#endif
196 192
197 pty.put (); 193 pty.put ();
194}
195
196rxvt_term::~rxvt_term ()
197{
198 termlist.erase (find (termlist.begin (), termlist.end(), this));
199
200 emergency_cleanup ();
198 201
199#if ENABLE_STYLES 202#if ENABLE_STYLES
200 for (int i = RS_styleCount; --i; ) 203 for (int i = RS_styleCount; --i; )
201 if (TermWin.fontset[i] != TermWin.fontset[0]) 204 if (TermWin.fontset[i] != TermWin.fontset[0])
202 delete TermWin.fontset[i]; 205 delete TermWin.fontset[i];
203#endif 206#endif
204 delete TermWin.fontset[0]; 207 delete TermWin.fontset[0];
205 208
206 if (display) 209 if (display)
207 { 210 {
211 dDisp;
212
208 selection_clear (); 213 selection_clear ();
209 214
210#ifdef USE_XIM 215#ifdef USE_XIM
211 im_destroy (); 216 im_destroy ();
212#endif 217#endif
213#ifdef MENUBAR 218#ifdef MENUBAR
214 if (menubarGC) XFreeGC (display->display, menubarGC); 219 if (menubarGC) XFreeGC (disp, menubarGC);
215#endif 220#endif
216#ifdef XTERM_SCROLLBAR 221#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
218 if (ShadowGC) XFreeGC (display->display, ShadowGC); 223 if (ShadowGC) XFreeGC (disp, ShadowGC);
219#endif 224#endif
220#ifdef PLAIN_SCROLLBAR 225#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
222#endif 227#endif
223#ifdef NEXT_SCROLLBAR 228#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (display->display, blackGC); 229 if (blackGC) XFreeGC (disp, blackGC);
225 if (whiteGC) XFreeGC (display->display, whiteGC); 230 if (whiteGC) XFreeGC (disp, whiteGC);
226 if (grayGC) XFreeGC (display->display, grayGC); 231 if (grayGC) XFreeGC (disp, grayGC);
227 if (darkGC) XFreeGC (display->display, darkGC); 232 if (darkGC) XFreeGC (disp, darkGC);
228 if (stippleGC) XFreeGC (display->display, stippleGC); 233 if (stippleGC) XFreeGC (disp, stippleGC);
229 if (dimple) XFreePixmap (display->display, dimple); 234 if (dimple) XFreePixmap (disp, dimple);
230 if (upArrow) XFreePixmap (display->display, upArrow); 235 if (upArrow) XFreePixmap (disp, upArrow);
231 if (downArrow) XFreePixmap (display->display, downArrow); 236 if (downArrow) XFreePixmap (disp, downArrow);
232 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 237 if (upArrowHi) XFreePixmap (disp, upArrowHi);
233 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 238 if (downArrowHi) XFreePixmap (disp, downArrowHi);
234#endif 239#endif
235#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
236 if (topShadowGC) XFreeGC (display->display, topShadowGC); 241 if (topShadowGC) XFreeGC (disp, topShadowGC);
237 if (botShadowGC) XFreeGC (display->display, botShadowGC); 242 if (botShadowGC) XFreeGC (disp, botShadowGC);
238 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 243 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
239#endif 244#endif
240 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 245 if (TermWin.gc) XFreeGC (disp, TermWin.gc);
241 246
242#if defined(MENUBAR) && (MENUBAR_MAX > 1) 247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
243 delete menuBar.drawable; 248 delete menuBar.drawable;
244 //if (menuBar.win) 249 //if (menuBar.win)
245 // XDestroyWindow (display->display, menuBar.win); 250 // XDestroyWindow (disp, menuBar.win);
246#endif 251#endif
247 delete TermWin.drawable; 252 delete TermWin.drawable;
248 // destroy all windows 253 // destroy all windows
249 if (TermWin.parent[0]) 254 if (TermWin.parent[0])
250 XDestroyWindow (display->display, TermWin.parent[0]); 255 XDestroyWindow (disp, TermWin.parent[0]);
251 } 256 }
252 257
253 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
254 259
255 delete pix_colors_focused; 260 delete pix_colors_focused;
256#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
257 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
258#endif 263#endif
259 264
260 displays.put (display); 265 displays.put (display);
261 266
262 scr_release (); 267 scr_release ();
263 268
264 /* clear all resources */ 269 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 271 free (allocated [i]);
267 272
268 free (selection.text); 273 free (selection.text);
269 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
270 free (env_windowid); 275 free (env_windowid);
271 free (env_display); 276 free (env_display);
… …
277 282
278 delete envv; 283 delete envv;
279 delete argv; 284 delete argv;
280 285
281#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
282 delete keyboard; 287 delete keyboard;
283#endif 288#endif
284} 289}
285 290
286void 291void
287rxvt_term::destroy () 292rxvt_term::destroy ()
… …
340 345
341 delete this; 346 delete this;
342} 347}
343 348
344/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
345/* rxvt_init () */ 350/*
351 * Exit gracefully, clearing the utmp entry and restoring tty attributes
352 * TODO: if debugging, this should free up any known resources if we can
353 */
354static XErrorHandler old_xerror_handler;
355
356static void
357rxvt_emergency_cleanup ()
358{
359 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
360 (*t)->emergency_cleanup ();
361}
362
363#if ENABLE_FRILLS
364static void
365print_x_error (Display *dpy, XErrorEvent *event)
366{
367 char buffer[BUFSIZ];
368 char mesg[BUFSIZ];
369 char number[32];
370 char *mtype = "XlibMessage";
371 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
372 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
373 rxvt_warn ("An X Error occured, trying to continue after report.\n");
374 rxvt_warn ("%s: %s\n", mesg, buffer);
375 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
376 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
377 sprintf(number, "%d", event->request_code);
378 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
379 rxvt_warn ("(which is %s)\n", buffer);
380 if (event->request_code >= 128) {
381 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
382 mesg, BUFSIZ);
383 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
384 }
385 if ((event->error_code == BadWindow) ||
386 (event->error_code == BadPixmap) ||
387 (event->error_code == BadCursor) ||
388 (event->error_code == BadFont) ||
389 (event->error_code == BadDrawable) ||
390 (event->error_code == BadColor) ||
391 (event->error_code == BadGC) ||
392 (event->error_code == BadIDChoice) ||
393 (event->error_code == BadValue) ||
394 (event->error_code == BadAtom)) {
395 if (event->error_code == BadValue)
396 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
397 mesg, BUFSIZ);
398 else if (event->error_code == BadAtom)
399 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
400 mesg, BUFSIZ);
401 else
402 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
403 mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
405 }
406 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
407 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
409}
410#endif
411
412int
413rxvt_xerror_handler (Display *display, XErrorEvent *event)
414{
415 if (GET_R->allowedxerror == -1)
416 GET_R->allowedxerror = event->error_code;
417 else
418 {
419 // GET_R is most likely not the terminal which caused the error,
420 // so just output the error and continue
421#if ENABLE_FRILLS
422 print_x_error (display, event);
423#else
424 old_xerror_handler (display, event);
425#endif
426 }
427
428 return 0;
429}
430
431int
432rxvt_xioerror_handler (Display *display)
433{
434 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
435 DisplayString (display));
436 rxvt_emergency_cleanup ();
437 _exit (EXIT_FAILURE);
438}
439
440/*----------------------------------------------------------------------*/
346bool 441bool
347rxvt_term::init (int argc, const char *const *argv) 442rxvt_term::init (int argc, const char *const *argv)
348{ 443{
349 SET_R (this); 444 SET_R (this);
350 445
… …
369 scrollBar.setIdle (); /* set existence for size calculations */ 464 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 465#endif
371 466
372 create_windows (argc, argv); 467 create_windows (argc, argv);
373 468
469 dDisp;
470
374 init_xlocale (); 471 init_xlocale ();
375 472
376 scr_reset (); /* initialize screen */ 473 scr_reset (); /* initialize screen */
377 474
378#if 0 475#if 0
379 XSynchronize (display->display, True); 476 XSynchronize (disp, True);
380#endif 477#endif
381 478
382#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 480 if (options & Opt_scrollBar)
384 resize_scrollbar (); /* create and map scrollbar */ 481 resize_scrollbar (); /* create and map scrollbar */
385#endif 482#endif
386#if (MENUBAR_MAX) 483#if (MENUBAR_MAX)
387 if (menubar_visible ()) 484 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 485 XMapWindow (disp, menuBar.win);
389#endif 486#endif
390#ifdef TRANSPARENT 487#ifdef TRANSPARENT
391 if (options & Opt_transparent) 488 if (options & Opt_transparent)
392 { 489 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 490 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 491 check_our_parents ();
395 rootwin_ev.start (display, display->root); 492 rootwin_ev.start (display, display->root);
396 } 493 }
397#endif 494#endif
398 495
399 XMapWindow (display->display, TermWin.vt); 496 XMapWindow (disp, TermWin.vt);
400 XMapWindow (display->display, TermWin.parent[0]); 497 XMapWindow (disp, TermWin.parent[0]);
401 498
402 set_colorfgbg (); 499 set_colorfgbg ();
403 500
404 init_command (cmd_argv); 501 init_command (cmd_argv);
405 502
… …
410 check_ev.start (); 507 check_ev.start ();
411 508
412 return true; 509 return true;
413} 510}
414 511
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 512static struct sig_handlers
513{
514 sig_watcher sw_chld, sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529
530 /*
531 * Catch a fatal signal and tidy up before quitting
532 */
533 void
534 sig_term (sig_watcher &w)
535 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL);
541 kill (getpid (), w.signum);
542 }
543
544 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term)
548 {
549 }
550} sig_handlers;
416 551
417void 552void
418rxvt_init () 553rxvt_init ()
419{ 554{
420 /* 555 /*
… …
428 rxvt_privileges (IGNORE); 563 rxvt_privileges (IGNORE);
429 564
430 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
431 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
432 567
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT);
571
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 573 /* signal (SIGURG, SIG_DFL); */
435 574
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 576 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 577 XSetIOErrorHandler (rxvt_xioerror_handler);
439}
440
441/* ------------------------------------------------------------------------- *
442 * SIGNAL HANDLING & EXIT HANDLER *
443 * ------------------------------------------------------------------------- */
444/*
445 * Catch a SIGCHLD signal and exit if the direct child has died
446 */
447
448void
449rxvt_term::sig_chld (sig_watcher &w)
450{
451 // we are being called for every SIGCHLD, not just ours
452 int pid;
453
454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
455 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
456 if (pid == (*t)->cmd_pid)
457 {
458 (*t)->destroy ();
459 break;
460 }
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 * ------------------------------------------------------------------------- */
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
515 590
516 return p; 591 return p;
517} 592}
518 593
519/* INTPROTO */ 594void *
520void *
521rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
522{ 596{
523 void *p = calloc (number, size); 597 void *p = calloc (number, size);
524 598
525 if (!p) 599 if (!p)
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
527 601
528 return p; 602 return p;
529} 603}
530 604
531/* INTPROTO */
532void * 605void *
533rxvt_realloc (void *ptr, size_t size) 606rxvt_realloc (void *ptr, size_t size)
534{ 607{
535 void *p = realloc (ptr, size); 608 void *p = realloc (ptr, size);
536 609
… …
620 * if width/height are non-zero then override calculated width/height 693 * if width/height are non-zero then override calculated width/height
621 */ 694 */
622void 695void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 696rxvt_term::window_calc (unsigned int width, unsigned int height)
624{ 697{
625 short recalc_x, recalc_y; 698 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 699 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 700 unsigned int w, h;
628 unsigned int max_width, max_height; 701 unsigned int max_width, max_height;
702 dDisp;
629 703
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 705 TermWin.ncol, TermWin.nrow, szHint.width,
632 szHint.height)); 706 szHint.height));
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
… …
639 if (!parsed_geometry) 713 if (!parsed_geometry)
640 { 714 {
641 parsed_geometry = 1; 715 parsed_geometry = 1;
642 if (rs[Rs_geometry]) 716 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 717 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
718
644 if (flags & WidthValue) 719 if (flags & WidthValue)
645 { 720 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 721 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
647 szHint.flags |= USSize; 722 szHint.flags |= USSize;
648 } 723 }
724
649 if (flags & HeightValue) 725 if (flags & HeightValue)
650 { 726 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 727 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
652 szHint.flags |= USSize; 728 szHint.flags |= USSize;
653 } 729 }
730
654 if (flags & XValue) 731 if (flags & XValue)
655 { 732 {
656 szHint.x = x; 733 szHint.x = x;
657 szHint.flags |= USPosition; 734 szHint.flags |= USPosition;
658 if (flags & XNegative) 735 if (flags & XNegative)
659 { 736 {
660 recalc_x = 1; 737 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 738 szHint.win_gravity = NorthEastGravity;
662 } 739 }
663 } 740 }
741
664 if (flags & YValue) 742 if (flags & YValue)
665 { 743 {
666 szHint.y = y; 744 szHint.y = y;
667 szHint.flags |= USPosition; 745 szHint.flags |= USPosition;
668 if (flags & YNegative) 746 if (flags & YNegative)
… …
731 809
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 810 if (scrollbar_visible () && (options & Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 811 window_sb_x = szHint.width - sb_w;
734 812
735 if (recalc_x) 813 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 814 szHint.x += (DisplayWidth (disp, display->screen)
737 - szHint.width - 2 * TermWin.ext_bwidth); 815 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 816 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 817 szHint.y += (DisplayHeight (disp, display->screen)
740 - szHint.height - 2 * TermWin.ext_bwidth); 818 - szHint.height - 2 * TermWin.ext_bwidth);
741 819
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 820 TermWin.ncol = TermWin.width / TermWin.fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 821 TermWin.nrow = TermWin.height / TermWin.fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 822 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
… …
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 845 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 846
769#if 0 847#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 848 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 849 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 850 kill (-cmd_pid, SIGWINCH);
773#endif 851#endif
774} 852}
775 853
776/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 855/* set_fonts () - load and set the various fonts
778/* 856 *
779 * init = 1 - initialize 857 * init = 1 - initialize
780 * 858 *
781 * fontname == FONT_UP - switch to bigger font 859 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 860 * fontname == FONT_DN - switch to smaller font
783 */ 861 */
… …
881/* xterm sequences - title, iconName, color (exptl) */ 959/* xterm sequences - title, iconName, color (exptl) */
882void 960void
883rxvt_term::set_title (const char *str) 961rxvt_term::set_title (const char *str)
884{ 962{
885 set_string_property (XA_WM_NAME, str); 963 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 964#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 965 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 966#endif
889} 967}
890 968
891void 969void
892rxvt_term::set_icon_name (const char *str) 970rxvt_term::set_icon_name (const char *str)
893{ 971{
894 set_string_property (XA_WM_ICON_NAME, str); 972 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 973#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 974 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 975#endif
898} 976}
899 977
900#ifdef XTERM_COLOR_CHANGE 978#ifdef XTERM_COLOR_CHANGE
… …
909 987
910 /* handle color aliases */ 988 /* handle color aliases */
911 if (isdigit (*color)) 989 if (isdigit (*color))
912 { 990 {
913 i = atoi (color); 991 i = atoi (color);
992
914 if (i >= 8 && i <= 15) 993 if (i >= 8 && i <= 15)
915 { /* bright colors */ 994 { /* bright colors */
916 i -= 8; 995 i -= 8;
917# ifndef NO_BRIGHTCOLOR 996# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 997 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 998 SET_PIXCOLOR (idx);
920 goto Done; 999 goto done;
921# endif 1000# endif
922
923 } 1001 }
1002
924 if (i >= 0 && i <= 7) 1003 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1004 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1005 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1006 SET_PIXCOLOR (idx);
928 goto Done; 1007 goto done;
929 } 1008 }
930 } 1009 }
931 1010
932 if (!rXParseAllocColor (& xcol, color)) 1011 if (!rXParseAllocColor (&xcol, color))
933 return; 1012 return;
934 1013
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1014 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1015
937 /* 1016 /*
… …
953 pix_colors_focused[idx] = xcol; 1032 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 1033 SET_PIXCOLOR (idx);
955 1034
956 /* XSetWindowAttributes attr; */ 1035 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 1036 /* Cursor cursor; */
958Done: 1037done:
1038
959#ifdef OFF_FOCUS_FADING 1039#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 1040 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1041 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 1042#endif
963 1043
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 1044 /*TODO: handle Color_BD, scrollbar background, etc. */
965 1045
966 recolour_cursor (); 1046 recolour_cursor ();
… …
1040 * -------------------------------------------------------------------- */ 1120 * -------------------------------------------------------------------- */
1041void 1121void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1122rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1043{ 1123{
1044 int fix_screen; 1124 int fix_screen;
1045
1046#ifdef SMART_RESIZE 1125#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1126 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1127#endif
1128 dDisp;
1049 1129
1050 window_calc (width, height); 1130 window_calc (width, height);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1131 XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1052 1132
1053 if (!ignoreparent) 1133 if (!ignoreparent)
1054 { 1134 {
1055#ifdef SMART_RESIZE 1135#ifdef SMART_RESIZE
1056 /* 1136 /*
… …
1060 int x, y, x1, y1; 1140 int x, y, x1, y1;
1061 int dx, dy; 1141 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1142 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1143 Window unused_cr;
1064 1144
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1145 XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1146 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1147 XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1148 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1149 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1150 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1151 * our position for handles and decorations. Counter it
1072 */ 1152 */
… …
1074 { 1154 {
1075 x -= x1; 1155 x -= x1;
1076 y -= y1; 1156 y -= y1;
1077 } 1157 }
1078 1158
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1159 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1160 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1161 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1162 dy = old_height - szHint.height;
1083 1163
1084 /* Check position of the center of the window */ 1164 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1165 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1169 if (y < y1) /* top half */
1090 dy = 0; 1170 dy = 0;
1091 else if (y == y1) /* exact center */ 1171 else if (y == y1) /* exact center */
1092 dy /= 2; 1172 dy /= 2;
1093 1173
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1174 XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1175 szHint.width, szHint.height);
1096#else 1176#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1177 XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1098#endif 1178#endif
1099 } 1179 }
1100 1180
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1181 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1102 1182
1103 if (fix_screen || width != old_width || height != old_height) 1183 if (fix_screen || width != old_width || height != old_height)
1104 { 1184 {
1105 if (scrollbar_visible ()) 1185 if (scrollbar_visible ())
1106 { 1186 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1187 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1188 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1189 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1190 resize_scrollbar ();
1111 } 1191 }
1112 1192
1113 if (menubar_visible ()) 1193 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1194 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1195 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1196 TermWin_TotalWidth (), menuBar_TotalHeight ());
1117 1197
1118 XMoveResizeWindow (display->display, TermWin.vt, 1198 XMoveResizeWindow (disp, TermWin.vt,
1119 window_vt_x, window_vt_y, 1199 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1200 TermWin_TotalWidth (), TermWin_TotalHeight ());
1121 1201
1122 scr_clear (); 1202 scr_clear ();
1123#ifdef XPM_BACKGROUND 1203#ifdef XPM_BACKGROUND
… …
1171 XWindowAttributes wattr; 1251 XWindowAttributes wattr;
1172 1252
1173 if (width == 0 || height == 0) 1253 if (width == 0 || height == 0)
1174 { 1254 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1255 XGetWindowAttributes (display->display, display->root, &wattr);
1256
1176 if (width == 0) 1257 if (width == 0)
1177 width = wattr.width - szHint.base_width; 1258 width = wattr.width - szHint.base_width;
1178 if (height == 0) 1259 if (height == 0)
1179 height = wattr.height - szHint.base_height; 1260 height = wattr.height - szHint.base_height;
1180 } 1261 }
… …
1474} 1555}
1475 1556
1476void 1557void
1477rxvt_term::im_cb () 1558rxvt_term::im_cb ()
1478{ 1559{
1479 int i, found, had_im; 1560 int i;
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