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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC vs.
Revision 1.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_chld (this, &rxvt_term::sig_chld),
165 termwin_ev (this, &rxvt_term::x_cb), 162 termwin_ev (this, &rxvt_term::x_cb),
166 vt_ev (this, &rxvt_term::x_cb), 163 vt_ev (this, &rxvt_term::x_cb),
167 check_ev (this, &rxvt_term::check_cb), 164 check_ev (this, &rxvt_term::check_cb),
168 flush_ev (this, &rxvt_term::flush_cb), 165 flush_ev (this, &rxvt_term::flush_cb),
169 destroy_ev (this, &rxvt_term::destroy_cb), 166 destroy_ev (this, &rxvt_term::destroy_cb),
… …
180 if (!keyboard) 177 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n"); 178 rxvt_fatal ("out of memory, aborting.\n");
182#endif 179#endif
183} 180}
184 181
185rxvt_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 ()
186{ 185{
187 termlist.erase (find (termlist.begin (), termlist.end(), this));
188
189 if (cmd_pid) 186 if (cmd_pid)
190 kill (-cmd_pid, SIGHUP); 187 kill (-cmd_pid, SIGHUP);
191 188
192 pty.put ();
193
194#ifdef UTMP_SUPPORT 189#ifdef UTMP_SUPPORT
195 privileged_utmp (RESTORE); 190 privileged_utmp (RESTORE);
196#endif 191#endif
197 192
193 pty.put ();
194}
195
196rxvt_term::~rxvt_term ()
197{
198 termlist.erase (find (termlist.begin (), termlist.end(), this));
199
200 emergency_cleanup ();
201
198#if ENABLE_STYLES 202#if ENABLE_STYLES
199 for (int i = RS_styleCount; --i; ) 203 for (int i = RS_styleCount; --i; )
200 if (TermWin.fontset[i] != TermWin.fontset[0]) 204 if (fontset[i] != fontset[0])
201 delete TermWin.fontset[i]; 205 delete fontset[i];
202#endif 206#endif
203 delete TermWin.fontset[0]; 207 delete fontset[0];
204 208
205 if (display) 209 if (display)
206 { 210 {
211 dDisp;
212
207 selection_clear (); 213 selection_clear ();
208 214
209#ifdef USE_XIM 215#ifdef USE_XIM
210 im_destroy (); 216 im_destroy ();
211#endif 217#endif
212#ifdef MENUBAR 218#ifdef MENUBAR
213 if (menubarGC) XFreeGC (display->display, menubarGC); 219 if (menubarGC) XFreeGC (disp, menubarGC);
214#endif 220#endif
215#ifdef XTERM_SCROLLBAR 221#ifdef XTERM_SCROLLBAR
216 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
217 if (ShadowGC) XFreeGC (display->display, ShadowGC); 223 if (ShadowGC) XFreeGC (disp, ShadowGC);
218#endif 224#endif
219#ifdef PLAIN_SCROLLBAR 225#ifdef PLAIN_SCROLLBAR
220 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
221#endif 227#endif
222#ifdef NEXT_SCROLLBAR 228#ifdef NEXT_SCROLLBAR
223 if (blackGC) XFreeGC (display->display, blackGC); 229 if (blackGC) XFreeGC (disp, blackGC);
224 if (whiteGC) XFreeGC (display->display, whiteGC); 230 if (whiteGC) XFreeGC (disp, whiteGC);
225 if (grayGC) XFreeGC (display->display, grayGC); 231 if (grayGC) XFreeGC (disp, grayGC);
226 if (darkGC) XFreeGC (display->display, darkGC); 232 if (darkGC) XFreeGC (disp, darkGC);
227 if (stippleGC) XFreeGC (display->display, stippleGC); 233 if (stippleGC) XFreeGC (disp, stippleGC);
228 if (dimple) XFreePixmap (display->display, dimple); 234 if (dimple) XFreePixmap (disp, dimple);
229 if (upArrow) XFreePixmap (display->display, upArrow); 235 if (upArrow) XFreePixmap (disp, upArrow);
230 if (downArrow) XFreePixmap (display->display, downArrow); 236 if (downArrow) XFreePixmap (disp, downArrow);
231 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 237 if (upArrowHi) XFreePixmap (disp, upArrowHi);
232 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 238 if (downArrowHi) XFreePixmap (disp, downArrowHi);
233#endif 239#endif
234#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
235 if (topShadowGC) XFreeGC (display->display, topShadowGC); 241 if (topShadowGC) XFreeGC (disp, topShadowGC);
236 if (botShadowGC) XFreeGC (display->display, botShadowGC); 242 if (botShadowGC) XFreeGC (disp, botShadowGC);
237 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 243 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
238#endif 244#endif
239 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 245 if (gc) XFreeGC (disp, gc);
240 246
241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
242 delete menuBar.drawable; 248 delete menuBar.drawable;
243 //if (menuBar.win) 249 //if (menuBar.win)
244 // XDestroyWindow (display->display, menuBar.win); 250 // XDestroyWindow (disp, menuBar.win);
245#endif 251#endif
246 delete TermWin.drawable; 252 delete drawable;
247 // destroy all windows 253 // destroy all windows
248 if (TermWin.parent[0]) 254 if (parent[0])
249 XDestroyWindow (display->display, TermWin.parent[0]); 255 XDestroyWindow (disp, parent[0]);
250 } 256 }
251 257
252 // TODO: free pixcolours, colours should become part of rxvt_display 258 // TODO: free pixcolours, colours should become part of rxvt_display
253 259
254 delete pix_colors_focused; 260 delete pix_colors_focused;
255#ifdef OFF_FOCUS_FADING 261#if OFF_FOCUS_FADING
256 delete pix_colors_unfocused; 262 delete pix_colors_unfocused;
257#endif 263#endif
258 264
259 displays.put (display); 265 displays.put (display);
260 266
261 scr_release (); 267 scr_release ();
262 268
263 /* clear all resources */ 269 /* clear all resources */
264 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
265 free (allocated[i]); 271 free (allocated [i]);
266 272
267 free (selection.text); 273 free (selection.text);
268 // TODO: manage env vars in child only(!) 274 // TODO: manage env vars in child only(!)
269 free (env_windowid); 275 free (env_windowid);
270 free (env_display); 276 free (env_display);
… …
276 282
277 delete envv; 283 delete envv;
278 delete argv; 284 delete argv;
279 285
280#ifdef KEYSYM_RESOURCE 286#ifdef KEYSYM_RESOURCE
281 delete keyboard; 287 delete keyboard;
282#endif 288#endif
283} 289}
284 290
285void 291void
286rxvt_term::destroy () 292rxvt_term::destroy ()
… …
339 345
340 delete this; 346 delete this;
341} 347}
342 348
343/*----------------------------------------------------------------------*/ 349/*----------------------------------------------------------------------*/
344/* 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/*----------------------------------------------------------------------*/
345bool 441bool
346rxvt_term::init (int argc, const char *const *argv) 442rxvt_term::init (int argc, const char *const *argv)
347{ 443{
348 SET_R (this); 444 SET_R (this);
349 445
… …
368 scrollBar.setIdle (); /* set existence for size calculations */ 464 scrollBar.setIdle (); /* set existence for size calculations */
369#endif 465#endif
370 466
371 create_windows (argc, argv); 467 create_windows (argc, argv);
372 468
469 dDisp;
470
373 init_xlocale (); 471 init_xlocale ();
374 472
375 scr_reset (); /* initialize screen */ 473 scr_reset (); /* initialize screen */
376 474
377#if 0 475#if 0
378 XSynchronize (display->display, True); 476 XSynchronize (disp, True);
379#endif 477#endif
380 478
381#ifdef HAVE_SCROLLBARS 479#ifdef HAVE_SCROLLBARS
382 if (options & Opt_scrollBar) 480 if (options & Opt_scrollBar)
383 resize_scrollbar (); /* create and map scrollbar */ 481 resize_scrollbar (); /* create and map scrollbar */
384#endif 482#endif
385#if (MENUBAR_MAX) 483#if (MENUBAR_MAX)
386 if (menubar_visible ()) 484 if (menubar_visible ())
387 XMapWindow (display->display, menuBar.win); 485 XMapWindow (disp, menuBar.win);
388#endif 486#endif
389#ifdef TRANSPARENT 487#ifdef TRANSPARENT
390 if (options & Opt_transparent) 488 if (options & Opt_transparent)
391 { 489 {
392 XSelectInput (display->display, display->root, PropertyChangeMask); 490 XSelectInput (disp, display->root, PropertyChangeMask);
393 check_our_parents (); 491 check_our_parents ();
394 rootwin_ev.start (display, display->root); 492 rootwin_ev.start (display, display->root);
395 } 493 }
396#endif 494#endif
397 495
398 XMapWindow (display->display, TermWin.vt); 496 XMapWindow (disp, vt);
399 XMapWindow (display->display, TermWin.parent[0]); 497 XMapWindow (disp, parent[0]);
400 498
401 set_colorfgbg (); 499 set_colorfgbg ();
402 500
403 init_command (cmd_argv); 501 init_command (cmd_argv);
404 502
… …
409 check_ev.start (); 507 check_ev.start ();
410 508
411 return true; 509 return true;
412} 510}
413 511
414static 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;
415 551
416void 552void
417rxvt_init () 553rxvt_init ()
418{ 554{
419 /* 555 /*
… …
427 rxvt_privileges (IGNORE); 563 rxvt_privileges (IGNORE);
428 564
429 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
430 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
431 567
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM);
570 sig_handlers.sw_int.start (SIGINT);
571
432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
433 /* signal (SIGURG, SIG_DFL); */ 573 /* signal (SIGURG, SIG_DFL); */
434 574
435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 // TODO: handle this with exceptions and tolerate the memory loss 576 // TODO: handle this with exceptions and tolerate the memory loss
437 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 577 XSetIOErrorHandler (rxvt_xioerror_handler);
438}
439
440/* ------------------------------------------------------------------------- *
441 * SIGNAL HANDLING & EXIT HANDLER *
442 * ------------------------------------------------------------------------- */
443/*
444 * Catch a SIGCHLD signal and exit if the direct child has died
445 */
446
447void
448rxvt_term::sig_chld (sig_watcher &w)
449{
450 // we are being called for every SIGCHLD, not just ours
451 int pid;
452
453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
454 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
455 if (pid == (*t)->cmd_pid)
456 {
457 (*t)->destroy ();
458 break;
459 }
460}
461
462/*----------------------------------------------------------------------*/
463/*
464 * Exit gracefully, clearing the utmp entry and restoring tty attributes
465 * TODO: if debugging, this should free up any known resources if we can
466 */
467void
468rxvt_destroy_all ()
469{
470 // TODO: rxvtd should clean up all ressources
471 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
472 (*t)->destroy ();
473}
474
475/*
476 * Catch a fatal signal and tidy up before quitting
477 */
478void
479rxvt_term::sig_term (sig_watcher &w)
480{
481#ifdef DEBUG_CMD
482 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
483#endif
484 rxvt_destroy_all ();
485 signal (w.signum, SIG_DFL);
486 kill (getpid (), w.signum);
487}
488
489/* INTPROTO */
490int
491rxvt_xerror_handler (Display *display, XErrorEvent *event)
492{
493 if (GET_R->allowedxerror == -1)
494 GET_R->allowedxerror = event->error_code;
495 else
496 {
497 old_xerror_handler (display, event);
498 GET_R->destroy ();
499 }
500
501 return 0;
502} 578}
503 579
504/* ------------------------------------------------------------------------- * 580/* ------------------------------------------------------------------------- *
505 * MEMORY ALLOCATION WRAPPERS * 581 * MEMORY ALLOCATION WRAPPERS *
506 * ------------------------------------------------------------------------- */ 582 * ------------------------------------------------------------------------- */
… …
513 rxvt_fatal ("memory allocation failure. aborting.\n"); 589 rxvt_fatal ("memory allocation failure. aborting.\n");
514 590
515 return p; 591 return p;
516} 592}
517 593
518/* INTPROTO */ 594void *
519void *
520rxvt_calloc (size_t number, size_t size) 595rxvt_calloc (size_t number, size_t size)
521{ 596{
522 void *p = calloc (number, size); 597 void *p = calloc (number, size);
523 598
524 if (!p) 599 if (!p)
525 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
526 601
527 return p; 602 return p;
528} 603}
529 604
530/* INTPROTO */
531void * 605void *
532rxvt_realloc (void *ptr, size_t size) 606rxvt_realloc (void *ptr, size_t size)
533{ 607{
534 void *p = realloc (ptr, size); 608 void *p = realloc (ptr, size);
535 609
… …
617/* 691/*
618 * window size/position calculcations for XSizeHint and other storage. 692 * window size/position calculcations for XSizeHint and other storage.
619 * if width/height are non-zero then override calculated width/height 693 * if width/height are non-zero then override calculated width/height
620 */ 694 */
621void 695void
622rxvt_term::window_calc (unsigned int width, unsigned int height) 696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
623{ 697{
624 short recalc_x, recalc_y; 698 short recalc_x, recalc_y;
625 int x, y, sb_w, mb_h, flags; 699 int x, y, sb_w, mb_h, flags;
626 unsigned int w, h; 700 unsigned int w, h;
627 unsigned int max_width, max_height; 701 unsigned int max_width, max_height;
702 dDisp;
628 703
629 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",
630 TermWin.ncol, TermWin.nrow, szHint.width, 705 ncol, nrow, szHint.width, szHint.height));
631 szHint.height)); 706
632 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
633 szHint.win_gravity = NorthWestGravity; 708 szHint.win_gravity = NorthWestGravity;
634 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
635 710
636 recalc_x = recalc_y = 0; 711 recalc_x = recalc_y = 0;
637 flags = 0; 712 flags = 0;
713
638 if (!parsed_geometry) 714 if (!parsed_geometry)
639 { 715 {
640 parsed_geometry = 1; 716 parsed_geometry = 1;
717
641 if (rs[Rs_geometry]) 718 if (rs[Rs_geometry])
642 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720
643 if (flags & WidthValue) 721 if (flags & WidthValue)
644 { 722 {
645 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 723 ncol = BOUND_POSITIVE_INT16 (w);
646 szHint.flags |= USSize; 724 szHint.flags |= USSize;
647 } 725 }
726
648 if (flags & HeightValue) 727 if (flags & HeightValue)
649 { 728 {
650 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 729 nrow = BOUND_POSITIVE_INT16 (h);
651 szHint.flags |= USSize; 730 szHint.flags |= USSize;
652 } 731 }
732
653 if (flags & XValue) 733 if (flags & XValue)
654 { 734 {
655 szHint.x = x; 735 szHint.x = x;
656 szHint.flags |= USPosition; 736 szHint.flags |= USPosition;
737
657 if (flags & XNegative) 738 if (flags & XNegative)
658 { 739 {
659 recalc_x = 1; 740 recalc_x = 1;
660 szHint.win_gravity = NorthEastGravity; 741 szHint.win_gravity = NorthEastGravity;
661 } 742 }
662 } 743 }
744
663 if (flags & YValue) 745 if (flags & YValue)
664 { 746 {
665 szHint.y = y; 747 szHint.y = y;
666 szHint.flags |= USPosition; 748 szHint.flags |= USPosition;
749
667 if (flags & YNegative) 750 if (flags & YNegative)
668 { 751 {
669 recalc_y = 1; 752 recalc_y = 1;
753
670 if (szHint.win_gravity == NorthEastGravity) 754 if (szHint.win_gravity == NorthEastGravity)
671 szHint.win_gravity = SouthEastGravity; 755 szHint.win_gravity = SouthEastGravity;
672 else 756 else
673 szHint.win_gravity = SouthWestGravity; 757 szHint.win_gravity = SouthWestGravity;
674 } 758 }
675 } 759 }
676 } 760 }
677 761
678 /* TODO: BOUNDS */ 762 /* TODO: BOUNDS */
679 TermWin.width = TermWin.ncol * TermWin.fwidth; 763 width = ncol * fwidth;
680 TermWin.height = TermWin.nrow * TermWin.fheight; 764 height = nrow * fheight;
681 max_width = MAX_COLS * TermWin.fwidth; 765 max_width = MAX_COLS * fwidth;
682 max_height = MAX_ROWS * TermWin.fheight; 766 max_height = MAX_ROWS * fheight;
683 767
684 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 768 szHint.base_width = szHint.base_height = 2 * int_bwidth;
685 769
686 sb_w = mb_h = 0; 770 sb_w = mb_h = 0;
687 window_vt_x = window_vt_y = TermWin.int_bwidth; 771 window_vt_x = window_vt_y = int_bwidth;
688 772
689 if (scrollbar_visible ()) 773 if (scrollbar_visible ())
690 { 774 {
691 sb_w = scrollbar_TotalWidth (); 775 sb_w = scrollbar_TotalWidth ();
692 szHint.base_width += sb_w; 776 szHint.base_width += sb_w;
… …
699 mb_h = menuBar_TotalHeight (); 783 mb_h = menuBar_TotalHeight ();
700 szHint.base_height += mb_h; 784 szHint.base_height += mb_h;
701 window_vt_y += mb_h; 785 window_vt_y += mb_h;
702 } 786 }
703 787
704 szHint.width_inc = TermWin.fwidth; 788 szHint.width_inc = fwidth;
705 szHint.height_inc = TermWin.fheight; 789 szHint.height_inc = fheight;
706 szHint.min_width = szHint.base_width + szHint.width_inc; 790 szHint.min_width = szHint.base_width + szHint.width_inc;
707 szHint.min_height = szHint.base_height + szHint.height_inc; 791 szHint.min_height = szHint.base_height + szHint.height_inc;
708 792
709 if (width && width - szHint.base_width < max_width) 793 if (newwidth && newwidth - szHint.base_width < max_width)
710 { 794 {
711 szHint.width = width; 795 szHint.width = newwidth;
712 TermWin.width = width - szHint.base_width; 796 width = newwidth - szHint.base_width;
713 } 797 }
714 else 798 else
715 { 799 {
716 MIN_IT (TermWin.width, max_width); 800 MIN_IT (width, max_width);
717 szHint.width = szHint.base_width + TermWin.width; 801 szHint.width = szHint.base_width + width;
718 } 802 }
719 803
720 if (height && height - szHint.base_height < max_height) 804 if (newheight && newheight - szHint.base_height < max_height)
721 { 805 {
722 szHint.height = height; 806 szHint.height = newheight;
723 TermWin.height = height - szHint.base_height; 807 height = newheight - szHint.base_height;
724 } 808 }
725 else 809 else
726 { 810 {
727 MIN_IT (TermWin.height, max_height); 811 MIN_IT (height, max_height);
728 szHint.height = szHint.base_height + TermWin.height; 812 szHint.height = szHint.base_height + height;
729 } 813 }
730 814
731 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 815 if (scrollbar_visible () && (options & Opt_scrollBar_right))
732 window_sb_x = szHint.width - sb_w; 816 window_sb_x = szHint.width - sb_w;
733 817
734 if (recalc_x) 818 if (recalc_x)
735 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
736 - szHint.width - 2 * TermWin.ext_bwidth);
737 if (recalc_y) 820 if (recalc_y)
738 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
739 - szHint.height - 2 * TermWin.ext_bwidth);
740 822
741 TermWin.ncol = TermWin.width / TermWin.fwidth; 823 ncol = width / fwidth;
742 TermWin.nrow = TermWin.height / TermWin.fheight; 824 nrow = height / fheight;
743 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",
744 TermWin.ncol, TermWin.nrow, szHint.width, 826 ncol, nrow, szHint.width,
745 szHint.height)); 827 szHint.height));
746 return; 828 return;
747} 829}
748 830
749/*----------------------------------------------------------------------*/ 831/*----------------------------------------------------------------------*/
… …
757 if (pty.pty < 0) 839 if (pty.pty < 0)
758 return; 840 return;
759 841
760 struct winsize ws; 842 struct winsize ws;
761 843
762 ws.ws_col = TermWin.ncol; 844 ws.ws_col = ncol;
763 ws.ws_row = TermWin.nrow; 845 ws.ws_row = nrow;
764 ws.ws_xpixel = TermWin.width; 846 ws.ws_xpixel = width;
765 ws.ws_ypixel = TermWin.height; 847 ws.ws_ypixel = height;
766 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
767 849
768#if 0 850#if 0
769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
770 if (cmd_pid) /* force through to the command */ 852 if (cmd_pid) /* force through to the command */
771 kill (cmd_pid, SIGWINCH); 853 kill (-cmd_pid, SIGWINCH);
772#endif 854#endif
773} 855}
774 856
775/*----------------------------------------------------------------------*/ 857/*----------------------------------------------------------------------*/
776/* set_fonts () - load and set the various fonts 858/* set_fonts () - load and set the various fonts
777/* 859 *
778 * init = 1 - initialize 860 * init = 1 - initialize
779 * 861 *
780 * fontname == FONT_UP - switch to bigger font 862 * fontname == FONT_UP - switch to bigger font
781 * fontname == FONT_DN - switch to smaller font 863 * fontname == FONT_DN - switch to smaller font
782 */ 864 */
… …
794 return false; 876 return false;
795 } 877 }
796 878
797#if ENABLE_STYLES 879#if ENABLE_STYLES
798 for (int i = RS_styleCount; --i; ) 880 for (int i = RS_styleCount; --i; )
799 if (TermWin.fontset[i] != TermWin.fontset[0]) 881 if (fontset[i] != fontset[0])
800 delete TermWin.fontset[i]; 882 delete fontset[i];
801#endif 883#endif
802 884
803 delete TermWin.fontset[0]; 885 delete fontset[0];
804 TermWin.fontset[0] = fs; 886 fontset[0] = fs;
805 887
806 prop = (*fs)[1]->properties (); 888 prop = (*fs)[1]->properties ();
807 prop.height += TermWin.lineSpace; 889 prop.height += lineSpace;
808 fs->set_prop (prop); 890 fs->set_prop (prop);
809 891
810 TermWin.fwidth = prop.width; 892 fwidth = prop.width;
811 TermWin.fheight = prop.height; 893 fheight = prop.height;
812 TermWin.fweight = prop.weight; 894 fweight = prop.weight;
813 TermWin.fslant = prop.slant; 895 fslant = prop.slant;
814 TermWin.fbase = (*fs)[1]->ascent; 896 fbase = (*fs)[1]->ascent;
815 897
816 for (int style = 1; style < 4; style++) 898 for (int style = 1; style < 4; style++)
817 { 899 {
818#if ENABLE_STYLES 900#if ENABLE_STYLES
819 const char *res = rs[Rs_font + style]; 901 const char *res = rs[Rs_font + style];
820 902
821 if (res && !*res) 903 if (res && !*res)
822 TermWin.fontset[style] = TermWin.fontset[0]; 904 fontset[style] = fontset[0];
823 else 905 else
824 { 906 {
825 TermWin.fontset[style] = fs = new rxvt_fontset (this); 907 fontset[style] = fs = new rxvt_fontset (this);
826 rxvt_fontprop prop2 = prop; 908 rxvt_fontprop prop2 = prop;
827 909
828 if (res) 910 if (res)
829 prop2.weight = prop2.slant = rxvt_fontprop::unset; 911 prop2.weight = prop2.slant = rxvt_fontprop::unset;
830 else 912 else
831 { 913 {
832 res = TermWin.fontset[0]->fontdesc; 914 res = fontset[0]->fontdesc;
833 915
834 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;
835 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;
836 } 918 }
837 919
838 fs->populate (res); 920 fs->populate (res);
839 fs->set_prop (prop2); 921 fs->set_prop (prop2);
840 } 922 }
841#else 923#else
842 TermWin.fontset[style] = TermWin.fontset[0]; 924 fontset[style] = fontset[0];
843#endif 925#endif
844 } 926 }
845 927
846 if (TermWin.parent[0]) 928 if (parent[0])
847 { 929 {
848 resize_all_windows (0, 0, 0); 930 resize_all_windows (0, 0, 0);
849 scr_remap_chars (); 931 scr_remap_chars ();
850 scr_touch (true); 932 scr_touch (true);
851 } 933 }
… …
854} 936}
855 937
856void 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)
857{ 939{
858 // TODO: SMART_WINDOW_TITLE 940 // TODO: SMART_WINDOW_TITLE
859 XChangeProperty (display->display, TermWin.parent[0], 941 XChangeProperty (display->display, parent[0],
860 prop, XA_STRING, 8, PropModeReplace, 942 prop, XA_STRING, 8, PropModeReplace,
861 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 943 (const unsigned char *)str, len >= 0 ? len : strlen (str));
862} 944}
863 945
864void 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)
865{ 947{
866 // TODO: SMART_WINDOW_TITLE 948 // TODO: SMART_WINDOW_TITLE
867 wchar_t *ws = rxvt_mbstowcs (str, len); 949 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws); 950 char *s = rxvt_wcstoutf8 (ws);
869 951
870 XChangeProperty (display->display, TermWin.parent[0], 952 XChangeProperty (display->display, parent[0],
871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
872 (const unsigned char *)s, strlen (s)); 954 (const unsigned char *)s, strlen (s));
873 955
874 free (s); 956 free (s);
875 free (ws); 957 free (ws);
… …
880/* xterm sequences - title, iconName, color (exptl) */ 962/* xterm sequences - title, iconName, color (exptl) */
881void 963void
882rxvt_term::set_title (const char *str) 964rxvt_term::set_title (const char *str)
883{ 965{
884 set_string_property (XA_WM_NAME, str); 966 set_string_property (XA_WM_NAME, str);
885#if ENABLE_FRILLS 967#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_NAME], str); 968 set_utf8_property (xa[XA_NET_WM_NAME], str);
887#endif 969#endif
888} 970}
889 971
890void 972void
891rxvt_term::set_icon_name (const char *str) 973rxvt_term::set_icon_name (const char *str)
892{ 974{
893 set_string_property (XA_WM_ICON_NAME, str); 975 set_string_property (XA_WM_ICON_NAME, str);
894#if ENABLE_FRILLS 976#if ENABLE_EWMH
895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
896#endif 978#endif
897} 979}
898 980
899#ifdef XTERM_COLOR_CHANGE 981#ifdef XTERM_COLOR_CHANGE
… …
908 990
909 /* handle color aliases */ 991 /* handle color aliases */
910 if (isdigit (*color)) 992 if (isdigit (*color))
911 { 993 {
912 i = atoi (color); 994 i = atoi (color);
995
913 if (i >= 8 && i <= 15) 996 if (i >= 8 && i <= 15)
914 { /* bright colors */ 997 { /* bright colors */
915 i -= 8; 998 i -= 8;
916# ifndef NO_BRIGHTCOLOR 999# ifndef NO_BRIGHTCOLOR
917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
918 SET_PIXCOLOR (idx); 1001 SET_PIXCOLOR (idx);
919 goto Done; 1002 goto done;
920# endif 1003# endif
921
922 } 1004 }
1005
923 if (i >= 0 && i <= 7) 1006 if (i >= 0 && i <= 7)
924 { /* normal colors */ 1007 { /* normal colors */
925 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
926 SET_PIXCOLOR (idx); 1009 SET_PIXCOLOR (idx);
927 goto Done; 1010 goto done;
928 } 1011 }
929 } 1012 }
930 1013
931 if (!rXParseAllocColor (& xcol, color)) 1014 if (!rXParseAllocColor (&xcol, color))
932 return; 1015 return;
933 1016
934 /* XStoreColor (display->display, display->cmap, XColor*); */ 1017 /* XStoreColor (display->display, display->cmap, XColor*); */
935 1018
936 /* 1019 /*
… …
952 pix_colors_focused[idx] = xcol; 1035 pix_colors_focused[idx] = xcol;
953 SET_PIXCOLOR (idx); 1036 SET_PIXCOLOR (idx);
954 1037
955 /* XSetWindowAttributes attr; */ 1038 /* XSetWindowAttributes attr; */
956 /* Cursor cursor; */ 1039 /* Cursor cursor; */
957Done: 1040done:
1041
958#ifdef OFF_FOCUS_FADING 1042#if OFF_FOCUS_FADING
959 if (rs[Rs_fade]) 1043 if (rs[Rs_fade])
960 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]);
961#endif 1045#endif
962 1046
963 /*TODO: handle Color_BD, scrollbar background, etc. */ 1047 /*TODO: handle Color_BD, scrollbar background, etc. */
964 1048
965 recolour_cursor (); 1049 recolour_cursor ();
… …
1036 1120
1037/* -------------------------------------------------------------------- * 1121/* -------------------------------------------------------------------- *
1038 * - WINDOW RESIZING - * 1122 * - WINDOW RESIZING - *
1039 * -------------------------------------------------------------------- */ 1123 * -------------------------------------------------------------------- */
1040void 1124void
1041rxvt_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)
1042{ 1126{
1043 int fix_screen; 1127 int fix_screen;
1044
1045#ifdef SMART_RESIZE
1046 int old_width = szHint.width, old_height = szHint.height; 1128 int old_width = szHint.width, old_height = szHint.height;
1047#endif 1129 dDisp;
1048 1130
1049 window_calc (width, height); 1131 window_calc (newwidth, newheight);
1050 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1132 XSetWMNormalHints (disp, parent[0], &szHint);
1051 1133
1052 if (!ignoreparent) 1134 if (!ignoreparent)
1053 { 1135 {
1054#ifdef SMART_RESIZE 1136#ifdef SMART_RESIZE
1055 /* 1137 /*
… …
1059 int x, y, x1, y1; 1141 int x, y, x1, y1;
1060 int dx, dy; 1142 int dx, dy;
1061 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1062 Window unused_cr; 1144 Window unused_cr;
1063 1145
1064 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1146 XTranslateCoordinates (disp, parent[0], display->root,
1065 0, 0, &x, &y, &unused_cr); 1147 0, 0, &x, &y, &unused_cr);
1066 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1067 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1068 /* 1150 /*
1069 * 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
1070 * our position for handles and decorations. Counter it 1152 * our position for handles and decorations. Counter it
1071 */ 1153 */
… …
1073 { 1155 {
1074 x -= x1; 1156 x -= x1;
1075 y -= y1; 1157 y -= y1;
1076 } 1158 }
1077 1159
1078 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1079 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1080 dx = old_width - szHint.width; 1162 dx = old_width - szHint.width;
1081 dy = old_height - szHint.height; 1163 dy = old_height - szHint.height;
1082 1164
1083 /* Check position of the center of the window */ 1165 /* Check position of the center of the window */
1084 if (x < x1) /* left half */ 1166 if (x < x1) /* left half */
… …
1088 if (y < y1) /* top half */ 1170 if (y < y1) /* top half */
1089 dy = 0; 1171 dy = 0;
1090 else if (y == y1) /* exact center */ 1172 else if (y == y1) /* exact center */
1091 dy /= 2; 1173 dy /= 2;
1092 1174
1093 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1094 szHint.width, szHint.height); 1176 szHint.width, szHint.height);
1095#else 1177#else
1096 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1097#endif 1179#endif
1098 } 1180 }
1099 1181
1100 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1101 1183
1102 if (fix_screen || width != old_width || height != old_height) 1184 if (fix_screen || newwidth != old_width || newheight != old_height)
1103 { 1185 {
1104 if (scrollbar_visible ()) 1186 if (scrollbar_visible ())
1105 { 1187 {
1106 XMoveResizeWindow (display->display, scrollBar.win, 1188 XMoveResizeWindow (disp, scrollBar.win,
1107 window_sb_x, 0, 1189 window_sb_x, 0,
1108 scrollbar_TotalWidth (), szHint.height); 1190 scrollbar_TotalWidth (), szHint.height);
1109 resize_scrollbar (); 1191 resize_scrollbar ();
1110 } 1192 }
1111 1193
1112 if (menubar_visible ()) 1194 if (menubar_visible ())
1113 XMoveResizeWindow (display->display, menuBar.win, 1195 XMoveResizeWindow (disp, menuBar.win,
1114 window_vt_x, 0, 1196 window_vt_x, 0,
1115 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1116 1198
1117 XMoveResizeWindow (display->display, TermWin.vt, 1199 XMoveResizeWindow (disp, vt,
1118 window_vt_x, window_vt_y, 1200 window_vt_x, window_vt_y,
1119 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1201 TermWin_TotalWidth (), TermWin_TotalHeight ());
1202
1120 scr_clear (); 1203 scr_clear ();
1121#ifdef XPM_BACKGROUND 1204#ifdef XPM_BACKGROUND
1122 resize_pixmap (); 1205 resize_pixmap ();
1123#endif 1206#endif
1124 } 1207 }
… …
1129 int old_ncol = prev_ncol; 1212 int old_ncol = prev_ncol;
1130 1213
1131 /* scr_reset only works on the primary screen */ 1214 /* scr_reset only works on the primary screen */
1132 if (old_height) /* this is not the first time through */ 1215 if (old_height) /* this is not the first time through */
1133 { 1216 {
1134 unsigned int ncol = TermWin.ncol; 1217 unsigned int ocol = ncol;
1135 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
1136 curr_screen = scr_change_screen (PRIMARY); 1219 curr_screen = scr_change_screen (PRIMARY);
1137 TermWin.ncol = ncol; 1220 ncol = ocol;
1138 } 1221 }
1139 1222
1140 scr_reset (); 1223 scr_reset ();
1141 1224
1142 if (curr_screen >= 0) /* this is not the first time through */ 1225 if (curr_screen >= 0) /* this is not the first time through */
1143 { 1226 {
1144 scr_change_screen (curr_screen); 1227 scr_change_screen (curr_screen);
1145 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1228 selection_check (old_ncol != ncol ? 4 : 0);
1146 } 1229 }
1147 } 1230 }
1148 1231
1149 old_width = szHint.width; 1232 old_width = szHint.width;
1150 old_height = szHint.height; 1233 old_height = szHint.height;
1234
1235#ifdef XPM_BACKGROUND
1236 if (pixmap)
1237 scr_touch (false);
1238#endif
1151 1239
1152#ifdef USE_XIM 1240#ifdef USE_XIM
1153 IMSetStatusPosition (); 1241 IMSetStatusPosition ();
1154#endif 1242#endif
1155} 1243}
… …
1157/* 1245/*
1158 * 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.
1159 * good for toggling 80/132 columns 1247 * good for toggling 80/132 columns
1160 */ 1248 */
1161void 1249void
1162rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1250rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1163{ 1251{
1164 XWindowAttributes wattr; 1252 XWindowAttributes wattr;
1165 1253
1166 if (width == 0 || height == 0) 1254 if (newwidth == 0 || newheight == 0)
1167 { 1255 {
1168 XGetWindowAttributes (display->display, display->root, &wattr); 1256 XGetWindowAttributes (display->display, display->root, &wattr);
1257
1169 if (width == 0) 1258 if (newwidth == 0)
1170 width = wattr.width - szHint.base_width; 1259 newwidth = wattr.width - szHint.base_width;
1171 if (height == 0) 1260 if (newheight == 0)
1172 height = wattr.height - szHint.base_height; 1261 newheight = wattr.height - szHint.base_height;
1173 }
1174
1175 if (width != TermWin.width || height != TermWin.height)
1176 { 1262 }
1263
1264 if (newwidth != width || newheight != height)
1265 {
1177 width += szHint.base_width; 1266 newwidth += szHint.base_width;
1178 height += szHint.base_height; 1267 newheight += szHint.base_height;
1179 resize_all_windows (width, height, 0); 1268 resize_all_windows (newwidth, newheight, 0);
1180 } 1269 }
1181} 1270}
1182 1271
1183/* -------------------------------------------------------------------- * 1272/* -------------------------------------------------------------------- *
1184 * - X INPUT METHOD ROUTINES - * 1273 * - X INPUT METHOD ROUTINES - *
… …
1194 1283
1195void 1284void
1196rxvt_term::im_set_size (XRectangle &size) 1285rxvt_term::im_set_size (XRectangle &size)
1197{ 1286{
1198 // the int_bwidth terms make no sense to me 1287 // the int_bwidth terms make no sense to me
1199 size.x = TermWin.int_bwidth; 1288 size.x = int_bwidth;
1200 size.y = TermWin.int_bwidth; 1289 size.y = int_bwidth;
1201 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1290 size.width = Width2Pixel (ncol) + int_bwidth;
1202 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1291 size.height = Height2Pixel (nrow) + int_bwidth;
1203} 1292}
1204 1293
1205void 1294void
1206rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1295rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1207 XRectangle &status_rect, 1296 XRectangle &status_rect,
1208 const XRectangle &needed_rect) 1297 const XRectangle &needed_rect)
1209{ 1298{
1210 preedit_rect.x = needed_rect.width; 1299 preedit_rect.x = needed_rect.width;
1211 preedit_rect.y = 0; 1300 preedit_rect.y = 0;
1212 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1301 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1213 preedit_rect.height = TermWin.fheight; 1302 preedit_rect.height = fheight;
1214 1303
1215 status_rect.x = 0; 1304 status_rect.x = 0;
1216 status_rect.y = 0; 1305 status_rect.y = 0;
1217 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;
1218 status_rect.height = TermWin.fheight; 1307 status_rect.height = fheight;
1219} 1308}
1220 1309
1221/* Checking whether input method is running. */ 1310/* Checking whether input method is running. */
1222bool 1311bool
1223rxvt_term::IMisRunning () 1312rxvt_term::IMisRunning ()
… …
1251{ 1340{
1252 XPoint nspot; 1341 XPoint nspot;
1253 XVaNestedList preedit_attr; 1342 XVaNestedList preedit_attr;
1254 1343
1255 if (!Input_Context 1344 if (!Input_Context
1256 || !TermWin.focus 1345 || !focus
1257 || !(input_style & XIMPreeditPosition)) 1346 || !(input_style & XIMPreeditPosition))
1258 return; 1347 return;
1259 1348
1260 im_set_position (nspot); 1349 im_set_position (nspot);
1261 1350
… …
1381 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1470 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1382 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1471 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1383 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1472 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1384 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1473 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1385 "*", 1474 "*",
1386 TermWin.fheight, 1475 fheight,
1387 TermWin.fheight + 1, TermWin.fheight - 1, 1476 fheight + 1, fheight - 1,
1388 TermWin.fheight - 2, TermWin.fheight + 2); 1477 fheight - 2, fheight + 2);
1389 1478
1390 fs = XCreateFontSet (display->display, pat, 1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1391 &missing_charset_list, &missing_charset_count, &def_string); 1480 &missing_charset_list, &missing_charset_count, &def_string);
1392 1481
1393 if (missing_charset_list) 1482 if (missing_charset_list)
1394 XFreeStringList (missing_charset_list); 1483 XFreeStringList (missing_charset_list);
1395 1484
… …
1439 NULL); 1528 NULL);
1440 } 1529 }
1441 1530
1442 Input_Context = XCreateIC (xim, 1531 Input_Context = XCreateIC (xim,
1443 XNInputStyle, input_style, 1532 XNInputStyle, input_style,
1444 XNClientWindow, TermWin.vt, 1533 XNClientWindow, vt,
1445 XNFocusWindow, TermWin.parent[0], 1534 XNFocusWindow, parent[0],
1446 preedit_attr ? XNPreeditAttributes : NULL, 1535 preedit_attr ? XNPreeditAttributes : NULL,
1447 preedit_attr, 1536 preedit_attr,
1448 status_attr ? XNStatusAttributes : NULL, 1537 status_attr ? XNStatusAttributes : NULL,
1449 status_attr, NULL); 1538 status_attr, NULL);
1450 1539
… …
1467} 1556}
1468 1557
1469void 1558void
1470rxvt_term::im_cb () 1559rxvt_term::im_cb ()
1471{ 1560{
1472 int i, found, had_im; 1561 int i;
1473 const char *p; 1562 const char *p;
1474 char **s; 1563 char **s;
1475 char buf[IMBUFSIZ]; 1564 char buf[IMBUFSIZ];
1565
1566 SET_R (this);
1476 1567
1477 im_destroy (); 1568 im_destroy ();
1478 1569
1479 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1480 if (Input_Context) 1571 if (Input_Context)
… …
1532{ 1623{
1533 XRectangle preedit_rect, status_rect, *needed_rect; 1624 XRectangle preedit_rect, status_rect, *needed_rect;
1534 XVaNestedList preedit_attr, status_attr; 1625 XVaNestedList preedit_attr, status_attr;
1535 1626
1536 if (!Input_Context 1627 if (!Input_Context
1537 || !TermWin.focus 1628 || !focus
1538 || !(input_style & XIMPreeditArea) 1629 || !(input_style & XIMPreeditArea)
1539 || !IMisRunning ()) 1630 || !IMisRunning ())
1540 return; 1631 return;
1541 1632
1542 /* 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