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.339 by root, Tue Dec 7 19:53:20 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-2010 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);
… …
375rxvt_term::destroy_cb (ev::idle &w, int revents) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 360{
377 make_current (); 361 make_current ();
378 362
379 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
380} 376}
381 377
382/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
383/* 379/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
401 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
402 char number[32]; 398 char number[32];
403 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 411 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 413 }
418 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 426 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 429 mesg, BUFSIZ);
434 else 430 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 432 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 434 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 436 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 438}
443#endif 439#endif
444 440
445int 441int
… …
468 DisplayString (display)); 464 DisplayString (display));
469 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
471} 467}
472 468
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 469static struct sig_handlers
593{ 470{
594 ev::sig sw_term, sw_int; 471 ev::sig sw_term, sw_int;
595 472
596 /* 473 /*
… …
611 rxvt_emergency_cleanup (); 488 rxvt_emergency_cleanup ();
612 w.stop (); 489 w.stop ();
613 kill (getpid (), w.signum); 490 kill (getpid (), w.signum);
614} 491}
615 492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
616char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
617 561
618void 562void
619rxvt_init () 563rxvt_init ()
620{ 564{
621 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
622 567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
623 if (!ev_default_loop (0)) 574 if (!ev_default_loop ())
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 576
626 rxvt_environ = environ; 577 rxvt_environ = environ;
627 578
628 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
629 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
630 581
631 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
632 sig_handlers.sw_int.start (SIGINT); ev_unref (); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
633
634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
635 /* signal (SIGURG, SIG_DFL); */
636 584
637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
638 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
639 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
640 588
… …
648 */ 596 */
649void 597void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 599{
652 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 601 int x, y, flags;
654 unsigned int w, h; 602 unsigned int w, h;
655 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
656 604
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
… …
668 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 618
671 if (flags & WidthValue) 619 if (flags & WidthValue)
672 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 625 szHint.flags |= USSize;
675 } 626 }
676 627
677 if (flags & HeightValue) 628 if (flags & HeightValue)
678 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 634 szHint.flags |= USSize;
681 } 635 }
682 636
683 if (flags & XValue) 637 if (flags & XValue)
684 { 638 {
… …
715 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
717 671
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 673
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
722 675
723 if (scrollBar.state) 676 if (scrollBar.state)
724 { 677 {
725 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
727 680
728 if (!option (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 682 window_vt_x += sb_w;
730 } 683 }
… …
754 { 707 {
755 min_it (height, max_height); 708 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
757 } 710 }
758 711
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 712 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 714
765 if (recalc_y) 715 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 717
768 ncol = width / fwidth; 718 ncol = width / fwidth;
769 nrow = height / fheight; 719 nrow = height / fheight;
770} 720}
771 721
772/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
773/* 723/*
… …
784 734
785 ws.ws_col = ncol; 735 ws.ws_col = ncol;
786 ws.ws_row = nrow; 736 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 740
791#if 0 741#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
… …
824#endif 774#endif
825 775
826 delete fontset[0]; 776 delete fontset[0];
827 fontset[0] = fs; 777 fontset[0] = fs;
828 778
829 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
831 782
832 fs->set_prop (prop, false); 783 fs->set_prop (prop, false);
833 784
834 fwidth = prop.width; 785 fwidth = prop.width;
835 fheight = prop.height; 786 fheight = prop.height;
… …
885 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 838}
888 839
889void 840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 854{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
894 857
… …
904/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
906void 869void
907rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
908{ 871{
909 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 873#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 875#endif
913} 876}
914 877
915void 878void
916rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
917{ 880{
918 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 882#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 884#endif
922} 885}
923 886
924void 887void
925rxvt_term::set_window_color (int idx, const char *color) 888rxvt_term::set_window_color (int idx, const char *color)
926{ 889{
927#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 891 rxvt_color xcol;
929 int i;
930 892
931 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
932 return; 894 return;
933 895
934 color = strdup (color); 896 color = strdup (color);
… …
936 rs[Rs_color + idx] = color; 898 rs[Rs_color + idx] = color;
937 899
938 /* handle color aliases */ 900 /* handle color aliases */
939 if (isdigit (*color)) 901 if (isdigit (*color))
940 { 902 {
941 i = atoi (color); 903 int i = atoi (color);
942 904
943 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
944 { 906 {
945 /* bright colors */ 907 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1050 int old_width = szHint.width; 1012 int old_width = szHint.width;
1051 int old_height = szHint.height; 1013 int old_height = szHint.height;
1052 1014
1053 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1054 1016
1055 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1057 1026
1058 if (!ignoreparent) 1027 if (!ignoreparent)
1059 { 1028 {
1060#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1061 /* 1030 /*
… …
1101#else 1070#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1103#endif 1072#endif
1104 } 1073 }
1105 1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1077
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 1079
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 1081 {
1110 if (scrollBar.state) 1082 if (scrollBar.state)
1111 { 1083 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1084
1118 XMoveResizeWindow (dpy, vt, 1085 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1120 width, height); 1087 width, height);
1121 1088
1122#ifdef HAVE_BG_PIXMAP 1089#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1090 if (bgPixmap.window_size_sensitive ())
1124 update_background (); 1091 update_background ();
1125#endif 1092#endif
1126
1127 scr_clear ();
1128 } 1093 }
1129 1094
1130 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1131 scr_reset (); 1096 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 1097
1136#ifdef HAVE_BG_PIXMAP 1098#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 ? 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap) 1100// if (bgPixmap.pixmap)
1139// scr_touch (false); 1101// scr_touch (false);
… …
1211 1173
1212/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1213bool 1175bool
1214rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1215{ 1177{
1216 char *p;
1217 Atom atom; 1178 Atom atom;
1218 Window win; 1179 Window win;
1219 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1220 1181
1221 /* get current locale modifier */ 1182 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1223 { 1184 {
1224 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1187
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1189 *p = '\0';
1229 1190
1230 atom = XInternAtom (dpy, server, False); 1191 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1232 1193
… …
1299 1260
1300 term->make_current (); 1261 term->make_current ();
1301 1262
1302 if (text) 1263 if (text)
1303 { 1264 {
1304 void *str; 1265 wchar_t *str;
1305 1266
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1268 {
1308 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1272
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1275
1315 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1317 } 1278 }
1318 else 1279 else
1319 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1320 1281
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
… …
1678void 1639void
1679rxvt_term::get_window_origin (int &x, int &y) 1640rxvt_term::get_window_origin (int &x, int &y)
1680{ 1641{
1681 Window cr; 1642 Window cr;
1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1684} 1644}
1685 1645
1686Pixmap 1646Pixmap
1687rxvt_term::get_pixmap_property (int prop_id) 1647rxvt_term::get_pixmap_property (int prop_id)
1688{ 1648{
… …
1702 1662
1703 return None; 1663 return None;
1704} 1664}
1705 1665
1706#ifdef HAVE_BG_PIXMAP 1666#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716 1667
1717void 1668void
1718rxvt_term::update_background () 1669rxvt_term::update_background ()
1719{ 1670{
1720 if (update_background_ev.is_active ()) 1671 if (update_background_ev.is_active ())

Diff Legend

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