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.149 by root, Sun Dec 18 00:59:42 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 (fontset[i] != fontset[0])
202 delete TermWin.fontset[i]; 205 delete fontset[i];
203#endif 206#endif
204 delete TermWin.fontset[0]; 207 delete 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 (gc) XFreeGC (disp, 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 drawable;
248 // destroy all windows 253 // destroy all windows
249 if (TermWin.parent[0]) 254 if (parent[0])
250 XDestroyWindow (display->display, TermWin.parent[0]); 255 XDestroyWindow (disp, 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, vt);
400 XMapWindow (display->display, TermWin.parent[0]); 497 XMapWindow (disp, 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
… …
618/* 691/*
619 * window size/position calculcations for XSizeHint and other storage. 692 * window size/position calculcations for XSizeHint and other storage.
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 newwidth, unsigned int newheight)
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 ncol, nrow, szHint.width, szHint.height));
632 szHint.height)); 706
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
634 szHint.win_gravity = NorthWestGravity; 708 szHint.win_gravity = NorthWestGravity;
635 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
636 710
637 recalc_x = recalc_y = 0; 711 recalc_x = recalc_y = 0;
638 flags = 0; 712 flags = 0;
713
639 if (!parsed_geometry) 714 if (!parsed_geometry)
640 { 715 {
641 parsed_geometry = 1; 716 parsed_geometry = 1;
717
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 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 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;
737
658 if (flags & XNegative) 738 if (flags & XNegative)
659 { 739 {
660 recalc_x = 1; 740 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
662 } 742 }
663 } 743 }
744
664 if (flags & YValue) 745 if (flags & YValue)
665 { 746 {
666 szHint.y = y; 747 szHint.y = y;
667 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
749
668 if (flags & YNegative) 750 if (flags & YNegative)
669 { 751 {
670 recalc_y = 1; 752 recalc_y = 1;
753
671 if (szHint.win_gravity == NorthEastGravity) 754 if (szHint.win_gravity == NorthEastGravity)
672 szHint.win_gravity = SouthEastGravity; 755 szHint.win_gravity = SouthEastGravity;
673 else 756 else
674 szHint.win_gravity = SouthWestGravity; 757 szHint.win_gravity = SouthWestGravity;
675 } 758 }
676 } 759 }
677 } 760 }
678 761
679 /* TODO: BOUNDS */ 762 /* TODO: BOUNDS */
680 TermWin.width = TermWin.ncol * TermWin.fwidth; 763 width = ncol * fwidth;
681 TermWin.height = TermWin.nrow * TermWin.fheight; 764 height = nrow * fheight;
682 max_width = MAX_COLS * TermWin.fwidth; 765 max_width = MAX_COLS * fwidth;
683 max_height = MAX_ROWS * TermWin.fheight; 766 max_height = MAX_ROWS * fheight;
684 767
685 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 768 szHint.base_width = szHint.base_height = 2 * int_bwidth;
686 769
687 sb_w = mb_h = 0; 770 sb_w = mb_h = 0;
688 window_vt_x = window_vt_y = TermWin.int_bwidth; 771 window_vt_x = window_vt_y = int_bwidth;
689 772
690 if (scrollbar_visible ()) 773 if (scrollbar_visible ())
691 { 774 {
692 sb_w = scrollbar_TotalWidth (); 775 sb_w = scrollbar_TotalWidth ();
693 szHint.base_width += sb_w; 776 szHint.base_width += sb_w;
… …
700 mb_h = menuBar_TotalHeight (); 783 mb_h = menuBar_TotalHeight ();
701 szHint.base_height += mb_h; 784 szHint.base_height += mb_h;
702 window_vt_y += mb_h; 785 window_vt_y += mb_h;
703 } 786 }
704 787
705 szHint.width_inc = TermWin.fwidth; 788 szHint.width_inc = fwidth;
706 szHint.height_inc = TermWin.fheight; 789 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 790 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 791 szHint.min_height = szHint.base_height + szHint.height_inc;
709 792
710 if (width && width - szHint.base_width < max_width) 793 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 794 {
712 szHint.width = width; 795 szHint.width = newwidth;
713 TermWin.width = width - szHint.base_width; 796 width = newwidth - szHint.base_width;
714 } 797 }
715 else 798 else
716 { 799 {
717 MIN_IT (TermWin.width, max_width); 800 MIN_IT (width, max_width);
718 szHint.width = szHint.base_width + TermWin.width; 801 szHint.width = szHint.base_width + width;
719 } 802 }
720 803
721 if (height && height - szHint.base_height < max_height) 804 if (newheight && newheight - szHint.base_height < max_height)
722 { 805 {
723 szHint.height = height; 806 szHint.height = newheight;
724 TermWin.height = height - szHint.base_height; 807 height = newheight - szHint.base_height;
725 } 808 }
726 else 809 else
727 { 810 {
728 MIN_IT (TermWin.height, max_height); 811 MIN_IT (height, max_height);
729 szHint.height = szHint.base_height + TermWin.height; 812 szHint.height = szHint.base_height + height;
730 } 813 }
731 814
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 815 if (scrollbar_visible () && (options & Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 816 window_sb_x = szHint.width - sb_w;
734 817
735 if (recalc_x) 818 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
737 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 820 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
740 - szHint.height - 2 * TermWin.ext_bwidth);
741 822
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 ncol = width / fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 824 nrow = height / fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 TermWin.ncol, TermWin.nrow, szHint.width, 826 ncol, nrow, szHint.width,
746 szHint.height)); 827 szHint.height));
747 return; 828 return;
748} 829}
749 830
750/*----------------------------------------------------------------------*/ 831/*----------------------------------------------------------------------*/
… …
758 if (pty.pty < 0) 839 if (pty.pty < 0)
759 return; 840 return;
760 841
761 struct winsize ws; 842 struct winsize ws;
762 843
763 ws.ws_col = TermWin.ncol; 844 ws.ws_col = ncol;
764 ws.ws_row = TermWin.nrow; 845 ws.ws_row = nrow;
765 ws.ws_xpixel = TermWin.width; 846 ws.ws_xpixel = width;
766 ws.ws_ypixel = TermWin.height; 847 ws.ws_ypixel = height;
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 849
769#if 0 850#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 852 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 853 kill (-cmd_pid, SIGWINCH);
773#endif 854#endif
774} 855}
775 856
776/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 858/* set_fonts () - load and set the various fonts
778/* 859 *
779 * init = 1 - initialize 860 * init = 1 - initialize
780 * 861 *
781 * fontname == FONT_UP - switch to bigger font 862 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 863 * fontname == FONT_DN - switch to smaller font
783 */ 864 */
… …
795 return false; 876 return false;
796 } 877 }
797 878
798#if ENABLE_STYLES 879#if ENABLE_STYLES
799 for (int i = RS_styleCount; --i; ) 880 for (int i = RS_styleCount; --i; )
800 if (TermWin.fontset[i] != TermWin.fontset[0]) 881 if (fontset[i] != fontset[0])
801 delete TermWin.fontset[i]; 882 delete fontset[i];
802#endif 883#endif
803 884
804 delete TermWin.fontset[0]; 885 delete fontset[0];
805 TermWin.fontset[0] = fs; 886 fontset[0] = fs;
806 887
807 prop = (*fs)[1]->properties (); 888 prop = (*fs)[1]->properties ();
808 prop.height += TermWin.lineSpace; 889 prop.height += lineSpace;
809 fs->set_prop (prop); 890 fs->set_prop (prop);
810 891
811 TermWin.fwidth = prop.width; 892 fwidth = prop.width;
812 TermWin.fheight = prop.height; 893 fheight = prop.height;
813 TermWin.fweight = prop.weight; 894 fweight = prop.weight;
814 TermWin.fslant = prop.slant; 895 fslant = prop.slant;
815 TermWin.fbase = (*fs)[1]->ascent; 896 fbase = (*fs)[1]->ascent;
816 897
817 for (int style = 1; style < 4; style++) 898 for (int style = 1; style < 4; style++)
818 { 899 {
819#if ENABLE_STYLES 900#if ENABLE_STYLES
820 const char *res = rs[Rs_font + style]; 901 const char *res = rs[Rs_font + style];
821 902
822 if (res && !*res) 903 if (res && !*res)
823 TermWin.fontset[style] = TermWin.fontset[0]; 904 fontset[style] = fontset[0];
824 else 905 else
825 { 906 {
826 TermWin.fontset[style] = fs = new rxvt_fontset (this); 907 fontset[style] = fs = new rxvt_fontset (this);
827 rxvt_fontprop prop2 = prop; 908 rxvt_fontprop prop2 = prop;
828 909
829 if (res) 910 if (res)
830 prop2.weight = prop2.slant = rxvt_fontprop::unset; 911 prop2.weight = prop2.slant = rxvt_fontprop::unset;
831 else 912 else
832 { 913 {
833 res = TermWin.fontset[0]->fontdesc; 914 res = fontset[0]->fontdesc;
834 915
835 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
836 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
837 } 918 }
838 919
839 fs->populate (res); 920 fs->populate (res);
840 fs->set_prop (prop2); 921 fs->set_prop (prop2);
841 } 922 }
842#else 923#else
843 TermWin.fontset[style] = TermWin.fontset[0]; 924 fontset[style] = fontset[0];
844#endif 925#endif
845 } 926 }
846 927
847 if (TermWin.parent[0]) 928 if (parent[0])
848 { 929 {
849 resize_all_windows (0, 0, 0); 930 resize_all_windows (0, 0, 0);
850 scr_remap_chars (); 931 scr_remap_chars ();
851 scr_touch (true); 932 scr_touch (true);
852 } 933 }
… …
855} 936}
856 937
857void rxvt_term::set_string_property (Atom prop, const char *str, int len) 938void rxvt_term::set_string_property (Atom prop, const char *str, int len)
858{ 939{
859 // TODO: SMART_WINDOW_TITLE 940 // TODO: SMART_WINDOW_TITLE
860 XChangeProperty (display->display, TermWin.parent[0], 941 XChangeProperty (display->display, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 942 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 943 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 944}
864 945
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 947{
867 // TODO: SMART_WINDOW_TITLE 948 // TODO: SMART_WINDOW_TITLE
868 wchar_t *ws = rxvt_mbstowcs (str, len); 949 wchar_t *ws = rxvt_mbstowcs (str, len);
869 char *s = rxvt_wcstoutf8 (ws); 950 char *s = rxvt_wcstoutf8 (ws);
870 951
871 XChangeProperty (display->display, TermWin.parent[0], 952 XChangeProperty (display->display, parent[0],
872 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
873 (const unsigned char *)s, strlen (s)); 954 (const unsigned char *)s, strlen (s));
874 955
875 free (s); 956 free (s);
876 free (ws); 957 free (ws);
… …
881/* xterm sequences - title, iconName, color (exptl) */ 962/* xterm sequences - title, iconName, color (exptl) */
882void 963void
883rxvt_term::set_title (const char *str) 964rxvt_term::set_title (const char *str)
884{ 965{
885 set_string_property (XA_WM_NAME, str); 966 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 967#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 968 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 969#endif
889} 970}
890 971
891void 972void
892rxvt_term::set_icon_name (const char *str) 973rxvt_term::set_icon_name (const char *str)
893{ 974{
894 set_string_property (XA_WM_ICON_NAME, str); 975 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 976#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 978#endif
898} 979}
899 980
900#ifdef XTERM_COLOR_CHANGE 981#ifdef XTERM_COLOR_CHANGE
… …
909 990
910 /* handle color aliases */ 991 /* handle color aliases */
911 if (isdigit (*color)) 992 if (isdigit (*color))
912 { 993 {
913 i = atoi (color); 994 i = atoi (color);
995
914 if (i >= 8 && i <= 15) 996 if (i >= 8 && i <= 15)
915 { /* bright colors */ 997 { /* bright colors */
916 i -= 8; 998 i -= 8;
917# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
920 goto Done; 1002 goto done;
921# endif 1003# endif
922
923 } 1004 }
1005
924 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1007 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
928 goto Done; 1010 goto done;
929 } 1011 }
930 } 1012 }
931 1013
932 if (!rXParseAllocColor (& xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
933 return; 1015 return;
934 1016
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1017 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1018
937 /* 1019 /*
… …
953 pix_colors_focused[idx] = xcol; 1035 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
955 1037
956 /* XSetWindowAttributes attr; */ 1038 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 1039 /* Cursor cursor; */
958Done: 1040done:
1041
959#ifdef OFF_FOCUS_FADING 1042#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 1043 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1044 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 1045#endif
963 1046
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 1047 /*TODO: handle Color_BD, scrollbar background, etc. */
965 1048
966 recolour_cursor (); 1049 recolour_cursor ();
… …
1037 1120
1038/* -------------------------------------------------------------------- * 1121/* -------------------------------------------------------------------- *
1039 * - WINDOW RESIZING - * 1122 * - WINDOW RESIZING - *
1040 * -------------------------------------------------------------------- */ 1123 * -------------------------------------------------------------------- */
1041void 1124void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1043{ 1126{
1044 int fix_screen; 1127 int fix_screen;
1045
1046#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1129 dDisp;
1049 1130
1050 window_calc (width, height); 1131 window_calc (newwidth, newheight);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, 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, 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, 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, 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, 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 = ncol != prev_ncol || nrow != prev_nrow;
1102 1183
1103 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || newwidth != old_width || newheight != 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, 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
… …
1131 int old_ncol = prev_ncol; 1212 int old_ncol = prev_ncol;
1132 1213
1133 /* scr_reset only works on the primary screen */ 1214 /* scr_reset only works on the primary screen */
1134 if (old_height) /* this is not the first time through */ 1215 if (old_height) /* this is not the first time through */
1135 { 1216 {
1136 unsigned int ncol = TermWin.ncol; 1217 unsigned int ocol = ncol;
1137 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1218 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1138 curr_screen = scr_change_screen (PRIMARY); 1219 curr_screen = scr_change_screen (PRIMARY);
1139 TermWin.ncol = ncol; 1220 ncol = ocol;
1140 } 1221 }
1141 1222
1142 scr_reset (); 1223 scr_reset ();
1143 1224
1144 if (curr_screen >= 0) /* this is not the first time through */ 1225 if (curr_screen >= 0) /* this is not the first time through */
1145 { 1226 {
1146 scr_change_screen (curr_screen); 1227 scr_change_screen (curr_screen);
1147 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1228 selection_check (old_ncol != ncol ? 4 : 0);
1148 } 1229 }
1149 } 1230 }
1150 1231
1151 old_width = szHint.width; 1232 old_width = szHint.width;
1152 old_height = szHint.height; 1233 old_height = szHint.height;
1153 1234
1154#ifdef XPM_BACKGROUND 1235#ifdef XPM_BACKGROUND
1155 if (TermWin.pixmap) 1236 if (pixmap)
1156 scr_touch (false); 1237 scr_touch (false);
1157#endif 1238#endif
1158 1239
1159#ifdef USE_XIM 1240#ifdef USE_XIM
1160 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
… …
1164/* 1245/*
1165 * Set the width/height of the vt window in characters. Units are pixels. 1246 * Set the width/height of the vt window in characters. Units are pixels.
1166 * good for toggling 80/132 columns 1247 * good for toggling 80/132 columns
1167 */ 1248 */
1168void 1249void
1169rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1250rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1170{ 1251{
1171 XWindowAttributes wattr; 1252 XWindowAttributes wattr;
1172 1253
1173 if (width == 0 || height == 0) 1254 if (newwidth == 0 || newheight == 0)
1174 { 1255 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1256 XGetWindowAttributes (display->display, display->root, &wattr);
1257
1176 if (width == 0) 1258 if (newwidth == 0)
1177 width = wattr.width - szHint.base_width; 1259 newwidth = wattr.width - szHint.base_width;
1178 if (height == 0) 1260 if (newheight == 0)
1179 height = wattr.height - szHint.base_height; 1261 newheight = wattr.height - szHint.base_height;
1180 }
1181
1182 if (width != TermWin.width || height != TermWin.height)
1183 { 1262 }
1263
1264 if (newwidth != width || newheight != height)
1265 {
1184 width += szHint.base_width; 1266 newwidth += szHint.base_width;
1185 height += szHint.base_height; 1267 newheight += szHint.base_height;
1186 resize_all_windows (width, height, 0); 1268 resize_all_windows (newwidth, newheight, 0);
1187 } 1269 }
1188} 1270}
1189 1271
1190/* -------------------------------------------------------------------- * 1272/* -------------------------------------------------------------------- *
1191 * - X INPUT METHOD ROUTINES - * 1273 * - X INPUT METHOD ROUTINES - *
… …
1201 1283
1202void 1284void
1203rxvt_term::im_set_size (XRectangle &size) 1285rxvt_term::im_set_size (XRectangle &size)
1204{ 1286{
1205 // the int_bwidth terms make no sense to me 1287 // the int_bwidth terms make no sense to me
1206 size.x = TermWin.int_bwidth; 1288 size.x = int_bwidth;
1207 size.y = TermWin.int_bwidth; 1289 size.y = int_bwidth;
1208 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1290 size.width = Width2Pixel (ncol) + int_bwidth;
1209 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1291 size.height = Height2Pixel (nrow) + int_bwidth;
1210} 1292}
1211 1293
1212void 1294void
1213rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1214 XRectangle &status_rect, 1296 XRectangle &status_rect,
1215 const XRectangle &needed_rect) 1297 const XRectangle &needed_rect)
1216{ 1298{
1217 preedit_rect.x = needed_rect.width; 1299 preedit_rect.x = needed_rect.width;
1218 preedit_rect.y = 0; 1300 preedit_rect.y = 0;
1219 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1301 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1220 preedit_rect.height = TermWin.fheight; 1302 preedit_rect.height = fheight;
1221 1303
1222 status_rect.x = 0; 1304 status_rect.x = 0;
1223 status_rect.y = 0; 1305 status_rect.y = 0;
1224 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1306 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1225 status_rect.height = TermWin.fheight; 1307 status_rect.height = fheight;
1226} 1308}
1227 1309
1228/* Checking whether input method is running. */ 1310/* Checking whether input method is running. */
1229bool 1311bool
1230rxvt_term::IMisRunning () 1312rxvt_term::IMisRunning ()
… …
1258{ 1340{
1259 XPoint nspot; 1341 XPoint nspot;
1260 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1261 1343
1262 if (!Input_Context 1344 if (!Input_Context
1263 || !TermWin.focus 1345 || !focus
1264 || !(input_style & XIMPreeditPosition)) 1346 || !(input_style & XIMPreeditPosition))
1265 return; 1347 return;
1266 1348
1267 im_set_position (nspot); 1349 im_set_position (nspot);
1268 1350
… …
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1391 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1392 "*", 1474 "*",
1393 TermWin.fheight, 1475 fheight,
1394 TermWin.fheight + 1, TermWin.fheight - 1, 1476 fheight + 1, fheight - 1,
1395 TermWin.fheight - 2, TermWin.fheight + 2); 1477 fheight - 2, fheight + 2);
1396 1478
1397 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1398 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1399 1481
1400 if (missing_charset_list) 1482 if (missing_charset_list)
… …
1446 NULL); 1528 NULL);
1447 } 1529 }
1448 1530
1449 Input_Context = XCreateIC (xim, 1531 Input_Context = XCreateIC (xim,
1450 XNInputStyle, input_style, 1532 XNInputStyle, input_style,
1451 XNClientWindow, TermWin.vt, 1533 XNClientWindow, vt,
1452 XNFocusWindow, TermWin.parent[0], 1534 XNFocusWindow, parent[0],
1453 preedit_attr ? XNPreeditAttributes : NULL, 1535 preedit_attr ? XNPreeditAttributes : NULL,
1454 preedit_attr, 1536 preedit_attr,
1455 status_attr ? XNStatusAttributes : NULL, 1537 status_attr ? XNStatusAttributes : NULL,
1456 status_attr, NULL); 1538 status_attr, NULL);
1457 1539
… …
1474} 1556}
1475 1557
1476void 1558void
1477rxvt_term::im_cb () 1559rxvt_term::im_cb ()
1478{ 1560{
1479 int i, found, had_im; 1561 int i;
1480 const char *p; 1562 const char *p;
1481 char **s; 1563 char **s;
1482 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1565
1566 SET_R (this);
1483 1567
1484 im_destroy (); 1568 im_destroy ();
1485 1569
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1571 if (Input_Context)
… …
1539{ 1623{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1542 1626
1543 if (!Input_Context 1627 if (!Input_Context
1544 || !TermWin.focus 1628 || !focus
1545 || !(input_style & XIMPreeditArea) 1629 || !(input_style & XIMPreeditArea)
1546 || !IMisRunning ()) 1630 || !IMisRunning ())
1547 return; 1631 return;
1548 1632
1549 /* Getting the necessary width of preedit area */ 1633 /* Getting the necessary width of preedit area */

Diff Legend

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