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.295 by root, Fri Jan 4 20:39:42 2008 UTC vs.
Revision 1.331 by sf-exg, Mon Jul 26 22:07:38 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.
… …
35#include "keyboard.h" 35#include "keyboard.h"
36#include "rxvtperl.h" 36#include "rxvtperl.h"
37 37
38#include <limits> 38#include <limits>
39 39
40#include <cassert>
40#include <csignal> 41#include <csignal>
41#include <cstring> 42#include <cstring>
42 43
43#include <termios.h> 44#include <termios.h>
44 45
… …
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.end (); cc-- > v.begin (); )
108 { 109 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 } 112 }
… …
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
… …
226 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
227 delete fontset[i]; 226 delete fontset[i];
228#endif 227#endif
229 delete fontset[0]; 228 delete fontset[0];
230 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
231 if (display) 240 if (display)
232 { 241 {
233 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
234 244
235#ifdef USE_XIM 245#ifdef USE_XIM
236 im_destroy (); 246 im_destroy ();
237#endif 247#endif
238#ifdef XTERM_SCROLLBAR 248 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); 249 if (gc) XFreeGC (dpy, gc);
263 250
264 delete drawable; 251 delete drawable;
265 // destroy all windows 252 // destroy all windows
266 if (parent[0]) 253 if (parent[0])
… …
274 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
275#endif 262#endif
276 } 263 }
277 264
278 clear (); 265 clear ();
279 }
280 266
281#ifdef HAVE_BG_PIXMAP
282 bgPixmap.destroy ();
283#endif
284 display->flush (); /* ideally .put should do this */ 267 display->flush (); /* ideally .put should do this */
285 displays.put (display); 268 displays.put (display);
269 }
286 270
287 scr_release (); 271 scr_release ();
288 272
289 /* clear all resources */ 273 /* clear all resources */
290 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
291 free (allocated [i]); 275 free (allocated [i]);
292 276
293 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
294 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
295 free (env_display); 280 free (env_display);
296 free (env_term); 281 free (env_term);
297 free (locale); 282 free (locale);
298 free (v_buffer); 283 free (v_buffer);
… …
336 if (display) 321 if (display)
337 { 322 {
338#if USE_XIM 323#if USE_XIM
339 im_ev.stop (display); 324 im_ev.stop (display);
340#endif 325#endif
341#if HAVE_SCROLLBARS
342 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
343#endif
344#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
345 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
346#endif 329#endif
347 incr_ev.stop (); 330 incr_ev.stop ();
348 termwin_ev.stop (display); 331 termwin_ev.stop (display);
… …
400 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
401 char number[32]; 384 char number[32];
402 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
403 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
404 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
405 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
406 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
407 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
409 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
410 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
411 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
412 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
413 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
414 mesg, BUFSIZ); 397 mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
416 } 399 }
417 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
418 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
419 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
420 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
421 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
422 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
423 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
424 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
425 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
426 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
427 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
428 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
429 mesg, BUFSIZ); 412 mesg, BUFSIZ);
430 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
431 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
432 mesg, BUFSIZ); 415 mesg, BUFSIZ);
433 else 416 else
434 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
435 mesg, BUFSIZ); 418 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
437 } 420 }
438 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
439 mesg, BUFSIZ); 422 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
441} 424}
442#endif 425#endif
443 426
444int 427int
… …
467 DisplayString (display)); 450 DisplayString (display));
468 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
469 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
470} 453}
471 454
472/*----------------------------------------------------------------------*/
473void
474rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
475{
476 this->envv = envv;
477
478 SET_R (this);
479 set_locale ("");
480 set_environ (envv); // few things in X do not call setlocale :(
481
482 init_vars ();
483
484 init_secondary ();
485
486 const char **cmd_argv = init_resources (argc, argv);
487
488#ifdef KEYSYM_RESOURCE
489 keyboard->register_done ();
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (option (Opt_scrollBar))
494 scrollBar.setIdle (); /* set existence for size calculations */
495#endif
496
497 pty = ptytty::create ();
498
499 create_windows (argc, argv);
500
501 init_xlocale ();
502
503 scr_reset (); // initialize screen
504
505#if 0
506 XSynchronize (dpy, True);
507#endif
508
509#ifdef HAVE_SCROLLBARS
510 if (option (Opt_scrollBar))
511 resize_scrollbar (); /* create and map scrollbar */
512#endif
513#ifdef HAVE_BG_PIXMAP
514 {
515 bgPixmap.set_target (this);
516
517#ifdef ENABLE_TRANSPARENCY
518 if (option (Opt_transparent))
519 {
520 bgPixmap.set_transparent ();
521
522#ifdef HAVE_AFTERIMAGE
523 if (rs [Rs_blurradius])
524 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
525#endif
526 if (ISSET_PIXCOLOR (Color_tint))
527 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
528
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap])
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != 0)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, ev::READ);
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586}
587
588static struct sig_handlers 455static struct sig_handlers
589{ 456{
590 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
591 458
592 /* 459 /*
… …
612char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
613 480
614void 481void
615rxvt_init () 482rxvt_init ()
616{ 483{
484 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486
487 // get rid of stdin/stdout as we don't need them, to free resources
488 dup2 (STDERR_FILENO, STDIN_FILENO);
489 dup2 (STDERR_FILENO, STDOUT_FILENO);
490
617 ptytty::init (); 491 ptytty::init ();
618 492
619 if (!ev_default_loop (0)) 493 if (!ev_default_loop (0))
620 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 494 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
621 495
… …
624 signal (SIGHUP, SIG_IGN); 498 signal (SIGHUP, SIG_IGN);
625 signal (SIGPIPE, SIG_IGN); 499 signal (SIGPIPE, SIG_IGN);
626 500
627 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 501 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
628 sig_handlers.sw_int.start (SIGINT); ev_unref (); 502 sig_handlers.sw_int.start (SIGINT); ev_unref ();
629
630 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
631 /* signal (SIGURG, SIG_DFL); */
632 503
633 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 504 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
634 // TODO: handle this with exceptions and tolerate the memory loss 505 // TODO: handle this with exceptions and tolerate the memory loss
635 XSetIOErrorHandler (rxvt_xioerror_handler); 506 XSetIOErrorHandler (rxvt_xioerror_handler);
636 507
… …
644 */ 515 */
645void 516void
646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 517rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
647{ 518{
648 short recalc_x, recalc_y; 519 short recalc_x, recalc_y;
649 int x, y, sb_w, flags; 520 int x, y, flags;
650 unsigned int w, h; 521 unsigned int w, h;
651 unsigned int max_width, max_height; 522 unsigned int max_width, max_height;
652 523
653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 524 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
654 szHint.win_gravity = NorthWestGravity; 525 szHint.win_gravity = NorthWestGravity;
… …
664 if (rs[Rs_geometry]) 535 if (rs[Rs_geometry])
665 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 536 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
666 537
667 if (flags & WidthValue) 538 if (flags & WidthValue)
668 { 539 {
540 if (!w)
541 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
542
669 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 543 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
670 szHint.flags |= USSize; 544 szHint.flags |= USSize;
671 } 545 }
672 546
673 if (flags & HeightValue) 547 if (flags & HeightValue)
674 { 548 {
549 if (!h)
550 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
551
675 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 552 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
676 szHint.flags |= USSize; 553 szHint.flags |= USSize;
677 } 554 }
678 555
679 if (flags & XValue) 556 if (flags & XValue)
680 { 557 {
… …
711 max_width = MAX_COLS * fwidth; 588 max_width = MAX_COLS * fwidth;
712 max_height = MAX_ROWS * fheight; 589 max_height = MAX_ROWS * fheight;
713 590
714 szHint.base_width = szHint.base_height = 2 * int_bwidth; 591 szHint.base_width = szHint.base_height = 2 * int_bwidth;
715 592
716 sb_w = 0;
717 window_vt_x = window_vt_y = int_bwidth; 593 window_vt_x = window_vt_y = int_bwidth;
718 594
719 if (scrollBar.state) 595 if (scrollBar.state)
720 { 596 {
721 sb_w = scrollbar_TotalWidth (); 597 int sb_w = scrollBar.total_width ();
722 szHint.base_width += sb_w; 598 szHint.base_width += sb_w;
723 599
724 if (!option (Opt_scrollBar_right)) 600 if (!option (Opt_scrollBar_right))
725 window_vt_x += sb_w; 601 window_vt_x += sb_w;
726 } 602 }
… …
750 { 626 {
751 min_it (height, max_height); 627 min_it (height, max_height);
752 szHint.height = szHint.base_height + height; 628 szHint.height = szHint.base_height + height;
753 } 629 }
754 630
755 if (scrollBar.state && option (Opt_scrollBar_right))
756 window_sb_x = szHint.width - sb_w;
757
758 if (recalc_x) 631 if (recalc_x)
759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 632 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
760 633
761 if (recalc_y) 634 if (recalc_y)
762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 635 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
763 636
764 ncol = width / fwidth; 637 ncol = width / fwidth;
765 nrow = height / fheight; 638 nrow = height / fheight;
766} 639}
767 640
768/*----------------------------------------------------------------------*/ 641/*----------------------------------------------------------------------*/
769/* 642/*
… …
780 653
781 ws.ws_col = ncol; 654 ws.ws_col = ncol;
782 ws.ws_row = nrow; 655 ws.ws_row = nrow;
783 ws.ws_xpixel = width; 656 ws.ws_xpixel = width;
784 ws.ws_ypixel = height; 657 ws.ws_ypixel = height;
785 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 658 ioctl (pty->pty, TIOCSWINSZ, &ws);
786 659
787#if 0 660#if 0
788 // TIOCSWINSZ is supposed to do this automatically and correctly 661 // TIOCSWINSZ is supposed to do this automatically and correctly
789 if (cmd_pid) /* force through to the command */ 662 if (cmd_pid) /* force through to the command */
790 kill (-cmd_pid, SIGWINCH); 663 kill (-cmd_pid, SIGWINCH);
… …
820#endif 693#endif
821 694
822 delete fontset[0]; 695 delete fontset[0];
823 fontset[0] = fs; 696 fontset[0] = fs;
824 697
825 prop = (*fs)[1]->properties (); 698 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
826 prop.height += lineSpace; 699 prop.height += lineSpace;
700 prop.width += letterSpace;
827 701
828 fs->set_prop (prop, false); 702 fs->set_prop (prop, false);
829 703
830 fwidth = prop.width; 704 fwidth = prop.width;
831 fheight = prop.height; 705 fheight = prop.height;
… …
881 prop, XA_STRING, 8, PropModeReplace, 755 prop, XA_STRING, 8, PropModeReplace,
882 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 756 (const unsigned char *)str, len >= 0 ? len : strlen (str));
883} 757}
884 758
885void 759void
760rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
761{
762 XTextProperty ct;
763
764 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
765 {
766 XSetTextProperty (dpy, parent[0], &ct, prop);
767 XFree (ct.value);
768 }
769}
770
771void
886rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 772rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
887{ 773{
888 wchar_t *ws = rxvt_mbstowcs (str, len); 774 wchar_t *ws = rxvt_mbstowcs (str, len);
889 char *s = rxvt_wcstoutf8 (ws); 775 char *s = rxvt_wcstoutf8 (ws);
890 776
… …
900/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
901/* xterm sequences - title, iconName, color (exptl) */ 787/* xterm sequences - title, iconName, color (exptl) */
902void 788void
903rxvt_term::set_title (const char *str) 789rxvt_term::set_title (const char *str)
904{ 790{
905 set_string_property (XA_WM_NAME, str); 791 set_mbstring_property (XA_WM_NAME, str);
906#if ENABLE_EWMH 792#if ENABLE_EWMH
907 set_utf8_property (xa[XA_NET_WM_NAME], str); 793 set_utf8_property (xa[XA_NET_WM_NAME], str);
908#endif 794#endif
909} 795}
910 796
911void 797void
912rxvt_term::set_icon_name (const char *str) 798rxvt_term::set_icon_name (const char *str)
913{ 799{
914 set_string_property (XA_WM_ICON_NAME, str); 800 set_mbstring_property (XA_WM_ICON_NAME, str);
915#if ENABLE_EWMH 801#if ENABLE_EWMH
916 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 802 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
917#endif 803#endif
918} 804}
919 805
920void 806void
921rxvt_term::set_window_color (int idx, const char *color) 807rxvt_term::set_window_color (int idx, const char *color)
922{ 808{
923#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
924 rxvt_color xcol; 810 rxvt_color xcol;
925 int i;
926 811
927 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
928 return; 813 return;
929 814
930 color = strdup (color); 815 color = strdup (color);
… …
932 rs[Rs_color + idx] = color; 817 rs[Rs_color + idx] = color;
933 818
934 /* handle color aliases */ 819 /* handle color aliases */
935 if (isdigit (*color)) 820 if (isdigit (*color))
936 { 821 {
937 i = atoi (color); 822 int i = atoi (color);
938 823
939 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
940 { 825 {
941 /* bright colors */ 826 /* bright colors */
942 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1046 int old_width = szHint.width; 931 int old_width = szHint.width;
1047 int old_height = szHint.height; 932 int old_height = szHint.height;
1048 933
1049 window_calc (newwidth, newheight); 934 window_calc (newwidth, newheight);
1050 935
1051 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 936 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
937
938 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
939 if (set_hint)
940 {
941 szHint.flags &= ~(PBaseSize | PResizeInc);
1052 XSetWMNormalHints (dpy, parent[0], &szHint); 942 XSetWMNormalHints (dpy, parent[0], &szHint);
943 szHint.flags |= PBaseSize | PResizeInc;
944 }
1053 945
1054 if (!ignoreparent) 946 if (!ignoreparent)
1055 { 947 {
1056#ifdef SMART_RESIZE 948#ifdef SMART_RESIZE
1057 /* 949 /*
… …
1097#else 989#else
1098 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 990 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1099#endif 991#endif
1100 } 992 }
1101 993
994 if (set_hint)
995 XSetWMNormalHints (dpy, parent[0], &szHint);
996
1102 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 997 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1103 998
1104 if (fix_screen || newwidth != old_width || newheight != old_height) 999 if (fix_screen || newwidth != old_width || newheight != old_height)
1105 { 1000 {
1106 if (scrollBar.state) 1001 if (scrollBar.state)
1107 { 1002 scrollBar.resize ();
1108 XMoveResizeWindow (dpy, scrollBar.win,
1109 window_sb_x, 0,
1110 scrollbar_TotalWidth (), szHint.height);
1111 resize_scrollbar ();
1112 }
1113 1003
1114 XMoveResizeWindow (dpy, vt, 1004 XMoveResizeWindow (dpy, vt,
1115 window_vt_x, window_vt_y, 1005 window_vt_x, window_vt_y,
1116 width, height); 1006 width, height);
1117 1007
1118#ifdef HAVE_BG_PIXMAP 1008#ifdef HAVE_BG_PIXMAP
1119 if (bgPixmap.window_size_sensitive ()) 1009 if (bgPixmap.window_size_sensitive ())
1120 update_background (); 1010 update_background ();
1121#endif 1011#endif
1122
1123 scr_clear ();
1124 } 1012 }
1125 1013
1126 if (fix_screen || old_height == 0) 1014 if (fix_screen || old_height == 0)
1127 scr_reset (); 1015 scr_reset ();
1128
1129 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1130 //scr_touch (false);
1131 1016
1132#ifdef HAVE_BG_PIXMAP 1017#ifdef HAVE_BG_PIXMAP
1133// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1134// if (bgPixmap.pixmap) 1019// if (bgPixmap.pixmap)
1135// scr_touch (false); 1020// scr_touch (false);
… …
1207 1092
1208/* Checking whether input method is running. */ 1093/* Checking whether input method is running. */
1209bool 1094bool
1210rxvt_term::IMisRunning () 1095rxvt_term::IMisRunning ()
1211{ 1096{
1212 char *p;
1213 Atom atom; 1097 Atom atom;
1214 Window win; 1098 Window win;
1215 char server[IMBUFSIZ]; 1099 char server[IMBUFSIZ];
1216 1100
1217 /* get current locale modifier */ 1101 /* get current locale modifier */
1218 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1102 if (char *p = XSetLocaleModifiers (0))
1219 { 1103 {
1220 strcpy (server, "@server="); 1104 strcpy (server, "@server=");
1221 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1105 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1222 1106
1223 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1107 if (p = strchr (server + 1, '@')) /* first one only */
1224 *p = '\0'; 1108 *p = '\0';
1225 1109
1226 atom = XInternAtom (dpy, server, False); 1110 atom = XInternAtom (dpy, server, False);
1227 win = XGetSelectionOwner (dpy, atom); 1111 win = XGetSelectionOwner (dpy, atom);
1228 1112
… …
1295 1179
1296 term->make_current (); 1180 term->make_current ();
1297 1181
1298 if (text) 1182 if (text)
1299 { 1183 {
1300 void *str; 1184 wchar_t *str;
1301 1185
1302 if (!text->encoding_is_wchar && text->string.multi_byte) 1186 if (!text->encoding_is_wchar && text->string.multi_byte)
1303 { 1187 {
1304 // of course, X makes it ugly again 1188 // of course, X makes it ugly again
1305 if (term->rs[Rs_imLocale]) 1189 if (term->rs[Rs_imLocale])
1306 SET_LOCALE (term->rs[Rs_imLocale]); 1190 SET_LOCALE (term->rs[Rs_imLocale]);
1307 1191
1308 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1192 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1309 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1193 mbstowcs (str, text->string.multi_byte, text->length + 1);
1310 1194
1311 if (term->rs[Rs_imLocale]) 1195 if (term->rs[Rs_imLocale])
1312 SET_LOCALE (term->locale); 1196 SET_LOCALE (term->locale);
1313 } 1197 }
1314 else 1198 else
1315 str = (void *)text->string.wide_char; 1199 str = text->string.wide_char;
1316 1200
1317 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1201 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1318 DT_INT, call_data->caret, 1202 DT_INT, call_data->caret,
1319 DT_INT, call_data->chg_first, 1203 DT_INT, call_data->chg_first,
1320 DT_INT, call_data->chg_length, 1204 DT_INT, call_data->chg_length,
… …
1716 if (update_background_ev.is_active ()) 1600 if (update_background_ev.is_active ())
1717 return; 1601 return;
1718 1602
1719 bgPixmap.invalidate (); 1603 bgPixmap.invalidate ();
1720 1604
1721 ev_tstamp refresh; 1605 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1722 1606
1723 if (!bgPixmap.need_client_side_rendering ()) 1607 if (to_wait <= 0.)
1724 refresh = .05; 1608 bgPixmap.render ();
1725 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1726 /* no chance of real time refresh if we are bluring! */
1727 refresh = .50;
1728 else 1609 else
1729 refresh = .07;
1730
1731 update_background_ev.start (refresh); 1610 update_background_ev.start (to_wait);
1732} 1611}
1733 1612
1734void 1613void
1735rxvt_term::update_background_cb (ev::timer &w, int revents) 1614rxvt_term::update_background_cb (ev::timer &w, int revents)
1736{ 1615{

Diff Legend

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