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

Diff Legend

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