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.273 by ayin, Tue Dec 11 11:39:06 2007 UTC vs.
Revision 1.327 by root, Sun May 23 00:25:48 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
45#ifdef HAVE_XSETLOCALE 46#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 47# define X_LOCALE
47# include <X11/Xlocale.h> 48# include <X11/Xlocale.h>
48#else 49#else
… …
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 }
… …
155{ 156{
156#if HAVE_BG_PIXMAP 157#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 159#endif
159#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 162#endif
162#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 165#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif 168#endif
168#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
… …
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
… …
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/*----------------------------------------------------------------------*/
478bool
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 if (!init_vars ())
488 return false;
489
490 init_secondary ();
491
492 const char **cmd_argv = init_resources (argc, argv);
493
494#ifdef KEYSYM_RESOURCE
495 keyboard->register_done ();
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (option (Opt_scrollBar))
500 scrollBar.setIdle (); /* set existence for size calculations */
501#endif
502
503 pty = ptytty::create ();
504
505 create_windows (argc, argv);
506
507 init_xlocale ();
508
509 scr_reset (); // initialize screen
510
511#if 0
512 XSynchronize (dpy, True);
513#endif
514
515#ifdef HAVE_SCROLLBARS
516 if (option (Opt_scrollBar))
517 resize_scrollbar (); /* create and map scrollbar */
518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
523#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent))
525 {
526 bgPixmap.set_transparent ();
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root);
539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
565#endif
566
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ);
575
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
590 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]);
592
593 return true;
594}
595
596static struct sig_handlers 455static struct sig_handlers
597{ 456{
598 ev::sig sw_term, sw_int; 457 ev::sig sw_term, sw_int;
599 458
600 /* 459 /*
… …
620char **rxvt_environ; // startup environment 479char **rxvt_environ; // startup environment
621 480
622void 481void
623rxvt_init () 482rxvt_init ()
624{ 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
625 ptytty::init (); 487 ptytty::init ();
626 488
627 if (!ev_default_loop (0)) 489 if (!ev_default_loop (0))
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 491
… …
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 504 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 505 XSetIOErrorHandler (rxvt_xioerror_handler);
644 506
645 XrmInitialize (); 507 XrmInitialize ();
646}
647
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 508}
683 509
684/*----------------------------------------------------------------------*/ 510/*----------------------------------------------------------------------*/
685/* 511/*
686 * window size/position calculations for XSizeHint and other storage. 512 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 514 */
689void 515void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 516rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 517{
692 short recalc_x, recalc_y; 518 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 519 int x, y, flags;
694 unsigned int w, h; 520 unsigned int w, h;
695 unsigned int max_width, max_height; 521 unsigned int max_width, max_height;
696 522
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 523 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 524 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 534 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 535 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 536
711 if (flags & WidthValue) 537 if (flags & WidthValue)
712 { 538 {
539 if (!w)
540 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
541
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 542 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 543 szHint.flags |= USSize;
715 } 544 }
716 545
717 if (flags & HeightValue) 546 if (flags & HeightValue)
718 { 547 {
548 if (!h)
549 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
550
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 551 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 552 szHint.flags |= USSize;
721 } 553 }
722 554
723 if (flags & XValue) 555 if (flags & XValue)
724 { 556 {
… …
755 max_width = MAX_COLS * fwidth; 587 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 588 max_height = MAX_ROWS * fheight;
757 589
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 590 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 591
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 592 window_vt_x = window_vt_y = int_bwidth;
762 593
763 if (scrollBar.state) 594 if (scrollBar.state)
764 { 595 {
765 sb_w = scrollbar_TotalWidth (); 596 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 597 szHint.base_width += sb_w;
767 598
768 if (!option (Opt_scrollBar_right)) 599 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 600 window_vt_x += sb_w;
770 } 601 }
… …
794 { 625 {
795 min_it (height, max_height); 626 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 627 szHint.height = szHint.base_height + height;
797 } 628 }
798 629
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 630 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 631 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 632
805 if (recalc_y) 633 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 635
808 ncol = width / fwidth; 636 ncol = width / fwidth;
809 nrow = height / fheight; 637 nrow = height / fheight;
810} 638}
811 639
812/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
813/* 641/*
… …
824 652
825 ws.ws_col = ncol; 653 ws.ws_col = ncol;
826 ws.ws_row = nrow; 654 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 655 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 656 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 657 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 658
831#if 0 659#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 660 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 661 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 662 kill (-cmd_pid, SIGWINCH);
835#endif 663#endif
836} 664}
837 665
… …
864#endif 692#endif
865 693
866 delete fontset[0]; 694 delete fontset[0];
867 fontset[0] = fs; 695 fontset[0] = fs;
868 696
869 prop = (*fs)[1]->properties (); 697 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 698 prop.height += lineSpace;
699 prop.width += letterSpace;
871 700
872 fs->set_prop (prop, false); 701 fs->set_prop (prop, false);
873 702
874 fwidth = prop.width; 703 fwidth = prop.width;
875 fheight = prop.height; 704 fheight = prop.height;
… …
964void 793void
965rxvt_term::set_window_color (int idx, const char *color) 794rxvt_term::set_window_color (int idx, const char *color)
966{ 795{
967#ifdef XTERM_COLOR_CHANGE 796#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 797 rxvt_color xcol;
969 int i;
970 798
971 if (color == NULL || *color == '\0') 799 if (color == NULL || *color == '\0')
972 return; 800 return;
973 801
974 color = strdup (color); 802 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 804 rs[Rs_color + idx] = color;
977 805
978 /* handle color aliases */ 806 /* handle color aliases */
979 if (isdigit (*color)) 807 if (isdigit (*color))
980 { 808 {
981 i = atoi (color); 809 int i = atoi (color);
982 810
983 if (i >= 8 && i <= 15) 811 if (i >= 8 && i <= 15)
984 { 812 {
985 /* bright colors */ 813 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 814 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1090 int old_width = szHint.width; 918 int old_width = szHint.width;
1091 int old_height = szHint.height; 919 int old_height = szHint.height;
1092 920
1093 window_calc (newwidth, newheight); 921 window_calc (newwidth, newheight);
1094 922
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 923 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
924
925 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
926 if (set_hint)
927 {
928 szHint.flags &= ~(PBaseSize | PResizeInc);
1096 XSetWMNormalHints (dpy, parent[0], &szHint); 929 XSetWMNormalHints (dpy, parent[0], &szHint);
930 szHint.flags |= PBaseSize | PResizeInc;
931 }
1097 932
1098 if (!ignoreparent) 933 if (!ignoreparent)
1099 { 934 {
1100#ifdef SMART_RESIZE 935#ifdef SMART_RESIZE
1101 /* 936 /*
… …
1141#else 976#else
1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 977 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1143#endif 978#endif
1144 } 979 }
1145 980
981 if (set_hint)
982 XSetWMNormalHints (dpy, parent[0], &szHint);
983
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 984 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 985
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 986 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 987 {
1150 if (scrollBar.state) 988 if (scrollBar.state)
1151 { 989 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 990
1158 XMoveResizeWindow (dpy, vt, 991 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 992 window_vt_x, window_vt_y,
1160 width, height); 993 width, height);
1161 994
1162#ifdef HAVE_BG_PIXMAP 995#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ()) 996 if (bgPixmap.window_size_sensitive ())
1164 update_background (); 997 update_background ();
1165#endif 998#endif
1166
1167 scr_clear ();
1168 } 999 }
1169 1000
1170 if (fix_screen || old_height == 0) 1001 if (fix_screen || old_height == 0)
1171 scr_reset (); 1002 scr_reset ();
1172
1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174 //scr_touch (false);
1175 1003
1176#ifdef HAVE_BG_PIXMAP 1004#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1005// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap) 1006// if (bgPixmap.pixmap)
1179// scr_touch (false); 1007// scr_touch (false);
… …
1251 1079
1252/* Checking whether input method is running. */ 1080/* Checking whether input method is running. */
1253bool 1081bool
1254rxvt_term::IMisRunning () 1082rxvt_term::IMisRunning ()
1255{ 1083{
1256 char *p;
1257 Atom atom; 1084 Atom atom;
1258 Window win; 1085 Window win;
1259 char server[IMBUFSIZ]; 1086 char server[IMBUFSIZ];
1260 1087
1261 /* get current locale modifier */ 1088 /* get current locale modifier */
1262 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1089 if (char *p = XSetLocaleModifiers (0))
1263 { 1090 {
1264 strcpy (server, "@server="); 1091 strcpy (server, "@server=");
1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1092 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266 1093
1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1094 if (p = strchr (server + 1, '@')) /* first one only */
1268 *p = '\0'; 1095 *p = '\0';
1269 1096
1270 atom = XInternAtom (dpy, server, False); 1097 atom = XInternAtom (dpy, server, False);
1271 win = XGetSelectionOwner (dpy, atom); 1098 win = XGetSelectionOwner (dpy, atom);
1272 1099
… …
1339 1166
1340 term->make_current (); 1167 term->make_current ();
1341 1168
1342 if (text) 1169 if (text)
1343 { 1170 {
1344 void *str; 1171 wchar_t *str;
1345 1172
1346 if (!text->encoding_is_wchar && text->string.multi_byte) 1173 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 { 1174 {
1348 // of course, X makes it ugly again 1175 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale]) 1176 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]); 1177 SET_LOCALE (term->rs[Rs_imLocale]);
1351 1178
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1179 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1180 mbstowcs (str, text->string.multi_byte, text->length + 1);
1354 1181
1355 if (term->rs[Rs_imLocale]) 1182 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale); 1183 SET_LOCALE (term->locale);
1357 } 1184 }
1358 else 1185 else
1359 str = (void *)text->string.wide_char; 1186 str = text->string.wide_char;
1360 1187
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1188 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret, 1189 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first, 1190 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length, 1191 DT_INT, call_data->chg_length,
… …
1718void 1545void
1719rxvt_term::get_window_origin (int &x, int &y) 1546rxvt_term::get_window_origin (int &x, int &y)
1720{ 1547{
1721 Window cr; 1548 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1549 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/ 1550/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1724} 1551}
1725 1552
1726Pixmap 1553Pixmap
1727rxvt_term::get_pixmap_property (int prop_id) 1554rxvt_term::get_pixmap_property (int prop_id)
1728{ 1555{
… …
1735 unsigned char *prop = NULL; 1562 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1563 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1564 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop); 1565 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP) 1566 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop; 1567 return *(Pixmap *)prop;
1742 }
1743 } 1568 }
1569
1744 return None; 1570 return None;
1745} 1571}
1746 1572
1747#ifdef HAVE_BG_PIXMAP 1573#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS 1574# if TRACE_PIXMAPS
1749# undef update_background 1575# undef update_background
1576void
1750int rxvt_term::trace_update_background (const char *file, int line) 1577rxvt_term::trace_update_background (const char *file, int line)
1751{ 1578{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line); 1579 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background (); 1580 update_background ();
1754} 1581}
1755# endif 1582# endif
1756 1583
1757int 1584void
1758rxvt_term::update_background () 1585rxvt_term::update_background ()
1759{ 1586{
1587 if (update_background_ev.is_active ())
1588 return;
1589
1760 bgPixmap.invalidate (); 1590 bgPixmap.invalidate ();
1761 1591
1762 /* no chance of real time refresh if we are blurring! */ 1592 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1593
1594 if (to_wait <= 0.)
1764 bgPixmap.render (); 1595 bgPixmap.render ();
1765 else 1596 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1597 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1598}
1779 1599
1780void 1600void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1601rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1602{
1603 make_current ();
1604
1605 update_background_ev.stop ();
1783 bgPixmap.render (); 1606 bgPixmap.render ();
1607 refresh_check ();
1784} 1608}
1785 1609
1786#endif /* HAVE_BG_PIXMAP */ 1610#endif /* HAVE_BG_PIXMAP */
1787 1611
1788/*----------------------- end-of-file (C source) -----------------------*/ 1612/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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