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.287 by ayin, Tue Dec 18 01:26:42 2007 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 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-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 32 *---------------------------------------------------------------------*/
32 33
33#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h"
35#include "keyboard.h" 37#include "keyboard.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include <limits> 40#include <limits>
39 41
42#include <assert.h>
40#include <csignal> 43#include <signal.h>
41#include <cstring> 44#include <string.h>
42 45
43#include <termios.h> 46#include <termios.h>
44 47
45#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 49# define X_LOCALE
47# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
48#else 51#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <locale.h>
51# endif 53#endif
52#endif
53 54
55struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
55 57
56// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
58 60
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 96{
95 compose_char *cc; 97 compose_char *cc;
96 98
97 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 101 cc = (*this)[c1];
100 while (cc) 102 while (cc)
101 { 103 {
102 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
104 } 106 }
105 107
106 // check to see wether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
108 {
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 112
113 // allocate a new combination 113 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 115 {
116 static int seen; 116 static int seen;
117 117
118 if (!seen++) 118 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 120
121 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
122 } 122 }
123 123
124 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
… …
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#if USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 183#endif
… …
188#endif 186#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 193
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 195
… …
226 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
227 delete fontset[i]; 224 delete fontset[i];
228#endif 225#endif
229 delete fontset[0]; 226 delete fontset[0];
230 227
228#ifdef HAVE_BG_PIXMAP
229 bg_destroy ();
230#endif
231
232#if HAVE_IMG
233 delete bg_img;
234#endif
235
231 if (display) 236 if (display)
232 { 237 {
233 selection_clear (); 238 selection_clear ();
239 selection_clear (true);
234 240
235#ifdef USE_XIM 241#if USE_XIM
236 im_destroy (); 242 im_destroy ();
237#endif 243#endif
238#ifdef XTERM_SCROLLBAR 244 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 245
240 if (ShadowGC) XFreeGC (dpy, ShadowGC); 246 if (gc)
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); 247 XFreeGC (dpy, gc);
263 248
264 delete drawable; 249 delete drawable;
250
265 // destroy all windows 251 // destroy all windows
266 if (parent[0]) 252 if (parent)
267 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
268 254
269 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
271 { 257 {
272 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
273#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
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 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 267 display->flush (); /* ideally .put should do this */
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);
299 // TODO: manage env vars in child only(!) 278 free (selection.clip_text);
300 free (env_display);
301 free (env_term);
302 free (locale); 279 free (locale);
303 free (v_buffer); 280 free (v_buffer);
304 free (incr_buf); 281
282 delete selection_req;
283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
305 288
306 delete envv; 289 delete envv;
307 delete argv; 290 delete argv;
308 291
309#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
310 delete keyboard; 293 delete keyboard;
311#endif 294#endif
312#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
314#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
315} 300}
316 301
317// child has exited, usually destroys 302// child has exited, usually destroys
318void 303void
319rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
341 if (display) 326 if (display)
342 { 327 {
343#if USE_XIM 328#if USE_XIM
344 im_ev.stop (display); 329 im_ev.stop (display);
345#endif 330#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
348#endif 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
349#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
351#endif 334#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 335 termwin_ev.stop (display);
354 vt_ev.stop (display); 336 vt_ev.stop (display);
355 } 337 }
356 338
357 flush_ev.stop (); 339 flush_ev.stop ();
… …
381 make_current (); 363 make_current ();
382 364
383 delete this; 365 delete this;
384} 366}
385 367
368void
369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
370{
371 if (!opt)
372 return;
373
374 uint8_t mask = 1 << (opt & 7);
375 uint8_t &val = options [opt >> 3];
376
377 val = val & ~mask | (set ? mask : 0);
378}
379
386/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
387/* 381/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
389 * TODO: if debugging, this should free up any known resources if we can
390 */ 383 */
391static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
392 385
393static void 386static void
394rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
396 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
397 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
398} 391}
399 392
400#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
401static void 394static void ecb_cold
402print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
403{ 396{
404 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
406 char number[32]; 399 char number[32];
407 char *mtype = "XlibMessage"; 400
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
411 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
414 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
417 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 467 }
468
422 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
423 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
424 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
425 (event->error_code == BadFont) || 472 || event->error_code == BadFont
426 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
427 (event->error_code == BadColor) || 474 || event->error_code == BadColor
428 (event->error_code == BadGC) || 475 || event->error_code == BadGC
429 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
430 (event->error_code == BadValue) || 477 || event->error_code == BadValue
431 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
432 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
434 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
437 mesg, BUFSIZ); 484 else
438 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
440 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446}
447#endif
448 486
449int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
450rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
451{ 494{
452 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
453 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
454 else 497 else
455 { 498 {
456 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
457 // so just output the error and continue 500 // so just output the error and continue
… …
463 } 506 }
464 507
465 return 0; 508 return 0;
466} 509}
467 510
468int 511int ecb_cold
469rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
470{ 513{
471 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
472 DisplayString (display)); 515 DisplayString (display));
473 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 517 _exit (EXIT_FAILURE);
475}
476
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589} 518}
590 519
591static struct sig_handlers 520static struct sig_handlers
592{ 521{
593 ev::sig sw_term, sw_int; 522 ev::sig sw_term, sw_int;
… …
610 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
611 w.stop (); 540 w.stop ();
612 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
613} 542}
614 543
544static void
545rxvt_get_ttymode (struct termios *tio)
546{
547 if (tcgetattr (STDIN_FILENO, tio) < 0)
548 memset (tio, 0, sizeof (struct termios));
549
550 for (int i = 0; i < NCCS; i++)
551 tio->c_cc[i] = VDISABLE;
552
553 tio->c_cc[VINTR] = CINTR;
554 tio->c_cc[VQUIT] = CQUIT;
555 tio->c_cc[VERASE] = CERASE;
556#ifdef VERASE2
557 tio->c_cc[VERASE2] = CERASE2;
558#endif
559 tio->c_cc[VKILL] = CKILL;
560 tio->c_cc[VEOF] = CEOF;
561 tio->c_cc[VSTART] = CSTART;
562 tio->c_cc[VSTOP] = CSTOP;
563 tio->c_cc[VSUSP] = CSUSP;
564# ifdef VDSUSP
565 tio->c_cc[VDSUSP] = CDSUSP;
566# endif
567# ifdef VREPRINT
568 tio->c_cc[VREPRINT] = CRPRNT;
569# endif
570# ifdef VDISCRD
571 tio->c_cc[VDISCRD] = CFLUSH;
572# endif
573# ifdef VWERSE
574 tio->c_cc[VWERSE] = CWERASE;
575# endif
576# ifdef VLNEXT
577 tio->c_cc[VLNEXT] = CLNEXT;
578# endif
579# ifdef VSTATUS
580 tio->c_cc[VSTATUS] = CSTATUS;
581# endif
582
583# if VMIN != VEOF
584 tio->c_cc[VMIN] = 1;
585# endif
586# if VTIME != VEOL
587 tio->c_cc[VTIME] = 0;
588# endif
589
590 /* input modes */
591 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
592# ifdef IMAXBEL
593 | IMAXBEL
594# endif
595 | IXON);
596
597 /* output modes */
598 tio->c_oflag = (OPOST | ONLCR);
599
600 /* control modes */
601 tio->c_cflag = (CS8 | CREAD);
602
603 /* local modes */
604 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
605# if defined (ECHOCTL) && defined (ECHOKE)
606 | ECHOCTL | ECHOKE
607# endif
608 | ECHOE | ECHOK);
609}
610
615char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
616 612
617void 613void
618rxvt_init () 614rxvt_init ()
619{ 615{
620 ptytty::init (); 616 assert (("fontMask must not overlap other RS masks",
617 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
621 618
619 rxvt_get_ttymode (&rxvt_term::def_tio);
620
621 // get rid of stdin/stdout as we don't need them, to free resources
622 dup2 (STDERR_FILENO, STDIN_FILENO);
623 dup2 (STDERR_FILENO, STDOUT_FILENO);
624
622 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 627
625 rxvt_environ = environ; 628 rxvt_environ = environ;
626 629
627 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
629 632
630 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 633 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev_unref (); 634 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 635
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
639 639
640 XrmInitialize (); 640 XrmInitialize ();
641}
642 641
643/* ------------------------------------------------------------------------- * 642#if HAVE_PIXBUF
644 * MEMORY ALLOCATION WRAPPERS * 643 g_type_init ();
645 * ------------------------------------------------------------------------- */ 644#endif
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 645}
678 646
679/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
680/* 648/*
681 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
683 */ 651 */
684void 652void
685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686{ 654{
687 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
688 int x, y, sb_w, flags; 656 int x, y, flags;
689 unsigned int w, h; 657 unsigned int w, h;
690 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
691 659
692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 660 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
693 szHint.win_gravity = NorthWestGravity; 661 szHint.win_gravity = NorthWestGravity;
… …
703 if (rs[Rs_geometry]) 671 if (rs[Rs_geometry])
704 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 672 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705 673
706 if (flags & WidthValue) 674 if (flags & WidthValue)
707 { 675 {
676 if (!w)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
708 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 679 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 680 szHint.flags |= USSize;
710 } 681 }
711 682
712 if (flags & HeightValue) 683 if (flags & HeightValue)
713 { 684 {
685 if (!h)
686 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
687
714 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 688 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 689 szHint.flags |= USSize;
716 } 690 }
717 691
718 if (flags & XValue) 692 if (flags & XValue)
719 { 693 {
… …
750 max_width = MAX_COLS * fwidth; 724 max_width = MAX_COLS * fwidth;
751 max_height = MAX_ROWS * fheight; 725 max_height = MAX_ROWS * fheight;
752 726
753 szHint.base_width = szHint.base_height = 2 * int_bwidth; 727 szHint.base_width = szHint.base_height = 2 * int_bwidth;
754 728
755 sb_w = 0;
756 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
757 730
758 if (scrollBar.state) 731 if (scrollBar.state)
759 { 732 {
760 sb_w = scrollbar_TotalWidth (); 733 int sb_w = scrollBar.total_width ();
761 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
762 735
763 if (!option (Opt_scrollBar_right)) 736 if (!option (Opt_scrollBar_right))
764 window_vt_x += sb_w; 737 window_vt_x += sb_w;
765 } 738 }
… …
789 { 762 {
790 min_it (height, max_height); 763 min_it (height, max_height);
791 szHint.height = szHint.base_height + height; 764 szHint.height = szHint.base_height + height;
792 } 765 }
793 766
794 if (scrollBar.state && option (Opt_scrollBar_right))
795 window_sb_x = szHint.width - sb_w;
796
797 if (recalc_x) 767 if (recalc_x)
798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 768 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799 769
800 if (recalc_y) 770 if (recalc_y)
801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802 772
803 ncol = width / fwidth; 773 ncol = width / fwidth;
804 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
805} 784}
806 785
807/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
808/* 787/*
809 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
817 796
818 struct winsize ws; 797 struct winsize ws;
819 798
820 ws.ws_col = ncol; 799 ws.ws_col = ncol;
821 ws.ws_row = nrow; 800 ws.ws_row = nrow;
822 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
823 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
825 804
826#if 0 805#if 0
827 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
828 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
829 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
830#endif 809#endif
831} 810}
832 811
833/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
834/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
835 *
836 * init = 1 - initialize
837 *
838 * fontname == FONT_UP - switch to bigger font
839 * fontname == FONT_DN - switch to smaller font
840 */
841bool 814bool
842rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
843{ 816{
844 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
845 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
859#endif 832#endif
860 833
861 delete fontset[0]; 834 delete fontset[0];
862 fontset[0] = fs; 835 fontset[0] = fs;
863 836
864 prop = (*fs)[1]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
865 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
866 839
867 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
868 841
869 fwidth = prop.width; 842 fwidth = prop.width;
870 fheight = prop.height; 843 fheight = prop.height + lineSpace;
871 fbase = prop.ascent; 844 fbase = prop.ascent;
872 845
873 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
874 { 847 {
875#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
901#else 874#else
902 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
903#endif 876#endif
904 } 877 }
905 878
906 if (parent[0]) 879 if (parent)
907 { 880 {
908 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
909 scr_remap_chars (); 882 scr_remap_chars ();
910 scr_touch (true); 883 scr_touch (true);
911 } 884 }
… …
914} 887}
915 888
916void 889void
917rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
918{ 891{
919 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
920 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
921 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
922} 895}
923 896
924void 897void
898rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
899{
900 XTextProperty ct;
901
902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
903 {
904 XSetTextProperty (dpy, parent, &ct, prop);
905 XFree (ct.value);
906 }
907}
908
909void
925rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
926{ 911{
927 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
928 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
929 914
930 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
932 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
933 918
934 free (s); 919 free (s);
935 free (ws); 920 free (ws);
… …
939/*----------------------------------------------------------------------*/ 924/*----------------------------------------------------------------------*/
940/* xterm sequences - title, iconName, color (exptl) */ 925/* xterm sequences - title, iconName, color (exptl) */
941void 926void
942rxvt_term::set_title (const char *str) 927rxvt_term::set_title (const char *str)
943{ 928{
944 set_string_property (XA_WM_NAME, str); 929 set_mbstring_property (XA_WM_NAME, str);
945#if ENABLE_EWMH 930#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_NAME], str);
947#endif 932#endif
948} 933}
949 934
950void 935void
951rxvt_term::set_icon_name (const char *str) 936rxvt_term::set_icon_name (const char *str)
952{ 937{
953 set_string_property (XA_WM_ICON_NAME, str); 938 set_mbstring_property (XA_WM_ICON_NAME, str);
954#if ENABLE_EWMH 939#if ENABLE_EWMH
955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 940 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
956#endif 941#endif
957} 942}
958 943
959void 944void
960rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
961{ 946{
962#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
963 rxvt_color xcol;
964 int i;
965
966 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
967 return; 949 return;
968 950
969 color = strdup (color); 951 color = strdup (color);
970 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
971 rs[Rs_color + idx] = color; 953 rs[Rs_color + idx] = color;
972 954
973 /* handle color aliases */ 955 /* handle color aliases */
974 if (isdigit (*color)) 956 if (isdigit (*color))
975 { 957 {
976 i = atoi (color); 958 int i = atoi (color);
977 959
978 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
979 { 961 {
980 /* bright colors */ 962 /* bright colors */
981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
982 goto done; 964 goto done;
983 } 965 }
984 966
985 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
986 { 968 {
987 /* normal colors */ 969 /* normal colors */
988 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
989 goto done; 971 goto done;
990 } 972 }
991 } 973 }
992 974
993 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
994 976 set_color (pix_colors_focused[idx], color);
995 /*
996 * FIXME: should free colors here, but no idea how to do it so instead,
997 * so just keep gobbling up the colormap
998 */
999
1000 pix_colors_focused[idx] = xcol;
1001 977
1002done: 978done:
1003 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
1004 980
1005 update_fade_color (idx); 981 update_fade_color (idx);
1006 recolour_cursor (); 982 recolor_cursor ();
1007 scr_recolour (); 983 scr_recolor ();
1008#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
1009} 985}
1010 986
1011void 987void
1012rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
1013{ 989{
1014 XColor fg, bg; 990 XColor fg, bg;
1015 991
1016 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
1017 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
1026 1002
1027/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
1028/* 1004/*
1029 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
1030 */ 1006 */
1031void 1007char *
1032rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
1033{ 1009{
1034 unsigned int i; 1010 unsigned int i;
1035 const char *xpmb = ""; 1011 const char *xpmb = "";
1036 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
1037 1015
1038 strcpy (fstr, "default");
1039 strcpy (bstr, "default");
1040 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
1041 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
1042 { 1018 {
1043 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
1044 break; 1020 break;
1045 } 1021 }
1046 1022
1047 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
1048 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
1049 { 1025 {
1050 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
1051#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
1052 xpmb = "default;"; 1028 xpmb = "default;";
1053#endif 1029#endif
1054 break; 1030 break;
1055 } 1031 }
1056 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1057 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
1058} 1036}
1059 1037
1060/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
1061 1039
1062bool 1040bool
… …
1070} 1048}
1071 1049
1072void 1050void
1073rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
1074{ 1052{
1053 pix_colors[dst].free (this);
1075 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1076} 1055}
1056
1057#ifdef SMART_RESIZE
1058static unsigned int
1059get_parent_bw (Display *dpy, Window w)
1060{
1061 int idummy;
1062 unsigned int udummy;
1063 Window wdummy, parent;
1064 Window *children;
1065 unsigned int nchildren, border_width;
1066
1067 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1068 XFree (children);
1069 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1070 &udummy, &udummy, &border_width, &udummy);
1071
1072 return border_width;
1073}
1074#endif
1077 1075
1078/* -------------------------------------------------------------------- * 1076/* -------------------------------------------------------------------- *
1079 * - WINDOW RESIZING - * 1077 * - WINDOW RESIZING - *
1080 * -------------------------------------------------------------------- */ 1078 * -------------------------------------------------------------------- */
1081void 1079void
… …
1085 int old_width = szHint.width; 1083 int old_width = szHint.width;
1086 int old_height = szHint.height; 1084 int old_height = szHint.height;
1087 1085
1088 window_calc (newwidth, newheight); 1086 window_calc (newwidth, newheight);
1089 1087
1090 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1088 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1089
1090 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1091 if (set_hint)
1092 {
1093 szHint.flags &= ~(PBaseSize | PResizeInc);
1091 XSetWMNormalHints (dpy, parent[0], &szHint); 1094 XSetWMNormalHints (dpy, parent, &szHint);
1095 szHint.flags |= PBaseSize | PResizeInc;
1096 }
1092 1097
1093 if (!ignoreparent) 1098 if (!ignoreparent)
1094 { 1099 {
1095#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
1096 /* 1101 /*
… …
1100 int x, y, x1, y1; 1105 int x, y, x1, y1;
1101 int dx, dy; 1106 int dx, dy;
1102 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1103 Window unused_cr; 1108 Window unused_cr;
1104 1109
1105 XTranslateCoordinates (dpy, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent, display->root,
1106 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
1107 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1108 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1109 /* 1114 /*
1110 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
1111 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
1112 */ 1117 */
1113 if (x1 != x || y1 != y) 1118 if (x1 != x || y1 != y)
1114 { 1119 {
1115 x -= x1; 1120 unsigned int border_width = get_parent_bw (dpy, parent);
1116 y -= y1; 1121
1122 x -= x1 + border_width;
1123 y -= y1 + border_width;
1117 } 1124 }
1118 1125
1119 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1126 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1120 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1127 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1121 dx = old_width - szHint.width; 1128 dx = old_width - szHint.width;
… …
1129 if (y < y1) /* top half */ 1136 if (y < y1) /* top half */
1130 dy = 0; 1137 dy = 0;
1131 else if (y == y1) /* exact center */ 1138 else if (y == y1) /* exact center */
1132 dy /= 2; 1139 dy /= 2;
1133 1140
1134 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1141 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1135 szHint.width, szHint.height); 1142 szHint.width, szHint.height);
1136#else 1143#else
1137 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1144 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1138#endif 1145#endif
1139 } 1146 }
1147
1148 if (set_hint)
1149 XSetWMNormalHints (dpy, parent, &szHint);
1140 1150
1141 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1151 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1142 1152
1143 if (fix_screen || newwidth != old_width || newheight != old_height) 1153 if (fix_screen || newwidth != old_width || newheight != old_height)
1144 { 1154 {
1145 if (scrollBar.state) 1155 if (scrollBar.state)
1146 { 1156 scrollBar.resize ();
1147 XMoveResizeWindow (dpy, scrollBar.win,
1148 window_sb_x, 0,
1149 scrollbar_TotalWidth (), szHint.height);
1150 resize_scrollbar ();
1151 }
1152 1157
1153 XMoveResizeWindow (dpy, vt, 1158 XMoveResizeWindow (dpy, vt,
1154 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1155 width, height); 1160 vt_width, vt_height);
1161
1162 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1156 1163
1157#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
1158 if (bgPixmap.window_size_sensitive ()) 1165 if (bg_window_size_sensitive ())
1159 update_background (); 1166 update_background ();
1160#endif 1167#endif
1161
1162 scr_clear ();
1163 } 1168 }
1164 1169
1165 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1166 scr_reset (); 1171 scr_reset ();
1167 1172
1168 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1169 //scr_touch (false);
1170
1171#ifdef HAVE_BG_PIXMAP
1172// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1173// if (bgPixmap.pixmap)
1174// scr_touch (false);
1175#endif
1176
1177#ifdef USE_XIM 1173#if USE_XIM
1178 IMSetPosition (); 1174 im_set_position ();
1179#endif 1175#endif
1180} 1176}
1181 1177
1182/* 1178/*
1183 * Set the width/height of the vt window in characters. Units are pixels. 1179 * Set the width/height of the vt window in characters. Units are pixels.
… …
1196 newwidth = wattr.width - szHint.base_width; 1192 newwidth = wattr.width - szHint.base_width;
1197 if (newheight == 0) 1193 if (newheight == 0)
1198 newheight = wattr.height - szHint.base_height; 1194 newheight = wattr.height - szHint.base_height;
1199 } 1195 }
1200 1196
1201 if (newwidth != width || newheight != height) 1197 if (newwidth != vt_width || newheight != vt_height)
1202 { 1198 {
1203 newwidth += szHint.base_width; 1199 newwidth += szHint.base_width;
1204 newheight += szHint.base_height; 1200 newheight += szHint.base_height;
1205 resize_all_windows (newwidth, newheight, 0); 1201 resize_all_windows (newwidth, newheight, 0);
1206 } 1202 }
1207} 1203}
1208 1204
1209/* -------------------------------------------------------------------- * 1205/* -------------------------------------------------------------------- *
1210 * - X INPUT METHOD ROUTINES - * 1206 * - X INPUT METHOD ROUTINES - *
1211 * -------------------------------------------------------------------- */ 1207 * -------------------------------------------------------------------- */
1212#ifdef USE_XIM 1208#if USE_XIM
1213 1209
1214void 1210void
1215rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1211rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1216{ 1212{
1217 fg = pix_colors [Color_fg]; 1213 fg = pix_colors [Color_fg];
… …
1244 status_rect.height = fheight; 1240 status_rect.height = fheight;
1245} 1241}
1246 1242
1247/* Checking whether input method is running. */ 1243/* Checking whether input method is running. */
1248bool 1244bool
1249rxvt_term::IMisRunning () 1245rxvt_term::im_is_running ()
1250{ 1246{
1251 char *p;
1252 Atom atom; 1247 Atom atom;
1253 Window win; 1248 Window win;
1254 char server[IMBUFSIZ]; 1249 char server[IMBUFSIZ];
1255 1250
1256 /* get current locale modifier */ 1251 /* get current locale modifier */
1257 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1252 if (char *p = XSetLocaleModifiers (0))
1258 { 1253 {
1259 strcpy (server, "@server="); 1254 strcpy (server, "@server=");
1260 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1261 1256
1262 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if (p = strchr (server + 1, '@')) /* first one only */
1263 *p = '\0'; 1258 *p = '\0';
1264 1259
1265 atom = XInternAtom (dpy, server, False); 1260 atom = XInternAtom (dpy, server, False);
1266 win = XGetSelectionOwner (dpy, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1267 1262
1268 if (win != None) 1263 if (win != None)
1269 return True; 1264 return true;
1270 } 1265 }
1271 1266
1272 return False; 1267 return false;
1273} 1268}
1274 1269
1275void 1270void
1276rxvt_term::IMSendSpot () 1271rxvt_term::im_send_spot ()
1277{ 1272{
1278 XPoint nspot; 1273 XPoint nspot;
1279 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1280 1275
1281 if (!Input_Context 1276 if (!Input_Context
… …
1334 1329
1335 term->make_current (); 1330 term->make_current ();
1336 1331
1337 if (text) 1332 if (text)
1338 { 1333 {
1339 void *str; 1334 wchar_t *str;
1340 1335
1341 if (!text->encoding_is_wchar && text->string.multi_byte) 1336 if (!text->encoding_is_wchar && text->string.multi_byte)
1342 { 1337 {
1343 // of course, X makes it ugly again 1338 // of course, X makes it ugly again
1344 if (term->rs[Rs_imLocale]) 1339 if (term->rs[Rs_imLocale])
1345 SET_LOCALE (term->rs[Rs_imLocale]); 1340 SET_LOCALE (term->rs[Rs_imLocale]);
1346 1341
1347 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1342 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1348 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1343 mbstowcs (str, text->string.multi_byte, text->length + 1);
1349 1344
1350 if (term->rs[Rs_imLocale]) 1345 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->locale); 1346 SET_LOCALE (term->locale);
1352 } 1347 }
1353 else 1348 else
1354 str = (void *)text->string.wide_char; 1349 str = text->string.wide_char;
1355 1350
1356 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1357 DT_INT, call_data->caret, 1352 DT_INT, call_data->caret,
1358 DT_INT, call_data->chg_first, 1353 DT_INT, call_data->chg_first,
1359 DT_INT, call_data->chg_length, 1354 DT_INT, call_data->chg_length,
… …
1387/* 1382/*
1388 * Try to open a XIM with the current modifiers, then see if we can 1383 * Try to open a XIM with the current modifiers, then see if we can
1389 * open a suitable preedit type 1384 * open a suitable preedit type
1390 */ 1385 */
1391bool 1386bool
1392rxvt_term::IM_get_IC (const char *modifiers) 1387rxvt_term::im_get_ic (const char *modifiers)
1393{ 1388{
1394 int i, j, found; 1389 int i, j, found;
1395 XIM xim; 1390 XIM xim;
1396 XPoint spot; 1391 XPoint spot;
1397 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1398 unsigned long fg, bg; 1393 unsigned long fg, bg;
1399 const char *p; 1394 const char *p;
1400 char **s; 1395 char **s;
1401 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1402#ifdef ENABLE_XIM_ONTHESPOT
1403 XIMCallback xcb[4];
1404#endif
1405 1397
1406 set_environ (envv); 1398 set_environ (env);
1407 1399
1408 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1409 return false; 1401 return false;
1410 1402
1411 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1412 if (input_method == NULL) 1404 if (input_method == NULL)
1413 return false; 1405 return false;
… …
1430 p = pet[pi]; 1422 p = pet[pi];
1431 1423
1432 if (!p) 1424 if (!p)
1433 continue; 1425 continue;
1434 1426
1435 s = rxvt_splitcommastring (p); 1427 s = rxvt_strsplit (',', p);
1436 1428
1437 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1438 { 1430 {
1439 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1440 input_style = XIMPreeditPosition | XIMStatusNothing; 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1452 input_style = XIMPreeditNothing | XIMStatusNothing; 1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1453 1445
1454 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1455 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1456 { 1448 {
1457 rxvt_freecommastring (s); 1449 rxvt_free_strsplit (s);
1458 1450
1459 found = 1; 1451 found = 1;
1460 goto foundpet; 1452 goto foundpet;
1461 } 1453 }
1462 1454
1463 } 1455 }
1464 1456
1465 rxvt_freecommastring (s); 1457 rxvt_free_strsplit (s);
1466 } 1458 }
1467 1459
1468foundpet: 1460foundpet:
1469 1461
1470 XFree (xim_styles); 1462 XFree (xim_styles);
… …
1549 NULL); 1541 NULL);
1550 } 1542 }
1551#if ENABLE_XIM_ONTHESPOT 1543#if ENABLE_XIM_ONTHESPOT
1552 else if (input_style & XIMPreeditCallbacks) 1544 else if (input_style & XIMPreeditCallbacks)
1553 { 1545 {
1546 XIMCallback xcb[4];
1547
1554 im_set_position (spot); 1548 im_set_position (spot);
1555 1549
1556 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1550 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1557 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1551 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1558 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1552 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1573#endif 1567#endif
1574 1568
1575 Input_Context = XCreateIC (xim, 1569 Input_Context = XCreateIC (xim,
1576 XNInputStyle, input_style, 1570 XNInputStyle, input_style,
1577 XNClientWindow, vt, 1571 XNClientWindow, vt,
1578 XNFocusWindow, parent[0], 1572 XNFocusWindow, parent,
1579 preedit_attr ? XNPreeditAttributes : NULL, 1573 preedit_attr ? XNPreeditAttributes : NULL,
1580 preedit_attr, 1574 preedit_attr,
1581 status_attr ? XNStatusAttributes : NULL, 1575 status_attr ? XNStatusAttributes : NULL,
1582 status_attr, NULL); 1576 status_attr, NULL);
1583 1577
… …
1596 // unfortunately, only the focus window is used by XIM, hard to fix 1590 // unfortunately, only the focus window is used by XIM, hard to fix
1597 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1591 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1598 vt_select_input (); 1592 vt_select_input ();
1599#endif 1593#endif
1600 1594
1601 IMSetPosition (); 1595 im_set_position ();
1602 1596
1603 return true; 1597 return true;
1604} 1598}
1605 1599
1606void 1600void
… …
1616 im_destroy (); 1610 im_destroy ();
1617 1611
1618 if (Input_Context) 1612 if (Input_Context)
1619 return; 1613 return;
1620 1614
1621#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1622 if (rs[Rs_imLocale]) 1615 if (rs[Rs_imLocale])
1623 SET_LOCALE (rs[Rs_imLocale]); 1616 SET_LOCALE (rs[Rs_imLocale]);
1624#endif
1625 1617
1626 p = rs[Rs_inputMethod]; 1618 p = rs[Rs_inputMethod];
1627 if (p && *p) 1619 if (p && *p)
1628 { 1620 {
1629 bool found = false; 1621 bool found = false;
1630 1622
1631 s = rxvt_splitcommastring (p); 1623 s = rxvt_strsplit (',', p);
1632 1624
1633 for (i = 0; s[i]; i++) 1625 for (i = 0; s[i]; i++)
1634 { 1626 {
1635 if (*s[i]) 1627 if (*s[i])
1636 { 1628 {
1637 strcpy (buf, "@im="); 1629 strcpy (buf, "@im=");
1638 strncat (buf, s[i], IMBUFSIZ - 5); 1630 strncat (buf, s[i], IMBUFSIZ - 5);
1639 if (IM_get_IC (buf)) 1631 if (im_get_ic (buf))
1640 { 1632 {
1641 found = true; 1633 found = true;
1642 break; 1634 break;
1643 } 1635 }
1644 } 1636 }
1645 } 1637 }
1646 1638
1647 rxvt_freecommastring (s); 1639 rxvt_free_strsplit (s);
1648 1640
1649 if (found) 1641 if (found)
1650 goto done; 1642 goto done;
1651 } 1643 }
1652 1644
1653 /* try with XMODIFIERS env. var. */ 1645 /* try with XMODIFIERS env. var. */
1654 if (IM_get_IC ("")) 1646 if (im_get_ic (""))
1655 goto done; 1647 goto done;
1656 1648
1657 /* try with no modifiers base IF the user didn't specify an IM */ 1649 /* try with no modifiers base IF the user didn't specify an IM */
1658 if (IM_get_IC ("@im=none")) 1650 if (im_get_ic ("@im=none"))
1659 goto done; 1651 goto done;
1660 1652
1661done: 1653done:
1662#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1663 if (rs[Rs_imLocale]) 1654 if (rs[Rs_imLocale])
1664 SET_LOCALE (locale); 1655 SET_LOCALE (locale);
1665#endif
1666} 1656}
1667 1657
1668void 1658void
1669rxvt_term::IMSetPosition () 1659rxvt_term::im_set_position ()
1670{ 1660{
1671 XRectangle preedit_rect, status_rect, *needed_rect; 1661 XRectangle preedit_rect, status_rect, *needed_rect;
1672 XVaNestedList preedit_attr, status_attr; 1662 XVaNestedList preedit_attr, status_attr;
1673 1663
1674 if (!Input_Context 1664 if (!Input_Context
1675 || !focus 1665 || !focus
1676 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1666 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1677 || !IMisRunning ()) 1667 || !im_is_running ())
1678 return; 1668 return;
1679 1669
1680 if (input_style & XIMPreeditPosition) 1670 if (input_style & XIMPreeditPosition)
1681 { 1671 {
1682 im_set_size (preedit_rect); 1672 im_set_size (preedit_rect);
… …
1712 1702
1713void 1703void
1714rxvt_term::get_window_origin (int &x, int &y) 1704rxvt_term::get_window_origin (int &x, int &y)
1715{ 1705{
1716 Window cr; 1706 Window cr;
1717 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1707 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1718/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1719}
1720
1721Pixmap
1722rxvt_term::get_pixmap_property (int prop_id)
1723{
1724 if (prop_id > 0 && prop_id < NUM_XA)
1725 if (xa[prop_id])
1726 {
1727 int aformat;
1728 unsigned long nitems, bytes_after;
1729 Atom atype;
1730 unsigned char *prop = NULL;
1731 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1732 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1733 &nitems, &bytes_after, &prop);
1734 if (result == Success && prop && atype == XA_PIXMAP)
1735 {
1736 return *(Pixmap *)prop;
1737 }
1738 }
1739 return None;
1740} 1708}
1741 1709
1742#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1743# if TRACE_PIXMAPS
1744# undef update_background
1745int rxvt_term::trace_update_background (const char *file, int line)
1746{
1747 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1748 update_background ();
1749}
1750# endif
1751 1711
1752int 1712void
1753rxvt_term::update_background () 1713rxvt_term::update_background ()
1754{ 1714{
1755 bgPixmap.invalidate (); 1715 if (update_background_ev.is_active ())
1716 return;
1756 1717
1757 /* no chance of real time refresh if we are blurring! */ 1718 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1719
1720 if (to_wait <= 0.)
1759 bgPixmap.render (); 1721 bg_render ();
1760 else 1722 else
1761 {
1762 ev_tstamp refresh;
1763 update_background_ev.stop ();
1764
1765 if (!bgPixmap.need_client_side_rendering ())
1766 refresh = .05;
1767 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1768 refresh = .20; /* very slow !!! */
1769 else
1770 refresh = .07;
1771 update_background_ev.start (refresh); 1723 update_background_ev.start (to_wait);
1772 }
1773
1774 return 0;
1775} 1724}
1776 1725
1777void 1726void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1727rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1728{
1780 make_current (); 1729 make_current ();
1730
1731 update_background_ev.stop ();
1781 bgPixmap.render (); 1732 bg_render ();
1782 refresh_check (); 1733 refresh_check ();
1783} 1734}
1784 1735
1785#endif /* HAVE_BG_PIXMAP */ 1736#endif /* HAVE_BG_PIXMAP */
1786 1737

Diff Legend

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