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.290 by ayin, Tue Dec 18 12:52:30 2007 UTC vs.
Revision 1.335 by root, Sun Oct 24 17:52:50 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 }
… …
170#endif 173#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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::x_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);
… …
226 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
227 delete fontset[i]; 228 delete fontset[i];
228#endif 229#endif
229 delete fontset[0]; 230 delete fontset[0];
230 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
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
241
231 if (display) 242 if (display)
232 { 243 {
233 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
234 246
235#ifdef USE_XIM 247#ifdef USE_XIM
236 im_destroy (); 248 im_destroy ();
237#endif 249#endif
238#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 251 if (gc) XFreeGC (dpy, gc);
263 252
264 delete drawable; 253 delete drawable;
265 // destroy all windows 254 // destroy all windows
266 if (parent[0]) 255 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 263 pix_colors_unfocused [i].free (this);
275#endif 264#endif
276 } 265 }
277 266
278 clear (); 267 clear ();
279 }
280 268
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 269 display->flush (); /* ideally .put should do this */
290 displays.put (display); 270 displays.put (display);
271 }
291 272
292 scr_release (); 273 scr_release ();
293 274
294 /* clear all resources */ 275 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 277 free (allocated [i]);
297 278
298 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
300 free (env_display); 282 free (env_display);
301 free (env_term); 283 free (env_term);
302 free (locale); 284 free (locale);
303 free (v_buffer); 285 free (v_buffer);
… …
341 if (display) 323 if (display)
342 { 324 {
343#if USE_XIM 325#if USE_XIM
344 im_ev.stop (display); 326 im_ev.stop (display);
345#endif 327#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
351#endif 331#endif
352 incr_ev.stop (); 332 incr_ev.stop ();
353 termwin_ev.stop (display); 333 termwin_ev.stop (display);
… …
405 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
406 char number[32]; 386 char number[32];
407 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 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");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 399 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 401 }
422 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 414 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 417 mesg, BUFSIZ);
438 else 418 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 420 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 422 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 424 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 426}
447#endif 427#endif
448 428
449int 429int
… …
472 DisplayString (display)); 452 DisplayString (display));
473 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
475} 455}
476 456
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589}
590
591static struct sig_handlers 457static struct sig_handlers
592{ 458{
593 ev::sig sw_term, sw_int; 459 ev::sig sw_term, sw_int;
594 460
595 /* 461 /*
… …
610 rxvt_emergency_cleanup (); 476 rxvt_emergency_cleanup ();
611 w.stop (); 477 w.stop ();
612 kill (getpid (), w.signum); 478 kill (getpid (), w.signum);
613} 479}
614 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
615char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
616 546
617void 547void
618rxvt_init () 548rxvt_init ()
619{ 549{
620 ptytty::init (); 550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
621 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
622 if (!ev_default_loop (0)) 559 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 560 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 561
625 rxvt_environ = environ; 562 rxvt_environ = environ;
626 563
627 signal (SIGHUP, SIG_IGN); 564 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 565 signal (SIGPIPE, SIG_IGN);
629 566
630 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 567 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev_unref (); 568 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 569
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 571 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 572 XSetIOErrorHandler (rxvt_xioerror_handler);
639 573
… …
647 */ 581 */
648void 582void
649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 583rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650{ 584{
651 short recalc_x, recalc_y; 585 short recalc_x, recalc_y;
652 int x, y, sb_w, flags; 586 int x, y, flags;
653 unsigned int w, h; 587 unsigned int w, h;
654 unsigned int max_width, max_height; 588 unsigned int max_width, max_height;
655 589
656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 590 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
657 szHint.win_gravity = NorthWestGravity; 591 szHint.win_gravity = NorthWestGravity;
… …
667 if (rs[Rs_geometry]) 601 if (rs[Rs_geometry])
668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 602 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669 603
670 if (flags & WidthValue) 604 if (flags & WidthValue)
671 { 605 {
606 if (!w)
607 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
608
672 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 609 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 610 szHint.flags |= USSize;
674 } 611 }
675 612
676 if (flags & HeightValue) 613 if (flags & HeightValue)
677 { 614 {
615 if (!h)
616 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
617
678 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 618 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679 szHint.flags |= USSize; 619 szHint.flags |= USSize;
680 } 620 }
681 621
682 if (flags & XValue) 622 if (flags & XValue)
683 { 623 {
… …
714 max_width = MAX_COLS * fwidth; 654 max_width = MAX_COLS * fwidth;
715 max_height = MAX_ROWS * fheight; 655 max_height = MAX_ROWS * fheight;
716 656
717 szHint.base_width = szHint.base_height = 2 * int_bwidth; 657 szHint.base_width = szHint.base_height = 2 * int_bwidth;
718 658
719 sb_w = 0;
720 window_vt_x = window_vt_y = int_bwidth; 659 window_vt_x = window_vt_y = int_bwidth;
721 660
722 if (scrollBar.state) 661 if (scrollBar.state)
723 { 662 {
724 sb_w = scrollbar_TotalWidth (); 663 int sb_w = scrollBar.total_width ();
725 szHint.base_width += sb_w; 664 szHint.base_width += sb_w;
726 665
727 if (!option (Opt_scrollBar_right)) 666 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 667 window_vt_x += sb_w;
729 } 668 }
… …
753 { 692 {
754 min_it (height, max_height); 693 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 694 szHint.height = szHint.base_height + height;
756 } 695 }
757 696
758 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 697 if (recalc_x)
762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 698 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763 699
764 if (recalc_y) 700 if (recalc_y)
765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 701 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766 702
767 ncol = width / fwidth; 703 ncol = width / fwidth;
768 nrow = height / fheight; 704 nrow = height / fheight;
769} 705}
770 706
771/*----------------------------------------------------------------------*/ 707/*----------------------------------------------------------------------*/
772/* 708/*
… …
783 719
784 ws.ws_col = ncol; 720 ws.ws_col = ncol;
785 ws.ws_row = nrow; 721 ws.ws_row = nrow;
786 ws.ws_xpixel = width; 722 ws.ws_xpixel = width;
787 ws.ws_ypixel = height; 723 ws.ws_ypixel = height;
788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 724 ioctl (pty->pty, TIOCSWINSZ, &ws);
789 725
790#if 0 726#if 0
791 // TIOCSWINSZ is supposed to do this automatically and correctly 727 // TIOCSWINSZ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 728 if (cmd_pid) /* force through to the command */
793 kill (-cmd_pid, SIGWINCH); 729 kill (-cmd_pid, SIGWINCH);
… …
823#endif 759#endif
824 760
825 delete fontset[0]; 761 delete fontset[0];
826 fontset[0] = fs; 762 fontset[0] = fs;
827 763
828 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
829 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
830 767
831 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
832 769
833 fwidth = prop.width; 770 fwidth = prop.width;
834 fheight = prop.height; 771 fheight = prop.height;
… …
884 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
885 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
886} 823}
887 824
888void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent[0], &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
889rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
890{ 839{
891 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
892 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
893 842
… …
903/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
904/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
905void 854void
906rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
907{ 856{
908 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
909#if ENABLE_EWMH 858#if ENABLE_EWMH
910 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
911#endif 860#endif
912} 861}
913 862
914void 863void
915rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
916{ 865{
917 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
918#if ENABLE_EWMH 867#if ENABLE_EWMH
919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
920#endif 869#endif
921} 870}
922 871
923void 872void
924rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
925{ 874{
926#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
927 rxvt_color xcol; 876 rxvt_color xcol;
928 int i;
929 877
930 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
931 return; 879 return;
932 880
933 color = strdup (color); 881 color = strdup (color);
… …
935 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
936 884
937 /* handle color aliases */ 885 /* handle color aliases */
938 if (isdigit (*color)) 886 if (isdigit (*color))
939 { 887 {
940 i = atoi (color); 888 int i = atoi (color);
941 889
942 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
943 { 891 {
944 /* bright colors */ 892 /* bright colors */
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1049 int old_width = szHint.width; 997 int old_width = szHint.width;
1050 int old_height = szHint.height; 998 int old_height = szHint.height;
1051 999
1052 window_calc (newwidth, newheight); 1000 window_calc (newwidth, newheight);
1053 1001
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1002 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1003
1004 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1005 if (set_hint)
1006 {
1007 szHint.flags &= ~(PBaseSize | PResizeInc);
1055 XSetWMNormalHints (dpy, parent[0], &szHint); 1008 XSetWMNormalHints (dpy, parent[0], &szHint);
1009 szHint.flags |= PBaseSize | PResizeInc;
1010 }
1056 1011
1057 if (!ignoreparent) 1012 if (!ignoreparent)
1058 { 1013 {
1059#ifdef SMART_RESIZE 1014#ifdef SMART_RESIZE
1060 /* 1015 /*
… …
1100#else 1055#else
1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1056 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1102#endif 1057#endif
1103 } 1058 }
1104 1059
1060 if (set_hint)
1061 XSetWMNormalHints (dpy, parent[0], &szHint);
1062
1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1063 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1064
1107 if (fix_screen || newwidth != old_width || newheight != old_height) 1065 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1066 {
1109 if (scrollBar.state) 1067 if (scrollBar.state)
1110 { 1068 scrollBar.resize ();
1111 XMoveResizeWindow (dpy, scrollBar.win,
1112 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar ();
1115 }
1116 1069
1117 XMoveResizeWindow (dpy, vt, 1070 XMoveResizeWindow (dpy, vt,
1118 window_vt_x, window_vt_y, 1071 window_vt_x, window_vt_y,
1119 width, height); 1072 width, height);
1120 1073
1121#ifdef HAVE_BG_PIXMAP 1074#ifdef HAVE_BG_PIXMAP
1122 if (bgPixmap.window_size_sensitive ()) 1075 if (bgPixmap.window_size_sensitive ())
1123 update_background (); 1076 update_background ();
1124#endif 1077#endif
1125
1126 scr_clear ();
1127 } 1078 }
1128 1079
1129 if (fix_screen || old_height == 0) 1080 if (fix_screen || old_height == 0)
1130 scr_reset (); 1081 scr_reset ();
1131
1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1133 //scr_touch (false);
1134 1082
1135#ifdef HAVE_BG_PIXMAP 1083#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1084// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap) 1085// if (bgPixmap.pixmap)
1138// scr_touch (false); 1086// scr_touch (false);
… …
1210 1158
1211/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1212bool 1160bool
1213rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1214{ 1162{
1215 char *p;
1216 Atom atom; 1163 Atom atom;
1217 Window win; 1164 Window win;
1218 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1219 1166
1220 /* get current locale modifier */ 1167 /* get current locale modifier */
1221 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1222 { 1169 {
1223 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225 1172
1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1227 *p = '\0'; 1174 *p = '\0';
1228 1175
1229 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1230 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1231 1178
… …
1298 1245
1299 term->make_current (); 1246 term->make_current ();
1300 1247
1301 if (text) 1248 if (text)
1302 { 1249 {
1303 void *str; 1250 wchar_t *str;
1304 1251
1305 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1306 { 1253 {
1307 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1308 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1309 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1310 1257
1311 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1312 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1313 1260
1314 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1315 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1316 } 1263 }
1317 else 1264 else
1318 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1319 1266
1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1321 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1322 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1323 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
… …
1677void 1624void
1678rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1679{ 1626{
1680 Window cr; 1627 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683} 1629}
1684 1630
1685Pixmap 1631Pixmap
1686rxvt_term::get_pixmap_property (int prop_id) 1632rxvt_term::get_pixmap_property (int prop_id)
1687{ 1633{
… …
1694 unsigned char *prop = NULL; 1640 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop; 1645 return *(Pixmap *)prop;
1701 }
1702 } 1646 }
1647
1703 return None; 1648 return None;
1704} 1649}
1705 1650
1706#ifdef HAVE_BG_PIXMAP 1651#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709int rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715 1652
1716int 1653void
1717rxvt_term::update_background () 1654rxvt_term::update_background ()
1718{ 1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1719 bgPixmap.invalidate (); 1659 bgPixmap.invalidate ();
1720 1660
1721 /* no chance of real time refresh if we are blurring! */ 1661 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1662
1663 if (to_wait <= 0.)
1723 bgPixmap.render (); 1664 bgPixmap.render ();
1724 else 1665 else
1725 {
1726 ev_tstamp refresh;
1727 update_background_ev.stop ();
1728
1729 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */
1733 else
1734 refresh = .07;
1735 update_background_ev.start (refresh); 1666 update_background_ev.start (to_wait);
1736 }
1737
1738 return 0;
1739} 1667}
1740 1668
1741void 1669void
1742rxvt_term::update_background_cb (ev::timer &w, int revents) 1670rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{ 1671{
1744 make_current (); 1672 make_current ();
1673
1674 update_background_ev.stop ();
1745 bgPixmap.render (); 1675 bgPixmap.render ();
1746 refresh_check (); 1676 refresh_check ();
1747} 1677}
1748 1678
1749#endif /* HAVE_BG_PIXMAP */ 1679#endif /* HAVE_BG_PIXMAP */

Diff Legend

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