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.289 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.401 by sf-exg, Thu Jul 14 05:33:26 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));
… …
151} 151}
152#endif 152#endif
153 153
154rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
155{ 155{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK 156#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); 157 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 158#endif
162#ifdef TEXT_BLINK 159#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 160 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
… …
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 166 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 167#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 169 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 170#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 171#if ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 172 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 173#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 174 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 175#if USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 176 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 177#endif
183#ifdef POINTER_BLANK 178#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 179 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 180#endif
… …
188#endif 183#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 184 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 185 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 186 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 187 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); 188 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 189 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 190
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 191 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 192
… …
226 if (fontset[i] != fontset[0]) 220 if (fontset[i] != fontset[0])
227 delete fontset[i]; 221 delete fontset[i];
228#endif 222#endif
229 delete fontset[0]; 223 delete fontset[0];
230 224
225#if HAVE_IMG
226 delete bg_img;
227#endif
228
231 if (display) 229 if (display)
232 { 230 {
233 selection_clear (); 231 selection_clear ();
232 selection_clear (true);
234 233
235#ifdef USE_XIM 234#if USE_XIM
236 im_destroy (); 235 im_destroy ();
237#endif 236#endif
238#ifdef XTERM_SCROLLBAR 237 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 238
240 if (ShadowGC) XFreeGC (dpy, ShadowGC); 239 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); 240 XFreeGC (dpy, gc);
263 241
264 delete drawable; 242 delete drawable;
243
265 // destroy all windows 244 // destroy all windows
266 if (parent[0]) 245 if (parent)
267 XDestroyWindow (dpy, parent[0]); 246 XDestroyWindow (dpy, parent);
268 247
269 for (int i = 0; i < TOTAL_COLORS; i++) 248 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 249 if (ISSET_PIXCOLOR (i))
271 { 250 {
272 pix_colors_focused [i].free (this); 251 pix_colors_focused [i].free (this);
273#if OFF_FOCUS_FADING 252#if OFF_FOCUS_FADING
253 if (rs[Rs_fade])
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
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 */ 260 display->flush (); /* ideally .put should do this */
290 displays.put (display); 261 displays.put (display);
262 }
291 263
292 scr_release (); 264 scr_release ();
293 265
294 /* clear all resources */ 266 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 268 free (allocated [i]);
297 269
298 free (selection.text); 270 free (selection.text);
299 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
300 free (env_display);
301 free (env_term);
302 free (locale); 272 free (locale);
303 free (v_buffer); 273 free (v_buffer);
304 free (incr_buf); 274
275 delete selection_req;
276
277 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
278 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
279
280 delete [] env;
305 281
306 delete envv; 282 delete envv;
307 delete argv; 283 delete argv;
308 284
309#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
310 delete keyboard; 286 delete keyboard;
311#endif 287#endif
312#ifndef NO_RESOURCES 288#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db); 289 XrmDestroyDatabase (option_db);
314#endif 290#endif
291
292 SET_R ((rxvt_term *)0);
315} 293}
316 294
317// child has exited, usually destroys 295// child has exited, usually destroys
318void 296void
319rxvt_term::child_cb (ev::child &w, int status) 297rxvt_term::child_cb (ev::child &w, int status)
… …
341 if (display) 319 if (display)
342 { 320 {
343#if USE_XIM 321#if USE_XIM
344 im_ev.stop (display); 322 im_ev.stop (display);
345#endif 323#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 324 scrollbar_ev.stop (display);
348#endif 325#if ENABLE_PERL
349#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 326 rootwin_ev.stop (display);
351#endif 327#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 328 termwin_ev.stop (display);
354 vt_ev.stop (display); 329 vt_ev.stop (display);
355 } 330 }
356 331
357 flush_ev.stop (); 332 flush_ev.stop ();
… …
381 make_current (); 356 make_current ();
382 357
383 delete this; 358 delete this;
384} 359}
385 360
361void
362rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
363{
364 if (!opt)
365 return;
366
367 uint8_t mask = 1 << (opt & 7);
368 uint8_t &val = options [opt >> 3];
369
370 val = val & ~mask | (set ? mask : 0);
371}
372
386/*----------------------------------------------------------------------*/ 373/*----------------------------------------------------------------------*/
387/* 374/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 375 * 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 */ 376 */
391static XErrorHandler old_xerror_handler; 377static XErrorHandler old_xerror_handler;
392 378
393static void 379static void
394rxvt_emergency_cleanup () 380rxvt_emergency_cleanup ()
… …
396 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 382 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
397 (*t)->emergency_cleanup (); 383 (*t)->emergency_cleanup ();
398} 384}
399 385
400#if !ENABLE_MINIMAL 386#if !ENABLE_MINIMAL
401static void 387static void ecb_cold
402print_x_error (Display *dpy, XErrorEvent *event) 388print_x_error (Display *dpy, XErrorEvent *event)
403{ 389{
404 char buffer[BUFSIZ]; 390 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 391 char mesg[BUFSIZ];
406 char number[32]; 392 char number[32];
407 char *mtype = "XlibMessage"; 393
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"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
395
396 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
397 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
398
399 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
400 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
411 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("+ %s: %s\n", mesg, buffer);
402
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 403 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
405
406 if (event->request_code >= 128)
407 {
408#if 0
409 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
410 int nexts;
411 char **exts = XListExtensions (dpy, &nexts);
412
413 while (nexts)
414 {
415 char *extname = exts [nexts - 1];
416 int major, first_event, first_error;
417
418 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
419 {
420 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
421 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
422
423 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
424 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
425 rxvt_warn ("+ (which is %s)\n", buffer);
426
427 break;
428 }
429
430 printf ("nextss %d %s\n", nexts, extname);//D
431 --nexts;
432 ++exts;
433 }
434#else
435 int nexts = 0;
436 char **exts = 0;
437#endif
438
439 if (!nexts)
440 {
441 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
442
443 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
444 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
445
446#if 0
447 sprintf (number, "RENDER.%d", event->minor_code);
448 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
449 rxvt_warn ("+ (which is %s)\n", buffer);
450#endif
451 }
452
453 XFreeExtensionList (exts);
454 }
455 else
456 {
414 sprintf(number, "%d", event->request_code); 457 sprintf (number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 458 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 459 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 } 460 }
461
422 if ((event->error_code == BadWindow) || 462 if (event->error_code == BadWindow
423 (event->error_code == BadPixmap) || 463 || event->error_code == BadPixmap
424 (event->error_code == BadCursor) || 464 || event->error_code == BadCursor
425 (event->error_code == BadFont) || 465 || event->error_code == BadFont
426 (event->error_code == BadDrawable) || 466 || event->error_code == BadDrawable
427 (event->error_code == BadColor) || 467 || event->error_code == BadColor
428 (event->error_code == BadGC) || 468 || event->error_code == BadGC
429 (event->error_code == BadIDChoice) || 469 || event->error_code == BadIDChoice
430 (event->error_code == BadValue) || 470 || event->error_code == BadValue
431 (event->error_code == BadAtom)) { 471 || event->error_code == BadAtom)
472 {
432 if (event->error_code == BadValue) 473 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
434 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 475 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 476 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
437 mesg, BUFSIZ); 477 else
438 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 478 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 479
449int 480 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
481 }
482}
483#endif
484
485int ecb_cold
450rxvt_xerror_handler (Display *display, XErrorEvent *event) 486rxvt_xerror_handler (Display *display, XErrorEvent *event)
451{ 487{
452 if (GET_R->allowedxerror == -1) 488 if (GET_R && GET_R->allowedxerror == -1)
453 GET_R->allowedxerror = event->error_code; 489 GET_R->allowedxerror = event->error_code;
454 else 490 else
455 { 491 {
456 // GET_R is most likely not the terminal which caused the error, 492 // GET_R is most likely not the terminal which caused the error,
457 // so just output the error and continue 493 // so just output the error and continue
… …
463 } 499 }
464 500
465 return 0; 501 return 0;
466} 502}
467 503
468int 504int ecb_cold
469rxvt_xioerror_handler (Display *display) 505rxvt_xioerror_handler (Display *display)
470{ 506{
471 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 507 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
472 DisplayString (display)); 508 DisplayString (display));
473 rxvt_emergency_cleanup (); 509 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 510 _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} 511}
590 512
591static struct sig_handlers 513static struct sig_handlers
592{ 514{
593 ev::sig sw_term, sw_int; 515 ev::sig sw_term, sw_int;
… …
610 rxvt_emergency_cleanup (); 532 rxvt_emergency_cleanup ();
611 w.stop (); 533 w.stop ();
612 kill (getpid (), w.signum); 534 kill (getpid (), w.signum);
613} 535}
614 536
537static void
538rxvt_get_ttymode (struct termios *tio)
539{
540 if (tcgetattr (STDIN_FILENO, tio) < 0)
541 memset (tio, 0, sizeof (struct termios));
542
543 for (int i = 0; i < NCCS; i++)
544 tio->c_cc[i] = VDISABLE;
545
546 tio->c_cc[VINTR] = CINTR;
547 tio->c_cc[VQUIT] = CQUIT;
548 tio->c_cc[VERASE] = CERASE;
549#ifdef VERASE2
550 tio->c_cc[VERASE2] = CERASE2;
551#endif
552 tio->c_cc[VKILL] = CKILL;
553 tio->c_cc[VEOF] = CEOF;
554 tio->c_cc[VSTART] = CSTART;
555 tio->c_cc[VSTOP] = CSTOP;
556 tio->c_cc[VSUSP] = CSUSP;
557# ifdef VDSUSP
558 tio->c_cc[VDSUSP] = CDSUSP;
559# endif
560# ifdef VREPRINT
561 tio->c_cc[VREPRINT] = CRPRNT;
562# endif
563# ifdef VDISCRD
564 tio->c_cc[VDISCRD] = CFLUSH;
565# endif
566# ifdef VWERSE
567 tio->c_cc[VWERSE] = CWERASE;
568# endif
569# ifdef VLNEXT
570 tio->c_cc[VLNEXT] = CLNEXT;
571# endif
572# ifdef VSTATUS
573 tio->c_cc[VSTATUS] = CSTATUS;
574# endif
575
576# if VMIN != VEOF
577 tio->c_cc[VMIN] = 1;
578# endif
579# if VTIME != VEOL
580 tio->c_cc[VTIME] = 0;
581# endif
582
583 /* input modes */
584 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
585# ifdef IMAXBEL
586 | IMAXBEL
587# endif
588 | IXON);
589
590 /* output modes */
591 tio->c_oflag = (OPOST | ONLCR);
592
593 /* control modes */
594 tio->c_cflag = (CS8 | CREAD);
595
596 /* local modes */
597 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
598# if defined (ECHOCTL) && defined (ECHOKE)
599 | ECHOCTL | ECHOKE
600# endif
601 | ECHOE | ECHOK);
602}
603
615char **rxvt_environ; // startup environment 604char **rxvt_environ; // startup environment
616 605
617void 606void
618rxvt_init () 607rxvt_init ()
619{ 608{
620 ptytty::init (); 609 assert (("fontMask must not overlap other RS masks",
610 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
621 611
612 rxvt_get_ttymode (&rxvt_term::def_tio);
613
614 // get rid of stdin/stdout as we don't need them, to free resources
615 dup2 (STDERR_FILENO, STDIN_FILENO);
616 dup2 (STDERR_FILENO, STDOUT_FILENO);
617
622 if (!ev_default_loop (0)) 618 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 619 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 620
625 rxvt_environ = environ; 621 rxvt_environ = environ;
626 622
627 signal (SIGHUP, SIG_IGN); 623 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 624 signal (SIGPIPE, SIG_IGN);
629 625
630 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 626 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev_unref (); 627 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 628
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 629 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 630 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 631 XSetIOErrorHandler (rxvt_xioerror_handler);
639 632
640 XrmInitialize (); 633 XrmInitialize ();
634
635#if HAVE_PIXBUF
636 g_type_init ();
637#endif
641} 638}
642 639
643/*----------------------------------------------------------------------*/ 640/*----------------------------------------------------------------------*/
644/* 641/*
645 * window size/position calculations for XSizeHint and other storage. 642 * window size/position calculations for XSizeHint and other storage.
… …
647 */ 644 */
648void 645void
649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 646rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
650{ 647{
651 short recalc_x, recalc_y; 648 short recalc_x, recalc_y;
652 int x, y, sb_w, flags; 649 int x, y, flags;
653 unsigned int w, h; 650 unsigned int w, h;
654 unsigned int max_width, max_height; 651 unsigned int max_width, max_height;
655 652
656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 653 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
657 szHint.win_gravity = NorthWestGravity; 654 szHint.win_gravity = NorthWestGravity;
… …
667 if (rs[Rs_geometry]) 664 if (rs[Rs_geometry])
668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 665 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
669 666
670 if (flags & WidthValue) 667 if (flags & WidthValue)
671 { 668 {
669 if (!w)
670 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
671
672 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 672 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
673 szHint.flags |= USSize; 673 szHint.flags |= USSize;
674 } 674 }
675 675
676 if (flags & HeightValue) 676 if (flags & HeightValue)
677 { 677 {
678 if (!h)
679 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
680
678 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 681 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
679 szHint.flags |= USSize; 682 szHint.flags |= USSize;
680 } 683 }
681 684
682 if (flags & XValue) 685 if (flags & XValue)
683 { 686 {
… …
714 max_width = MAX_COLS * fwidth; 717 max_width = MAX_COLS * fwidth;
715 max_height = MAX_ROWS * fheight; 718 max_height = MAX_ROWS * fheight;
716 719
717 szHint.base_width = szHint.base_height = 2 * int_bwidth; 720 szHint.base_width = szHint.base_height = 2 * int_bwidth;
718 721
719 sb_w = 0;
720 window_vt_x = window_vt_y = int_bwidth; 722 window_vt_x = window_vt_y = int_bwidth;
721 723
722 if (scrollBar.state) 724 if (scrollBar.state)
723 { 725 {
724 sb_w = scrollbar_TotalWidth (); 726 int sb_w = scrollBar.total_width ();
725 szHint.base_width += sb_w; 727 szHint.base_width += sb_w;
726 728
727 if (!option (Opt_scrollBar_right)) 729 if (!option (Opt_scrollBar_right))
728 window_vt_x += sb_w; 730 window_vt_x += sb_w;
729 } 731 }
… …
753 { 755 {
754 min_it (height, max_height); 756 min_it (height, max_height);
755 szHint.height = szHint.base_height + height; 757 szHint.height = szHint.base_height + height;
756 } 758 }
757 759
758 if (scrollBar.state && option (Opt_scrollBar_right))
759 window_sb_x = szHint.width - sb_w;
760
761 if (recalc_x) 760 if (recalc_x)
762 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 761 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
763 762
764 if (recalc_y) 763 if (recalc_y)
765 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 764 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
766 765
767 ncol = width / fwidth; 766 ncol = width / fwidth;
768 nrow = height / fheight; 767 nrow = height / fheight;
768
769 // When the size of the vt window is not a multiple of the cell
770 // size, i.e., when the wm does not honour our size hints, there are
771 // extra areas not covered by the terminal screen. Such gaps, when a
772 // bg pixmap is set, would have to be cleared manually to properly
773 // refresh the background. We take the simpler route and shrink the
774 // vt window so as to avoid creating gaps.
775 vt_width = ncol * fwidth;
776 vt_height = nrow * fheight;
769} 777}
770 778
771/*----------------------------------------------------------------------*/ 779/*----------------------------------------------------------------------*/
772/* 780/*
773 * Tell the teletype handler what size the window is. 781 * Tell the teletype handler what size the window is.
… …
781 789
782 struct winsize ws; 790 struct winsize ws;
783 791
784 ws.ws_col = ncol; 792 ws.ws_col = ncol;
785 ws.ws_row = nrow; 793 ws.ws_row = nrow;
786 ws.ws_xpixel = width; 794 ws.ws_xpixel = vt_width;
787 ws.ws_ypixel = height; 795 ws.ws_ypixel = vt_height;
788 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 796 ioctl (pty->pty, TIOCSWINSZ, &ws);
789 797
790#if 0 798#if 0
791 // TIOCSWINSZ is supposed to do this automatically and correctly 799 // TIOCSWINSZ is supposed to do this automatically and correctly
792 if (cmd_pid) /* force through to the command */ 800 if (cmd_pid) /* force through to the command */
793 kill (-cmd_pid, SIGWINCH); 801 kill (-cmd_pid, SIGWINCH);
794#endif 802#endif
795} 803}
796 804
797/*----------------------------------------------------------------------*/ 805/*----------------------------------------------------------------------*/
798/* set_fonts () - load and set the various fonts 806/* load and set the various fonts */
799 *
800 * init = 1 - initialize
801 *
802 * fontname == FONT_UP - switch to bigger font
803 * fontname == FONT_DN - switch to smaller font
804 */
805bool 807bool
806rxvt_term::set_fonts () 808rxvt_term::set_fonts ()
807{ 809{
808 rxvt_fontset *fs = new rxvt_fontset (this); 810 rxvt_fontset *fs = new rxvt_fontset (this);
809 rxvt_fontprop prop; 811 rxvt_fontprop prop;
… …
823#endif 825#endif
824 826
825 delete fontset[0]; 827 delete fontset[0];
826 fontset[0] = fs; 828 fontset[0] = fs;
827 829
828 prop = (*fs)[1]->properties (); 830 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
829 prop.height += lineSpace; 831 prop.width = max (prop.width + letterSpace, 1);
830 832
831 fs->set_prop (prop, false); 833 fs->set_prop (prop, false);
832 834
833 fwidth = prop.width; 835 fwidth = prop.width;
834 fheight = prop.height; 836 fheight = prop.height + lineSpace;
835 fbase = prop.ascent; 837 fbase = prop.ascent;
836 838
837 for (int style = 1; style < 4; style++) 839 for (int style = 1; style < 4; style++)
838 { 840 {
839#if ENABLE_STYLES 841#if ENABLE_STYLES
… …
865#else 867#else
866 fontset[style] = fontset[0]; 868 fontset[style] = fontset[0];
867#endif 869#endif
868 } 870 }
869 871
870 if (parent[0]) 872 if (parent)
871 { 873 {
872 resize_all_windows (0, 0, 0); 874 resize_all_windows (0, 0, 0);
873 scr_remap_chars (); 875 scr_remap_chars ();
874 scr_touch (true); 876 scr_touch (true);
875 } 877 }
… …
878} 880}
879 881
880void 882void
881rxvt_term::set_string_property (Atom prop, const char *str, int len) 883rxvt_term::set_string_property (Atom prop, const char *str, int len)
882{ 884{
883 XChangeProperty (dpy, parent[0], 885 XChangeProperty (dpy, parent,
884 prop, XA_STRING, 8, PropModeReplace, 886 prop, XA_STRING, 8, PropModeReplace,
885 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 887 (const unsigned char *)str, len >= 0 ? len : strlen (str));
886} 888}
887 889
888void 890void
891rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
892{
893 XTextProperty ct;
894
895 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
896 {
897 XSetTextProperty (dpy, parent, &ct, prop);
898 XFree (ct.value);
899 }
900}
901
902void
889rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 903rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
890{ 904{
891 wchar_t *ws = rxvt_mbstowcs (str, len); 905 wchar_t *ws = rxvt_mbstowcs (str, len);
892 char *s = rxvt_wcstoutf8 (ws); 906 char *s = rxvt_wcstoutf8 (ws);
893 907
894 XChangeProperty (dpy, parent[0], 908 XChangeProperty (dpy, parent,
895 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 909 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
896 (const unsigned char *)s, strlen (s)); 910 (const unsigned char *)s, strlen (s));
897 911
898 free (s); 912 free (s);
899 free (ws); 913 free (ws);
… …
903/*----------------------------------------------------------------------*/ 917/*----------------------------------------------------------------------*/
904/* xterm sequences - title, iconName, color (exptl) */ 918/* xterm sequences - title, iconName, color (exptl) */
905void 919void
906rxvt_term::set_title (const char *str) 920rxvt_term::set_title (const char *str)
907{ 921{
908 set_string_property (XA_WM_NAME, str); 922 set_mbstring_property (XA_WM_NAME, str);
909#if ENABLE_EWMH 923#if ENABLE_EWMH
910 set_utf8_property (xa[XA_NET_WM_NAME], str); 924 set_utf8_property (xa[XA_NET_WM_NAME], str);
911#endif 925#endif
912} 926}
913 927
914void 928void
915rxvt_term::set_icon_name (const char *str) 929rxvt_term::set_icon_name (const char *str)
916{ 930{
917 set_string_property (XA_WM_ICON_NAME, str); 931 set_mbstring_property (XA_WM_ICON_NAME, str);
918#if ENABLE_EWMH 932#if ENABLE_EWMH
919 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 933 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
920#endif 934#endif
921} 935}
922 936
923void 937void
924rxvt_term::set_window_color (int idx, const char *color) 938rxvt_term::set_window_color (int idx, const char *color)
925{ 939{
926#ifdef XTERM_COLOR_CHANGE 940#ifdef XTERM_COLOR_CHANGE
927 rxvt_color xcol;
928 int i;
929
930 if (color == NULL || *color == '\0') 941 if (color == NULL || *color == '\0')
931 return; 942 return;
932 943
933 color = strdup (color); 944 color = strdup (color);
934 allocated.push_back ((void *)color); 945 allocated.push_back ((void *)color);
935 rs[Rs_color + idx] = color; 946 rs[Rs_color + idx] = color;
936 947
937 /* handle color aliases */ 948 /* handle color aliases */
938 if (isdigit (*color)) 949 if (isdigit (*color))
939 { 950 {
940 i = atoi (color); 951 int i = atoi (color);
941 952
942 if (i >= 8 && i <= 15) 953 if (i >= 8 && i <= 15)
943 { 954 {
944 /* bright colors */ 955 /* bright colors */
945 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 956 alias_color (idx, minBrightCOLOR + i - 8);
946 goto done; 957 goto done;
947 } 958 }
948 959
949 if (i >= 0 && i <= 7) 960 if (i >= 0 && i <= 7)
950 { 961 {
951 /* normal colors */ 962 /* normal colors */
952 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 963 alias_color (idx, minCOLOR + i);
953 goto done; 964 goto done;
954 } 965 }
955 } 966 }
956 967
957 set_color (xcol, color); 968 pix_colors_focused[idx].free (this);
958 969 set_color (pix_colors_focused[idx], color);
959 /*
960 * FIXME: should free colors here, but no idea how to do it so instead,
961 * so just keep gobbling up the colormap
962 */
963
964 pix_colors_focused[idx] = xcol;
965 970
966done: 971done:
967 /*TODO: handle Color_BD, scrollbar background, etc. */ 972 /*TODO: handle Color_BD, scrollbar background, etc. */
968 973
969 update_fade_color (idx); 974 update_fade_color (idx);
970 recolour_cursor (); 975 recolor_cursor ();
971 scr_recolour (); 976 scr_recolor ();
972#endif /* XTERM_COLOR_CHANGE */ 977#endif /* XTERM_COLOR_CHANGE */
973} 978}
974 979
975void 980void
976rxvt_term::recolour_cursor () 981rxvt_term::recolor_cursor ()
977{ 982{
978 XColor fg, bg; 983 XColor fg, bg;
979 984
980 (ISSET_PIXCOLOR (Color_pointer_fg) 985 (ISSET_PIXCOLOR (Color_pointer_fg)
981 ? pix_colors_focused[Color_pointer_fg] 986 ? pix_colors_focused[Color_pointer_fg]
… …
990 995
991/*----------------------------------------------------------------------*/ 996/*----------------------------------------------------------------------*/
992/* 997/*
993 * find if fg/bg matches any of the normal (low-intensity) colors 998 * find if fg/bg matches any of the normal (low-intensity) colors
994 */ 999 */
995void 1000char *
996rxvt_term::set_colorfgbg () 1001rxvt_term::get_colorfgbg ()
997{ 1002{
998 unsigned int i; 1003 unsigned int i;
999 const char *xpmb = ""; 1004 const char *xpmb = "";
1000 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1005 char fstr[] = "default";
1006 char bstr[] = "default";
1007 char *env_colorfgbg;
1001 1008
1002 strcpy (fstr, "default");
1003 strcpy (bstr, "default");
1004 for (i = Color_Black; i <= Color_White; i++) 1009 for (i = Color_Black; i <= Color_White; i++)
1005 if (pix_colors[Color_fg] == pix_colors[i]) 1010 if (pix_colors[Color_fg] == pix_colors[i])
1006 { 1011 {
1007 sprintf (fstr, "%d", (i - Color_Black)); 1012 sprintf (fstr, "%d", i - Color_Black);
1008 break; 1013 break;
1009 } 1014 }
1010 1015
1011 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
1012 if (pix_colors[Color_bg] == pix_colors[i]) 1017 if (pix_colors[Color_bg] == pix_colors[i])
1013 { 1018 {
1014 sprintf (bstr, "%d", (i - Color_Black)); 1019 sprintf (bstr, "%d", i - Color_Black);
1015#ifdef BG_IMAGE_FROM_FILE 1020#if HAVE_IMG
1016 xpmb = "default;"; 1021 xpmb = "default;";
1017#endif 1022#endif
1018 break; 1023 break;
1019 } 1024 }
1020 1025
1026 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1021 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1027 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1028 return env_colorfgbg;
1022} 1029}
1023 1030
1024/*----------------------------------------------------------------------*/ 1031/*----------------------------------------------------------------------*/
1025 1032
1026bool 1033bool
… …
1034} 1041}
1035 1042
1036void 1043void
1037rxvt_term::alias_color (int dst, int src) 1044rxvt_term::alias_color (int dst, int src)
1038{ 1045{
1046 pix_colors[dst].free (this);
1039 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1047 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1040} 1048}
1049
1050#ifdef SMART_RESIZE
1051static unsigned int
1052get_parent_bw (Display *dpy, Window w)
1053{
1054 int idummy;
1055 unsigned int udummy;
1056 Window wdummy, parent;
1057 Window *children;
1058 unsigned int nchildren, border_width;
1059
1060 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1061 XFree (children);
1062 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1063 &udummy, &udummy, &border_width, &udummy);
1064
1065 return border_width;
1066}
1067#endif
1041 1068
1042/* -------------------------------------------------------------------- * 1069/* -------------------------------------------------------------------- *
1043 * - WINDOW RESIZING - * 1070 * - WINDOW RESIZING - *
1044 * -------------------------------------------------------------------- */ 1071 * -------------------------------------------------------------------- */
1045void 1072void
… …
1049 int old_width = szHint.width; 1076 int old_width = szHint.width;
1050 int old_height = szHint.height; 1077 int old_height = szHint.height;
1051 1078
1052 window_calc (newwidth, newheight); 1079 window_calc (newwidth, newheight);
1053 1080
1054 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1081 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1082
1083 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1084 if (set_hint)
1085 {
1086 szHint.flags &= ~(PBaseSize | PResizeInc);
1055 XSetWMNormalHints (dpy, parent[0], &szHint); 1087 XSetWMNormalHints (dpy, parent, &szHint);
1088 szHint.flags |= PBaseSize | PResizeInc;
1089 }
1056 1090
1057 if (!ignoreparent) 1091 if (!ignoreparent)
1058 { 1092 {
1059#ifdef SMART_RESIZE 1093#ifdef SMART_RESIZE
1060 /* 1094 /*
… …
1064 int x, y, x1, y1; 1098 int x, y, x1, y1;
1065 int dx, dy; 1099 int dx, dy;
1066 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1100 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1067 Window unused_cr; 1101 Window unused_cr;
1068 1102
1069 XTranslateCoordinates (dpy, parent[0], display->root, 1103 XTranslateCoordinates (dpy, parent, display->root,
1070 0, 0, &x, &y, &unused_cr); 1104 0, 0, &x, &y, &unused_cr);
1071 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1105 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1072 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1106 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1073 /* 1107 /*
1074 * if display->root isn't the parent window, a WM will probably have offset 1108 * if display->root isn't the parent window, a WM will probably have offset
1075 * our position for handles and decorations. Counter it 1109 * our position for handles and decorations. Counter it
1076 */ 1110 */
1077 if (x1 != x || y1 != y) 1111 if (x1 != x || y1 != y)
1078 { 1112 {
1079 x -= x1; 1113 unsigned int border_width = get_parent_bw (dpy, parent);
1080 y -= y1; 1114
1115 x -= x1 + border_width;
1116 y -= y1 + border_width;
1081 } 1117 }
1082 1118
1083 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1119 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1084 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1120 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1085 dx = old_width - szHint.width; 1121 dx = old_width - szHint.width;
… …
1093 if (y < y1) /* top half */ 1129 if (y < y1) /* top half */
1094 dy = 0; 1130 dy = 0;
1095 else if (y == y1) /* exact center */ 1131 else if (y == y1) /* exact center */
1096 dy /= 2; 1132 dy /= 2;
1097 1133
1098 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1134 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1099 szHint.width, szHint.height); 1135 szHint.width, szHint.height);
1100#else 1136#else
1101 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1137 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1102#endif 1138#endif
1103 } 1139 }
1140
1141 if (set_hint)
1142 XSetWMNormalHints (dpy, parent, &szHint);
1104 1143
1105 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1144 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1106 1145
1107 if (fix_screen || newwidth != old_width || newheight != old_height) 1146 if (fix_screen || newwidth != old_width || newheight != old_height)
1108 { 1147 {
1109 if (scrollBar.state) 1148 if (scrollBar.state)
1110 { 1149 scrollBar.resize ();
1111 XMoveResizeWindow (dpy, scrollBar.win,
1112 window_sb_x, 0,
1113 scrollbar_TotalWidth (), szHint.height);
1114 resize_scrollbar ();
1115 }
1116 1150
1117 XMoveResizeWindow (dpy, vt, 1151 XMoveResizeWindow (dpy, vt,
1118 window_vt_x, window_vt_y, 1152 window_vt_x, window_vt_y,
1119 width, height); 1153 vt_width, vt_height);
1120 1154
1121#ifdef HAVE_BG_PIXMAP 1155 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1122 if (bgPixmap.window_size_sensitive ())
1123 update_background ();
1124#endif
1125
1126 scr_clear ();
1127 } 1156 }
1128 1157
1129 if (fix_screen || old_height == 0) 1158 if (fix_screen || old_height == 0)
1130 scr_reset (); 1159 scr_reset ();
1131 1160
1132 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1133 //scr_touch (false);
1134
1135#ifdef HAVE_BG_PIXMAP
1136// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1137// if (bgPixmap.pixmap)
1138// scr_touch (false);
1139#endif
1140
1141#ifdef USE_XIM 1161#if USE_XIM
1142 IMSetPosition (); 1162 im_set_position ();
1143#endif 1163#endif
1144} 1164}
1145 1165
1146/* 1166/*
1147 * Set the width/height of the vt window in characters. Units are pixels. 1167 * Set the width/height of the vt window in characters. Units are pixels.
… …
1160 newwidth = wattr.width - szHint.base_width; 1180 newwidth = wattr.width - szHint.base_width;
1161 if (newheight == 0) 1181 if (newheight == 0)
1162 newheight = wattr.height - szHint.base_height; 1182 newheight = wattr.height - szHint.base_height;
1163 } 1183 }
1164 1184
1165 if (newwidth != width || newheight != height) 1185 if (newwidth != vt_width || newheight != vt_height)
1166 { 1186 {
1167 newwidth += szHint.base_width; 1187 newwidth += szHint.base_width;
1168 newheight += szHint.base_height; 1188 newheight += szHint.base_height;
1169 resize_all_windows (newwidth, newheight, 0); 1189 resize_all_windows (newwidth, newheight, 0);
1170 } 1190 }
1171} 1191}
1172 1192
1173/* -------------------------------------------------------------------- * 1193/* -------------------------------------------------------------------- *
1174 * - X INPUT METHOD ROUTINES - * 1194 * - X INPUT METHOD ROUTINES - *
1175 * -------------------------------------------------------------------- */ 1195 * -------------------------------------------------------------------- */
1176#ifdef USE_XIM 1196#if USE_XIM
1177 1197
1178void 1198void
1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1199rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1180{ 1200{
1181 fg = pix_colors [Color_fg]; 1201 fg = pix_colors [Color_fg];
… …
1208 status_rect.height = fheight; 1228 status_rect.height = fheight;
1209} 1229}
1210 1230
1211/* Checking whether input method is running. */ 1231/* Checking whether input method is running. */
1212bool 1232bool
1213rxvt_term::IMisRunning () 1233rxvt_term::im_is_running ()
1214{ 1234{
1215 char *p;
1216 Atom atom; 1235 Atom atom;
1217 Window win; 1236 Window win;
1218 char server[IMBUFSIZ]; 1237 char server[IMBUFSIZ];
1219 1238
1220 /* get current locale modifier */ 1239 /* get current locale modifier */
1221 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1240 if (char *p = XSetLocaleModifiers (0))
1222 { 1241 {
1223 strcpy (server, "@server="); 1242 strcpy (server, "@server=");
1224 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1243 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1225 1244
1226 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1245 if (p = strchr (server + 1, '@')) /* first one only */
1227 *p = '\0'; 1246 *p = '\0';
1228 1247
1229 atom = XInternAtom (dpy, server, False); 1248 atom = XInternAtom (dpy, server, False);
1230 win = XGetSelectionOwner (dpy, atom); 1249 win = XGetSelectionOwner (dpy, atom);
1231 1250
1232 if (win != None) 1251 if (win != None)
1233 return True; 1252 return true;
1234 } 1253 }
1235 1254
1236 return False; 1255 return false;
1237} 1256}
1238 1257
1239void 1258void
1240rxvt_term::IMSendSpot () 1259rxvt_term::im_send_spot ()
1241{ 1260{
1242 XPoint nspot; 1261 XPoint nspot;
1243 XVaNestedList preedit_attr; 1262 XVaNestedList preedit_attr;
1244 1263
1245 if (!Input_Context 1264 if (!Input_Context
… …
1298 1317
1299 term->make_current (); 1318 term->make_current ();
1300 1319
1301 if (text) 1320 if (text)
1302 { 1321 {
1303 void *str; 1322 wchar_t *str;
1304 1323
1305 if (!text->encoding_is_wchar && text->string.multi_byte) 1324 if (!text->encoding_is_wchar && text->string.multi_byte)
1306 { 1325 {
1307 // of course, X makes it ugly again 1326 // of course, X makes it ugly again
1308 if (term->rs[Rs_imLocale]) 1327 if (term->rs[Rs_imLocale])
1309 SET_LOCALE (term->rs[Rs_imLocale]); 1328 SET_LOCALE (term->rs[Rs_imLocale]);
1310 1329
1311 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1330 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1312 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1331 mbstowcs (str, text->string.multi_byte, text->length + 1);
1313 1332
1314 if (term->rs[Rs_imLocale]) 1333 if (term->rs[Rs_imLocale])
1315 SET_LOCALE (term->locale); 1334 SET_LOCALE (term->locale);
1316 } 1335 }
1317 else 1336 else
1318 str = (void *)text->string.wide_char; 1337 str = text->string.wide_char;
1319 1338
1320 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1339 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1321 DT_INT, call_data->caret, 1340 DT_INT, call_data->caret,
1322 DT_INT, call_data->chg_first, 1341 DT_INT, call_data->chg_first,
1323 DT_INT, call_data->chg_length, 1342 DT_INT, call_data->chg_length,
… …
1351/* 1370/*
1352 * Try to open a XIM with the current modifiers, then see if we can 1371 * Try to open a XIM with the current modifiers, then see if we can
1353 * open a suitable preedit type 1372 * open a suitable preedit type
1354 */ 1373 */
1355bool 1374bool
1356rxvt_term::IM_get_IC (const char *modifiers) 1375rxvt_term::im_get_ic (const char *modifiers)
1357{ 1376{
1358 int i, j, found; 1377 int i, j, found;
1359 XIM xim; 1378 XIM xim;
1360 XPoint spot; 1379 XPoint spot;
1361 XRectangle rect, status_rect, needed_rect; 1380 XRectangle rect, status_rect, needed_rect;
1362 unsigned long fg, bg; 1381 unsigned long fg, bg;
1363 const char *p; 1382 const char *p;
1364 char **s; 1383 char **s;
1365 XIMStyles *xim_styles; 1384 XIMStyles *xim_styles;
1366#ifdef ENABLE_XIM_ONTHESPOT
1367 XIMCallback xcb[4];
1368#endif
1369 1385
1370 set_environ (envv); 1386 set_environ (env);
1371 1387
1372 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1388 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1373 return false; 1389 return false;
1374 1390
1375 input_method = display->get_xim (locale, modifiers); 1391 input_method = display->get_xim (locale, modifiers);
1376 if (input_method == NULL) 1392 if (input_method == NULL)
1377 return false; 1393 return false;
… …
1394 p = pet[pi]; 1410 p = pet[pi];
1395 1411
1396 if (!p) 1412 if (!p)
1397 continue; 1413 continue;
1398 1414
1399 s = rxvt_splitcommastring (p); 1415 s = rxvt_strsplit (',', p);
1400 1416
1401 for (i = found = 0; !found && s[i]; i++) 1417 for (i = found = 0; !found && s[i]; i++)
1402 { 1418 {
1403 if (!strcmp (s[i], "OverTheSpot")) 1419 if (!strcmp (s[i], "OverTheSpot"))
1404 input_style = XIMPreeditPosition | XIMStatusNothing; 1420 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1416 input_style = XIMPreeditNothing | XIMStatusNothing; 1432 input_style = XIMPreeditNothing | XIMStatusNothing;
1417 1433
1418 for (j = 0; j < xim_styles->count_styles; j++) 1434 for (j = 0; j < xim_styles->count_styles; j++)
1419 if (input_style == xim_styles->supported_styles[j]) 1435 if (input_style == xim_styles->supported_styles[j])
1420 { 1436 {
1421 rxvt_freecommastring (s); 1437 rxvt_free_strsplit (s);
1422 1438
1423 found = 1; 1439 found = 1;
1424 goto foundpet; 1440 goto foundpet;
1425 } 1441 }
1426 1442
1427 } 1443 }
1428 1444
1429 rxvt_freecommastring (s); 1445 rxvt_free_strsplit (s);
1430 } 1446 }
1431 1447
1432foundpet: 1448foundpet:
1433 1449
1434 XFree (xim_styles); 1450 XFree (xim_styles);
… …
1513 NULL); 1529 NULL);
1514 } 1530 }
1515#if ENABLE_XIM_ONTHESPOT 1531#if ENABLE_XIM_ONTHESPOT
1516 else if (input_style & XIMPreeditCallbacks) 1532 else if (input_style & XIMPreeditCallbacks)
1517 { 1533 {
1534 XIMCallback xcb[4];
1535
1518 im_set_position (spot); 1536 im_set_position (spot);
1519 1537
1520 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1538 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1521 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1539 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1540 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1537#endif 1555#endif
1538 1556
1539 Input_Context = XCreateIC (xim, 1557 Input_Context = XCreateIC (xim,
1540 XNInputStyle, input_style, 1558 XNInputStyle, input_style,
1541 XNClientWindow, vt, 1559 XNClientWindow, vt,
1542 XNFocusWindow, parent[0], 1560 XNFocusWindow, parent,
1543 preedit_attr ? XNPreeditAttributes : NULL, 1561 preedit_attr ? XNPreeditAttributes : NULL,
1544 preedit_attr, 1562 preedit_attr,
1545 status_attr ? XNStatusAttributes : NULL, 1563 status_attr ? XNStatusAttributes : NULL,
1546 status_attr, NULL); 1564 status_attr, NULL);
1547 1565
… …
1560 // unfortunately, only the focus window is used by XIM, hard to fix 1578 // unfortunately, only the focus window is used by XIM, hard to fix
1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1579 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1562 vt_select_input (); 1580 vt_select_input ();
1563#endif 1581#endif
1564 1582
1565 IMSetPosition (); 1583 im_set_position ();
1566 1584
1567 return true; 1585 return true;
1568} 1586}
1569 1587
1570void 1588void
… …
1580 im_destroy (); 1598 im_destroy ();
1581 1599
1582 if (Input_Context) 1600 if (Input_Context)
1583 return; 1601 return;
1584 1602
1585#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1586 if (rs[Rs_imLocale]) 1603 if (rs[Rs_imLocale])
1587 SET_LOCALE (rs[Rs_imLocale]); 1604 SET_LOCALE (rs[Rs_imLocale]);
1588#endif
1589 1605
1590 p = rs[Rs_inputMethod]; 1606 p = rs[Rs_inputMethod];
1591 if (p && *p) 1607 if (p && *p)
1592 { 1608 {
1593 bool found = false; 1609 bool found = false;
1594 1610
1595 s = rxvt_splitcommastring (p); 1611 s = rxvt_strsplit (',', p);
1596 1612
1597 for (i = 0; s[i]; i++) 1613 for (i = 0; s[i]; i++)
1598 { 1614 {
1599 if (*s[i]) 1615 if (*s[i])
1600 { 1616 {
1601 strcpy (buf, "@im="); 1617 strcpy (buf, "@im=");
1602 strncat (buf, s[i], IMBUFSIZ - 5); 1618 strncat (buf, s[i], IMBUFSIZ - 5);
1603 if (IM_get_IC (buf)) 1619 if (im_get_ic (buf))
1604 { 1620 {
1605 found = true; 1621 found = true;
1606 break; 1622 break;
1607 } 1623 }
1608 } 1624 }
1609 } 1625 }
1610 1626
1611 rxvt_freecommastring (s); 1627 rxvt_free_strsplit (s);
1612 1628
1613 if (found) 1629 if (found)
1614 goto done; 1630 goto done;
1615 } 1631 }
1616 1632
1617 /* try with XMODIFIERS env. var. */ 1633 /* try with XMODIFIERS env. var. */
1618 if (IM_get_IC ("")) 1634 if (im_get_ic (""))
1619 goto done; 1635 goto done;
1620 1636
1621 /* try with no modifiers base IF the user didn't specify an IM */ 1637 /* try with no modifiers base IF the user didn't specify an IM */
1622 if (IM_get_IC ("@im=none")) 1638 if (im_get_ic ("@im=none"))
1623 goto done; 1639 goto done;
1624 1640
1625done: 1641done:
1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1627 if (rs[Rs_imLocale]) 1642 if (rs[Rs_imLocale])
1628 SET_LOCALE (locale); 1643 SET_LOCALE (locale);
1629#endif
1630} 1644}
1631 1645
1632void 1646void
1633rxvt_term::IMSetPosition () 1647rxvt_term::im_set_position ()
1634{ 1648{
1635 XRectangle preedit_rect, status_rect, *needed_rect; 1649 XRectangle preedit_rect, status_rect, *needed_rect;
1636 XVaNestedList preedit_attr, status_attr; 1650 XVaNestedList preedit_attr, status_attr;
1637 1651
1638 if (!Input_Context 1652 if (!Input_Context
1639 || !focus 1653 || !focus
1640 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1654 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1641 || !IMisRunning ()) 1655 || !im_is_running ())
1642 return; 1656 return;
1643 1657
1644 if (input_style & XIMPreeditPosition) 1658 if (input_style & XIMPreeditPosition)
1645 { 1659 {
1646 im_set_size (preedit_rect); 1660 im_set_size (preedit_rect);
… …
1676 1690
1677void 1691void
1678rxvt_term::get_window_origin (int &x, int &y) 1692rxvt_term::get_window_origin (int &x, int &y)
1679{ 1693{
1680 Window cr; 1694 Window cr;
1681 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1695 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1682/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1683} 1696}
1684
1685Pixmap
1686rxvt_term::get_pixmap_property (int prop_id)
1687{
1688 if (prop_id > 0 && prop_id < NUM_XA)
1689 if (xa[prop_id])
1690 {
1691 int aformat;
1692 unsigned long nitems, bytes_after;
1693 Atom atype;
1694 unsigned char *prop = NULL;
1695 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1696 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1697 &nitems, &bytes_after, &prop);
1698 if (result == Success && prop && atype == XA_PIXMAP)
1699 {
1700 return *(Pixmap *)prop;
1701 }
1702 }
1703 return None;
1704}
1705
1706#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709int rxvt_term::trace_update_background (const char *file, int line)
1710{
1711 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1712 update_background ();
1713}
1714# endif
1715
1716int
1717rxvt_term::update_background ()
1718{
1719 bgPixmap.invalidate ();
1720
1721 /* no chance of real time refresh if we are blurring! */
1722 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1723 bgPixmap.render ();
1724 else
1725 {
1726 ev_tstamp refresh;
1727 update_background_ev.stop ();
1728
1729 if (!bgPixmap.need_client_side_rendering ())
1730 refresh = .05;
1731 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1732 refresh = .20; /* very slow !!! */
1733 else
1734 refresh = .07;
1735 update_background_ev.start (refresh);
1736 }
1737
1738 return 0;
1739}
1740
1741void
1742rxvt_term::update_background_cb (ev::timer &w, int revents)
1743{
1744 make_current ();
1745 bgPixmap.render ();
1746 refresh_check ();
1747}
1748
1749#endif /* HAVE_BG_PIXMAP */
1750 1697
1751/*----------------------- end-of-file (C source) -----------------------*/ 1698/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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