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

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

Diff Legend

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