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

Diff Legend

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