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.153 by root, Tue Dec 27 12:23:37 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 */ 35
36#include <limits>
36 37
37#include <csignal> 38#include <csignal>
38#include <cstring> 39#include <cstring>
39 40
40#ifdef TTY_GID_SUPPORT 41#ifdef TTY_GID_SUPPORT
… …
158 pointer_ev (this, &rxvt_term::pointer_cb), 159 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif 160#endif
160#ifdef USE_XIM 161#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb), 162 im_ev (this, &rxvt_term::im_cb),
162#endif 163#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), 164 termwin_ev (this, &rxvt_term::x_cb),
167 vt_ev (this, &rxvt_term::x_cb), 165 vt_ev (this, &rxvt_term::x_cb),
168 check_ev (this, &rxvt_term::check_cb), 166 check_ev (this, &rxvt_term::check_cb),
169 flush_ev (this, &rxvt_term::flush_cb), 167 flush_ev (this, &rxvt_term::flush_cb),
170 destroy_ev (this, &rxvt_term::destroy_cb), 168 destroy_ev (this, &rxvt_term::destroy_cb),
… …
181 if (!keyboard) 179 if (!keyboard)
182 rxvt_fatal ("out of memory, aborting.\n"); 180 rxvt_fatal ("out of memory, aborting.\n");
183#endif 181#endif
184} 182}
185 183
186rxvt_term::~rxvt_term () 184// clean up the most important stuff, do *not* call x or free mem etc.
185// for use before an emergency exit
186void rxvt_term::emergency_cleanup ()
187{ 187{
188 termlist.erase (find (termlist.begin (), termlist.end(), this));
189
190 if (cmd_pid) 188 if (cmd_pid)
191 kill (-cmd_pid, SIGHUP); 189 kill (-cmd_pid, SIGHUP);
192 190
193#ifdef UTMP_SUPPORT 191#ifdef UTMP_SUPPORT
194 privileged_utmp (RESTORE); 192 privileged_utmp (RESTORE);
195#endif 193#endif
196 194
197 pty.put (); 195 pty.put ();
196}
197
198rxvt_term::~rxvt_term ()
199{
200 termlist.erase (find (termlist.begin (), termlist.end(), this));
201
202 emergency_cleanup ();
198 203
199#if ENABLE_STYLES 204#if ENABLE_STYLES
200 for (int i = RS_styleCount; --i; ) 205 for (int i = RS_styleCount; --i; )
201 if (TermWin.fontset[i] != TermWin.fontset[0]) 206 if (fontset[i] != fontset[0])
202 delete TermWin.fontset[i]; 207 delete fontset[i];
203#endif 208#endif
204 delete TermWin.fontset[0]; 209 delete fontset[0];
205 210
206 if (display) 211 if (display)
207 { 212 {
213 dDisp;
214
208 selection_clear (); 215 selection_clear ();
209 216
210#ifdef USE_XIM 217#ifdef USE_XIM
211 im_destroy (); 218 im_destroy ();
212#endif 219#endif
213#ifdef MENUBAR 220#ifdef MENUBAR
214 if (menubarGC) XFreeGC (display->display, menubarGC); 221 if (menubarGC) XFreeGC (disp, menubarGC);
215#endif 222#endif
216#ifdef XTERM_SCROLLBAR 223#ifdef XTERM_SCROLLBAR
217 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 224 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
218 if (ShadowGC) XFreeGC (display->display, ShadowGC); 225 if (ShadowGC) XFreeGC (disp, ShadowGC);
219#endif 226#endif
220#ifdef PLAIN_SCROLLBAR 227#ifdef PLAIN_SCROLLBAR
221 if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC); 228 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
222#endif 229#endif
223#ifdef NEXT_SCROLLBAR 230#ifdef NEXT_SCROLLBAR
224 if (blackGC) XFreeGC (display->display, blackGC); 231 if (blackGC) XFreeGC (disp, blackGC);
225 if (whiteGC) XFreeGC (display->display, whiteGC); 232 if (whiteGC) XFreeGC (disp, whiteGC);
226 if (grayGC) XFreeGC (display->display, grayGC); 233 if (grayGC) XFreeGC (disp, grayGC);
227 if (darkGC) XFreeGC (display->display, darkGC); 234 if (darkGC) XFreeGC (disp, darkGC);
228 if (stippleGC) XFreeGC (display->display, stippleGC); 235 if (stippleGC) XFreeGC (disp, stippleGC);
229 if (dimple) XFreePixmap (display->display, dimple); 236 if (dimple) XFreePixmap (disp, dimple);
230 if (upArrow) XFreePixmap (display->display, upArrow); 237 if (upArrow) XFreePixmap (disp, upArrow);
231 if (downArrow) XFreePixmap (display->display, downArrow); 238 if (downArrow) XFreePixmap (disp, downArrow);
232 if (upArrowHi) XFreePixmap (display->display, upArrowHi); 239 if (upArrowHi) XFreePixmap (disp, upArrowHi);
233 if (downArrowHi) XFreePixmap (display->display, downArrowHi); 240 if (downArrowHi) XFreePixmap (disp, downArrowHi);
234#endif 241#endif
235#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 242#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
236 if (topShadowGC) XFreeGC (display->display, topShadowGC); 243 if (topShadowGC) XFreeGC (disp, topShadowGC);
237 if (botShadowGC) XFreeGC (display->display, botShadowGC); 244 if (botShadowGC) XFreeGC (disp, botShadowGC);
238 if (scrollbarGC) XFreeGC (display->display, scrollbarGC); 245 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
239#endif 246#endif
240 if (TermWin.gc) XFreeGC (display->display, TermWin.gc); 247 if (gc) XFreeGC (disp, gc);
241 248
242#if defined(MENUBAR) && (MENUBAR_MAX > 1) 249#if defined(MENUBAR) && (MENUBAR_MAX > 1)
243 delete menuBar.drawable; 250 delete menuBar.drawable;
244 //if (menuBar.win) 251 //if (menuBar.win)
245 // XDestroyWindow (display->display, menuBar.win); 252 // XDestroyWindow (disp, menuBar.win);
246#endif 253#endif
247 delete TermWin.drawable; 254 delete drawable;
248 // destroy all windows 255 // destroy all windows
249 if (TermWin.parent[0]) 256 if (parent[0])
250 XDestroyWindow (display->display, TermWin.parent[0]); 257 XDestroyWindow (disp, parent[0]);
251 } 258 }
252 259
253 // TODO: free pixcolours, colours should become part of rxvt_display 260 // TODO: free pixcolours, colours should become part of rxvt_display
254 261
255 delete pix_colors_focused; 262 delete pix_colors_focused;
256#ifdef OFF_FOCUS_FADING 263#if OFF_FOCUS_FADING
257 delete pix_colors_unfocused; 264 delete pix_colors_unfocused;
258#endif 265#endif
259 266
260 displays.put (display); 267 displays.put (display);
261 268
262 scr_release (); 269 scr_release ();
263 270
264 /* clear all resources */ 271 /* clear all resources */
265 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
266 free (allocated[i]); 273 free (allocated [i]);
267 274
268 free (selection.text); 275 free (selection.text);
269 // TODO: manage env vars in child only(!) 276 // TODO: manage env vars in child only(!)
270 free (env_windowid); 277 free (env_windowid);
271 free (env_display); 278 free (env_display);
… …
277 284
278 delete envv; 285 delete envv;
279 delete argv; 286 delete argv;
280 287
281#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
282 delete keyboard; 289 delete keyboard;
283#endif 290#endif
291}
292
293void
294rxvt_term::child_exit ()
295{
296 cmd_pid = 0;
297
298 if (!(options & Opt_hold))
299 destroy ();
284} 300}
285 301
286void 302void
287rxvt_term::destroy () 303rxvt_term::destroy ()
288{ 304{
… …
340 356
341 delete this; 357 delete this;
342} 358}
343 359
344/*----------------------------------------------------------------------*/ 360/*----------------------------------------------------------------------*/
345/* rxvt_init () */ 361/*
362 * Exit gracefully, clearing the utmp entry and restoring tty attributes
363 * TODO: if debugging, this should free up any known resources if we can
364 */
365static XErrorHandler old_xerror_handler;
366
367static void
368rxvt_emergency_cleanup ()
369{
370 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
371 (*t)->emergency_cleanup ();
372}
373
374#if ENABLE_FRILLS
375static void
376print_x_error (Display *dpy, XErrorEvent *event)
377{
378 char buffer[BUFSIZ];
379 char mesg[BUFSIZ];
380 char number[32];
381 char *mtype = "XlibMessage";
382 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
383 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
384 rxvt_warn ("An X Error occured, trying to continue after report.\n");
385 rxvt_warn ("%s: %s\n", mesg, buffer);
386 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
387 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
388 sprintf(number, "%d", event->request_code);
389 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
390 rxvt_warn ("(which is %s)\n", buffer);
391 if (event->request_code >= 128) {
392 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
393 mesg, BUFSIZ);
394 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
395 }
396 if ((event->error_code == BadWindow) ||
397 (event->error_code == BadPixmap) ||
398 (event->error_code == BadCursor) ||
399 (event->error_code == BadFont) ||
400 (event->error_code == BadDrawable) ||
401 (event->error_code == BadColor) ||
402 (event->error_code == BadGC) ||
403 (event->error_code == BadIDChoice) ||
404 (event->error_code == BadValue) ||
405 (event->error_code == BadAtom)) {
406 if (event->error_code == BadValue)
407 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
408 mesg, BUFSIZ);
409 else if (event->error_code == BadAtom)
410 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
411 mesg, BUFSIZ);
412 else
413 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
414 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
416 }
417 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
420}
421#endif
422
423int
424rxvt_xerror_handler (Display *display, XErrorEvent *event)
425{
426 if (GET_R->allowedxerror == -1)
427 GET_R->allowedxerror = event->error_code;
428 else
429 {
430 // GET_R is most likely not the terminal which caused the error,
431 // so just output the error and continue
432#if ENABLE_FRILLS
433 print_x_error (display, event);
434#else
435 old_xerror_handler (display, event);
436#endif
437 }
438
439 return 0;
440}
441
442int
443rxvt_xioerror_handler (Display *display)
444{
445 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
446 DisplayString (display));
447 rxvt_emergency_cleanup ();
448 _exit (EXIT_FAILURE);
449}
450
451/*----------------------------------------------------------------------*/
346bool 452bool
347rxvt_term::init (int argc, const char *const *argv) 453rxvt_term::init (int argc, const char *const *argv)
348{ 454{
349 SET_R (this); 455 SET_R (this);
350 456
… …
369 scrollBar.setIdle (); /* set existence for size calculations */ 475 scrollBar.setIdle (); /* set existence for size calculations */
370#endif 476#endif
371 477
372 create_windows (argc, argv); 478 create_windows (argc, argv);
373 479
480 dDisp;
481
374 init_xlocale (); 482 init_xlocale ();
375 483
376 scr_reset (); /* initialize screen */ 484 scr_reset (); /* initialize screen */
377 485
378#if 0 486#if 0
379 XSynchronize (display->display, True); 487 XSynchronize (disp, True);
380#endif 488#endif
381 489
382#ifdef HAVE_SCROLLBARS 490#ifdef HAVE_SCROLLBARS
383 if (options & Opt_scrollBar) 491 if (options & Opt_scrollBar)
384 resize_scrollbar (); /* create and map scrollbar */ 492 resize_scrollbar (); /* create and map scrollbar */
385#endif 493#endif
386#if (MENUBAR_MAX) 494#if (MENUBAR_MAX)
387 if (menubar_visible ()) 495 if (menubar_visible ())
388 XMapWindow (display->display, menuBar.win); 496 XMapWindow (disp, menuBar.win);
389#endif 497#endif
390#ifdef TRANSPARENT 498#ifdef TRANSPARENT
391 if (options & Opt_transparent) 499 if (options & Opt_transparent)
392 { 500 {
393 XSelectInput (display->display, display->root, PropertyChangeMask); 501 XSelectInput (disp, display->root, PropertyChangeMask);
394 check_our_parents (); 502 check_our_parents ();
395 rootwin_ev.start (display, display->root); 503 rootwin_ev.start (display, display->root);
396 } 504 }
397#endif 505#endif
398 506
399 XMapWindow (display->display, TermWin.vt); 507 XMapWindow (disp, vt);
400 XMapWindow (display->display, TermWin.parent[0]); 508 XMapWindow (disp, parent[0]);
401 509
402 set_colorfgbg (); 510 set_colorfgbg ();
403 511
404 init_command (cmd_argv); 512 init_command (cmd_argv);
405 513
… …
410 check_ev.start (); 518 check_ev.start ();
411 519
412 return true; 520 return true;
413} 521}
414 522
415static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event); 523static struct sig_handlers
524{
525 sig_watcher sw_chld, sw_term, sw_int;
526
527 void sig_chld (sig_watcher &w)
528 {
529 // we are being called for every SIGCHLD, find the corresponding term
530 int pid;
531
532 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
533 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
534 if (pid == (*t)->cmd_pid)
535 {
536 (*t)->child_exit ();
537 break;
538 }
539 }
540
541 /*
542 * Catch a fatal signal and tidy up before quitting
543 */
544 void
545 sig_term (sig_watcher &w)
546 {
547#ifdef DEBUG_CMD
548 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
549#endif
550 rxvt_emergency_cleanup ();
551 signal (w.signum, SIG_DFL);
552 kill (getpid (), w.signum);
553 }
554
555 sig_handlers ()
556 : sw_chld (this, &sig_handlers::sig_chld),
557 sw_term (this, &sig_handlers::sig_term),
558 sw_int (this, &sig_handlers::sig_term)
559 {
560 }
561} sig_handlers;
416 562
417void 563void
418rxvt_init () 564rxvt_init ()
419{ 565{
420 /* 566 /*
… …
428 rxvt_privileges (IGNORE); 574 rxvt_privileges (IGNORE);
429 575
430 signal (SIGHUP, SIG_IGN); 576 signal (SIGHUP, SIG_IGN);
431 signal (SIGPIPE, SIG_IGN); 577 signal (SIGPIPE, SIG_IGN);
432 578
579 sig_handlers.sw_chld.start (SIGCHLD);
580 sig_handlers.sw_term.start (SIGTERM);
581 sig_handlers.sw_int.start (SIGINT);
582
433 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 583 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
434 /* signal (SIGURG, SIG_DFL); */ 584 /* signal (SIGURG, SIG_DFL); */
435 585
436 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 586 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
437 // TODO: handle this with exceptions and tolerate the memory loss 587 // TODO: handle this with exceptions and tolerate the memory loss
438 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 588 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} 589}
504 590
505/* ------------------------------------------------------------------------- * 591/* ------------------------------------------------------------------------- *
506 * MEMORY ALLOCATION WRAPPERS * 592 * MEMORY ALLOCATION WRAPPERS *
507 * ------------------------------------------------------------------------- */ 593 * ------------------------------------------------------------------------- */
… …
514 rxvt_fatal ("memory allocation failure. aborting.\n"); 600 rxvt_fatal ("memory allocation failure. aborting.\n");
515 601
516 return p; 602 return p;
517} 603}
518 604
519/* INTPROTO */ 605void *
520void *
521rxvt_calloc (size_t number, size_t size) 606rxvt_calloc (size_t number, size_t size)
522{ 607{
523 void *p = calloc (number, size); 608 void *p = calloc (number, size);
524 609
525 if (!p) 610 if (!p)
526 rxvt_fatal ("memory allocation failure. aborting.\n"); 611 rxvt_fatal ("memory allocation failure. aborting.\n");
527 612
528 return p; 613 return p;
529} 614}
530 615
531/* INTPROTO */
532void * 616void *
533rxvt_realloc (void *ptr, size_t size) 617rxvt_realloc (void *ptr, size_t size)
534{ 618{
535 void *p = realloc (ptr, size); 619 void *p = realloc (ptr, size);
536 620
… …
618/* 702/*
619 * window size/position calculcations for XSizeHint and other storage. 703 * window size/position calculcations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 704 * if width/height are non-zero then override calculated width/height
621 */ 705 */
622void 706void
623rxvt_term::window_calc (unsigned int width, unsigned int height) 707rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 708{
625 short recalc_x, recalc_y; 709 short recalc_x, recalc_y;
626 int x, y, sb_w, mb_h, flags; 710 int x, y, sb_w, mb_h, flags;
627 unsigned int w, h; 711 unsigned int w, h;
628 unsigned int max_width, max_height; 712 unsigned int max_width, max_height;
713 dDisp;
629 714
630 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 715 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
631 TermWin.ncol, TermWin.nrow, szHint.width, 716 ncol, nrow, szHint.width, szHint.height));
632 szHint.height)); 717
633 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 718 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
634 szHint.win_gravity = NorthWestGravity; 719 szHint.win_gravity = NorthWestGravity;
635 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 720 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
636 721
637 recalc_x = recalc_y = 0; 722 recalc_x = recalc_y = 0;
638 flags = 0; 723 flags = 0;
724
639 if (!parsed_geometry) 725 if (!parsed_geometry)
640 { 726 {
641 parsed_geometry = 1; 727 parsed_geometry = 1;
728
642 if (rs[Rs_geometry]) 729 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 730 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
731
644 if (flags & WidthValue) 732 if (flags & WidthValue)
645 { 733 {
646 TermWin.ncol = BOUND_POSITIVE_INT16 (w); 734 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
647 szHint.flags |= USSize; 735 szHint.flags |= USSize;
648 } 736 }
737
649 if (flags & HeightValue) 738 if (flags & HeightValue)
650 { 739 {
651 TermWin.nrow = BOUND_POSITIVE_INT16 (h); 740 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 741 szHint.flags |= USSize;
653 } 742 }
743
654 if (flags & XValue) 744 if (flags & XValue)
655 { 745 {
656 szHint.x = x; 746 szHint.x = x;
657 szHint.flags |= USPosition; 747 szHint.flags |= USPosition;
748
658 if (flags & XNegative) 749 if (flags & XNegative)
659 { 750 {
660 recalc_x = 1; 751 recalc_x = 1;
661 szHint.win_gravity = NorthEastGravity; 752 szHint.win_gravity = NorthEastGravity;
662 } 753 }
663 } 754 }
755
664 if (flags & YValue) 756 if (flags & YValue)
665 { 757 {
666 szHint.y = y; 758 szHint.y = y;
667 szHint.flags |= USPosition; 759 szHint.flags |= USPosition;
760
668 if (flags & YNegative) 761 if (flags & YNegative)
669 { 762 {
670 recalc_y = 1; 763 recalc_y = 1;
764
671 if (szHint.win_gravity == NorthEastGravity) 765 if (szHint.win_gravity == NorthEastGravity)
672 szHint.win_gravity = SouthEastGravity; 766 szHint.win_gravity = SouthEastGravity;
673 else 767 else
674 szHint.win_gravity = SouthWestGravity; 768 szHint.win_gravity = SouthWestGravity;
675 } 769 }
676 } 770 }
677 } 771 }
678 772
679 /* TODO: BOUNDS */ 773 /* TODO: BOUNDS */
680 TermWin.width = TermWin.ncol * TermWin.fwidth; 774 width = ncol * fwidth;
681 TermWin.height = TermWin.nrow * TermWin.fheight; 775 height = nrow * fheight;
682 max_width = MAX_COLS * TermWin.fwidth; 776 max_width = MAX_COLS * fwidth;
683 max_height = MAX_ROWS * TermWin.fheight; 777 max_height = MAX_ROWS * fheight;
684 778
685 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 779 szHint.base_width = szHint.base_height = 2 * int_bwidth;
686 780
687 sb_w = mb_h = 0; 781 sb_w = mb_h = 0;
688 window_vt_x = window_vt_y = TermWin.int_bwidth; 782 window_vt_x = window_vt_y = int_bwidth;
689 783
690 if (scrollbar_visible ()) 784 if (scrollbar_visible ())
691 { 785 {
692 sb_w = scrollbar_TotalWidth (); 786 sb_w = scrollbar_TotalWidth ();
693 szHint.base_width += sb_w; 787 szHint.base_width += sb_w;
… …
700 mb_h = menuBar_TotalHeight (); 794 mb_h = menuBar_TotalHeight ();
701 szHint.base_height += mb_h; 795 szHint.base_height += mb_h;
702 window_vt_y += mb_h; 796 window_vt_y += mb_h;
703 } 797 }
704 798
705 szHint.width_inc = TermWin.fwidth; 799 szHint.width_inc = fwidth;
706 szHint.height_inc = TermWin.fheight; 800 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 801 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 802 szHint.min_height = szHint.base_height + szHint.height_inc;
709 803
710 if (width && width - szHint.base_width < max_width) 804 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 805 {
712 szHint.width = width; 806 szHint.width = newwidth;
713 TermWin.width = width - szHint.base_width; 807 width = newwidth - szHint.base_width;
714 } 808 }
715 else 809 else
716 { 810 {
717 MIN_IT (TermWin.width, max_width); 811 min_it (width, max_width);
718 szHint.width = szHint.base_width + TermWin.width; 812 szHint.width = szHint.base_width + width;
719 } 813 }
720 814
721 if (height && height - szHint.base_height < max_height) 815 if (newheight && newheight - szHint.base_height < max_height)
722 { 816 {
723 szHint.height = height; 817 szHint.height = newheight;
724 TermWin.height = height - szHint.base_height; 818 height = newheight - szHint.base_height;
725 } 819 }
726 else 820 else
727 { 821 {
728 MIN_IT (TermWin.height, max_height); 822 min_it (height, max_height);
729 szHint.height = szHint.base_height + TermWin.height; 823 szHint.height = szHint.base_height + height;
730 } 824 }
731 825
732 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 826 if (scrollbar_visible () && (options & Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w; 827 window_sb_x = szHint.width - sb_w;
734 828
735 if (recalc_x) 829 if (recalc_x)
736 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 830 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;
737 - szHint.width - 2 * TermWin.ext_bwidth);
738 if (recalc_y) 831 if (recalc_y)
739 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 832 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;
740 - szHint.height - 2 * TermWin.ext_bwidth);
741 833
742 TermWin.ncol = TermWin.width / TermWin.fwidth; 834 ncol = width / fwidth;
743 TermWin.nrow = TermWin.height / TermWin.fheight; 835 nrow = height / fheight;
744 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 836 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
745 TermWin.ncol, TermWin.nrow, szHint.width, 837 ncol, nrow, szHint.width,
746 szHint.height)); 838 szHint.height));
747 return; 839 return;
748} 840}
749 841
750/*----------------------------------------------------------------------*/ 842/*----------------------------------------------------------------------*/
… …
758 if (pty.pty < 0) 850 if (pty.pty < 0)
759 return; 851 return;
760 852
761 struct winsize ws; 853 struct winsize ws;
762 854
763 ws.ws_col = TermWin.ncol; 855 ws.ws_col = ncol;
764 ws.ws_row = TermWin.nrow; 856 ws.ws_row = nrow;
765 ws.ws_xpixel = TermWin.width; 857 ws.ws_xpixel = width;
766 ws.ws_ypixel = TermWin.height; 858 ws.ws_ypixel = height;
767 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 859 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
768 860
769#if 0 861#if 0
770 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 862 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
771 if (cmd_pid) /* force through to the command */ 863 if (cmd_pid) /* force through to the command */
772 kill (cmd_pid, SIGWINCH); 864 kill (-cmd_pid, SIGWINCH);
773#endif 865#endif
774} 866}
775 867
776/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
777/* set_fonts () - load and set the various fonts 869/* set_fonts () - load and set the various fonts
778/* 870 *
779 * init = 1 - initialize 871 * init = 1 - initialize
780 * 872 *
781 * fontname == FONT_UP - switch to bigger font 873 * fontname == FONT_UP - switch to bigger font
782 * fontname == FONT_DN - switch to smaller font 874 * fontname == FONT_DN - switch to smaller font
783 */ 875 */
… …
795 return false; 887 return false;
796 } 888 }
797 889
798#if ENABLE_STYLES 890#if ENABLE_STYLES
799 for (int i = RS_styleCount; --i; ) 891 for (int i = RS_styleCount; --i; )
800 if (TermWin.fontset[i] != TermWin.fontset[0]) 892 if (fontset[i] != fontset[0])
801 delete TermWin.fontset[i]; 893 delete fontset[i];
802#endif 894#endif
803 895
804 delete TermWin.fontset[0]; 896 delete fontset[0];
805 TermWin.fontset[0] = fs; 897 fontset[0] = fs;
806 898
807 prop = (*fs)[1]->properties (); 899 prop = (*fs)[1]->properties ();
808 prop.height += TermWin.lineSpace; 900 prop.height += lineSpace;
809 fs->set_prop (prop); 901 fs->set_prop (prop);
810 902
811 TermWin.fwidth = prop.width; 903 fwidth = prop.width;
812 TermWin.fheight = prop.height; 904 fheight = prop.height;
813 TermWin.fweight = prop.weight;
814 TermWin.fslant = prop.slant;
815 TermWin.fbase = (*fs)[1]->ascent; 905 fbase = (*fs)[1]->ascent;
816 906
817 for (int style = 1; style < 4; style++) 907 for (int style = 1; style < 4; style++)
818 { 908 {
819#if ENABLE_STYLES 909#if ENABLE_STYLES
820 const char *res = rs[Rs_font + style]; 910 const char *res = rs[Rs_font + style];
821 911
822 if (res && !*res) 912 if (res && !*res)
823 TermWin.fontset[style] = TermWin.fontset[0]; 913 fontset[style] = fontset[0];
824 else 914 else
825 { 915 {
826 TermWin.fontset[style] = fs = new rxvt_fontset (this); 916 fontset[style] = fs = new rxvt_fontset (this);
827 rxvt_fontprop prop2 = prop; 917 rxvt_fontprop prop2 = prop;
828 918
829 if (res) 919 if (res)
830 prop2.weight = prop2.slant = rxvt_fontprop::unset; 920 prop2.weight = prop2.slant = rxvt_fontprop::unset;
831 else 921 else
832 { 922 {
833 res = TermWin.fontset[0]->fontdesc; 923 res = fontset[0]->fontdesc;
834 924
835 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 925 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; 926 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
837 } 927 }
838 928
839 fs->populate (res); 929 fs->populate (res);
840 fs->set_prop (prop2); 930 fs->set_prop (prop2);
841 } 931 }
842#else 932#else
843 TermWin.fontset[style] = TermWin.fontset[0]; 933 fontset[style] = fontset[0];
844#endif 934#endif
845 } 935 }
846 936
847 if (TermWin.parent[0]) 937 if (parent[0])
848 { 938 {
849 resize_all_windows (0, 0, 0); 939 resize_all_windows (0, 0, 0);
850 scr_remap_chars (); 940 scr_remap_chars ();
851 scr_touch (true); 941 scr_touch (true);
852 } 942 }
… …
854 return true; 944 return true;
855} 945}
856 946
857void rxvt_term::set_string_property (Atom prop, const char *str, int len) 947void rxvt_term::set_string_property (Atom prop, const char *str, int len)
858{ 948{
859 // TODO: SMART_WINDOW_TITLE
860 XChangeProperty (display->display, TermWin.parent[0], 949 XChangeProperty (display->display, parent[0],
861 prop, XA_STRING, 8, PropModeReplace, 950 prop, XA_STRING, 8, PropModeReplace,
862 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 951 (const unsigned char *)str, len >= 0 ? len : strlen (str));
863} 952}
864 953
865void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 954void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
866{ 955{
867 // TODO: SMART_WINDOW_TITLE
868 wchar_t *ws = rxvt_mbstowcs (str, len); 956 wchar_t *ws = rxvt_mbstowcs (str, len);
869 char *s = rxvt_wcstoutf8 (ws); 957 char *s = rxvt_wcstoutf8 (ws);
870 958
871 XChangeProperty (display->display, TermWin.parent[0], 959 XChangeProperty (display->display, parent[0],
872 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 960 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
873 (const unsigned char *)s, strlen (s)); 961 (const unsigned char *)s, strlen (s));
874 962
875 free (s); 963 free (s);
876 free (ws); 964 free (ws);
… …
881/* xterm sequences - title, iconName, color (exptl) */ 969/* xterm sequences - title, iconName, color (exptl) */
882void 970void
883rxvt_term::set_title (const char *str) 971rxvt_term::set_title (const char *str)
884{ 972{
885 set_string_property (XA_WM_NAME, str); 973 set_string_property (XA_WM_NAME, str);
886#if ENABLE_FRILLS 974#if ENABLE_EWMH
887 set_utf8_property (xa[XA_NET_WM_NAME], str); 975 set_utf8_property (xa[XA_NET_WM_NAME], str);
888#endif 976#endif
889} 977}
890 978
891void 979void
892rxvt_term::set_icon_name (const char *str) 980rxvt_term::set_icon_name (const char *str)
893{ 981{
894 set_string_property (XA_WM_ICON_NAME, str); 982 set_string_property (XA_WM_ICON_NAME, str);
895#if ENABLE_FRILLS 983#if ENABLE_EWMH
896 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 984 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
897#endif 985#endif
898} 986}
899 987
900#ifdef XTERM_COLOR_CHANGE 988#ifdef XTERM_COLOR_CHANGE
… …
909 997
910 /* handle color aliases */ 998 /* handle color aliases */
911 if (isdigit (*color)) 999 if (isdigit (*color))
912 { 1000 {
913 i = atoi (color); 1001 i = atoi (color);
1002
914 if (i >= 8 && i <= 15) 1003 if (i >= 8 && i <= 15)
915 { /* bright colors */ 1004 { /* bright colors */
916 i -= 8; 1005 i -= 8;
917# ifndef NO_BRIGHTCOLOR 1006# ifndef NO_BRIGHTCOLOR
918 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 1007 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
919 SET_PIXCOLOR (idx); 1008 SET_PIXCOLOR (idx);
920 goto Done; 1009 goto done;
921# endif 1010# endif
922
923 } 1011 }
1012
924 if (i >= 0 && i <= 7) 1013 if (i >= 0 && i <= 7)
925 { /* normal colors */ 1014 { /* normal colors */
926 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 1015 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
927 SET_PIXCOLOR (idx); 1016 SET_PIXCOLOR (idx);
928 goto Done; 1017 goto done;
929 } 1018 }
930 } 1019 }
931 1020
932 if (!rXParseAllocColor (& xcol, color)) 1021 if (!rXParseAllocColor (&xcol, color))
933 return; 1022 return;
934 1023
935 /* XStoreColor (display->display, display->cmap, XColor*); */ 1024 /* XStoreColor (display->display, display->cmap, XColor*); */
936 1025
937 /* 1026 /*
… …
953 pix_colors_focused[idx] = xcol; 1042 pix_colors_focused[idx] = xcol;
954 SET_PIXCOLOR (idx); 1043 SET_PIXCOLOR (idx);
955 1044
956 /* XSetWindowAttributes attr; */ 1045 /* XSetWindowAttributes attr; */
957 /* Cursor cursor; */ 1046 /* Cursor cursor; */
958Done: 1047done:
1048
959#ifdef OFF_FOCUS_FADING 1049#if OFF_FOCUS_FADING
960 if (rs[Rs_fade]) 1050 if (rs[Rs_fade])
961 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade])); 1051 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
962#endif 1052#endif
963 1053
964 /*TODO: handle Color_BD, scrollbar background, etc. */ 1054 /*TODO: handle Color_BD, scrollbar background, etc. */
965 1055
966 recolour_cursor (); 1056 recolour_cursor ();
… …
1037 1127
1038/* -------------------------------------------------------------------- * 1128/* -------------------------------------------------------------------- *
1039 * - WINDOW RESIZING - * 1129 * - WINDOW RESIZING - *
1040 * -------------------------------------------------------------------- */ 1130 * -------------------------------------------------------------------- */
1041void 1131void
1042rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent) 1132rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1043{ 1133{
1044 int fix_screen; 1134 int fix_screen;
1045
1046#ifdef SMART_RESIZE
1047 int old_width = szHint.width, old_height = szHint.height; 1135 int old_width = szHint.width, old_height = szHint.height;
1048#endif 1136 dDisp;
1049 1137
1050 window_calc (width, height); 1138 window_calc (newwidth, newheight);
1051 XSetWMNormalHints (display->display, TermWin.parent[0], &szHint); 1139 XSetWMNormalHints (disp, parent[0], &szHint);
1052 1140
1053 if (!ignoreparent) 1141 if (!ignoreparent)
1054 { 1142 {
1055#ifdef SMART_RESIZE 1143#ifdef SMART_RESIZE
1056 /* 1144 /*
… …
1060 int x, y, x1, y1; 1148 int x, y, x1, y1;
1061 int dx, dy; 1149 int dx, dy;
1062 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1150 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1063 Window unused_cr; 1151 Window unused_cr;
1064 1152
1065 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 1153 XTranslateCoordinates (disp, parent[0], display->root,
1066 0, 0, &x, &y, &unused_cr); 1154 0, 0, &x, &y, &unused_cr);
1067 XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1, 1155 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,
1068 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1156 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1069 /* 1157 /*
1070 * if display->root isn't the parent window, a WM will probably have offset 1158 * if display->root isn't the parent window, a WM will probably have offset
1071 * our position for handles and decorations. Counter it 1159 * our position for handles and decorations. Counter it
1072 */ 1160 */
… …
1074 { 1162 {
1075 x -= x1; 1163 x -= x1;
1076 y -= y1; 1164 y -= y1;
1077 } 1165 }
1078 1166
1079 x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2; 1167 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1080 y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2; 1168 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1081 dx = old_width - szHint.width; 1169 dx = old_width - szHint.width;
1082 dy = old_height - szHint.height; 1170 dy = old_height - szHint.height;
1083 1171
1084 /* Check position of the center of the window */ 1172 /* Check position of the center of the window */
1085 if (x < x1) /* left half */ 1173 if (x < x1) /* left half */
… …
1089 if (y < y1) /* top half */ 1177 if (y < y1) /* top half */
1090 dy = 0; 1178 dy = 0;
1091 else if (y == y1) /* exact center */ 1179 else if (y == y1) /* exact center */
1092 dy /= 2; 1180 dy /= 2;
1093 1181
1094 XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy, 1182 XMoveResizeWindow (disp, parent[0], x + dx, y + dy,
1095 szHint.width, szHint.height); 1183 szHint.width, szHint.height);
1096#else 1184#else
1097 XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height); 1185 XResizeWindow (disp, parent[0], szHint.width, szHint.height);
1098#endif 1186#endif
1099 } 1187 }
1100 1188
1101 fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow; 1189 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1102 1190
1103 if (fix_screen || width != old_width || height != old_height) 1191 if (fix_screen || newwidth != old_width || newheight != old_height)
1104 { 1192 {
1105 if (scrollbar_visible ()) 1193 if (scrollbar_visible ())
1106 { 1194 {
1107 XMoveResizeWindow (display->display, scrollBar.win, 1195 XMoveResizeWindow (disp, scrollBar.win,
1108 window_sb_x, 0, 1196 window_sb_x, 0,
1109 scrollbar_TotalWidth (), szHint.height); 1197 scrollbar_TotalWidth (), szHint.height);
1110 resize_scrollbar (); 1198 resize_scrollbar ();
1111 } 1199 }
1112 1200
1113 if (menubar_visible ()) 1201 if (menubar_visible ())
1114 XMoveResizeWindow (display->display, menuBar.win, 1202 XMoveResizeWindow (disp, menuBar.win,
1115 window_vt_x, 0, 1203 window_vt_x, 0,
1116 TermWin_TotalWidth (), menuBar_TotalHeight ()); 1204 TermWin_TotalWidth (), menuBar_TotalHeight ());
1117 1205
1118 XMoveResizeWindow (display->display, TermWin.vt, 1206 XMoveResizeWindow (disp, vt,
1119 window_vt_x, window_vt_y, 1207 window_vt_x, window_vt_y,
1120 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1208 TermWin_TotalWidth (), TermWin_TotalHeight ());
1121 1209
1122 scr_clear (); 1210 scr_clear ();
1123#ifdef XPM_BACKGROUND 1211#ifdef XPM_BACKGROUND
… …
1131 int old_ncol = prev_ncol; 1219 int old_ncol = prev_ncol;
1132 1220
1133 /* scr_reset only works on the primary screen */ 1221 /* scr_reset only works on the primary screen */
1134 if (old_height) /* this is not the first time through */ 1222 if (old_height) /* this is not the first time through */
1135 { 1223 {
1136 unsigned int ncol = TermWin.ncol; 1224 unsigned int ocol = ncol;
1137 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1225 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1138 curr_screen = scr_change_screen (PRIMARY); 1226 curr_screen = scr_change_screen (PRIMARY);
1139 TermWin.ncol = ncol; 1227 ncol = ocol;
1140 } 1228 }
1141 1229
1142 scr_reset (); 1230 scr_reset ();
1143 1231
1144 if (curr_screen >= 0) /* this is not the first time through */ 1232 if (curr_screen >= 0) /* this is not the first time through */
1145 { 1233 {
1146 scr_change_screen (curr_screen); 1234 scr_change_screen (curr_screen);
1147 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1235 selection_check (old_ncol != ncol ? 4 : 0);
1148 } 1236 }
1149 } 1237 }
1150 1238
1151 old_width = szHint.width; 1239 old_width = szHint.width;
1152 old_height = szHint.height; 1240 old_height = szHint.height;
1153 1241
1154#ifdef XPM_BACKGROUND 1242#ifdef XPM_BACKGROUND
1155 if (TermWin.pixmap) 1243 if (pixmap)
1156 scr_touch (false); 1244 scr_touch (false);
1157#endif 1245#endif
1158 1246
1159#ifdef USE_XIM 1247#ifdef USE_XIM
1160 IMSetStatusPosition (); 1248 IMSetStatusPosition ();
… …
1164/* 1252/*
1165 * Set the width/height of the vt window in characters. Units are pixels. 1253 * Set the width/height of the vt window in characters. Units are pixels.
1166 * good for toggling 80/132 columns 1254 * good for toggling 80/132 columns
1167 */ 1255 */
1168void 1256void
1169rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1257rxvt_term::set_widthheight (unsigned int newwidth, unsigned int newheight)
1170{ 1258{
1171 XWindowAttributes wattr; 1259 XWindowAttributes wattr;
1172 1260
1173 if (width == 0 || height == 0) 1261 if (newwidth == 0 || newheight == 0)
1174 { 1262 {
1175 XGetWindowAttributes (display->display, display->root, &wattr); 1263 XGetWindowAttributes (display->display, display->root, &wattr);
1264
1176 if (width == 0) 1265 if (newwidth == 0)
1177 width = wattr.width - szHint.base_width; 1266 newwidth = wattr.width - szHint.base_width;
1178 if (height == 0) 1267 if (newheight == 0)
1179 height = wattr.height - szHint.base_height; 1268 newheight = wattr.height - szHint.base_height;
1180 }
1181
1182 if (width != TermWin.width || height != TermWin.height)
1183 { 1269 }
1270
1271 if (newwidth != width || newheight != height)
1272 {
1184 width += szHint.base_width; 1273 newwidth += szHint.base_width;
1185 height += szHint.base_height; 1274 newheight += szHint.base_height;
1186 resize_all_windows (width, height, 0); 1275 resize_all_windows (newwidth, newheight, 0);
1187 } 1276 }
1188} 1277}
1189 1278
1190/* -------------------------------------------------------------------- * 1279/* -------------------------------------------------------------------- *
1191 * - X INPUT METHOD ROUTINES - * 1280 * - X INPUT METHOD ROUTINES - *
… …
1201 1290
1202void 1291void
1203rxvt_term::im_set_size (XRectangle &size) 1292rxvt_term::im_set_size (XRectangle &size)
1204{ 1293{
1205 // the int_bwidth terms make no sense to me 1294 // the int_bwidth terms make no sense to me
1206 size.x = TermWin.int_bwidth; 1295 size.x = int_bwidth;
1207 size.y = TermWin.int_bwidth; 1296 size.y = int_bwidth;
1208 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth; 1297 size.width = Width2Pixel (ncol) + int_bwidth;
1209 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth; 1298 size.height = Height2Pixel (nrow) + int_bwidth;
1210} 1299}
1211 1300
1212void 1301void
1213rxvt_term::im_set_preedit_area (XRectangle &preedit_rect, 1302rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1214 XRectangle &status_rect, 1303 XRectangle &status_rect,
1215 const XRectangle &needed_rect) 1304 const XRectangle &needed_rect)
1216{ 1305{
1217 preedit_rect.x = needed_rect.width; 1306 preedit_rect.x = needed_rect.width;
1218 preedit_rect.y = 0; 1307 preedit_rect.y = 0;
1219 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1; 1308 preedit_rect.width = Width2Pixel (ncol) - needed_rect.width + 1;
1220 preedit_rect.height = TermWin.fheight; 1309 preedit_rect.height = fheight;
1221 1310
1222 status_rect.x = 0; 1311 status_rect.x = 0;
1223 status_rect.y = 0; 1312 status_rect.y = 0;
1224 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1; 1313 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (ncol) + 1;
1225 status_rect.height = TermWin.fheight; 1314 status_rect.height = fheight;
1226} 1315}
1227 1316
1228/* Checking whether input method is running. */ 1317/* Checking whether input method is running. */
1229bool 1318bool
1230rxvt_term::IMisRunning () 1319rxvt_term::IMisRunning ()
… …
1258{ 1347{
1259 XPoint nspot; 1348 XPoint nspot;
1260 XVaNestedList preedit_attr; 1349 XVaNestedList preedit_attr;
1261 1350
1262 if (!Input_Context 1351 if (!Input_Context
1263 || !TermWin.focus 1352 || !focus
1264 || !(input_style & XIMPreeditPosition)) 1353 || !(input_style & XIMPreeditPosition))
1265 return; 1354 return;
1266 1355
1267 im_set_position (nspot); 1356 im_set_position (nspot);
1268 1357
… …
1388 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1477 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1389 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1478 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1390 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1479 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1391 "-*-*-*-R-*-*-%d-*-*-*-*-*-*," 1480 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1392 "*", 1481 "*",
1393 TermWin.fheight, 1482 fheight,
1394 TermWin.fheight + 1, TermWin.fheight - 1, 1483 fheight + 1, fheight - 1,
1395 TermWin.fheight - 2, TermWin.fheight + 2); 1484 fheight - 2, fheight + 2);
1396 1485
1397 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1486 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1398 &missing_charset_list, &missing_charset_count, &def_string); 1487 &missing_charset_list, &missing_charset_count, &def_string);
1399 1488
1400 if (missing_charset_list) 1489 if (missing_charset_list)
… …
1446 NULL); 1535 NULL);
1447 } 1536 }
1448 1537
1449 Input_Context = XCreateIC (xim, 1538 Input_Context = XCreateIC (xim,
1450 XNInputStyle, input_style, 1539 XNInputStyle, input_style,
1451 XNClientWindow, TermWin.vt, 1540 XNClientWindow, vt,
1452 XNFocusWindow, TermWin.parent[0], 1541 XNFocusWindow, parent[0],
1453 preedit_attr ? XNPreeditAttributes : NULL, 1542 preedit_attr ? XNPreeditAttributes : NULL,
1454 preedit_attr, 1543 preedit_attr,
1455 status_attr ? XNStatusAttributes : NULL, 1544 status_attr ? XNStatusAttributes : NULL,
1456 status_attr, NULL); 1545 status_attr, NULL);
1457 1546
… …
1474} 1563}
1475 1564
1476void 1565void
1477rxvt_term::im_cb () 1566rxvt_term::im_cb ()
1478{ 1567{
1479 int i, found, had_im; 1568 int i;
1480 const char *p; 1569 const char *p;
1481 char **s; 1570 char **s;
1482 char buf[IMBUFSIZ]; 1571 char buf[IMBUFSIZ];
1572
1573 SET_R (this);
1483 1574
1484 im_destroy (); 1575 im_destroy ();
1485 1576
1486 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()")); 1577 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1487 if (Input_Context) 1578 if (Input_Context)
… …
1539{ 1630{
1540 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1541 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1542 1633
1543 if (!Input_Context 1634 if (!Input_Context
1544 || !TermWin.focus 1635 || !focus
1545 || !(input_style & XIMPreeditArea) 1636 || !(input_style & XIMPreeditArea)
1546 || !IMisRunning ()) 1637 || !IMisRunning ())
1547 return; 1638 return;
1548 1639
1549 /* Getting the necessary width of preedit area */ 1640 /* Getting the necessary width of preedit area */

Diff Legend

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