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.241 by sasha, Mon Aug 13 22:41:34 2007 UTC vs.
Revision 1.381 by root, Tue Jun 5 12:04:33 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
49#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
55 59
… …
88class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
89 93
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 95{
92 compose_char *cc; 96 compose_char *cc;
93 97
94 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
96 cc = (*this)[c1]; 100 cc = (*this)[c1];
97 while (cc) 101 while (cc)
98 { 102 {
99 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
101 } 105 }
102 106
103 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
105 {
106 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
108 }
109 111
110 // allocate a new combination 112 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 { 114 {
113 static int seen; 115 static int seen;
114 116
115 if (!seen++) 117 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
117 119
118 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
119 } 121 }
120 122
121 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
147 149
148} 150}
149#endif 151#endif
150 152
151rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
152 : 154{
155#if HAVE_BG_PIXMAP
156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
157#endif
158#ifdef CURSOR_BLINK
159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
160#endif
161#ifdef TEXT_BLINK
162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
163#endif
164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
166#endif
167#ifdef SELECTION_SCROLLING
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 175#endif
156#if ENABLE_TRANSPARENCY 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 177#if USE_XIM
158#endif 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 179#endif
177#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 182#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 185#endif
186 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
197 termlist.push_back (this); 195 termlist.push_back (this);
198 196
199#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
201#endif 199#endif
202} 200}
203 201
204// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 203// for use before an emergency exit
204void
206void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
207{ 206{
208 if (cmd_pid) 207 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
210 209
211 pty_ev.stop (); 210 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
224 delete fontset[i]; 223 delete fontset[i];
225#endif 224#endif
226 delete fontset[0]; 225 delete fontset[0];
227 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
228 if (display) 231 if (display)
229 { 232 {
230 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
231 235
232#ifdef USE_XIM 236#if USE_XIM
233 im_destroy (); 237 im_destroy ();
234#endif 238#endif
235#ifdef XTERM_SCROLLBAR 239 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
260 241
261 delete drawable; 242 delete drawable;
262 // destroy all windows 243 // destroy all windows
263 if (parent[0]) 244 if (parent)
264 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
265 246
266 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
268 { 249 {
269 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
271 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
272#endif 253#endif
273 } 254 }
274 255
275 clear (); 256 clear ();
276 }
277 257
278 delete [] pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 259 displays.put (display);
260 }
284 261
285 scr_release (); 262 scr_release ();
286 263
287 /* clear all resources */ 264 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 266 free (allocated [i]);
290 267
291 free (selection.text); 268 free (selection.text);
292 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 270 free (locale);
296 free (v_buffer); 271 free (v_buffer);
297 free (incr_buf); 272
273 delete selection_req;
298 274
299 delete envv; 275 delete envv;
300 delete argv; 276 delete argv;
301 277
302#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
303 delete keyboard; 279 delete keyboard;
304#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
305} 284}
306 285
307// child has exited, usually destroys 286// child has exited, usually destroys
308void 287void
309rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
310{ 289{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 291
313 cmd_pid = 0; 292 cmd_pid = 0;
314 293
… …
317} 296}
318 297
319void 298void
320rxvt_term::destroy () 299rxvt_term::destroy ()
321{ 300{
322 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
323 return; 302 return;
324 303
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 305
327#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
331 if (display) 310 if (display)
332 { 311 {
333#if USE_XIM 312#if USE_XIM
334 im_ev.stop (display); 313 im_ev.stop (display);
335#endif 314#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
341#endif 318#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 319 termwin_ev.stop (display);
344 vt_ev.stop (display); 320 vt_ev.stop (display);
345 } 321 }
346 322
347 check_ev.stop (); 323 flush_ev.stop ();
348 pty_ev.stop (); 324 pty_ev.stop ();
349#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
351#endif 327#endif
352#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
360#endif 336#endif
361#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
362 pointer_ev.stop (); 338 pointer_ev.stop ();
363#endif 339#endif
364 340
365 destroy_ev.start (0); 341 destroy_ev.start ();
366} 342}
367 343
368void 344void
369rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 346{
371 make_current (); 347 make_current ();
372 348
373 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
374} 362}
375 363
376/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
377/* 365/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
379 * TODO: if debugging, this should free up any known resources if we can
380 */ 367 */
381static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
382 369
383static void 370static void
384rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
388} 375}
389 376
390#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
391static void 378static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
393{ 380{
394 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
396 char number[32]; 383 char number[32];
397 char *mtype = "XlibMessage"; 384
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
401 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
404 sprintf(number, "%d", event->request_code); 396
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 {
409 mesg, BUFSIZ); 399#if 0
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436
437 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
411 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
412 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
413 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
414 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
415 (event->error_code == BadFont) || 454 || event->error_code == BadFont
416 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
417 (event->error_code == BadColor) || 456 || event->error_code == BadColor
418 (event->error_code == BadGC) || 457 || event->error_code == BadGC
419 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
420 (event->error_code == BadValue) || 459 || event->error_code == BadValue
421 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
422 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
424 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
427 mesg, BUFSIZ); 466 else
428 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
430 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436}
437#endif
438 468
439int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 476{
442 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
444 else 479 else
… …
453 } 488 }
454 489
455 return 0; 490 return 0;
456} 491}
457 492
458int 493int ecb_cold
459rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
460{ 495{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 497 DisplayString (display));
463 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 499 _exit (EXIT_FAILURE);
465} 500}
466 501
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bool changed = false;
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527
528 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root);
531 }
532#endif
533
534#ifdef XPM_BACKGROUND
535 if (rs[Rs_backgroundPixmap] != NULL)
536 {
537 const char *p = rs[Rs_backgroundPixmap];
538
539 if ((p = strchr (p, ';')) != NULL)
540 {
541 p++;
542 bgPixmap.set_geometry (p);
543 }
544 else
545 bgPixmap.set_defaultGeometry ();
546
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]);
548 }
549#endif
550 if (changed)
551 {
552 bgPixmap.render ();
553 scr_touch (true);
554 }
555 }
556#endif
557
558#if ENABLE_PERL
559 rootwin_ev.start (display, display->root);
560#endif
561
562 set_colorfgbg ();
563
564 init_command (cmd_argv);
565
566 free (cmd_argv);
567
568 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ);
570
571 check_ev.start ();
572
573 HOOK_INVOKE ((this, HOOK_START, DT_END));
574
575#if ENABLE_XEMBED
576 if (rs[Rs_embed])
577 {
578 long info[2] = { 0, XEMBED_MAPPED };
579
580 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
581 32, PropModeReplace, (unsigned char *)&info, 2);
582 }
583#endif
584
585 XMapWindow (dpy, vt);
586 XMapWindow (dpy, parent[0]);
587
588 return true;
589}
590
591static struct sig_handlers 502static struct sig_handlers
592{ 503{
593 sig_watcher sw_term, sw_int; 504 ev::sig sw_term, sw_int;
594 505
595 /* 506 /*
596 * Catch a fatal signal and tidy up before quitting 507 * Catch a fatal signal and tidy up before quitting
597 */ 508 */
598 void 509 void sig_term (ev::sig &w, int revents);
599 sig_term (sig_watcher &w) 510
511 sig_handlers ()
600 { 512 {
601 rxvt_emergency_cleanup (); 513 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
602 signal (w.signum, SIG_DFL);
603 kill (getpid (), w.signum);
604 }
605
606 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term),
608 sw_int (this, &sig_handlers::sig_term) 514 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
609 {
610 } 515 }
611} sig_handlers; 516} sig_handlers;
612 517
518void
519sig_handlers::sig_term (ev::sig &w, int revents)
520{
521 rxvt_emergency_cleanup ();
522 w.stop ();
523 kill (getpid (), w.signum);
524}
525
526static void
527rxvt_get_ttymode (struct termios *tio)
528{
529 if (tcgetattr (STDIN_FILENO, tio) < 0)
530 memset (tio, 0, sizeof (struct termios));
531
532 for (int i = 0; i < NCCS; i++)
533 tio->c_cc[i] = VDISABLE;
534
535 tio->c_cc[VINTR] = CINTR;
536 tio->c_cc[VQUIT] = CQUIT;
537 tio->c_cc[VERASE] = CERASE;
538#ifdef VERASE2
539 tio->c_cc[VERASE2] = CERASE2;
540#endif
541 tio->c_cc[VKILL] = CKILL;
542 tio->c_cc[VEOF] = CEOF;
543 tio->c_cc[VSTART] = CSTART;
544 tio->c_cc[VSTOP] = CSTOP;
545 tio->c_cc[VSUSP] = CSUSP;
546# ifdef VDSUSP
547 tio->c_cc[VDSUSP] = CDSUSP;
548# endif
549# ifdef VREPRINT
550 tio->c_cc[VREPRINT] = CRPRNT;
551# endif
552# ifdef VDISCRD
553 tio->c_cc[VDISCRD] = CFLUSH;
554# endif
555# ifdef VWERSE
556 tio->c_cc[VWERSE] = CWERASE;
557# endif
558# ifdef VLNEXT
559 tio->c_cc[VLNEXT] = CLNEXT;
560# endif
561# ifdef VSTATUS
562 tio->c_cc[VSTATUS] = CSTATUS;
563# endif
564
565# if VMIN != VEOF
566 tio->c_cc[VMIN] = 1;
567# endif
568# if VTIME != VEOL
569 tio->c_cc[VTIME] = 0;
570# endif
571
572 /* input modes */
573 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
574# ifdef IMAXBEL
575 | IMAXBEL
576# endif
577 | IXON);
578
579 /* output modes */
580 tio->c_oflag = (OPOST | ONLCR);
581
582 /* control modes */
583 tio->c_cflag = (CS8 | CREAD);
584
585 /* local modes */
586 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
587# if defined (ECHOCTL) && defined (ECHOKE)
588 | ECHOCTL | ECHOKE
589# endif
590 | ECHOE | ECHOK);
591}
592
613char **rxvt_environ; // startup environment 593char **rxvt_environ; // startup environment
614 594
615void 595void
616rxvt_init () 596rxvt_init ()
617{ 597{
618 ptytty::init (); 598 assert (("fontMask must not overlap other RS masks",
599 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
600
601 rxvt_get_ttymode (&rxvt_term::def_tio);
602
603 // get rid of stdin/stdout as we don't need them, to free resources
604 dup2 (STDERR_FILENO, STDIN_FILENO);
605 dup2 (STDERR_FILENO, STDOUT_FILENO);
606
607 if (!ev_default_loop ())
608 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
619 609
620 rxvt_environ = environ; 610 rxvt_environ = environ;
621 611
622 signal (SIGHUP, SIG_IGN); 612 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN); 613 signal (SIGPIPE, SIG_IGN);
624 614
625 sig_handlers.sw_term.start (SIGTERM); 615 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
626 sig_handlers.sw_int.start (SIGINT); 616 sig_handlers.sw_int.start (SIGINT); ev_unref ();
627
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */
630 617
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
632 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
633 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
634 621
635 XrmInitialize (); 622 XrmInitialize ();
636}
637 623
638/* ------------------------------------------------------------------------- * 624#if HAVE_PIXBUF
639 * MEMORY ALLOCATION WRAPPERS * 625 g_type_init ();
640 * ------------------------------------------------------------------------- */ 626#endif
641void *
642rxvt_malloc (size_t size)
643{
644 void *p = malloc (size);
645
646 if (!p)
647 rxvt_fatal ("memory allocation failure. aborting.\n");
648
649 return p;
650}
651
652void *
653rxvt_calloc (size_t number, size_t size)
654{
655 void *p = calloc (number, size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_realloc (void *ptr, size_t size)
665{
666 void *p = realloc (ptr, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672} 627}
673 628
674/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
675/* 630/*
676 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
678 */ 633 */
679void 634void
680rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 635rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
681{ 636{
682 short recalc_x, recalc_y; 637 short recalc_x, recalc_y;
683 int x, y, sb_w, flags; 638 int x, y, flags;
684 unsigned int w, h; 639 unsigned int w, h;
685 unsigned int max_width, max_height; 640 unsigned int max_width, max_height;
686 641
687 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 642 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
688 szHint.win_gravity = NorthWestGravity; 643 szHint.win_gravity = NorthWestGravity;
… …
698 if (rs[Rs_geometry]) 653 if (rs[Rs_geometry])
699 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 654 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
700 655
701 if (flags & WidthValue) 656 if (flags & WidthValue)
702 { 657 {
658 if (!w)
659 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
660
703 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 661 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
704 szHint.flags |= USSize; 662 szHint.flags |= USSize;
705 } 663 }
706 664
707 if (flags & HeightValue) 665 if (flags & HeightValue)
708 { 666 {
667 if (!h)
668 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
669
709 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 670 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
710 szHint.flags |= USSize; 671 szHint.flags |= USSize;
711 } 672 }
712 673
713 if (flags & XValue) 674 if (flags & XValue)
714 { 675 {
… …
745 max_width = MAX_COLS * fwidth; 706 max_width = MAX_COLS * fwidth;
746 max_height = MAX_ROWS * fheight; 707 max_height = MAX_ROWS * fheight;
747 708
748 szHint.base_width = szHint.base_height = 2 * int_bwidth; 709 szHint.base_width = szHint.base_height = 2 * int_bwidth;
749 710
750 sb_w = 0;
751 window_vt_x = window_vt_y = int_bwidth; 711 window_vt_x = window_vt_y = int_bwidth;
752 712
753 if (scrollBar.state) 713 if (scrollBar.state)
754 { 714 {
755 sb_w = scrollbar_TotalWidth (); 715 int sb_w = scrollBar.total_width ();
756 szHint.base_width += sb_w; 716 szHint.base_width += sb_w;
757 717
758 if (!option (Opt_scrollBar_right)) 718 if (!option (Opt_scrollBar_right))
759 window_vt_x += sb_w; 719 window_vt_x += sb_w;
760 } 720 }
… …
784 { 744 {
785 min_it (height, max_height); 745 min_it (height, max_height);
786 szHint.height = szHint.base_height + height; 746 szHint.height = szHint.base_height + height;
787 } 747 }
788 748
789 if (scrollBar.state && option (Opt_scrollBar_right))
790 window_sb_x = szHint.width - sb_w;
791
792 if (recalc_x) 749 if (recalc_x)
793 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
794 751
795 if (recalc_y) 752 if (recalc_y)
796 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
797 754
798 ncol = width / fwidth; 755 ncol = width / fwidth;
799 nrow = height / fheight; 756 nrow = height / fheight;
757
758 // When the size of the vt window is not a multiple of the cell
759 // size, i.e., when the wm does not honour our size hints, there are
760 // extra areas not covered by the terminal screen. Such gaps, when a
761 // bg pixmap is set, would have to be cleared manually to properly
762 // refresh the background. We take the simpler route and shrink the
763 // vt window so as to avoid creating gaps.
764 vt_width = ncol * fwidth;
765 vt_height = nrow * fheight;
800} 766}
801 767
802/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
803/* 769/*
804 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
812 778
813 struct winsize ws; 779 struct winsize ws;
814 780
815 ws.ws_col = ncol; 781 ws.ws_col = ncol;
816 ws.ws_row = nrow; 782 ws.ws_row = nrow;
817 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
818 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
819 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
820 786
821#if 0 787#if 0
822 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
823 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
824 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
825#endif 791#endif
826} 792}
827 793
828/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
829/* set_fonts () - load and set the various fonts 795/* load and set the various fonts */
830 *
831 * init = 1 - initialize
832 *
833 * fontname == FONT_UP - switch to bigger font
834 * fontname == FONT_DN - switch to smaller font
835 */
836bool 796bool
837rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
838{ 798{
839 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
840 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
854#endif 814#endif
855 815
856 delete fontset[0]; 816 delete fontset[0];
857 fontset[0] = fs; 817 fontset[0] = fs;
858 818
859 prop = (*fs)[1]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
860 prop.height += lineSpace; 820 prop.width += letterSpace;
861 821
862 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
863 823
864 fwidth = prop.width; 824 fwidth = prop.width;
865 fheight = prop.height; 825 fheight = prop.height + lineSpace;
866 fbase = prop.ascent; 826 fbase = prop.ascent;
867 827
868 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
869 { 829 {
870#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
896#else 856#else
897 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
898#endif 858#endif
899 } 859 }
900 860
901 if (parent[0]) 861 if (parent)
902 { 862 {
903 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
904 scr_remap_chars (); 864 scr_remap_chars ();
905 scr_touch (true); 865 scr_touch (true);
906 } 866 }
907 867
908 return true; 868 return true;
909} 869}
910 870
871void
911void rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
912{ 873{
913 XChangeProperty (dpy, parent[0], 874 XChangeProperty (dpy, parent,
914 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916} 877}
917 878
879void
880rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
881{
882 XTextProperty ct;
883
884 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
885 {
886 XSetTextProperty (dpy, parent, &ct, prop);
887 XFree (ct.value);
888 }
889}
890
891void
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{ 893{
920 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
922 896
923 XChangeProperty (dpy, parent[0], 897 XChangeProperty (dpy, parent,
924 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
925 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
926 900
927 free (s); 901 free (s);
928 free (ws); 902 free (ws);
… …
932/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
933/* xterm sequences - title, iconName, color (exptl) */ 907/* xterm sequences - title, iconName, color (exptl) */
934void 908void
935rxvt_term::set_title (const char *str) 909rxvt_term::set_title (const char *str)
936{ 910{
937 set_string_property (XA_WM_NAME, str); 911 set_mbstring_property (XA_WM_NAME, str);
938#if ENABLE_EWMH 912#if ENABLE_EWMH
939 set_utf8_property (xa[XA_NET_WM_NAME], str); 913 set_utf8_property (xa[XA_NET_WM_NAME], str);
940#endif 914#endif
941} 915}
942 916
943void 917void
944rxvt_term::set_icon_name (const char *str) 918rxvt_term::set_icon_name (const char *str)
945{ 919{
946 set_string_property (XA_WM_ICON_NAME, str); 920 set_mbstring_property (XA_WM_ICON_NAME, str);
947#if ENABLE_EWMH 921#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 922 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 923#endif
950} 924}
951 925
926void
927rxvt_term::set_window_color (int idx, const char *color)
928{
952#ifdef XTERM_COLOR_CHANGE 929#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 930 rxvt_color xcol;
957 int i; 931
958
959 if (color == NULL || *color == '\0') 932 if (color == NULL || *color == '\0')
960 return; 933 return;
961 934
962 color = strdup (color); 935 color = strdup (color);
963 allocated.push_back ((void *)color); 936 allocated.push_back ((void *)color);
964 rs[Rs_color + idx] = color; 937 rs[Rs_color + idx] = color;
965 938
966 /* handle color aliases */ 939 /* handle color aliases */
967 if (isdigit (*color)) 940 if (isdigit (*color))
968 { 941 {
969 i = atoi (color); 942 int i = atoi (color);
970 943
971 if (i >= 8 && i <= 15) 944 if (i >= 8 && i <= 15)
945 {
972 { /* bright colors */ 946 /* bright colors */
973 i -= 8;
974 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
975 goto done; 948 goto done;
976 } 949 }
977 950
978 if (i >= 0 && i <= 7) 951 if (i >= 0 && i <= 7)
952 {
979 { /* normal colors */ 953 /* normal colors */
980 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 954 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
981 goto done; 955 goto done;
982 } 956 }
983 } 957 }
984 958
… …
989 * so just keep gobbling up the colormap 963 * so just keep gobbling up the colormap
990 */ 964 */
991 965
992 pix_colors_focused[idx] = xcol; 966 pix_colors_focused[idx] = xcol;
993 967
994 /* XSetWindowAttributes attr; */
995 /* Cursor cursor; */
996done: 968done:
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 969 /*TODO: handle Color_BD, scrollbar background, etc. */
998 970
999 update_fade_color (idx); 971 update_fade_color (idx);
1000 recolour_cursor (); 972 recolour_cursor ();
1001 scr_recolour (); 973 scr_recolour ();
974#endif /* XTERM_COLOR_CHANGE */
1002} 975}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */
1007 976
1008void 977void
1009rxvt_term::recolour_cursor () 978rxvt_term::recolour_cursor ()
1010{ 979{
1011 XColor fg, bg; 980 XColor fg, bg;
… …
1023 992
1024/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
1025/* 994/*
1026 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
1027 */ 996 */
1028void 997char *
1029rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
1030{ 999{
1031 unsigned int i; 1000 unsigned int i;
1032 const char *xpmb = "\0"; 1001 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[] = "default";
1003 char bstr[] = "default";
1004 char *env_colorfgbg;
1034 1005
1035 strcpy (fstr, "default");
1036 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
1038 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
1039 { 1008 {
1040 sprintf (fstr, "%d", (i - Color_Black)); 1009 sprintf (fstr, "%d", i - Color_Black);
1041 break; 1010 break;
1042 } 1011 }
1043 1012
1044 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1015 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", i - Color_Black);
1048#ifdef XPM_BACKGROUND 1017#if BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1018 xpmb = "default;";
1050#endif 1019#endif
1051 break; 1020 break;
1052 } 1021 }
1053 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1054 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025 return env_colorfgbg;
1055} 1026}
1056 1027
1057/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
1058 1029
1059bool 1030bool
… …
1082 int old_width = szHint.width; 1053 int old_width = szHint.width;
1083 int old_height = szHint.height; 1054 int old_height = szHint.height;
1084 1055
1085 window_calc (newwidth, newheight); 1056 window_calc (newwidth, newheight);
1086 1057
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1058 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1059
1060 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1061 if (set_hint)
1062 {
1063 szHint.flags &= ~(PBaseSize | PResizeInc);
1088 XSetWMNormalHints (dpy, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1065 szHint.flags |= PBaseSize | PResizeInc;
1066 }
1089 1067
1090 if (!ignoreparent) 1068 if (!ignoreparent)
1091 { 1069 {
1092#ifdef SMART_RESIZE 1070#ifdef SMART_RESIZE
1093 /* 1071 /*
… …
1097 int x, y, x1, y1; 1075 int x, y, x1, y1;
1098 int dx, dy; 1076 int dx, dy;
1099 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1100 Window unused_cr; 1078 Window unused_cr;
1101 1079
1102 XTranslateCoordinates (dpy, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
1103 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
1104 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1105 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1106 /* 1084 /*
1107 * if display->root isn't the parent window, a WM will probably have offset 1085 * if display->root isn't the parent window, a WM will probably have offset
1108 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
1109 */ 1087 */
… …
1126 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
1127 dy = 0; 1105 dy = 0;
1128 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
1129 dy /= 2; 1107 dy /= 2;
1130 1108
1131 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1132 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
1133#else 1111#else
1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1135#endif 1113#endif
1136 } 1114 }
1115
1116 if (set_hint)
1117 XSetWMNormalHints (dpy, parent, &szHint);
1137 1118
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1120
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1122 {
1142 if (scrollBar.state) 1123 if (scrollBar.state)
1143 { 1124 scrollBar.resize ();
1144 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar ();
1148 }
1149 1125
1150 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
1152 width, height); 1128 vt_width, vt_height);
1153 1129
1154 scr_clear (); 1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1155#ifdef XPM_BACKGROUND 1131
1156 /* TODO: should that really be here ? */ 1132#ifdef HAVE_BG_PIXMAP
1157 bgPixmap.render (); 1133 if (bg_window_size_sensitive ())
1134 update_background ();
1158#endif 1135#endif
1159 } 1136 }
1160 1137
1161 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
1162 scr_reset (); 1139 scr_reset ();
1163 1140
1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 //scr_touch (false);
1166
1167#ifdef HAVE_BG_PIXMAP
1168 if (bgPixmap.pixmap)
1169 scr_touch (false);
1170#endif
1171
1172#ifdef USE_XIM 1141#if USE_XIM
1173 IMSetPosition (); 1142 im_set_position ();
1174#endif 1143#endif
1175} 1144}
1176 1145
1177/* 1146/*
1178 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1191 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1192 if (newheight == 0) 1161 if (newheight == 0)
1193 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1194 } 1163 }
1195 1164
1196 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1197 { 1166 {
1198 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1199 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1200 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1201 } 1170 }
1202} 1171}
1203 1172
1204/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1205 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1206 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1207#ifdef USE_XIM 1176#if USE_XIM
1208 1177
1209void 1178void
1210rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1211{ 1180{
1212 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1239 status_rect.height = fheight; 1208 status_rect.height = fheight;
1240} 1209}
1241 1210
1242/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1243bool 1212bool
1244rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1245{ 1214{
1246 char *p;
1247 Atom atom; 1215 Atom atom;
1248 Window win; 1216 Window win;
1249 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1250 1218
1251 /* get current locale modifier */ 1219 /* get current locale modifier */
1252 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1220 if (char *p = XSetLocaleModifiers (0))
1253 { 1221 {
1254 strcpy (server, "@server="); 1222 strcpy (server, "@server=");
1255 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1223 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1256 1224
1257 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1225 if (p = strchr (server + 1, '@')) /* first one only */
1258 *p = '\0'; 1226 *p = '\0';
1259 1227
1260 atom = XInternAtom (dpy, server, False); 1228 atom = XInternAtom (dpy, server, False);
1261 win = XGetSelectionOwner (dpy, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1262 1230
1263 if (win != None) 1231 if (win != None)
1264 return True; 1232 return true;
1265 } 1233 }
1266 1234
1267 return False; 1235 return false;
1268} 1236}
1269 1237
1270void 1238void
1271rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1272{ 1240{
1273 XPoint nspot; 1241 XPoint nspot;
1274 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1275 1243
1276 if (!Input_Context 1244 if (!Input_Context
… …
1329 1297
1330 term->make_current (); 1298 term->make_current ();
1331 1299
1332 if (text) 1300 if (text)
1333 { 1301 {
1334 void *str; 1302 wchar_t *str;
1335 1303
1336 if (!text->encoding_is_wchar && text->string.multi_byte) 1304 if (!text->encoding_is_wchar && text->string.multi_byte)
1337 { 1305 {
1338 // of course, X makes it ugly again 1306 // of course, X makes it ugly again
1339 if (term->rs[Rs_imLocale]) 1307 if (term->rs[Rs_imLocale])
1340 SET_LOCALE (term->rs[Rs_imLocale]); 1308 SET_LOCALE (term->rs[Rs_imLocale]);
1341 1309
1342 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1310 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1343 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1311 mbstowcs (str, text->string.multi_byte, text->length + 1);
1344 1312
1345 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale); 1314 SET_LOCALE (term->locale);
1347 } 1315 }
1348 else 1316 else
1349 str = (void *)text->string.wide_char; 1317 str = text->string.wide_char;
1350 1318
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret, 1320 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first, 1321 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length, 1322 DT_INT, call_data->chg_length,
1355 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1323 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1382/* 1350/*
1383 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1384 * open a suitable preedit type 1352 * open a suitable preedit type
1385 */ 1353 */
1386bool 1354bool
1387rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1388{ 1356{
1389 int i, j, found; 1357 int i, j, found;
1390 XIM xim; 1358 XIM xim;
1391 XPoint spot; 1359 XPoint spot;
1392 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1393 unsigned long fg, bg; 1361 unsigned long fg, bg;
1394 const char *p; 1362 const char *p;
1395 char **s; 1363 char **s;
1396 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1397#ifdef ENABLE_XIM_ONTHESPOT
1398 XIMCallback xcb[4];
1399#endif
1400 1365
1401 set_environ (envv); 1366 set_environ (envv);
1402 1367
1403 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1404 return false; 1369 return false;
… …
1425 p = pet[pi]; 1390 p = pet[pi];
1426 1391
1427 if (!p) 1392 if (!p)
1428 continue; 1393 continue;
1429 1394
1430 s = rxvt_splitcommastring (p); 1395 s = rxvt_strsplit (',', p);
1431 1396
1432 for (i = found = 0; !found && s[i]; i++) 1397 for (i = found = 0; !found && s[i]; i++)
1433 { 1398 {
1434 if (!strcmp (s[i], "OverTheSpot")) 1399 if (!strcmp (s[i], "OverTheSpot"))
1435 input_style = XIMPreeditPosition | XIMStatusNothing; 1400 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1447 input_style = XIMPreeditNothing | XIMStatusNothing; 1412 input_style = XIMPreeditNothing | XIMStatusNothing;
1448 1413
1449 for (j = 0; j < xim_styles->count_styles; j++) 1414 for (j = 0; j < xim_styles->count_styles; j++)
1450 if (input_style == xim_styles->supported_styles[j]) 1415 if (input_style == xim_styles->supported_styles[j])
1451 { 1416 {
1452 rxvt_freecommastring (s); 1417 rxvt_free_strsplit (s);
1453 1418
1454 found = 1; 1419 found = 1;
1455 goto foundpet; 1420 goto foundpet;
1456 } 1421 }
1457 1422
1458 } 1423 }
1459 1424
1460 rxvt_freecommastring (s); 1425 rxvt_free_strsplit (s);
1461 } 1426 }
1462 1427
1463foundpet: 1428foundpet:
1464 1429
1465 XFree (xim_styles); 1430 XFree (xim_styles);
… …
1544 NULL); 1509 NULL);
1545 } 1510 }
1546#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1547 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1548 { 1513 {
1514 XIMCallback xcb[4];
1515
1549 im_set_position (spot); 1516 im_set_position (spot);
1550 1517
1551 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1518 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1552 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1519 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1553 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1520 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1568#endif 1535#endif
1569 1536
1570 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1571 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1572 XNClientWindow, vt, 1539 XNClientWindow, vt,
1573 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1574 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1575 preedit_attr, 1542 preedit_attr,
1576 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1577 status_attr, NULL); 1544 status_attr, NULL);
1578 1545
… …
1591 // unfortunately, only the focus window is used by XIM, hard to fix 1558 // unfortunately, only the focus window is used by XIM, hard to fix
1592 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1593 vt_select_input (); 1560 vt_select_input ();
1594#endif 1561#endif
1595 1562
1596 IMSetPosition (); 1563 im_set_position ();
1597 1564
1598 return true; 1565 return true;
1599} 1566}
1600 1567
1601void 1568void
… …
1611 im_destroy (); 1578 im_destroy ();
1612 1579
1613 if (Input_Context) 1580 if (Input_Context)
1614 return; 1581 return;
1615 1582
1616#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1617 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1618 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1619#endif
1620 1585
1621 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1622 if (p && *p) 1587 if (p && *p)
1623 { 1588 {
1624 bool found = false; 1589 bool found = false;
1625 1590
1626 s = rxvt_splitcommastring (p); 1591 s = rxvt_strsplit (',', p);
1627 1592
1628 for (i = 0; s[i]; i++) 1593 for (i = 0; s[i]; i++)
1629 { 1594 {
1630 if (*s[i]) 1595 if (*s[i])
1631 { 1596 {
1632 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1633 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1634 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1635 { 1600 {
1636 found = true; 1601 found = true;
1637 break; 1602 break;
1638 } 1603 }
1639 } 1604 }
1640 } 1605 }
1641 1606
1642 rxvt_freecommastring (s); 1607 rxvt_free_strsplit (s);
1643 1608
1644 if (found) 1609 if (found)
1645 goto done; 1610 goto done;
1646 } 1611 }
1647 1612
1648 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1649 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1650 goto done; 1615 goto done;
1651 1616
1652 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1653 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1654 goto done; 1619 goto done;
1655 1620
1656done: 1621done:
1657#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1658 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1659 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1660#endif
1661} 1624}
1662 1625
1663void 1626void
1664rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1665{ 1628{
1666 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1667 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1668 1631
1669 if (!Input_Context 1632 if (!Input_Context
1670 || !focus 1633 || !focus
1671 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1672 || !IMisRunning ()) 1635 || !im_is_running ())
1673 return; 1636 return;
1674 1637
1675 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1676 { 1639 {
1677 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1641 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679 1642
1680 XSetICValues (Input_Context, 1643 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL); 1644 XNPreeditAttributes, preedit_attr, NULL);
1682 } 1645 }
1683 else 1646 else
1684 { 1647 {
… …
1701 XFree (status_attr); 1664 XFree (status_attr);
1702 } 1665 }
1703 1666
1704 XFree (preedit_attr); 1667 XFree (preedit_attr);
1705} 1668}
1706#endif /* USE_XIM */ 1669#endif /* USE_XIM */
1670
1671void
1672rxvt_term::get_window_origin (int &x, int &y)
1673{
1674 Window cr;
1675 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1676}
1677
1678#ifdef HAVE_BG_PIXMAP
1679
1680void
1681rxvt_term::update_background ()
1682{
1683 if (update_background_ev.is_active ())
1684 return;
1685
1686 bg_invalidate ();
1687
1688 if (!mapped)
1689 return;
1690
1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1692
1693 if (to_wait <= 0.)
1694 bg_render ();
1695 else
1696 update_background_ev.start (to_wait);
1697}
1698
1699void
1700rxvt_term::update_background_cb (ev::timer &w, int revents)
1701{
1702 make_current ();
1703
1704 update_background_ev.stop ();
1705 bg_render ();
1706 refresh_check ();
1707}
1708
1709#endif /* HAVE_BG_PIXMAP */
1707 1710
1708/*----------------------- end-of-file (C source) -----------------------*/ 1711/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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