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.280 by ayin, Wed Dec 12 11:35:56 2007 UTC vs.
Revision 1.330 by sf-exg, Mon Jul 26 09:57:53 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-2006 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 }
… …
170#endif 171#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
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::x_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);
185#endif 184#endif
186#ifndef NO_BELL 185#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this); 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
… …
227 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
228 delete fontset[i]; 226 delete fontset[i];
229#endif 227#endif
230 delete fontset[0]; 228 delete fontset[0];
231 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
232 if (display) 240 if (display)
233 { 241 {
234 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
235 244
236#ifdef USE_XIM 245#ifdef USE_XIM
237 im_destroy (); 246 im_destroy ();
238#endif 247#endif
239#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
241 if (ShadowGC) XFreeGC (dpy, ShadowGC);
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 249 if (gc) XFreeGC (dpy, gc);
264 250
265 delete drawable; 251 delete drawable;
266 // destroy all windows 252 // destroy all windows
267 if (parent[0]) 253 if (parent[0])
… …
275 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
276#endif 262#endif
277 } 263 }
278 264
279 clear (); 265 clear ();
280 }
281 266
282 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 268 displays.put (display);
269 }
291 270
292 scr_release (); 271 scr_release ();
293 272
294 /* clear all resources */ 273 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 275 free (allocated [i]);
297 276
298 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
300 free (env_display); 280 free (env_display);
301 free (env_term); 281 free (env_term);
302 free (locale); 282 free (locale);
303 free (v_buffer); 283 free (v_buffer);
… …
327} 307}
328 308
329void 309void
330rxvt_term::destroy () 310rxvt_term::destroy ()
331{ 311{
332 if (ev_is_active (&destroy_ev)) 312 if (destroy_ev.is_active ())
333 return; 313 return;
334 314
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 316
337#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
341 if (display) 321 if (display)
342 { 322 {
343#if USE_XIM 323#if USE_XIM
344 im_ev.stop (display); 324 im_ev.stop (display);
345#endif 325#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
351#endif 329#endif
352 incr_ev.stop (); 330 incr_ev.stop ();
353 termwin_ev.stop (display); 331 termwin_ev.stop (display);
354 vt_ev.stop (display); 332 vt_ev.stop (display);
355 } 333 }
356 334
357 prepare_ev.stop (); 335 flush_ev.stop ();
358 pty_ev.stop (); 336 pty_ev.stop ();
359#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
361#endif 339#endif
362#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
405 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
406 char number[32]; 384 char number[32];
407 char *mtype = "XlibMessage"; 385 char *mtype = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 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");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 397 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 399 }
422 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 412 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 415 mesg, BUFSIZ);
438 else 416 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 418 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 420 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 422 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 424}
447#endif 425#endif
448 426
449int 427int
… …
472 DisplayString (display)); 450 DisplayString (display));
473 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
475} 453}
476 454
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 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591}
592
593static struct sig_handlers 455static struct sig_handlers
594{ 456{
595 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
596 458
597 /* 459 /*
… …
617char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
618 480
619void 481void
620rxvt_init () 482rxvt_init ()
621{ 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
622 ptytty::init (); 487 ptytty::init ();
623 488
624 if (!ev_default_loop (0)) 489 if (!ev_default_loop (0))
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 491
… …
629 signal (SIGHUP, SIG_IGN); 494 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 495 signal (SIGPIPE, SIG_IGN);
631 496
632 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 497 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev_unref (); 498 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 499
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 501 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 502 XSetIOErrorHandler (rxvt_xioerror_handler);
641 503
642 XrmInitialize (); 504 XrmInitialize ();
643}
644
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 505}
680 506
681/*----------------------------------------------------------------------*/ 507/*----------------------------------------------------------------------*/
682/* 508/*
683 * window size/position calculations for XSizeHint and other storage. 509 * window size/position calculations for XSizeHint and other storage.
… …
685 */ 511 */
686void 512void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 513rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 514{
689 short recalc_x, recalc_y; 515 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 516 int x, y, flags;
691 unsigned int w, h; 517 unsigned int w, h;
692 unsigned int max_width, max_height; 518 unsigned int max_width, max_height;
693 519
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 520 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 521 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 531 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 532 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 533
708 if (flags & WidthValue) 534 if (flags & WidthValue)
709 { 535 {
536 if (!w)
537 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
538
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 539 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 540 szHint.flags |= USSize;
712 } 541 }
713 542
714 if (flags & HeightValue) 543 if (flags & HeightValue)
715 { 544 {
545 if (!h)
546 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
547
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 548 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 549 szHint.flags |= USSize;
718 } 550 }
719 551
720 if (flags & XValue) 552 if (flags & XValue)
721 { 553 {
… …
752 max_width = MAX_COLS * fwidth; 584 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 585 max_height = MAX_ROWS * fheight;
754 586
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 587 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 588
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 589 window_vt_x = window_vt_y = int_bwidth;
759 590
760 if (scrollBar.state) 591 if (scrollBar.state)
761 { 592 {
762 sb_w = scrollbar_TotalWidth (); 593 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 594 szHint.base_width += sb_w;
764 595
765 if (!option (Opt_scrollBar_right)) 596 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 597 window_vt_x += sb_w;
767 } 598 }
… …
791 { 622 {
792 min_it (height, max_height); 623 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 624 szHint.height = szHint.base_height + height;
794 } 625 }
795 626
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 627 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 628 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 629
802 if (recalc_y) 630 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 632
805 ncol = width / fwidth; 633 ncol = width / fwidth;
806 nrow = height / fheight; 634 nrow = height / fheight;
807} 635}
808 636
809/*----------------------------------------------------------------------*/ 637/*----------------------------------------------------------------------*/
810/* 638/*
… …
821 649
822 ws.ws_col = ncol; 650 ws.ws_col = ncol;
823 ws.ws_row = nrow; 651 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 652 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 653 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 654 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 655
828#if 0 656#if 0
829 // TIOCSWINSZ is supposed to do this automatically and correctly 657 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 658 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 659 kill (-cmd_pid, SIGWINCH);
… …
861#endif 689#endif
862 690
863 delete fontset[0]; 691 delete fontset[0];
864 fontset[0] = fs; 692 fontset[0] = fs;
865 693
866 prop = (*fs)[1]->properties (); 694 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
867 prop.height += lineSpace; 695 prop.height += lineSpace;
696 prop.width += letterSpace;
868 697
869 fs->set_prop (prop, false); 698 fs->set_prop (prop, false);
870 699
871 fwidth = prop.width; 700 fwidth = prop.width;
872 fheight = prop.height; 701 fheight = prop.height;
… …
922 prop, XA_STRING, 8, PropModeReplace, 751 prop, XA_STRING, 8, PropModeReplace,
923 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 752 (const unsigned char *)str, len >= 0 ? len : strlen (str));
924} 753}
925 754
926void 755void
756rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
757{
758 XTextProperty ct;
759
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 {
762 XSetTextProperty (dpy, parent[0], &ct, prop);
763 XFree (ct.value);
764 }
765}
766
767void
927rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 768rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
928{ 769{
929 wchar_t *ws = rxvt_mbstowcs (str, len); 770 wchar_t *ws = rxvt_mbstowcs (str, len);
930 char *s = rxvt_wcstoutf8 (ws); 771 char *s = rxvt_wcstoutf8 (ws);
931 772
… …
941/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
942/* xterm sequences - title, iconName, color (exptl) */ 783/* xterm sequences - title, iconName, color (exptl) */
943void 784void
944rxvt_term::set_title (const char *str) 785rxvt_term::set_title (const char *str)
945{ 786{
946 set_string_property (XA_WM_NAME, str); 787 set_mbstring_property (XA_WM_NAME, str);
947#if ENABLE_EWMH 788#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_NAME], str); 789 set_utf8_property (xa[XA_NET_WM_NAME], str);
949#endif 790#endif
950} 791}
951 792
952void 793void
953rxvt_term::set_icon_name (const char *str) 794rxvt_term::set_icon_name (const char *str)
954{ 795{
955 set_string_property (XA_WM_ICON_NAME, str); 796 set_mbstring_property (XA_WM_ICON_NAME, str);
956#if ENABLE_EWMH 797#if ENABLE_EWMH
957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 798 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
958#endif 799#endif
959} 800}
960 801
961void 802void
962rxvt_term::set_window_color (int idx, const char *color) 803rxvt_term::set_window_color (int idx, const char *color)
963{ 804{
964#ifdef XTERM_COLOR_CHANGE 805#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 806 rxvt_color xcol;
966 int i;
967 807
968 if (color == NULL || *color == '\0') 808 if (color == NULL || *color == '\0')
969 return; 809 return;
970 810
971 color = strdup (color); 811 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 813 rs[Rs_color + idx] = color;
974 814
975 /* handle color aliases */ 815 /* handle color aliases */
976 if (isdigit (*color)) 816 if (isdigit (*color))
977 { 817 {
978 i = atoi (color); 818 int i = atoi (color);
979 819
980 if (i >= 8 && i <= 15) 820 if (i >= 8 && i <= 15)
981 { 821 {
982 /* bright colors */ 822 /* bright colors */
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1087 int old_width = szHint.width; 927 int old_width = szHint.width;
1088 int old_height = szHint.height; 928 int old_height = szHint.height;
1089 929
1090 window_calc (newwidth, newheight); 930 window_calc (newwidth, newheight);
1091 931
1092 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 932 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
933
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint)
936 {
937 szHint.flags &= ~(PBaseSize | PResizeInc);
1093 XSetWMNormalHints (dpy, parent[0], &szHint); 938 XSetWMNormalHints (dpy, parent[0], &szHint);
939 szHint.flags |= PBaseSize | PResizeInc;
940 }
1094 941
1095 if (!ignoreparent) 942 if (!ignoreparent)
1096 { 943 {
1097#ifdef SMART_RESIZE 944#ifdef SMART_RESIZE
1098 /* 945 /*
… …
1138#else 985#else
1139 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1140#endif 987#endif
1141 } 988 }
1142 989
990 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint);
992
1143 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 993 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1144 994
1145 if (fix_screen || newwidth != old_width || newheight != old_height) 995 if (fix_screen || newwidth != old_width || newheight != old_height)
1146 { 996 {
1147 if (scrollBar.state) 997 if (scrollBar.state)
1148 { 998 scrollBar.resize ();
1149 XMoveResizeWindow (dpy, scrollBar.win,
1150 window_sb_x, 0,
1151 scrollbar_TotalWidth (), szHint.height);
1152 resize_scrollbar ();
1153 }
1154 999
1155 XMoveResizeWindow (dpy, vt, 1000 XMoveResizeWindow (dpy, vt,
1156 window_vt_x, window_vt_y, 1001 window_vt_x, window_vt_y,
1157 width, height); 1002 width, height);
1158 1003
1159#ifdef HAVE_BG_PIXMAP 1004#ifdef HAVE_BG_PIXMAP
1160 if (bgPixmap.window_size_sensitive ()) 1005 if (bgPixmap.window_size_sensitive ())
1161 update_background (); 1006 update_background ();
1162#endif 1007#endif
1163
1164 scr_clear ();
1165 } 1008 }
1166 1009
1167 if (fix_screen || old_height == 0) 1010 if (fix_screen || old_height == 0)
1168 scr_reset (); 1011 scr_reset ();
1169
1170 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1171 //scr_touch (false);
1172 1012
1173#ifdef HAVE_BG_PIXMAP 1013#ifdef HAVE_BG_PIXMAP
1174// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1175// if (bgPixmap.pixmap) 1015// if (bgPixmap.pixmap)
1176// scr_touch (false); 1016// scr_touch (false);
… …
1248 1088
1249/* Checking whether input method is running. */ 1089/* Checking whether input method is running. */
1250bool 1090bool
1251rxvt_term::IMisRunning () 1091rxvt_term::IMisRunning ()
1252{ 1092{
1253 char *p;
1254 Atom atom; 1093 Atom atom;
1255 Window win; 1094 Window win;
1256 char server[IMBUFSIZ]; 1095 char server[IMBUFSIZ];
1257 1096
1258 /* get current locale modifier */ 1097 /* get current locale modifier */
1259 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1098 if (char *p = XSetLocaleModifiers (0))
1260 { 1099 {
1261 strcpy (server, "@server="); 1100 strcpy (server, "@server=");
1262 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1101 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1263 1102
1264 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1103 if (p = strchr (server + 1, '@')) /* first one only */
1265 *p = '\0'; 1104 *p = '\0';
1266 1105
1267 atom = XInternAtom (dpy, server, False); 1106 atom = XInternAtom (dpy, server, False);
1268 win = XGetSelectionOwner (dpy, atom); 1107 win = XGetSelectionOwner (dpy, atom);
1269 1108
… …
1336 1175
1337 term->make_current (); 1176 term->make_current ();
1338 1177
1339 if (text) 1178 if (text)
1340 { 1179 {
1341 void *str; 1180 wchar_t *str;
1342 1181
1343 if (!text->encoding_is_wchar && text->string.multi_byte) 1182 if (!text->encoding_is_wchar && text->string.multi_byte)
1344 { 1183 {
1345 // of course, X makes it ugly again 1184 // of course, X makes it ugly again
1346 if (term->rs[Rs_imLocale]) 1185 if (term->rs[Rs_imLocale])
1347 SET_LOCALE (term->rs[Rs_imLocale]); 1186 SET_LOCALE (term->rs[Rs_imLocale]);
1348 1187
1349 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1188 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1350 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1189 mbstowcs (str, text->string.multi_byte, text->length + 1);
1351 1190
1352 if (term->rs[Rs_imLocale]) 1191 if (term->rs[Rs_imLocale])
1353 SET_LOCALE (term->locale); 1192 SET_LOCALE (term->locale);
1354 } 1193 }
1355 else 1194 else
1356 str = (void *)text->string.wide_char; 1195 str = text->string.wide_char;
1357 1196
1358 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1197 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1359 DT_INT, call_data->caret, 1198 DT_INT, call_data->caret,
1360 DT_INT, call_data->chg_first, 1199 DT_INT, call_data->chg_first,
1361 DT_INT, call_data->chg_length, 1200 DT_INT, call_data->chg_length,
… …
1715void 1554void
1716rxvt_term::get_window_origin (int &x, int &y) 1555rxvt_term::get_window_origin (int &x, int &y)
1717{ 1556{
1718 Window cr; 1557 Window cr;
1719 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1720/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1721} 1560}
1722 1561
1723Pixmap 1562Pixmap
1724rxvt_term::get_pixmap_property (int prop_id) 1563rxvt_term::get_pixmap_property (int prop_id)
1725{ 1564{
… …
1732 unsigned char *prop = NULL; 1571 unsigned char *prop = NULL;
1733 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1734 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1735 &nitems, &bytes_after, &prop); 1574 &nitems, &bytes_after, &prop);
1736 if (result == Success && prop && atype == XA_PIXMAP) 1575 if (result == Success && prop && atype == XA_PIXMAP)
1737 {
1738 return *(Pixmap *)prop; 1576 return *(Pixmap *)prop;
1739 }
1740 } 1577 }
1578
1741 return None; 1579 return None;
1742} 1580}
1743 1581
1744#ifdef HAVE_BG_PIXMAP 1582#ifdef HAVE_BG_PIXMAP
1745# if TRACE_PIXMAPS 1583# if TRACE_PIXMAPS
1746# undef update_background 1584# undef update_background
1585void
1747int rxvt_term::trace_update_background (const char *file, int line) 1586rxvt_term::trace_update_background (const char *file, int line)
1748{ 1587{
1749 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1750 update_background (); 1589 update_background ();
1751} 1590}
1752# endif 1591# endif
1753 1592
1754int 1593void
1755rxvt_term::update_background () 1594rxvt_term::update_background ()
1756{ 1595{
1596 if (update_background_ev.is_active ())
1597 return;
1598
1757 bgPixmap.invalidate (); 1599 bgPixmap.invalidate ();
1758 1600
1759 /* no chance of real time refresh if we are blurring! */ 1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1602
1603 if (to_wait <= 0.)
1761 bgPixmap.render (); 1604 bgPixmap.render ();
1762 else 1605 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1606 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1607}
1776 1608
1777void 1609void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1610rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1611{
1612 make_current ();
1613
1614 update_background_ev.stop ();
1780 bgPixmap.render (); 1615 bgPixmap.render ();
1616 refresh_check ();
1781} 1617}
1782 1618
1783#endif /* HAVE_BG_PIXMAP */ 1619#endif /* HAVE_BG_PIXMAP */
1784 1620
1785/*----------------------- end-of-file (C source) -----------------------*/ 1621/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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