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.203 by root, Wed Jan 25 02:42:06 2006 UTC vs.
Revision 1.342 by sf-exg, Sun Dec 19 00:49:32 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-2010 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;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
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);
359} 376}
360 377
361/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
362/* 379/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
370{ 387{
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
373} 390}
374 391
375#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
376static void 393static void
377print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
378{ 395{
379 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
381 char number[32]; 398 char number[32];
382 char *mtype = "XlibMessage"; 399 char *mtype = "XlibMessage";
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
389 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ); 411 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 413 }
397 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
398 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
399 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
400 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
401 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
402 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
403 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
404 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
405 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
406 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
407 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
409 mesg, BUFSIZ); 426 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
412 mesg, BUFSIZ); 429 mesg, BUFSIZ);
413 else 430 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
415 mesg, BUFSIZ); 432 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 } 434 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ); 436 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421} 438}
422#endif 439#endif
423 440
424int 441int
… …
428 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
429 else 446 else
430 { 447 {
431 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 449 // so just output the error and continue
433#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
434 print_x_error (display, event); 453 print_x_error (display, event);
435#else
436 old_xerror_handler (display, event);
437#endif 454#endif
438 } 455 }
439 456
440 return 0; 457 return 0;
441} 458}
… …
447 DisplayString (display)); 464 DisplayString (display));
448 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
449 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
450} 467}
451 468
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#if ENABLE_XEMBED
519 if (rs[Rs_embed])
520 {
521 long info[2] = { 0, XEMBED_MAPPED };
522
523 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
524 32, PropModeReplace, (unsigned char *)&info, 2);
525 }
526#endif
527
528 XMapWindow (disp, vt);
529 XMapWindow (disp, parent[0]);
530
531 return true;
532}
533
534static struct sig_handlers 469static struct sig_handlers
535{ 470{
536 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
537 472
538 /* 473 /*
539 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
540 */ 475 */
541 void 476 void sig_term (ev::sig &w, int revents);
542 sig_term (sig_watcher &w) 477
478 sig_handlers ()
543 { 479 {
544 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
545 signal (w.signum, SIG_DFL);
546 kill (getpid (), w.signum);
547 }
548
549 sig_handlers ()
550 : sw_term (this, &sig_handlers::sig_term),
551 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
552 {
553 } 482 }
554} sig_handlers; 483} sig_handlers;
555 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
556char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
557 561
558void 562void
559rxvt_init () 563rxvt_init ()
560{ 564{
561 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
574 if (!ev_default_loop ())
575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
562 576
563 rxvt_environ = environ; 577 rxvt_environ = environ;
564 578
565 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
567 581
568 sig_handlers.sw_term.start (SIGTERM); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
569 sig_handlers.sw_int.start (SIGINT); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
570
571 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
572 /* signal (SIGURG, SIG_DFL); */
573 584
574 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
575 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
576 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
577 588
578 XrmInitialize (); 589 XrmInitialize ();
579} 590}
580 591
581/* ------------------------------------------------------------------------- *
582 * MEMORY ALLOCATION WRAPPERS *
583 * ------------------------------------------------------------------------- */
584void *
585rxvt_malloc (size_t size)
586{
587 void *p = malloc (size);
588
589 if (!p)
590 rxvt_fatal ("memory allocation failure. aborting.\n");
591
592 return p;
593}
594
595void *
596rxvt_calloc (size_t number, size_t size)
597{
598 void *p = calloc (number, size);
599
600 if (!p)
601 rxvt_fatal ("memory allocation failure. aborting.\n");
602
603 return p;
604}
605
606void *
607rxvt_realloc (void *ptr, size_t size)
608{
609 void *p = realloc (ptr, size);
610
611 if (!p)
612 rxvt_fatal ("memory allocation failure. aborting.\n");
613
614 return p;
615}
616
617/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
618/* 593/*
619 * window size/position calculcations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
620 * if width/height are non-zero then override calculated width/height 595 * if width/height are non-zero then override calculated width/height
621 */ 596 */
622void 597void
623rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
624{ 599{
625 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
626 int x, y, sb_w, flags; 601 int x, y, flags;
627 unsigned int w, h; 602 unsigned int w, h;
628 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
629 dDisp;
630 604
631 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
632 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
633 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 607 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
634 608
… …
642 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
643 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
644 618
645 if (flags & WidthValue) 619 if (flags & WidthValue)
646 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
647 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
648 szHint.flags |= USSize; 625 szHint.flags |= USSize;
649 } 626 }
650 627
651 if (flags & HeightValue) 628 if (flags & HeightValue)
652 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
653 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
654 szHint.flags |= USSize; 634 szHint.flags |= USSize;
655 } 635 }
656 636
657 if (flags & XValue) 637 if (flags & XValue)
658 { 638 {
… …
689 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
690 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
691 671
692 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
693 673
694 sb_w = 0;
695 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
696 675
697 if (scrollBar.state) 676 if (scrollBar.state)
698 { 677 {
699 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
700 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
680
701 if (!OPTION (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
702 window_vt_x += sb_w; 682 window_vt_x += sb_w;
703 } 683 }
704 684
705 szHint.width_inc = fwidth; 685 szHint.width_inc = fwidth;
706 szHint.height_inc = fheight; 686 szHint.height_inc = fheight;
707 szHint.min_width = szHint.base_width + szHint.width_inc; 687 szHint.min_width = szHint.base_width + szHint.width_inc;
708 szHint.min_height = szHint.base_height + szHint.height_inc; 688 szHint.min_height = szHint.base_height + szHint.height_inc;
709 689
710 if (newwidth && newwidth - szHint.base_width < max_width) 690 if (newwidth && newwidth - szHint.base_width < max_width)
711 { 691 {
712 szHint.width = newwidth; 692 szHint.width = newwidth;
… …
727 { 707 {
728 min_it (height, max_height); 708 min_it (height, max_height);
729 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
730 } 710 }
731 711
732 if (scrollBar.state && OPTION (Opt_scrollBar_right))
733 window_sb_x = szHint.width - sb_w;
734
735 if (recalc_x) 712 if (recalc_x)
736 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
714
737 if (recalc_y) 715 if (recalc_y)
738 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
739 717
740 ncol = width / fwidth; 718 ncol = width / fwidth;
741 nrow = height / fheight; 719 nrow = height / fheight;
742} 720}
743 721
744/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
745/* 723/*
… …
756 734
757 ws.ws_col = ncol; 735 ws.ws_col = ncol;
758 ws.ws_row = nrow; 736 ws.ws_row = nrow;
759 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
760 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
761 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
762 740
763#if 0 741#if 0
764 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
765 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
766 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
767#endif 745#endif
768} 746}
769 747
… …
796#endif 774#endif
797 775
798 delete fontset[0]; 776 delete fontset[0];
799 fontset[0] = fs; 777 fontset[0] = fs;
800 778
801 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
802 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
782
803 fs->set_prop (prop); 783 fs->set_prop (prop, false);
804 784
805 fwidth = prop.width; 785 fwidth = prop.width;
806 fheight = prop.height; 786 fheight = prop.height;
807 fbase = prop.ascent; 787 fbase = prop.ascent;
808 788
… …
817 { 797 {
818 fontset[style] = fs = new rxvt_fontset (this); 798 fontset[style] = fs = new rxvt_fontset (this);
819 rxvt_fontprop prop2 = prop; 799 rxvt_fontprop prop2 = prop;
820 800
821 if (res) 801 if (res)
822 prop2.weight = prop2.slant = rxvt_fontprop::unset; 802 {
803 fs->populate (res);
804 fs->set_prop (prop2, false);
805 }
823 else 806 else
824 { 807 {
825 res = fontset[0]->fontdesc; 808 fs->populate (fontset[0]->fontdesc);
826 809
827 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 810 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
828 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 811 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
812
813 fs->set_prop (prop2, true);
829 } 814 }
830 815
831 fs->populate (res);
832 fs->set_prop (prop2);
833 } 816 }
834#else 817#else
835 fontset[style] = fontset[0]; 818 fontset[style] = fontset[0];
836#endif 819#endif
837 } 820 }
… …
839 if (parent[0]) 822 if (parent[0])
840 { 823 {
841 resize_all_windows (0, 0, 0); 824 resize_all_windows (0, 0, 0);
842 scr_remap_chars (); 825 scr_remap_chars ();
843 scr_touch (true); 826 scr_touch (true);
844 } 827 }
845 828
846 return true; 829 return true;
847} 830}
848 831
832void
849void rxvt_term::set_string_property (Atom prop, const char *str, int len) 833rxvt_term::set_string_property (Atom prop, const char *str, int len)
850{ 834{
851 XChangeProperty (display->display, parent[0], 835 XChangeProperty (dpy, parent[0],
852 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
853 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
854} 838}
855 839
840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
856void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
857{ 854{
858 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
859 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
860 857
861 XChangeProperty (display->display, parent[0], 858 XChangeProperty (dpy, parent[0],
862 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
863 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
864 861
865 free (s); 862 free (s);
866 free (ws); 863 free (ws);
… …
870/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
871/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
872void 869void
873rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
874{ 871{
875 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
876#if ENABLE_EWMH 873#if ENABLE_EWMH
877 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
878#endif 875#endif
879} 876}
880 877
881void 878void
882rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
883{ 880{
884 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
885#if ENABLE_EWMH 882#if ENABLE_EWMH
886 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
887#endif 884#endif
888} 885}
889 886
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
891void
892rxvt_term::set_window_color (int idx, const char *color)
893{
894 rxvt_color xcol; 891 rxvt_color xcol;
895 int i;
896 892
897 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
898 return; 894 return;
899 895
896 color = strdup (color);
897 allocated.push_back ((void *)color);
898 rs[Rs_color + idx] = color;
899
900 /* handle color aliases */ 900 /* handle color aliases */
901 if (isdigit (*color)) 901 if (isdigit (*color))
902 { 902 {
903 i = atoi (color); 903 int i = atoi (color);
904 904
905 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
906 {
906 { /* bright colors */ 907 /* bright colors */
907 i -= 8;
908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
909 SET_PIXCOLOR (idx);
910 goto done; 909 goto done;
911 } 910 }
912 911
913 if (i >= 0 && i <= 7) 912 if (i >= 0 && i <= 7)
913 {
914 { /* normal colors */ 914 /* normal colors */
915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
916 SET_PIXCOLOR (idx);
917 goto done; 916 goto done;
918 } 917 }
919 } 918 }
920 919
921 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
922 return;
923
924 /* XStoreColor (display->display, display->cmap, XColor*); */
925 921
926 /* 922 /*
927 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
928 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
929 */ 925 */
930# if 0
931 for (i = Color_Black; i <= Color_White; i++)
932 if (pix_colors[idx] == pix_colors[i])
933 break;
934 if (i > Color_White)
935 {
936 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
937 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
938 DisplayPlanes (display->display, display->screen));
939 }
940# endif
941 926
942 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
943 SET_PIXCOLOR (idx);
944 928
945 /* XSetWindowAttributes attr; */
946 /* Cursor cursor; */
947done: 929done:
948
949#if OFF_FOCUS_FADING
950 if (rs[Rs_fade])
951 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
952#endif
953
954 /*TODO: handle Color_BD, scrollbar background, etc. */ 930 /*TODO: handle Color_BD, scrollbar background, etc. */
955 931
932 update_fade_color (idx);
956 recolour_cursor (); 933 recolour_cursor ();
957 scr_recolour (); 934 scr_recolour ();
935#endif /* XTERM_COLOR_CHANGE */
958} 936}
959
960#else
961# define set_window_color (idx,color) ((void)0)
962#endif /* XTERM_COLOR_CHANGE */
963 937
964void 938void
965rxvt_term::recolour_cursor () 939rxvt_term::recolour_cursor ()
966{ 940{
967 XColor xcol[2]; 941 XColor fg, bg;
968 942
969 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 943 (ISSET_PIXCOLOR (Color_pointer_fg)
970 ? pix_colors_focused[Color_pointer_fg] 944 ? pix_colors_focused[Color_pointer_fg]
971 : pix_colors_focused[Color_fg]; 945 : pix_colors_focused[Color_fg]).get (fg);
946
972 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 947 (ISSET_PIXCOLOR (Color_pointer_bg)
973 ? pix_colors_focused[Color_pointer_bg] 948 ? pix_colors_focused[Color_pointer_bg]
974 : pix_colors_focused[Color_bg]; 949 : pix_colors_focused[Color_bg]).get (bg);
975 950
976 XQueryColors (display->display, display->cmap, xcol, 2); 951 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
977 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
978} 952}
979 953
980/*----------------------------------------------------------------------*/ 954/*----------------------------------------------------------------------*/
981/* 955/*
982 * find if fg/bg matches any of the normal (low-intensity) colors 956 * find if fg/bg matches any of the normal (low-intensity) colors
983 */ 957 */
984void 958void
985rxvt_term::set_colorfgbg () 959rxvt_term::set_colorfgbg ()
986{ 960{
987 unsigned int i; 961 unsigned int i;
988 const char *xpmb = "\0"; 962 const char *xpmb = "";
989 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
990 964
991 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
992 strcpy (fstr, "default"); 965 strcpy (fstr, "default");
993 strcpy (bstr, "default"); 966 strcpy (bstr, "default");
994 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
995 if (pix_colors[Color_fg] == pix_colors[i]) 968 if (pix_colors[Color_fg] == pix_colors[i])
996 { 969 {
… …
1000 973
1001 for (i = Color_Black; i <= Color_White; i++) 974 for (i = Color_Black; i <= Color_White; i++)
1002 if (pix_colors[Color_bg] == pix_colors[i]) 975 if (pix_colors[Color_bg] == pix_colors[i])
1003 { 976 {
1004 sprintf (bstr, "%d", (i - Color_Black)); 977 sprintf (bstr, "%d", (i - Color_Black));
1005#ifdef XPM_BACKGROUND 978#ifdef BG_IMAGE_FROM_FILE
1006 xpmb = "default;"; 979 xpmb = "default;";
1007#endif 980#endif
1008 break; 981 break;
1009 } 982 }
1010 983
1011 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1012} 985}
1013 986
1014/*----------------------------------------------------------------------*/ 987/*----------------------------------------------------------------------*/
1015 988
1016int 989bool
1017rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 990rxvt_term::set_color (rxvt_color &color, const char *name)
1018{ 991{
1019 if (!screen_in_out->set (display, colour)) 992 if (color.set (this, name))
1020 {
1021 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1022 return false;
1023 }
1024
1025 return true; 993 return true;
994
995 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
996 return false;
997}
998
999void
1000rxvt_term::alias_color (int dst, int src)
1001{
1002 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1026} 1003}
1027 1004
1028/* -------------------------------------------------------------------- * 1005/* -------------------------------------------------------------------- *
1029 * - WINDOW RESIZING - * 1006 * - WINDOW RESIZING - *
1030 * -------------------------------------------------------------------- */ 1007 * -------------------------------------------------------------------- */
… …
1032rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1009rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1033{ 1010{
1034 int fix_screen; 1011 int fix_screen;
1035 int old_width = szHint.width; 1012 int old_width = szHint.width;
1036 int old_height = szHint.height; 1013 int old_height = szHint.height;
1037 dDisp;
1038 1014
1039 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1016
1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1040 XSetWMNormalHints (disp, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1041 1026
1042 if (!ignoreparent) 1027 if (!ignoreparent)
1043 { 1028 {
1044#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1045 /* 1030 /*
… …
1049 int x, y, x1, y1; 1034 int x, y, x1, y1;
1050 int dx, dy; 1035 int dx, dy;
1051 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1052 Window unused_cr; 1037 Window unused_cr;
1053 1038
1054 XTranslateCoordinates (disp, parent[0], display->root, 1039 XTranslateCoordinates (dpy, parent[0], display->root,
1055 0, 0, &x, &y, &unused_cr); 1040 0, 0, &x, &y, &unused_cr);
1056 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1057 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1058 /* 1043 /*
1059 * if display->root isn't the parent window, a WM will probably have offset 1044 * if display->root isn't the parent window, a WM will probably have offset
1060 * our position for handles and decorations. Counter it 1045 * our position for handles and decorations. Counter it
1061 */ 1046 */
… …
1063 { 1048 {
1064 x -= x1; 1049 x -= x1;
1065 y -= y1; 1050 y -= y1;
1066 } 1051 }
1067 1052
1068 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1053 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1069 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1054 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1070 dx = old_width - szHint.width; 1055 dx = old_width - szHint.width;
1071 dy = old_height - szHint.height; 1056 dy = old_height - szHint.height;
1072 1057
1073 /* Check position of the center of the window */ 1058 /* Check position of the center of the window */
1074 if (x < x1) /* left half */ 1059 if (x < x1) /* left half */
… …
1078 if (y < y1) /* top half */ 1063 if (y < y1) /* top half */
1079 dy = 0; 1064 dy = 0;
1080 else if (y == y1) /* exact center */ 1065 else if (y == y1) /* exact center */
1081 dy /= 2; 1066 dy /= 2;
1082 1067
1083 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1084 szHint.width, szHint.height); 1069 szHint.width, szHint.height);
1085#else 1070#else
1086 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1087#endif 1072#endif
1088 } 1073 }
1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1089 1077
1090 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1091 1079
1092 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1093 { 1081 {
1094 if (scrollBar.state) 1082 if (scrollBar.state)
1095 { 1083 scrollBar.resize ();
1096 XMoveResizeWindow (disp, scrollBar.win,
1097 window_sb_x, 0,
1098 scrollbar_TotalWidth (), szHint.height);
1099 resize_scrollbar ();
1100 }
1101 1084
1102 XMoveResizeWindow (disp, vt, 1085 XMoveResizeWindow (dpy, vt,
1103 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1104 width, height); 1087 width, height);
1105 1088
1106 scr_clear (); 1089#ifdef HAVE_BG_PIXMAP
1107#ifdef XPM_BACKGROUND 1090 if (bgPixmap.window_size_sensitive ())
1108 resize_pixmap (); 1091 update_background ();
1109#endif 1092#endif
1110 } 1093 }
1111 1094
1112 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1113 scr_reset (); 1096 scr_reset ();
1114 1097
1115#ifdef XPM_BACKGROUND 1098#ifdef HAVE_BG_PIXMAP
1116 if (pixmap) 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1117 scr_touch (false); 1101// scr_touch (false);
1118#endif 1102#endif
1119 1103
1120#ifdef USE_XIM 1104#ifdef USE_XIM
1121 IMSetStatusPosition (); 1105 IMSetPosition ();
1122#endif 1106#endif
1123} 1107}
1124 1108
1125/* 1109/*
1126 * Set the width/height of the vt window in characters. Units are pixels. 1110 * Set the width/height of the vt window in characters. Units are pixels.
… …
1131{ 1115{
1132 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1133 1117
1134 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1135 { 1119 {
1136 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (dpy, display->root, &wattr);
1137 1121
1138 if (newwidth == 0) 1122 if (newwidth == 0)
1139 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1140 if (newheight == 0) 1124 if (newheight == 0)
1141 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1155#ifdef USE_XIM 1139#ifdef USE_XIM
1156 1140
1157void 1141void
1158rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1159{ 1143{
1160 fg = pix_colors[Color_fg]; 1144 fg = pix_colors [Color_fg];
1161 bg = pix_colors[Color_bg]; 1145 bg = pix_colors [Color_bg];
1162} 1146}
1163 1147
1164void 1148void
1165rxvt_term::im_set_size (XRectangle &size) 1149rxvt_term::im_set_size (XRectangle &size)
1166{ 1150{
… …
1189 1173
1190/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1191bool 1175bool
1192rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1193{ 1177{
1194 char *p;
1195 Atom atom; 1178 Atom atom;
1196 Window win; 1179 Window win;
1197 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1198 1181
1199 /* get current locale modifier */ 1182 /* get current locale modifier */
1200 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1201 { 1184 {
1202 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1203 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1204 1187
1205 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1206 *p = '\0'; 1189 *p = '\0';
1207 1190
1208 atom = XInternAtom (display->display, server, False); 1191 atom = XInternAtom (dpy, server, False);
1209 win = XGetSelectionOwner (display->display, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1210 1193
1211 if (win != None) 1194 if (win != None)
1212 return True; 1195 return True;
1213 } 1196 }
1214 1197
… …
1277 1260
1278 term->make_current (); 1261 term->make_current ();
1279 1262
1280 if (text) 1263 if (text)
1281 { 1264 {
1282 void *str; 1265 wchar_t *str;
1283 1266
1284 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1285 { 1268 {
1286 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1287 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1289 1272
1290 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1291 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1292 1275
1293 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1294 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1295 } 1278 }
1296 else 1279 else
1297 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1298 1281
1299 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1300 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1301 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1302 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
1303 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1286 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1438 "*", 1421 "*",
1439 fheight, 1422 fheight,
1440 fheight + 1, fheight - 1, 1423 fheight + 1, fheight - 1,
1441 fheight - 2, fheight + 2); 1424 fheight - 2, fheight + 2);
1442 1425
1443 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1426 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1444 &missing_charset_list, &missing_charset_count, &def_string); 1427 &missing_charset_list, &missing_charset_count, &def_string);
1445 1428
1446 if (missing_charset_list) 1429 if (missing_charset_list)
1447 XFreeStringList (missing_charset_list); 1430 XFreeStringList (missing_charset_list);
1448 1431
… …
1489 XNBackground, bg, 1472 XNBackground, bg,
1490 XNArea, &status_rect, 1473 XNArea, &status_rect,
1491 XNFontSet, fs, 1474 XNFontSet, fs,
1492 NULL); 1475 NULL);
1493 } 1476 }
1477#if ENABLE_XIM_ONTHESPOT
1494 else if (input_style & XIMPreeditCallbacks) 1478 else if (input_style & XIMPreeditCallbacks)
1495 { 1479 {
1496 im_set_position (spot); 1480 im_set_position (spot);
1497 1481
1498 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1482 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1499 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1483 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1500 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1484 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1501#if 0 1485# if 0
1502 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret; 1486 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1503#endif 1487# endif
1504 1488
1505 preedit_attr = XVaCreateNestedList (0, 1489 preedit_attr = XVaCreateNestedList (0,
1506 XNSpotLocation, &spot, 1490 XNSpotLocation, &spot,
1507 XNPreeditStartCallback, &xcb[0], 1491 XNPreeditStartCallback, &xcb[0],
1508 XNPreeditDoneCallback , &xcb[1], 1492 XNPreeditDoneCallback , &xcb[1],
1509 XNPreeditDrawCallback , &xcb[2], 1493 XNPreeditDrawCallback , &xcb[2],
1510#if 0 1494# if 0
1511 XNPreeditCaretCallback, &xcb[3], 1495 XNPreeditCaretCallback, &xcb[3],
1512#endif 1496# endif
1513 NULL); 1497 NULL);
1514 } 1498 }
1499#endif
1515 1500
1516 Input_Context = XCreateIC (xim, 1501 Input_Context = XCreateIC (xim,
1517 XNInputStyle, input_style, 1502 XNInputStyle, input_style,
1518 XNClientWindow, vt, 1503 XNClientWindow, vt,
1519 XNFocusWindow, parent[0], 1504 XNFocusWindow, parent[0],
… …
1521 preedit_attr, 1506 preedit_attr,
1522 status_attr ? XNStatusAttributes : NULL, 1507 status_attr ? XNStatusAttributes : NULL,
1523 status_attr, NULL); 1508 status_attr, NULL);
1524 1509
1525 if (preedit_attr) XFree (preedit_attr); 1510 if (preedit_attr) XFree (preedit_attr);
1526 if (status_attr) XFree (status_attr); 1511 if (status_attr) XFree (status_attr);
1527 if (fs) XFreeFontSet (display->display, fs); 1512 if (fs) XFreeFontSet (dpy, fs);
1528 1513
1529 if (Input_Context == NULL) 1514 if (Input_Context == NULL)
1530 { 1515 {
1531 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1516 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1532 im_destroy (); 1517 im_destroy ();
… …
1537 // unfortunately, only the focus window is used by XIM, hard to fix 1522 // unfortunately, only the focus window is used by XIM, hard to fix
1538 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1539 vt_select_input (); 1524 vt_select_input ();
1540#endif 1525#endif
1541 1526
1542 if (input_style & XIMPreeditArea)
1543 IMSetStatusPosition (); 1527 IMSetPosition ();
1544 1528
1545 return true; 1529 return true;
1546} 1530}
1547 1531
1548void 1532void
… …
1606 SET_LOCALE (locale); 1590 SET_LOCALE (locale);
1607#endif 1591#endif
1608} 1592}
1609 1593
1610void 1594void
1611rxvt_term::IMSetStatusPosition () 1595rxvt_term::IMSetPosition ()
1612{ 1596{
1613 XRectangle preedit_rect, status_rect, *needed_rect; 1597 XRectangle preedit_rect, status_rect, *needed_rect;
1614 XVaNestedList preedit_attr, status_attr; 1598 XVaNestedList preedit_attr, status_attr;
1615 1599
1616 if (!Input_Context 1600 if (!Input_Context
1617 || !focus 1601 || !focus
1618 || !(input_style & XIMPreeditArea) 1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1619 || !IMisRunning ()) 1603 || !IMisRunning ())
1620 return; 1604 return;
1621 1605
1606 if (input_style & XIMPreeditPosition)
1607 {
1608 im_set_size (preedit_rect);
1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1610
1611 XSetICValues (Input_Context,
1612 XNPreeditAttributes, preedit_attr, NULL);
1613 }
1614 else
1615 {
1622 /* Getting the necessary width of preedit area */ 1616 /* Getting the necessary width of preedit area */
1623 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1624 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1625 XFree (status_attr); 1619 XFree (status_attr);
1626 1620
1627 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1628 XFree (needed_rect); 1622 XFree (needed_rect);
1629 1623
1630 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1631 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1632 1626
1633 XSetICValues (Input_Context, 1627 XSetICValues (Input_Context,
1634 XNPreeditAttributes, preedit_attr, 1628 XNPreeditAttributes, preedit_attr,
1635 XNStatusAttributes, status_attr, NULL); 1629 XNStatusAttributes, status_attr,
1630 NULL);
1636 1631
1632 XFree (status_attr);
1633 }
1634
1637 XFree (preedit_attr); 1635 XFree (preedit_attr);
1638 XFree (status_attr);
1639} 1636}
1640#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1638
1639void
1640rxvt_term::get_window_origin (int &x, int &y)
1641{
1642 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644}
1645
1646Pixmap
1647rxvt_term::get_pixmap_property (Atom property)
1648{
1649 Pixmap pixmap = None;
1650
1651 int aformat;
1652 unsigned long nitems, bytes_after;
1653 Atom atype;
1654 unsigned char *prop;
1655 int result = XGetWindowProperty (dpy, display->root, property,
1656 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1657 &nitems, &bytes_after, &prop);
1658 if (result == Success)
1659 {
1660 if (atype == XA_PIXMAP)
1661 pixmap = *(Pixmap *)prop;
1662 XFree (prop);
1663 }
1664
1665 return pixmap;
1666}
1667
1668#ifdef HAVE_BG_PIXMAP
1669
1670void
1671rxvt_term::update_background ()
1672{
1673 if (update_background_ev.is_active ())
1674 return;
1675
1676 bgPixmap.invalidate ();
1677
1678 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1679
1680 if (to_wait <= 0.)
1681 bgPixmap.render ();
1682 else
1683 update_background_ev.start (to_wait);
1684}
1685
1686void
1687rxvt_term::update_background_cb (ev::timer &w, int revents)
1688{
1689 make_current ();
1690
1691 update_background_ev.stop ();
1692 bgPixmap.render ();
1693 refresh_check ();
1694}
1695
1696#endif /* HAVE_BG_PIXMAP */
1641 1697
1642/*----------------------- end-of-file (C source) -----------------------*/ 1698/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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