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

Diff Legend

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