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.201 by root, Wed Jan 25 00:57:57 2006 UTC vs.
Revision 1.334 by sf-exg, Fri Oct 22 16:49:26 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
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>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
56static char curlocale[128], savelocale[128]; 62static char curlocale[128], savelocale[128];
57 63
58bool 64bool
59rxvt_set_locale (const char *locale) NOTHROW 65rxvt_set_locale (const char *locale) NOTHROW
60{ 66{
67 int size = strlen (locale) + 1;
68
69 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n");
71
61 if (!locale || !strncmp (locale, curlocale, 128)) 72 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 73 return false;
63 74
64 strncpy (curlocale, locale, 128); 75 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 76 setlocale (LC_CTYPE, curlocale);
66 return true; 77 return true;
67} 78}
68 79
69void 80void
… …
83class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
84 95
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 97{
87 compose_char *cc; 98 compose_char *cc;
88 99
89 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 101 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 102 cc = (*this)[c1];
92 while (cc) 103 while (cc)
93 { 104 {
94 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
96 } 107 }
97 108
98 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
100 { 111 {
101 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
103 } 114 }
… …
142 153
143} 154}
144#endif 155#endif
145 156
146rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
147 : 158{
148#if TRANSPARENT 159#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 164#endif
157#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 167#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 170#endif
163#ifdef SELECTION_SCROLLING 171#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 173#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 183#endif
169#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 186#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 187#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 189#endif
178 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 197
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 199
189 termlist.push_back (this); 200 termlist.push_back (this);
190 201
191#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
193#endif 204#endif
194} 205}
195 206
196// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 208// for use before an emergency exit
209void
198void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
199{ 211{
200 if (cmd_pid) 212 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
202 214
215 pty_ev.stop ();
203 delete pty; pty = 0; 216 delete pty; pty = 0;
204} 217}
205 218
206rxvt_term::~rxvt_term () 219rxvt_term::~rxvt_term ()
207{ 220{
… …
214 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
215 delete fontset[i]; 228 delete fontset[i];
216#endif 229#endif
217 delete fontset[0]; 230 delete fontset[0];
218 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
219 if (display) 242 if (display)
220 { 243 {
221 dDisp;
222
223 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
224 246
225#ifdef USE_XIM 247#ifdef USE_XIM
226 im_destroy (); 248 im_destroy ();
227#endif 249#endif
228#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
253 252
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 263 pix_colors_unfocused [i].free (this);
264#endif 264#endif
265 }
265 266
267 clear ();
268
269 display->flush (); /* ideally .put should do this */
266 displays.put (display); 270 displays.put (display);
271 }
267 272
268 scr_release (); 273 scr_release ();
269 274
270 /* clear all resources */ 275 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 277 free (allocated [i]);
273 278
274 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
276 free (env_windowid);
277 free (env_display); 282 free (env_display);
278 free (env_term); 283 free (env_term);
279 free (env_colorfgbg);
280 free (locale); 284 free (locale);
281 free (v_buffer); 285 free (v_buffer);
282 free (incr_buf); 286 free (incr_buf);
283 287
284 delete envv; 288 delete envv;
285 delete argv; 289 delete argv;
286 290
287#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
288 delete keyboard; 292 delete keyboard;
289#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
290} 297}
291 298
292// child has exited, usually destroys 299// child has exited, usually destroys
293void 300void
294rxvt_term::child_cb (child_watcher &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
295{ 302{
296 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
297 304
298 cmd_pid = 0; 305 cmd_pid = 0;
299 306
300 if (!OPTION (Opt_hold)) 307 if (!option (Opt_hold))
301 destroy (); 308 destroy ();
302} 309}
303 310
304void 311void
305rxvt_term::destroy () 312rxvt_term::destroy ()
306{ 313{
307 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
308 return; 315 return;
309 316
310 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
311 318
312#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
… …
316 if (display) 323 if (display)
317 { 324 {
318#if USE_XIM 325#if USE_XIM
319 im_ev.stop (display); 326 im_ev.stop (display);
320#endif 327#endif
321#if HAVE_SCROLLBARS
322 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
323#endif 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
324#if TRANSPARENT
325 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
326#endif 331#endif
327 incr_ev.stop (); 332 incr_ev.stop ();
328 termwin_ev.stop (display); 333 termwin_ev.stop (display);
329 vt_ev.stop (display); 334 vt_ev.stop (display);
330 } 335 }
331 336
332 check_ev.stop (); 337 flush_ev.stop ();
333 pty_ev.stop (); 338 pty_ev.stop ();
334#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
335 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
336#endif 341#endif
337#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
… …
345#endif 350#endif
346#ifdef POINTER_BLANK 351#ifdef POINTER_BLANK
347 pointer_ev.stop (); 352 pointer_ev.stop ();
348#endif 353#endif
349 354
350 destroy_ev.start (0); 355 destroy_ev.start ();
351} 356}
352 357
353void 358void
354rxvt_term::destroy_cb (time_watcher &w) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
355{ 360{
356 make_current (); 361 make_current ();
357 362
358 delete this; 363 delete this;
359} 364}
… …
370{ 375{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 377 (*t)->emergency_cleanup ();
373} 378}
374 379
375#if ENABLE_FRILLS 380#if !ENABLE_MINIMAL
376static void 381static void
377print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
378{ 383{
379 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
381 char number[32]; 386 char number[32];
382 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 399 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 401 }
397 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 414 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 417 mesg, BUFSIZ);
413 else 418 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 420 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 422 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 424 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 426}
422#endif 427#endif
423 428
424int 429int
… …
428 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
429 else 434 else
430 { 435 {
431 // GET_R is most likely not the terminal which caused the error, 436 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 437 // so just output the error and continue
433#if ENABLE_FRILLS 438#if ENABLE_MINIMAL
439 old_xerror_handler (display, event);
440#else
434 print_x_error (display, event); 441 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 442#endif
438 } 443 }
439 444
440 return 0; 445 return 0;
441} 446}
… …
447 DisplayString (display)); 452 DisplayString (display));
448 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
450} 455}
451 456
452/*----------------------------------------------------------------------*/
453bool
454rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
455{
456 this->envv = envv;
457
458 SET_R (this);
459 set_locale ("");
460 set_environ (envv); // few things in X do not call setlocale :(
461
462 if (!init_vars ())
463 return false;
464
465 init_secondary ();
466
467 const char **cmd_argv = init_resources (argc, argv);
468
469#ifdef KEYSYM_RESOURCE
470 keyboard->register_done ();
471#endif
472
473#ifdef HAVE_SCROLLBARS
474 if (OPTION (Opt_scrollBar))
475 scrollBar.setIdle (); /* set existence for size calculations */
476#endif
477
478 pty = ptytty::create ();
479
480 create_windows (argc, argv);
481
482 dDisp;
483
484 init_xlocale ();
485
486 scr_reset (); // initialize screen
487
488#if 0
489 XSynchronize (disp, True);
490#endif
491
492#ifdef HAVE_SCROLLBARS
493 if (OPTION (Opt_scrollBar))
494 resize_scrollbar (); /* create and map scrollbar */
495#endif
496#ifdef TRANSPARENT
497 if (OPTION (Opt_transparent))
498 {
499 XSelectInput (disp, display->root, PropertyChangeMask);
500 check_our_parents ();
501 rootwin_ev.start (display, display->root);
502 }
503#endif
504
505 set_colorfgbg ();
506
507 init_command (cmd_argv);
508
509 free (cmd_argv);
510
511 if (pty->pty >= 0)
512 pty_ev.start (pty->pty, EVENT_READ);
513
514 check_ev.start ();
515
516 HOOK_INVOKE ((this, HOOK_START, DT_END));
517
518 XMapWindow (disp, vt);
519 XMapWindow (disp, parent[0]);
520
521 return true;
522}
523
524static struct sig_handlers 457static struct sig_handlers
525{ 458{
526 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
527 460
528 /* 461 /*
529 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
530 */ 463 */
531 void 464 void sig_term (ev::sig &w, int revents);
532 sig_term (sig_watcher &w) 465
466 sig_handlers ()
533 { 467 {
534 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
535 signal (w.signum, SIG_DFL);
536 kill (getpid (), w.signum);
537 }
538
539 sig_handlers ()
540 : sw_term (this, &sig_handlers::sig_term),
541 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
542 {
543 } 470 }
544} sig_handlers; 471} sig_handlers;
545 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516
517# if VMIN != VEOF
518 tio->c_cc[VMIN] = 1;
519# endif
520# if VTIME != VEOL
521 tio->c_cc[VTIME] = 0;
522# endif
523
524 /* input modes */
525 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
526# ifdef IMAXBEL
527 | IMAXBEL
528# endif
529 | IXON);
530
531 /* output modes */
532 tio->c_oflag = (OPOST | ONLCR);
533
534 /* control modes */
535 tio->c_cflag = (CS8 | CREAD);
536
537 /* local modes */
538 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
539# if defined (ECHOCTL) && defined (ECHOKE)
540 | ECHOCTL | ECHOKE
541# endif
542 | ECHOE | ECHOK);
543}
544
546char **rxvt_environ; // startup environment 545char **rxvt_environ; // startup environment
547 546
548void 547void
549rxvt_init () 548rxvt_init ()
550{ 549{
550 assert (("fontMask must not overlap other RS masks",
551 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
552
553 rxvt_get_ttymode (&rxvt_term::def_tio);
554
555 // get rid of stdin/stdout as we don't need them, to free resources
556 dup2 (STDERR_FILENO, STDIN_FILENO);
557 dup2 (STDERR_FILENO, STDOUT_FILENO);
558
551 ptytty::init (); 559 ptytty::init ();
560
561 if (!ev_default_loop ())
562 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
552 563
553 rxvt_environ = environ; 564 rxvt_environ = environ;
554 565
555 signal (SIGHUP, SIG_IGN); 566 signal (SIGHUP, SIG_IGN);
556 signal (SIGPIPE, SIG_IGN); 567 signal (SIGPIPE, SIG_IGN);
557 568
558 sig_handlers.sw_term.start (SIGTERM); 569 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
559 sig_handlers.sw_int.start (SIGINT); 570 sig_handlers.sw_int.start (SIGINT); ev_unref ();
560
561 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
562 /* signal (SIGURG, SIG_DFL); */
563 571
564 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
565 // TODO: handle this with exceptions and tolerate the memory loss 573 // TODO: handle this with exceptions and tolerate the memory loss
566 XSetIOErrorHandler (rxvt_xioerror_handler); 574 XSetIOErrorHandler (rxvt_xioerror_handler);
567 575
568 XrmInitialize (); 576 XrmInitialize ();
569} 577}
570 578
571/* ------------------------------------------------------------------------- *
572 * MEMORY ALLOCATION WRAPPERS *
573 * ------------------------------------------------------------------------- */
574void *
575rxvt_malloc (size_t size)
576{
577 void *p = malloc (size);
578
579 if (!p)
580 rxvt_fatal ("memory allocation failure. aborting.\n");
581
582 return p;
583}
584
585void *
586rxvt_calloc (size_t number, size_t size)
587{
588 void *p = calloc (number, size);
589
590 if (!p)
591 rxvt_fatal ("memory allocation failure. aborting.\n");
592
593 return p;
594}
595
596void *
597rxvt_realloc (void *ptr, size_t size)
598{
599 void *p = realloc (ptr, size);
600
601 if (!p)
602 rxvt_fatal ("memory allocation failure. aborting.\n");
603
604 return p;
605}
606
607/*----------------------------------------------------------------------*/ 579/*----------------------------------------------------------------------*/
608/* 580/*
609 * window size/position calculcations for XSizeHint and other storage. 581 * window size/position calculations for XSizeHint and other storage.
610 * if width/height are non-zero then override calculated width/height 582 * if width/height are non-zero then override calculated width/height
611 */ 583 */
612void 584void
613rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 585rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
614{ 586{
615 short recalc_x, recalc_y; 587 short recalc_x, recalc_y;
616 int x, y, sb_w, flags; 588 int x, y, flags;
617 unsigned int w, h; 589 unsigned int w, h;
618 unsigned int max_width, max_height; 590 unsigned int max_width, max_height;
619 dDisp;
620 591
621 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 592 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
622 szHint.win_gravity = NorthWestGravity; 593 szHint.win_gravity = NorthWestGravity;
623 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 594 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
624 595
… …
632 if (rs[Rs_geometry]) 603 if (rs[Rs_geometry])
633 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 604 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
634 605
635 if (flags & WidthValue) 606 if (flags & WidthValue)
636 { 607 {
608 if (!w)
609 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
610
637 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 611 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
638 szHint.flags |= USSize; 612 szHint.flags |= USSize;
639 } 613 }
640 614
641 if (flags & HeightValue) 615 if (flags & HeightValue)
642 { 616 {
617 if (!h)
618 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
619
643 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 620 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
644 szHint.flags |= USSize; 621 szHint.flags |= USSize;
645 } 622 }
646 623
647 if (flags & XValue) 624 if (flags & XValue)
648 { 625 {
… …
679 max_width = MAX_COLS * fwidth; 656 max_width = MAX_COLS * fwidth;
680 max_height = MAX_ROWS * fheight; 657 max_height = MAX_ROWS * fheight;
681 658
682 szHint.base_width = szHint.base_height = 2 * int_bwidth; 659 szHint.base_width = szHint.base_height = 2 * int_bwidth;
683 660
684 sb_w = 0;
685 window_vt_x = window_vt_y = int_bwidth; 661 window_vt_x = window_vt_y = int_bwidth;
686 662
687 if (scrollBar.state) 663 if (scrollBar.state)
688 { 664 {
689 sb_w = scrollbar_TotalWidth (); 665 int sb_w = scrollBar.total_width ();
690 szHint.base_width += sb_w; 666 szHint.base_width += sb_w;
667
691 if (!OPTION (Opt_scrollBar_right)) 668 if (!option (Opt_scrollBar_right))
692 window_vt_x += sb_w; 669 window_vt_x += sb_w;
693 } 670 }
694 671
695 szHint.width_inc = fwidth; 672 szHint.width_inc = fwidth;
696 szHint.height_inc = fheight; 673 szHint.height_inc = fheight;
697 szHint.min_width = szHint.base_width + szHint.width_inc; 674 szHint.min_width = szHint.base_width + szHint.width_inc;
698 szHint.min_height = szHint.base_height + szHint.height_inc; 675 szHint.min_height = szHint.base_height + szHint.height_inc;
699 676
700 if (newwidth && newwidth - szHint.base_width < max_width) 677 if (newwidth && newwidth - szHint.base_width < max_width)
701 { 678 {
702 szHint.width = newwidth; 679 szHint.width = newwidth;
… …
717 { 694 {
718 min_it (height, max_height); 695 min_it (height, max_height);
719 szHint.height = szHint.base_height + height; 696 szHint.height = szHint.base_height + height;
720 } 697 }
721 698
722 if (scrollBar.state && OPTION (Opt_scrollBar_right))
723 window_sb_x = szHint.width - sb_w;
724
725 if (recalc_x) 699 if (recalc_x)
726 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 700 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
701
727 if (recalc_y) 702 if (recalc_y)
728 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 703 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
729 704
730 ncol = width / fwidth; 705 ncol = width / fwidth;
731 nrow = height / fheight; 706 nrow = height / fheight;
732} 707}
733 708
734/*----------------------------------------------------------------------*/ 709/*----------------------------------------------------------------------*/
735/* 710/*
… …
746 721
747 ws.ws_col = ncol; 722 ws.ws_col = ncol;
748 ws.ws_row = nrow; 723 ws.ws_row = nrow;
749 ws.ws_xpixel = width; 724 ws.ws_xpixel = width;
750 ws.ws_ypixel = height; 725 ws.ws_ypixel = height;
751 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 726 ioctl (pty->pty, TIOCSWINSZ, &ws);
752 727
753#if 0 728#if 0
754 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 729 // TIOCSWINSZ is supposed to do this automatically and correctly
755 if (cmd_pid) /* force through to the command */ 730 if (cmd_pid) /* force through to the command */
756 kill (-cmd_pid, SIGWINCH); 731 kill (-cmd_pid, SIGWINCH);
757#endif 732#endif
758} 733}
759 734
… …
786#endif 761#endif
787 762
788 delete fontset[0]; 763 delete fontset[0];
789 fontset[0] = fs; 764 fontset[0] = fs;
790 765
791 prop = (*fs)[1]->properties (); 766 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
792 prop.height += lineSpace; 767 prop.height += lineSpace;
768 prop.width += letterSpace;
769
793 fs->set_prop (prop); 770 fs->set_prop (prop, false);
794 771
795 fwidth = prop.width; 772 fwidth = prop.width;
796 fheight = prop.height; 773 fheight = prop.height;
797 fbase = prop.ascent; 774 fbase = prop.ascent;
798 775
… …
807 { 784 {
808 fontset[style] = fs = new rxvt_fontset (this); 785 fontset[style] = fs = new rxvt_fontset (this);
809 rxvt_fontprop prop2 = prop; 786 rxvt_fontprop prop2 = prop;
810 787
811 if (res) 788 if (res)
812 prop2.weight = prop2.slant = rxvt_fontprop::unset; 789 {
790 fs->populate (res);
791 fs->set_prop (prop2, false);
792 }
813 else 793 else
814 { 794 {
815 res = fontset[0]->fontdesc; 795 fs->populate (fontset[0]->fontdesc);
816 796
817 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 797 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
818 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 798 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
799
800 fs->set_prop (prop2, true);
819 } 801 }
820 802
821 fs->populate (res);
822 fs->set_prop (prop2);
823 } 803 }
824#else 804#else
825 fontset[style] = fontset[0]; 805 fontset[style] = fontset[0];
826#endif 806#endif
827 } 807 }
… …
829 if (parent[0]) 809 if (parent[0])
830 { 810 {
831 resize_all_windows (0, 0, 0); 811 resize_all_windows (0, 0, 0);
832 scr_remap_chars (); 812 scr_remap_chars ();
833 scr_touch (true); 813 scr_touch (true);
834 } 814 }
835 815
836 return true; 816 return true;
837} 817}
838 818
819void
839void rxvt_term::set_string_property (Atom prop, const char *str, int len) 820rxvt_term::set_string_property (Atom prop, const char *str, int len)
840{ 821{
841 XChangeProperty (display->display, parent[0], 822 XChangeProperty (dpy, parent[0],
842 prop, XA_STRING, 8, PropModeReplace, 823 prop, XA_STRING, 8, PropModeReplace,
843 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 824 (const unsigned char *)str, len >= 0 ? len : strlen (str));
844} 825}
845 826
827void
828rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
829{
830 XTextProperty ct;
831
832 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
833 {
834 XSetTextProperty (dpy, parent[0], &ct, prop);
835 XFree (ct.value);
836 }
837}
838
839void
846void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 840rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
847{ 841{
848 wchar_t *ws = rxvt_mbstowcs (str, len); 842 wchar_t *ws = rxvt_mbstowcs (str, len);
849 char *s = rxvt_wcstoutf8 (ws); 843 char *s = rxvt_wcstoutf8 (ws);
850 844
851 XChangeProperty (display->display, parent[0], 845 XChangeProperty (dpy, parent[0],
852 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 846 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
853 (const unsigned char *)s, strlen (s)); 847 (const unsigned char *)s, strlen (s));
854 848
855 free (s); 849 free (s);
856 free (ws); 850 free (ws);
… …
860/*----------------------------------------------------------------------*/ 854/*----------------------------------------------------------------------*/
861/* xterm sequences - title, iconName, color (exptl) */ 855/* xterm sequences - title, iconName, color (exptl) */
862void 856void
863rxvt_term::set_title (const char *str) 857rxvt_term::set_title (const char *str)
864{ 858{
865 set_string_property (XA_WM_NAME, str); 859 set_mbstring_property (XA_WM_NAME, str);
866#if ENABLE_EWMH 860#if ENABLE_EWMH
867 set_utf8_property (xa[XA_NET_WM_NAME], str); 861 set_utf8_property (xa[XA_NET_WM_NAME], str);
868#endif 862#endif
869} 863}
870 864
871void 865void
872rxvt_term::set_icon_name (const char *str) 866rxvt_term::set_icon_name (const char *str)
873{ 867{
874 set_string_property (XA_WM_ICON_NAME, str); 868 set_mbstring_property (XA_WM_ICON_NAME, str);
875#if ENABLE_EWMH 869#if ENABLE_EWMH
876 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 870 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
877#endif 871#endif
878} 872}
879 873
874void
875rxvt_term::set_window_color (int idx, const char *color)
876{
880#ifdef XTERM_COLOR_CHANGE 877#ifdef XTERM_COLOR_CHANGE
881void
882rxvt_term::set_window_color (int idx, const char *color)
883{
884 rxvt_color xcol; 878 rxvt_color xcol;
885 int i;
886 879
887 if (color == NULL || *color == '\0') 880 if (color == NULL || *color == '\0')
888 return; 881 return;
889 882
883 color = strdup (color);
884 allocated.push_back ((void *)color);
885 rs[Rs_color + idx] = color;
886
890 /* handle color aliases */ 887 /* handle color aliases */
891 if (isdigit (*color)) 888 if (isdigit (*color))
892 { 889 {
893 i = atoi (color); 890 int i = atoi (color);
894 891
895 if (i >= 8 && i <= 15) 892 if (i >= 8 && i <= 15)
893 {
896 { /* bright colors */ 894 /* bright colors */
897 i -= 8;
898 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 895 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
899 SET_PIXCOLOR (idx);
900 goto done; 896 goto done;
901 } 897 }
902 898
903 if (i >= 0 && i <= 7) 899 if (i >= 0 && i <= 7)
900 {
904 { /* normal colors */ 901 /* normal colors */
905 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 902 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
906 SET_PIXCOLOR (idx);
907 goto done; 903 goto done;
908 } 904 }
909 } 905 }
910 906
911 if (!rXParseAllocColor (&xcol, color)) 907 set_color (xcol, color);
912 return;
913
914 /* XStoreColor (display->display, display->cmap, XColor*); */
915 908
916 /* 909 /*
917 * FIXME: should free colors here, but no idea how to do it so instead, 910 * FIXME: should free colors here, but no idea how to do it so instead,
918 * so just keep gobbling up the colormap 911 * so just keep gobbling up the colormap
919 */ 912 */
920# if 0
921 for (i = Color_Black; i <= Color_White; i++)
922 if (pix_colors[idx] == pix_colors[i])
923 break;
924 if (i > Color_White)
925 {
926 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
927 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
928 DisplayPlanes (display->display, display->screen));
929 }
930# endif
931 913
932 pix_colors_focused[idx] = xcol; 914 pix_colors_focused[idx] = xcol;
933 SET_PIXCOLOR (idx);
934 915
935 /* XSetWindowAttributes attr; */
936 /* Cursor cursor; */
937done: 916done:
938
939#if OFF_FOCUS_FADING
940 if (rs[Rs_fade])
941 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
942#endif
943
944 /*TODO: handle Color_BD, scrollbar background, etc. */ 917 /*TODO: handle Color_BD, scrollbar background, etc. */
945 918
919 update_fade_color (idx);
946 recolour_cursor (); 920 recolour_cursor ();
947 scr_recolour (); 921 scr_recolour ();
922#endif /* XTERM_COLOR_CHANGE */
948} 923}
949
950#else
951# define set_window_color (idx,color) ((void)0)
952#endif /* XTERM_COLOR_CHANGE */
953 924
954void 925void
955rxvt_term::recolour_cursor () 926rxvt_term::recolour_cursor ()
956{ 927{
957 XColor xcol[2]; 928 XColor fg, bg;
958 929
959 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 930 (ISSET_PIXCOLOR (Color_pointer_fg)
960 ? pix_colors_focused[Color_pointer_fg] 931 ? pix_colors_focused[Color_pointer_fg]
961 : pix_colors_focused[Color_fg]; 932 : pix_colors_focused[Color_fg]).get (fg);
933
962 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 934 (ISSET_PIXCOLOR (Color_pointer_bg)
963 ? pix_colors_focused[Color_pointer_bg] 935 ? pix_colors_focused[Color_pointer_bg]
964 : pix_colors_focused[Color_bg]; 936 : pix_colors_focused[Color_bg]).get (bg);
965 937
966 XQueryColors (display->display, display->cmap, xcol, 2); 938 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
967 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
968} 939}
969 940
970/*----------------------------------------------------------------------*/ 941/*----------------------------------------------------------------------*/
971/* 942/*
972 * find if fg/bg matches any of the normal (low-intensity) colors 943 * find if fg/bg matches any of the normal (low-intensity) colors
973 */ 944 */
974void 945void
975rxvt_term::set_colorfgbg () 946rxvt_term::set_colorfgbg ()
976{ 947{
977 unsigned int i; 948 unsigned int i;
978 const char *xpmb = "\0"; 949 const char *xpmb = "";
979 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 950 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
980 951
981 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
982 strcpy (fstr, "default"); 952 strcpy (fstr, "default");
983 strcpy (bstr, "default"); 953 strcpy (bstr, "default");
984 for (i = Color_Black; i <= Color_White; i++) 954 for (i = Color_Black; i <= Color_White; i++)
985 if (pix_colors[Color_fg] == pix_colors[i]) 955 if (pix_colors[Color_fg] == pix_colors[i])
986 { 956 {
… …
990 960
991 for (i = Color_Black; i <= Color_White; i++) 961 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_bg] == pix_colors[i]) 962 if (pix_colors[Color_bg] == pix_colors[i])
993 { 963 {
994 sprintf (bstr, "%d", (i - Color_Black)); 964 sprintf (bstr, "%d", (i - Color_Black));
995#ifdef XPM_BACKGROUND 965#ifdef BG_IMAGE_FROM_FILE
996 xpmb = "default;"; 966 xpmb = "default;";
997#endif 967#endif
998 break; 968 break;
999 } 969 }
1000 970
1001 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 971 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1002} 972}
1003 973
1004/*----------------------------------------------------------------------*/ 974/*----------------------------------------------------------------------*/
1005 975
1006int 976bool
1007rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 977rxvt_term::set_color (rxvt_color &color, const char *name)
1008{ 978{
1009 if (!screen_in_out->set (display, colour)) 979 if (color.set (this, name))
1010 {
1011 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1012 return false;
1013 }
1014
1015 return true; 980 return true;
981
982 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
983 return false;
984}
985
986void
987rxvt_term::alias_color (int dst, int src)
988{
989 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1016} 990}
1017 991
1018/* -------------------------------------------------------------------- * 992/* -------------------------------------------------------------------- *
1019 * - WINDOW RESIZING - * 993 * - WINDOW RESIZING - *
1020 * -------------------------------------------------------------------- */ 994 * -------------------------------------------------------------------- */
… …
1022rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 996rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1023{ 997{
1024 int fix_screen; 998 int fix_screen;
1025 int old_width = szHint.width; 999 int old_width = szHint.width;
1026 int old_height = szHint.height; 1000 int old_height = szHint.height;
1027 dDisp;
1028 1001
1029 window_calc (newwidth, newheight); 1002 window_calc (newwidth, newheight);
1003
1004 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1005
1006 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1007 if (set_hint)
1008 {
1009 szHint.flags &= ~(PBaseSize | PResizeInc);
1030 XSetWMNormalHints (disp, parent[0], &szHint); 1010 XSetWMNormalHints (dpy, parent[0], &szHint);
1011 szHint.flags |= PBaseSize | PResizeInc;
1012 }
1031 1013
1032 if (!ignoreparent) 1014 if (!ignoreparent)
1033 { 1015 {
1034#ifdef SMART_RESIZE 1016#ifdef SMART_RESIZE
1035 /* 1017 /*
… …
1039 int x, y, x1, y1; 1021 int x, y, x1, y1;
1040 int dx, dy; 1022 int dx, dy;
1041 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1023 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1042 Window unused_cr; 1024 Window unused_cr;
1043 1025
1044 XTranslateCoordinates (disp, parent[0], display->root, 1026 XTranslateCoordinates (dpy, parent[0], display->root,
1045 0, 0, &x, &y, &unused_cr); 1027 0, 0, &x, &y, &unused_cr);
1046 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1028 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1047 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1029 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1048 /* 1030 /*
1049 * if display->root isn't the parent window, a WM will probably have offset 1031 * if display->root isn't the parent window, a WM will probably have offset
1050 * our position for handles and decorations. Counter it 1032 * our position for handles and decorations. Counter it
1051 */ 1033 */
… …
1053 { 1035 {
1054 x -= x1; 1036 x -= x1;
1055 y -= y1; 1037 y -= y1;
1056 } 1038 }
1057 1039
1058 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1040 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1059 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1041 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1060 dx = old_width - szHint.width; 1042 dx = old_width - szHint.width;
1061 dy = old_height - szHint.height; 1043 dy = old_height - szHint.height;
1062 1044
1063 /* Check position of the center of the window */ 1045 /* Check position of the center of the window */
1064 if (x < x1) /* left half */ 1046 if (x < x1) /* left half */
… …
1068 if (y < y1) /* top half */ 1050 if (y < y1) /* top half */
1069 dy = 0; 1051 dy = 0;
1070 else if (y == y1) /* exact center */ 1052 else if (y == y1) /* exact center */
1071 dy /= 2; 1053 dy /= 2;
1072 1054
1073 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1055 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1074 szHint.width, szHint.height); 1056 szHint.width, szHint.height);
1075#else 1057#else
1076 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1058 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1077#endif 1059#endif
1078 } 1060 }
1061
1062 if (set_hint)
1063 XSetWMNormalHints (dpy, parent[0], &szHint);
1079 1064
1080 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1065 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1081 1066
1082 if (fix_screen || newwidth != old_width || newheight != old_height) 1067 if (fix_screen || newwidth != old_width || newheight != old_height)
1083 { 1068 {
1084 if (scrollBar.state) 1069 if (scrollBar.state)
1085 { 1070 scrollBar.resize ();
1086 XMoveResizeWindow (disp, scrollBar.win,
1087 window_sb_x, 0,
1088 scrollbar_TotalWidth (), szHint.height);
1089 resize_scrollbar ();
1090 }
1091 1071
1092 XMoveResizeWindow (disp, vt, 1072 XMoveResizeWindow (dpy, vt,
1093 window_vt_x, window_vt_y, 1073 window_vt_x, window_vt_y,
1094 width, height); 1074 width, height);
1095 1075
1096 scr_clear (); 1076#ifdef HAVE_BG_PIXMAP
1097#ifdef XPM_BACKGROUND 1077 if (bgPixmap.window_size_sensitive ())
1098 resize_pixmap (); 1078 update_background ();
1099#endif 1079#endif
1100 } 1080 }
1101 1081
1102 if (fix_screen || old_height == 0) 1082 if (fix_screen || old_height == 0)
1103 scr_reset (); 1083 scr_reset ();
1104 1084
1105#ifdef XPM_BACKGROUND 1085#ifdef HAVE_BG_PIXMAP
1106 if (pixmap) 1086// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1087// if (bgPixmap.pixmap)
1107 scr_touch (false); 1088// scr_touch (false);
1108#endif 1089#endif
1109 1090
1110#ifdef USE_XIM 1091#ifdef USE_XIM
1111 IMSetStatusPosition (); 1092 IMSetPosition ();
1112#endif 1093#endif
1113} 1094}
1114 1095
1115/* 1096/*
1116 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1121{ 1102{
1122 XWindowAttributes wattr; 1103 XWindowAttributes wattr;
1123 1104
1124 if (newwidth == 0 || newheight == 0) 1105 if (newwidth == 0 || newheight == 0)
1125 { 1106 {
1126 XGetWindowAttributes (display->display, display->root, &wattr); 1107 XGetWindowAttributes (dpy, display->root, &wattr);
1127 1108
1128 if (newwidth == 0) 1109 if (newwidth == 0)
1129 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1130 if (newheight == 0) 1111 if (newheight == 0)
1131 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
… …
1145#ifdef USE_XIM 1126#ifdef USE_XIM
1146 1127
1147void 1128void
1148rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1129rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1149{ 1130{
1150 fg = pix_colors[Color_fg]; 1131 fg = pix_colors [Color_fg];
1151 bg = pix_colors[Color_bg]; 1132 bg = pix_colors [Color_bg];
1152} 1133}
1153 1134
1154void 1135void
1155rxvt_term::im_set_size (XRectangle &size) 1136rxvt_term::im_set_size (XRectangle &size)
1156{ 1137{
… …
1179 1160
1180/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1181bool 1162bool
1182rxvt_term::IMisRunning () 1163rxvt_term::IMisRunning ()
1183{ 1164{
1184 char *p;
1185 Atom atom; 1165 Atom atom;
1186 Window win; 1166 Window win;
1187 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1188 1168
1189 /* get current locale modifier */ 1169 /* get current locale modifier */
1190 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1191 { 1171 {
1192 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1193 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1194 1174
1195 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1196 *p = '\0'; 1176 *p = '\0';
1197 1177
1198 atom = XInternAtom (display->display, server, False); 1178 atom = XInternAtom (dpy, server, False);
1199 win = XGetSelectionOwner (display->display, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1200 1180
1201 if (win != None) 1181 if (win != None)
1202 return True; 1182 return True;
1203 } 1183 }
1204 1184
… …
1211 XPoint nspot; 1191 XPoint nspot;
1212 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1213 1193
1214 if (!Input_Context 1194 if (!Input_Context
1215 || !focus 1195 || !focus
1216 || !(input_style & XIMPreeditPosition)) 1196 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1217 return; 1197 return;
1218 1198
1219 im_set_position (nspot); 1199 im_set_position (nspot);
1220 1200
1221 if (nspot.x == spot.x && nspot.y == spot.y) 1201 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1267 1247
1268 term->make_current (); 1248 term->make_current ();
1269 1249
1270 if (text) 1250 if (text)
1271 { 1251 {
1272 void *str; 1252 wchar_t *str;
1273 1253
1274 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1275 { 1255 {
1276 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1277 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1278 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1279 1259
1280 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1281 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1282 1262
1283 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1284 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1285 } 1265 }
1286 else 1266 else
1287 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1288 1268
1289 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1290 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1291 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1292 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
1293 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1273 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1428 "*", 1408 "*",
1429 fheight, 1409 fheight,
1430 fheight + 1, fheight - 1, 1410 fheight + 1, fheight - 1,
1431 fheight - 2, fheight + 2); 1411 fheight - 2, fheight + 2);
1432 1412
1433 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1413 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1434 &missing_charset_list, &missing_charset_count, &def_string); 1414 &missing_charset_list, &missing_charset_count, &def_string);
1435 1415
1436 if (missing_charset_list) 1416 if (missing_charset_list)
1437 XFreeStringList (missing_charset_list); 1417 XFreeStringList (missing_charset_list);
1438 1418
… …
1479 XNBackground, bg, 1459 XNBackground, bg,
1480 XNArea, &status_rect, 1460 XNArea, &status_rect,
1481 XNFontSet, fs, 1461 XNFontSet, fs,
1482 NULL); 1462 NULL);
1483 } 1463 }
1464#if ENABLE_XIM_ONTHESPOT
1484 else if (input_style & XIMPreeditCallbacks) 1465 else if (input_style & XIMPreeditCallbacks)
1485 { 1466 {
1467 im_set_position (spot);
1468
1486 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1487 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1470 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1488 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1489#if 0 1472# if 0
1490 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1473 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1491#endif 1474# endif
1492 1475
1493 preedit_attr = XVaCreateNestedList (0, 1476 preedit_attr = XVaCreateNestedList (0,
1477 XNSpotLocation, &spot,
1494 XNPreeditStartCallback, &xcb[0], 1478 XNPreeditStartCallback, &xcb[0],
1495 XNPreeditDoneCallback , &xcb[1], 1479 XNPreeditDoneCallback , &xcb[1],
1496 XNPreeditDrawCallback , &xcb[2], 1480 XNPreeditDrawCallback , &xcb[2],
1497#if 0 1481# if 0
1498 XNPreeditCaretCallback, &xcb[3], 1482 XNPreeditCaretCallback, &xcb[3],
1499#endif 1483# endif
1500 NULL); 1484 NULL);
1501 } 1485 }
1486#endif
1502 1487
1503 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1504 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1505 XNClientWindow, vt, 1490 XNClientWindow, vt,
1506 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent[0],
… …
1508 preedit_attr, 1493 preedit_attr,
1509 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1510 status_attr, NULL); 1495 status_attr, NULL);
1511 1496
1512 if (preedit_attr) XFree (preedit_attr); 1497 if (preedit_attr) XFree (preedit_attr);
1513 if (status_attr) XFree (status_attr); 1498 if (status_attr) XFree (status_attr);
1514 if (fs) XFreeFontSet (display->display, fs); 1499 if (fs) XFreeFontSet (dpy, fs);
1515 1500
1516 if (Input_Context == NULL) 1501 if (Input_Context == NULL)
1517 { 1502 {
1518 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1503 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1519 im_destroy (); 1504 im_destroy ();
… …
1524 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1525 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1526 vt_select_input (); 1511 vt_select_input ();
1527#endif 1512#endif
1528 1513
1529 if (input_style & XIMPreeditArea)
1530 IMSetStatusPosition (); 1514 IMSetPosition ();
1531 1515
1532 return true; 1516 return true;
1533} 1517}
1534 1518
1535void 1519void
… …
1593 SET_LOCALE (locale); 1577 SET_LOCALE (locale);
1594#endif 1578#endif
1595} 1579}
1596 1580
1597void 1581void
1598rxvt_term::IMSetStatusPosition () 1582rxvt_term::IMSetPosition ()
1599{ 1583{
1600 XRectangle preedit_rect, status_rect, *needed_rect; 1584 XRectangle preedit_rect, status_rect, *needed_rect;
1601 XVaNestedList preedit_attr, status_attr; 1585 XVaNestedList preedit_attr, status_attr;
1602 1586
1603 if (!Input_Context 1587 if (!Input_Context
1604 || !focus 1588 || !focus
1605 || !(input_style & XIMPreeditArea) 1589 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1606 || !IMisRunning ()) 1590 || !IMisRunning ())
1607 return; 1591 return;
1608 1592
1593 if (input_style & XIMPreeditPosition)
1594 {
1595 im_set_size (preedit_rect);
1596 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1597
1598 XSetICValues (Input_Context,
1599 XNPreeditAttributes, preedit_attr, NULL);
1600 }
1601 else
1602 {
1609 /* Getting the necessary width of preedit area */ 1603 /* Getting the necessary width of preedit area */
1610 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1604 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1611 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1605 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1612 XFree (status_attr); 1606 XFree (status_attr);
1613 1607
1614 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1608 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1615 XFree (needed_rect); 1609 XFree (needed_rect);
1616 1610
1617 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1611 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1618 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1612 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1619 1613
1620 XSetICValues (Input_Context, 1614 XSetICValues (Input_Context,
1621 XNPreeditAttributes, preedit_attr, 1615 XNPreeditAttributes, preedit_attr,
1622 XNStatusAttributes, status_attr, NULL); 1616 XNStatusAttributes, status_attr,
1617 NULL);
1623 1618
1619 XFree (status_attr);
1620 }
1621
1624 XFree (preedit_attr); 1622 XFree (preedit_attr);
1625 XFree (status_attr);
1626} 1623}
1627#endif /* USE_XIM */ 1624#endif /* USE_XIM */
1625
1626void
1627rxvt_term::get_window_origin (int &x, int &y)
1628{
1629 Window cr;
1630 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1631}
1632
1633Pixmap
1634rxvt_term::get_pixmap_property (int prop_id)
1635{
1636 if (prop_id > 0 && prop_id < NUM_XA)
1637 if (xa[prop_id])
1638 {
1639 int aformat;
1640 unsigned long nitems, bytes_after;
1641 Atom atype;
1642 unsigned char *prop = NULL;
1643 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1644 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1645 &nitems, &bytes_after, &prop);
1646 if (result == Success && prop && atype == XA_PIXMAP)
1647 return *(Pixmap *)prop;
1648 }
1649
1650 return None;
1651}
1652
1653#ifdef HAVE_BG_PIXMAP
1654
1655void
1656rxvt_term::update_background ()
1657{
1658 if (update_background_ev.is_active ())
1659 return;
1660
1661 bgPixmap.invalidate ();
1662
1663 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1664
1665 if (to_wait <= 0.)
1666 bgPixmap.render ();
1667 else
1668 update_background_ev.start (to_wait);
1669}
1670
1671void
1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1673{
1674 make_current ();
1675
1676 update_background_ev.stop ();
1677 bgPixmap.render ();
1678 refresh_check ();
1679}
1680
1681#endif /* HAVE_BG_PIXMAP */
1628 1682
1629/*----------------------- end-of-file (C source) -----------------------*/ 1683/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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