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.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.333 by root, Fri Oct 22 05:57:59 2010 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
… …
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
… …
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 { 111 {
109 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
111 } 114 }
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 176#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 177#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 179#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 181#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 183#endif
183#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
229 delete fontset[0]; 230 delete fontset[0];
230 231
231#ifdef HAVE_BG_PIXMAP 232#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 233 bgPixmap.destroy ();
233#endif 234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
234 241
235 if (display) 242 if (display)
236 { 243 {
237 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
238 246
239#ifdef USE_XIM 247#ifdef USE_XIM
240 im_destroy (); 248 im_destroy ();
241#endif 249#endif
242#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
267 252
268 delete drawable; 253 delete drawable;
269 // destroy all windows 254 // destroy all windows
270 if (parent[0]) 255 if (parent[0])
… …
290 /* clear all resources */ 275 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 277 free (allocated [i]);
293 278
294 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
295 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
296 free (env_display); 282 free (env_display);
297 free (env_term); 283 free (env_term);
298 free (locale); 284 free (locale);
299 free (v_buffer); 285 free (v_buffer);
… …
337 if (display) 323 if (display)
338 { 324 {
339#if USE_XIM 325#if USE_XIM
340 im_ev.stop (display); 326 im_ev.stop (display);
341#endif 327#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
347#endif 331#endif
348 incr_ev.stop (); 332 incr_ev.stop ();
349 termwin_ev.stop (display); 333 termwin_ev.stop (display);
… …
401 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
402 char number[32]; 386 char number[32];
403 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 399 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 401 }
418 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 414 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 417 mesg, BUFSIZ);
434 else 418 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 420 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 422 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 424 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 426}
443#endif 427#endif
444 428
445int 429int
… …
468 DisplayString (display)); 452 DisplayString (display));
469 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
471} 455}
472 456
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590}
591
592static struct sig_handlers 457static struct sig_handlers
593{ 458{
594 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
595 460
596 /* 461 /*
… …
611 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
612 w.stop (); 477 w.stop ();
613 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
614} 479}
615 480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
616char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
617 546
618void 547void
619rxvt_init () 548rxvt_init ()
620{ 549{
550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
621 ptytty::init (); 559 ptytty::init ();
622 560
623 if (!ev_default_loop (0)) 561 if (!ev_default_loop ())
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 563
626 rxvt_environ = environ; 564 rxvt_environ = environ;
627 565
628 signal (SIGHUP, SIG_IGN); 566 signal (SIGHUP, SIG_IGN);
629 signal (SIGPIPE, SIG_IGN); 567 signal (SIGPIPE, SIG_IGN);
630 568
631 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 569 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
632 sig_handlers.sw_int.start (SIGINT); ev_unref (); 570 sig_handlers.sw_int.start (SIGINT); ev_unref ();
633
634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
635 /* signal (SIGURG, SIG_DFL); */
636 571
637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
638 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
639 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
640 575
… …
648 */ 583 */
649void 584void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 585rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 586{
652 short recalc_x, recalc_y; 587 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 588 int x, y, flags;
654 unsigned int w, h; 589 unsigned int w, h;
655 unsigned int max_width, max_height; 590 unsigned int max_width, max_height;
656 591
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 592 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 593 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 603 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 604 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 605
671 if (flags & WidthValue) 606 if (flags & WidthValue)
672 { 607 {
608 if (!w)
609 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
610
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 611 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 612 szHint.flags |= USSize;
675 } 613 }
676 614
677 if (flags & HeightValue) 615 if (flags & HeightValue)
678 { 616 {
617 if (!h)
618 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
619
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 620 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 621 szHint.flags |= USSize;
681 } 622 }
682 623
683 if (flags & XValue) 624 if (flags & XValue)
684 { 625 {
… …
715 max_width = MAX_COLS * fwidth; 656 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 657 max_height = MAX_ROWS * fheight;
717 658
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 659 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 660
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 661 window_vt_x = window_vt_y = int_bwidth;
722 662
723 if (scrollBar.state) 663 if (scrollBar.state)
724 { 664 {
725 sb_w = scrollbar_TotalWidth (); 665 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 666 szHint.base_width += sb_w;
727 667
728 if (!option (Opt_scrollBar_right)) 668 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 669 window_vt_x += sb_w;
730 } 670 }
… …
754 { 694 {
755 min_it (height, max_height); 695 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 696 szHint.height = szHint.base_height + height;
757 } 697 }
758 698
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 699 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 700 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 701
765 if (recalc_y) 702 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 704
768 ncol = width / fwidth; 705 ncol = width / fwidth;
769 nrow = height / fheight; 706 nrow = height / fheight;
770} 707}
771 708
772/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
773/* 710/*
… …
784 721
785 ws.ws_col = ncol; 722 ws.ws_col = ncol;
786 ws.ws_row = nrow; 723 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 724 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 725 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 726 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 727
791#if 0 728#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 729 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 730 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 731 kill (-cmd_pid, SIGWINCH);
… …
824#endif 761#endif
825 762
826 delete fontset[0]; 763 delete fontset[0];
827 fontset[0] = fs; 764 fontset[0] = fs;
828 765
829 prop = (*fs)[1]->properties (); 766 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 767 prop.height += lineSpace;
768 prop.width += letterSpace;
831 769
832 fs->set_prop (prop, false); 770 fs->set_prop (prop, false);
833 771
834 fwidth = prop.width; 772 fwidth = prop.width;
835 fheight = prop.height; 773 fheight = prop.height;
… …
885 prop, XA_STRING, 8, PropModeReplace, 823 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 824 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 825}
888 826
889void 827void
828rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
829{
830 XTextProperty ct;
831
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 {
834 XSetTextProperty (dpy, parent[0], &ct, prop);
835 XFree (ct.value);
836 }
837}
838
839void
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 840rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 841{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 842 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 843 char *s = rxvt_wcstoutf8 (ws);
894 844
… …
904/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 855/* xterm sequences - title, iconName, color (exptl) */
906void 856void
907rxvt_term::set_title (const char *str) 857rxvt_term::set_title (const char *str)
908{ 858{
909 set_string_property (XA_WM_NAME, str); 859 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 860#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 861 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 862#endif
913} 863}
914 864
915void 865void
916rxvt_term::set_icon_name (const char *str) 866rxvt_term::set_icon_name (const char *str)
917{ 867{
918 set_string_property (XA_WM_ICON_NAME, str); 868 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 869#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 871#endif
922} 872}
923 873
924void 874void
925rxvt_term::set_window_color (int idx, const char *color) 875rxvt_term::set_window_color (int idx, const char *color)
926{ 876{
927#ifdef XTERM_COLOR_CHANGE 877#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 878 rxvt_color xcol;
929 int i;
930 879
931 if (color == NULL || *color == '\0') 880 if (color == NULL || *color == '\0')
932 return; 881 return;
933 882
934 color = strdup (color); 883 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 885 rs[Rs_color + idx] = color;
937 886
938 /* handle color aliases */ 887 /* handle color aliases */
939 if (isdigit (*color)) 888 if (isdigit (*color))
940 { 889 {
941 i = atoi (color); 890 int i = atoi (color);
942 891
943 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
944 { 893 {
945 /* bright colors */ 894 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1050 int old_width = szHint.width; 999 int old_width = szHint.width;
1051 int old_height = szHint.height; 1000 int old_height = szHint.height;
1052 1001
1053 window_calc (newwidth, newheight); 1002 window_calc (newwidth, newheight);
1054 1003
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1004 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1005
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint)
1008 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 1010 XSetWMNormalHints (dpy, parent[0], &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc;
1012 }
1057 1013
1058 if (!ignoreparent) 1014 if (!ignoreparent)
1059 { 1015 {
1060#ifdef SMART_RESIZE 1016#ifdef SMART_RESIZE
1061 /* 1017 /*
… …
1101#else 1057#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1103#endif 1059#endif
1104 } 1060 }
1105 1061
1062 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint);
1064
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 1066
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 1067 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 1068 {
1110 if (scrollBar.state) 1069 if (scrollBar.state)
1111 { 1070 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1071
1118 XMoveResizeWindow (dpy, vt, 1072 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1073 window_vt_x, window_vt_y,
1120 width, height); 1074 width, height);
1121 1075
1122#ifdef HAVE_BG_PIXMAP 1076#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1077 if (bgPixmap.window_size_sensitive ())
1124 update_background (); 1078 update_background ();
1125#endif 1079#endif
1126
1127 scr_clear ();
1128 } 1080 }
1129 1081
1130 if (fix_screen || old_height == 0) 1082 if (fix_screen || old_height == 0)
1131 scr_reset (); 1083 scr_reset ();
1132
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135 1084
1136#ifdef HAVE_BG_PIXMAP 1085#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap) 1087// if (bgPixmap.pixmap)
1139// scr_touch (false); 1088// scr_touch (false);
… …
1211 1160
1212/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1213bool 1162bool
1214rxvt_term::IMisRunning () 1163rxvt_term::IMisRunning ()
1215{ 1164{
1216 char *p;
1217 Atom atom; 1165 Atom atom;
1218 Window win; 1166 Window win;
1219 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1220 1168
1221 /* get current locale modifier */ 1169 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1223 { 1171 {
1224 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1174
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1176 *p = '\0';
1229 1177
1230 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1232 1180
… …
1299 1247
1300 term->make_current (); 1248 term->make_current ();
1301 1249
1302 if (text) 1250 if (text)
1303 { 1251 {
1304 void *str; 1252 wchar_t *str;
1305 1253
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1255 {
1308 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1259
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1262
1315 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1317 } 1265 }
1318 else 1266 else
1319 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1320 1268
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,

Diff Legend

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