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

Diff Legend

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