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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.349 by sf-exg, Thu Jan 27 17:37:19 2011 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 {
101 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
103 }
104 113
105 // allocate a new combination 114 // allocate a new combination
106 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
107 { 116 {
108 static int seen; 117 static int seen;
109 118
110 if (!seen++) 119 if (!seen++)
111 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
112 121
113 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
114 } 123 }
115 124
116 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
142 151
143} 152}
144#endif 153#endif
145 154
146rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
147 : 156{
148#if TRANSPARENT 157#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 158 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 159#endif
154#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 162#endif
157#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 165#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 168#endif
163#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 171#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 181#endif
169#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 184#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 185#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 187#endif
178 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 195
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 197
189 termlist.push_back (this); 198 termlist.push_back (this);
190 199
191#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
193#endif 202#endif
194} 203}
195 204
196// clean up the most important stuff, do *not* call x or free mem etc. 205// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 206// for use before an emergency exit
207void
198void rxvt_term::emergency_cleanup () 208rxvt_term::emergency_cleanup ()
199{ 209{
200 if (cmd_pid) 210 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 211 kill (-cmd_pid, SIGHUP);
202 212
213 pty_ev.stop ();
203 delete pty; pty = 0; 214 delete pty; pty = 0;
204} 215}
205 216
206rxvt_term::~rxvt_term () 217rxvt_term::~rxvt_term ()
207{ 218{
… …
214 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
215 delete fontset[i]; 226 delete fontset[i];
216#endif 227#endif
217 delete fontset[0]; 228 delete fontset[0];
218 229
230#ifdef HAVE_BG_PIXMAP
231 bg_destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
219 if (display) 240 if (display)
220 { 241 {
221 dDisp;
222
223 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
224 244
225#ifdef USE_XIM 245#ifdef USE_XIM
226 im_destroy (); 246 im_destroy ();
227#endif 247#endif
228#ifdef XTERM_SCROLLBAR 248 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); 249 if (gc) XFreeGC (dpy, gc);
253 250
254 delete drawable; 251 delete drawable;
255 // destroy all windows 252 // destroy all windows
256 if (parent[0]) 253 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 254 XDestroyWindow (dpy, parent[0]);
258 }
259 255
260 // TODO: free pixcolours, colours should become part of rxvt_display 256 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 257 if (ISSET_PIXCOLOR (i))
258 {
259 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 260#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 261 pix_colors_unfocused [i].free (this);
264#endif 262#endif
263 }
265 264
265 clear ();
266
267 display->flush (); /* ideally .put should do this */
266 displays.put (display); 268 displays.put (display);
269 }
267 270
268 scr_release (); 271 scr_release ();
269 272
270 /* clear all resources */ 273 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 275 free (allocated [i]);
273 276
274 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
276 free (env_display); 280 free (env_display);
277 free (env_term); 281 free (env_term);
278 free (locale); 282 free (locale);
279 free (v_buffer); 283 free (v_buffer);
… …
283 delete argv; 287 delete argv;
284 288
285#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
286 delete keyboard; 290 delete keyboard;
287#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
288} 295}
289 296
290// child has exited, usually destroys 297// child has exited, usually destroys
291void 298void
292rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
293{ 300{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 302
296 cmd_pid = 0; 303 cmd_pid = 0;
297 304
298 if (!OPTION (Opt_hold)) 305 if (!option (Opt_hold))
299 destroy (); 306 destroy ();
300} 307}
301 308
302void 309void
303rxvt_term::destroy () 310rxvt_term::destroy ()
304{ 311{
305 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
306 return; 313 return;
307 314
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 316
310#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
314 if (display) 321 if (display)
315 { 322 {
316#if USE_XIM 323#if USE_XIM
317 im_ev.stop (display); 324 im_ev.stop (display);
318#endif 325#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
321#endif 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
324#endif 329#endif
325 incr_ev.stop (); 330 incr_ev.stop ();
326 termwin_ev.stop (display); 331 termwin_ev.stop (display);
327 vt_ev.stop (display); 332 vt_ev.stop (display);
328 } 333 }
329 334
330 check_ev.stop (); 335 flush_ev.stop ();
331 pty_ev.stop (); 336 pty_ev.stop ();
332#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
334#endif 339#endif
335#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
343#endif 348#endif
344#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
345 pointer_ev.stop (); 350 pointer_ev.stop ();
346#endif 351#endif
347 352
348 destroy_ev.start (0); 353 destroy_ev.start ();
349} 354}
350 355
351void 356void
352rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 358{
354 make_current (); 359 make_current ();
355 360
356 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
357} 374}
358 375
359/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
360/* 377/*
361 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
368{ 385{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 387 (*t)->emergency_cleanup ();
371} 388}
372 389
373#if ENABLE_FRILLS 390#if !ENABLE_MINIMAL
374static void 391static void
375print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
376{ 393{
377 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
379 char number[32]; 396 char number[32];
380 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 409 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 411 }
395 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 424 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 427 mesg, BUFSIZ);
411 else 428 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 430 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 432 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 434 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 436}
420#endif 437#endif
421 438
422int 439int
… …
426 GET_R->allowedxerror = event->error_code; 443 GET_R->allowedxerror = event->error_code;
427 else 444 else
428 { 445 {
429 // GET_R is most likely not the terminal which caused the error, 446 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 447 // so just output the error and continue
431#if ENABLE_FRILLS 448#if ENABLE_MINIMAL
449 old_xerror_handler (display, event);
450#else
432 print_x_error (display, event); 451 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 452#endif
436 } 453 }
437 454
438 return 0; 455 return 0;
439} 456}
… …
445 DisplayString (display)); 462 DisplayString (display));
446 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
448} 465}
449 466
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 467static struct sig_handlers
533{ 468{
534 sig_watcher sw_term, sw_int; 469 ev::sig sw_term, sw_int;
535 470
536 /* 471 /*
537 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
538 */ 473 */
539 void 474 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 475
476 sig_handlers ()
541 { 477 {
542 rxvt_emergency_cleanup (); 478 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 479 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 480 }
552} sig_handlers; 481} sig_handlers;
553 482
483void
484sig_handlers::sig_term (ev::sig &w, int revents)
485{
486 rxvt_emergency_cleanup ();
487 w.stop ();
488 kill (getpid (), w.signum);
489}
490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
554char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
555 559
556void 560void
557rxvt_init () 561rxvt_init ()
558{ 562{
559 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
572 if (!ev_default_loop ())
573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 574
561 rxvt_environ = environ; 575 rxvt_environ = environ;
562 576
563 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
565 579
566 sig_handlers.sw_term.start (SIGTERM); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */
571 582
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
575 586
576 XrmInitialize (); 587 XrmInitialize ();
577} 588}
578 589
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
616/* 591/*
617 * window size/position calculcations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 593 * if width/height are non-zero then override calculated width/height
619 */ 594 */
620void 595void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 597{
623 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 599 int x, y, flags;
625 unsigned int w, h; 600 unsigned int w, h;
626 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
627 dDisp;
628 602
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 605 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 606
… …
640 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642 616
643 if (flags & WidthValue) 617 if (flags & WidthValue)
644 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 623 szHint.flags |= USSize;
647 } 624 }
648 625
649 if (flags & HeightValue) 626 if (flags & HeightValue)
650 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 632 szHint.flags |= USSize;
653 } 633 }
654 634
655 if (flags & XValue) 635 if (flags & XValue)
656 { 636 {
… …
687 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
688 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
689 669
690 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
691 671
692 sb_w = 0;
693 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
694 673
695 if (scrollBar.state) 674 if (scrollBar.state)
696 { 675 {
697 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
698 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
678
699 if (!OPTION (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 680 window_vt_x += sb_w;
701 } 681 }
702 682
703 szHint.width_inc = fwidth; 683 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 684 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 685 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 686 szHint.min_height = szHint.base_height + szHint.height_inc;
707 687
708 if (newwidth && newwidth - szHint.base_width < max_width) 688 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 689 {
710 szHint.width = newwidth; 690 szHint.width = newwidth;
… …
725 { 705 {
726 min_it (height, max_height); 706 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
728 } 708 }
729 709
730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w;
732
733 if (recalc_x) 710 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
712
735 if (recalc_y) 713 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 715
738 ncol = width / fwidth; 716 ncol = width / fwidth;
739 nrow = height / fheight; 717 nrow = height / fheight;
740} 718}
741 719
742/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
743/* 721/*
… …
754 732
755 ws.ws_col = ncol; 733 ws.ws_col = ncol;
756 ws.ws_row = nrow; 734 ws.ws_row = nrow;
757 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
760 738
761#if 0 739#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
765#endif 743#endif
766} 744}
767 745
… …
794#endif 772#endif
795 773
796 delete fontset[0]; 774 delete fontset[0];
797 fontset[0] = fs; 775 fontset[0] = fs;
798 776
799 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
800 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
780
801 fs->set_prop (prop); 781 fs->set_prop (prop, false);
802 782
803 fwidth = prop.width; 783 fwidth = prop.width;
804 fheight = prop.height; 784 fheight = prop.height;
805 fbase = prop.ascent; 785 fbase = prop.ascent;
806 786
… …
815 { 795 {
816 fontset[style] = fs = new rxvt_fontset (this); 796 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 797 rxvt_fontprop prop2 = prop;
818 798
819 if (res) 799 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 800 {
801 fs->populate (res);
802 fs->set_prop (prop2, false);
803 }
821 else 804 else
822 { 805 {
823 res = fontset[0]->fontdesc; 806 fs->populate (fontset[0]->fontdesc);
824 807
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 808 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 809 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
810
811 fs->set_prop (prop2, true);
827 } 812 }
828 813
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 814 }
832#else 815#else
833 fontset[style] = fontset[0]; 816 fontset[style] = fontset[0];
834#endif 817#endif
835 } 818 }
… …
837 if (parent[0]) 820 if (parent[0])
838 { 821 {
839 resize_all_windows (0, 0, 0); 822 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 823 scr_remap_chars ();
841 scr_touch (true); 824 scr_touch (true);
842 } 825 }
843 826
844 return true; 827 return true;
845} 828}
846 829
830void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 831rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 832{
849 XChangeProperty (display->display, parent[0], 833 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 836}
853 837
838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 852{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
858 855
859 XChangeProperty (display->display, parent[0], 856 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 857 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 858 (const unsigned char *)s, strlen (s));
862 859
863 free (s); 860 free (s);
864 free (ws); 861 free (ws);
… …
868/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
869/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
870void 867void
871rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
872{ 869{
873 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
874#if ENABLE_EWMH 871#if ENABLE_EWMH
875 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
876#endif 873#endif
877} 874}
878 875
879void 876void
880rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
881{ 878{
882 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
883#if ENABLE_EWMH 880#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 882#endif
886} 883}
887 884
885void
886rxvt_term::set_window_color (int idx, const char *color)
887{
888#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 889 rxvt_color xcol;
893 int i;
894 890
895 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
896 return; 892 return;
897 893
894 color = strdup (color);
895 allocated.push_back ((void *)color);
896 rs[Rs_color + idx] = color;
897
898 /* handle color aliases */ 898 /* handle color aliases */
899 if (isdigit (*color)) 899 if (isdigit (*color))
900 { 900 {
901 i = atoi (color); 901 int i = atoi (color);
902 902
903 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
904 {
904 { /* bright colors */ 905 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 907 goto done;
909 } 908 }
910 909
911 if (i >= 0 && i <= 7) 910 if (i >= 0 && i <= 7)
911 {
912 { /* normal colors */ 912 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 914 goto done;
916 } 915 }
917 } 916 }
918 917
919 if (!rXParseAllocColor (&xcol, color)) 918 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 919
924 /* 920 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 921 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 922 * so just keep gobbling up the colormap
927 */ 923 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 924
940 pix_colors_focused[idx] = xcol; 925 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 926
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 927done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 928 /*TODO: handle Color_BD, scrollbar background, etc. */
953 929
930 update_fade_color (idx);
954 recolour_cursor (); 931 recolour_cursor ();
955 scr_recolour (); 932 scr_recolour ();
933#endif /* XTERM_COLOR_CHANGE */
956} 934}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 935
962void 936void
963rxvt_term::recolour_cursor () 937rxvt_term::recolour_cursor ()
964{ 938{
965 XColor xcol[2]; 939 XColor fg, bg;
966 940
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 941 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 942 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 943 : pix_colors_focused[Color_fg]).get (fg);
944
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 945 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 946 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 947 : pix_colors_focused[Color_bg]).get (bg);
973 948
974 XQueryColors (display->display, display->cmap, xcol, 2); 949 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 950}
977 951
978/*----------------------------------------------------------------------*/ 952/*----------------------------------------------------------------------*/
979/* 953/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 954 * find if fg/bg matches any of the normal (low-intensity) colors
981 */ 955 */
982void 956void
983rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
984{ 958{
985 unsigned int i; 959 unsigned int i;
986 const char *xpmb = "\0"; 960 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
988 963
989 strcpy (fstr, "default");
990 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
992 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
993 { 966 {
994 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
995 break; 968 break;
996 } 969 }
997 970
998 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 973 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
1002#ifdef XPM_BACKGROUND 975#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 976 xpmb = "default;";
1004#endif 977#endif
1005 break; 978 break;
1006 } 979 }
1007 980
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 981 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 982}
1010 983
1011/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
1012 985
1013int 986bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 987rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 988{
1016 if (!screen_in_out->set (display, colour)) 989 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 990 return true;
991
992 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
993 return false;
994}
995
996void
997rxvt_term::alias_color (int dst, int src)
998{
999 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1000}
1024 1001
1025/* -------------------------------------------------------------------- * 1002/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1003 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1004 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1006rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1007{
1031 int fix_screen; 1008 int fix_screen;
1032 int old_width = szHint.width; 1009 int old_width = szHint.width;
1033 int old_height = szHint.height; 1010 int old_height = szHint.height;
1034 dDisp;
1035 1011
1036 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
1013
1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent[0], &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
1038 1023
1039 if (!ignoreparent) 1024 if (!ignoreparent)
1040 { 1025 {
1041#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
1042 /* 1027 /*
… …
1046 int x, y, x1, y1; 1031 int x, y, x1, y1;
1047 int dx, dy; 1032 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1033 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1034 Window unused_cr;
1050 1035
1051 XTranslateCoordinates (disp, parent[0], display->root, 1036 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1037 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1038 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1039 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1040 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1041 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1042 * our position for handles and decorations. Counter it
1058 */ 1043 */
… …
1060 { 1045 {
1061 x -= x1; 1046 x -= x1;
1062 y -= y1; 1047 y -= y1;
1063 } 1048 }
1064 1049
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1050 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1051 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1052 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1053 dy = old_height - szHint.height;
1069 1054
1070 /* Check position of the center of the window */ 1055 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1056 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1060 if (y < y1) /* top half */
1076 dy = 0; 1061 dy = 0;
1077 else if (y == y1) /* exact center */ 1062 else if (y == y1) /* exact center */
1078 dy /= 2; 1063 dy /= 2;
1079 1064
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1065 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1066 szHint.width, szHint.height);
1082#else 1067#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1069#endif
1085 } 1070 }
1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint);
1086 1074
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1076
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1078 {
1091 if (scrollBar.state) 1079 if (scrollBar.state)
1092 { 1080 scrollBar.resize ();
1093 XMoveResizeWindow (disp, scrollBar.win,
1094 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar ();
1097 }
1098 1081
1099 XMoveResizeWindow (disp, vt, 1082 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1101 width, height); 1084 width, height);
1102 1085
1103 scr_clear (); 1086#ifdef HAVE_BG_PIXMAP
1104#ifdef XPM_BACKGROUND 1087 if (bg_window_size_sensitive ())
1105 resize_pixmap (); 1088 update_background ();
1106#endif 1089#endif
1107 } 1090 }
1108 1091
1109 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
1110 scr_reset (); 1093 scr_reset ();
1111 1094
1112#ifdef XPM_BACKGROUND
1113 if (pixmap)
1114 scr_touch (false);
1115#endif
1116
1117#ifdef USE_XIM 1095#ifdef USE_XIM
1118 IMSetStatusPosition (); 1096 IMSetPosition ();
1119#endif 1097#endif
1120} 1098}
1121 1099
1122/* 1100/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1101 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1106{
1129 XWindowAttributes wattr; 1107 XWindowAttributes wattr;
1130 1108
1131 if (newwidth == 0 || newheight == 0) 1109 if (newwidth == 0 || newheight == 0)
1132 { 1110 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1111 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1112
1135 if (newwidth == 0) 1113 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1114 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1115 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1116 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1130#ifdef USE_XIM
1153 1131
1154void 1132void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1133rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1134{
1157 fg = pix_colors[Color_fg]; 1135 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1136 bg = pix_colors [Color_bg];
1159} 1137}
1160 1138
1161void 1139void
1162rxvt_term::im_set_size (XRectangle &size) 1140rxvt_term::im_set_size (XRectangle &size)
1163{ 1141{
… …
1186 1164
1187/* Checking whether input method is running. */ 1165/* Checking whether input method is running. */
1188bool 1166bool
1189rxvt_term::IMisRunning () 1167rxvt_term::IMisRunning ()
1190{ 1168{
1191 char *p;
1192 Atom atom; 1169 Atom atom;
1193 Window win; 1170 Window win;
1194 char server[IMBUFSIZ]; 1171 char server[IMBUFSIZ];
1195 1172
1196 /* get current locale modifier */ 1173 /* get current locale modifier */
1197 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1174 if (char *p = XSetLocaleModifiers (0))
1198 { 1175 {
1199 strcpy (server, "@server="); 1176 strcpy (server, "@server=");
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1177 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1201 1178
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1179 if (p = strchr (server + 1, '@')) /* first one only */
1203 *p = '\0'; 1180 *p = '\0';
1204 1181
1205 atom = XInternAtom (display->display, server, False); 1182 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1183 win = XGetSelectionOwner (dpy, atom);
1207 1184
1208 if (win != None) 1185 if (win != None)
1209 return True; 1186 return True;
1210 } 1187 }
1211 1188
… …
1274 1251
1275 term->make_current (); 1252 term->make_current ();
1276 1253
1277 if (text) 1254 if (text)
1278 { 1255 {
1279 void *str; 1256 wchar_t *str;
1280 1257
1281 if (!text->encoding_is_wchar && text->string.multi_byte) 1258 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 { 1259 {
1283 // of course, X makes it ugly again 1260 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]); 1262 SET_LOCALE (term->rs[Rs_imLocale]);
1286 1263
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1264 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1265 mbstowcs (str, text->string.multi_byte, text->length + 1);
1289 1266
1290 if (term->rs[Rs_imLocale]) 1267 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1268 SET_LOCALE (term->locale);
1292 } 1269 }
1293 else 1270 else
1294 str = (void *)text->string.wide_char; 1271 str = text->string.wide_char;
1295 1272
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1273 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1274 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1275 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1276 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1277 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1370 p = pet[pi]; 1347 p = pet[pi];
1371 1348
1372 if (!p) 1349 if (!p)
1373 continue; 1350 continue;
1374 1351
1375 s = rxvt_splitcommastring (p); 1352 s = rxvt_strsplit (',', p);
1376 1353
1377 for (i = found = 0; !found && s[i]; i++) 1354 for (i = found = 0; !found && s[i]; i++)
1378 { 1355 {
1379 if (!strcmp (s[i], "OverTheSpot")) 1356 if (!strcmp (s[i], "OverTheSpot"))
1380 input_style = XIMPreeditPosition | XIMStatusNothing; 1357 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1392 input_style = XIMPreeditNothing | XIMStatusNothing; 1369 input_style = XIMPreeditNothing | XIMStatusNothing;
1393 1370
1394 for (j = 0; j < xim_styles->count_styles; j++) 1371 for (j = 0; j < xim_styles->count_styles; j++)
1395 if (input_style == xim_styles->supported_styles[j]) 1372 if (input_style == xim_styles->supported_styles[j])
1396 { 1373 {
1397 rxvt_freecommastring (s); 1374 rxvt_free_strsplit (s);
1398 1375
1399 found = 1; 1376 found = 1;
1400 goto foundpet; 1377 goto foundpet;
1401 } 1378 }
1402 1379
1403 } 1380 }
1404 1381
1405 rxvt_freecommastring (s); 1382 rxvt_free_strsplit (s);
1406 } 1383 }
1407 1384
1408foundpet: 1385foundpet:
1409 1386
1410 XFree (xim_styles); 1387 XFree (xim_styles);
… …
1435 "*", 1412 "*",
1436 fheight, 1413 fheight,
1437 fheight + 1, fheight - 1, 1414 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1415 fheight - 2, fheight + 2);
1439 1416
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1417 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1418 &missing_charset_list, &missing_charset_count, &def_string);
1442 1419
1443 if (missing_charset_list) 1420 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1421 XFreeStringList (missing_charset_list);
1445 1422
… …
1520 preedit_attr, 1497 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1498 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1499 status_attr, NULL);
1523 1500
1524 if (preedit_attr) XFree (preedit_attr); 1501 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1502 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1503 if (fs) XFreeFontSet (dpy, fs);
1527 1504
1528 if (Input_Context == NULL) 1505 if (Input_Context == NULL)
1529 { 1506 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1507 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1508 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1513 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1514 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1515 vt_select_input ();
1539#endif 1516#endif
1540 1517
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1518 IMSetPosition ();
1543 1519
1544 return true; 1520 return true;
1545} 1521}
1546 1522
1547void 1523void
… …
1567 p = rs[Rs_inputMethod]; 1543 p = rs[Rs_inputMethod];
1568 if (p && *p) 1544 if (p && *p)
1569 { 1545 {
1570 bool found = false; 1546 bool found = false;
1571 1547
1572 s = rxvt_splitcommastring (p); 1548 s = rxvt_strsplit (',', p);
1573 1549
1574 for (i = 0; s[i]; i++) 1550 for (i = 0; s[i]; i++)
1575 { 1551 {
1576 if (*s[i]) 1552 if (*s[i])
1577 { 1553 {
… …
1583 break; 1559 break;
1584 } 1560 }
1585 } 1561 }
1586 } 1562 }
1587 1563
1588 rxvt_freecommastring (s); 1564 rxvt_free_strsplit (s);
1589 1565
1590 if (found) 1566 if (found)
1591 goto done; 1567 goto done;
1592 } 1568 }
1593 1569
… …
1605 SET_LOCALE (locale); 1581 SET_LOCALE (locale);
1606#endif 1582#endif
1607} 1583}
1608 1584
1609void 1585void
1610rxvt_term::IMSetStatusPosition () 1586rxvt_term::IMSetPosition ()
1611{ 1587{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1588 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1589 XVaNestedList preedit_attr, status_attr;
1614 1590
1615 if (!Input_Context 1591 if (!Input_Context
1616 || !focus 1592 || !focus
1617 || !(input_style & XIMPreeditArea) 1593 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1594 || !IMisRunning ())
1619 return; 1595 return;
1620 1596
1597 if (input_style & XIMPreeditPosition)
1598 {
1599 im_set_size (preedit_rect);
1600 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1601
1602 XSetICValues (Input_Context,
1603 XNPreeditAttributes, preedit_attr, NULL);
1604 }
1605 else
1606 {
1621 /* Getting the necessary width of preedit area */ 1607 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1608 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1609 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1610 XFree (status_attr);
1625 1611
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1612 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1613 XFree (needed_rect);
1628 1614
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1615 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1616 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1617
1632 XSetICValues (Input_Context, 1618 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1619 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1620 XNStatusAttributes, status_attr,
1621 NULL);
1635 1622
1623 XFree (status_attr);
1624 }
1625
1636 XFree (preedit_attr); 1626 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1627}
1639#endif /* USE_XIM */ 1628#endif /* USE_XIM */
1629
1630void
1631rxvt_term::get_window_origin (int &x, int &y)
1632{
1633 Window cr;
1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1635}
1636
1637Pixmap
1638rxvt_term::get_pixmap_property (Atom property)
1639{
1640 Pixmap pixmap = None;
1641
1642 int aformat;
1643 unsigned long nitems, bytes_after;
1644 Atom atype;
1645 unsigned char *prop;
1646 int result = XGetWindowProperty (dpy, display->root, property,
1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1648 &nitems, &bytes_after, &prop);
1649 if (result == Success)
1650 {
1651 if (atype == XA_PIXMAP)
1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1654 }
1655
1656 return pixmap;
1657}
1658
1659#ifdef HAVE_BG_PIXMAP
1660
1661void
1662rxvt_term::update_background ()
1663{
1664 if (update_background_ev.is_active ())
1665 return;
1666
1667 bg_invalidate ();
1668
1669 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1670
1671 if (to_wait <= 0.)
1672 bg_render ();
1673 else
1674 update_background_ev.start (to_wait);
1675}
1676
1677void
1678rxvt_term::update_background_cb (ev::timer &w, int revents)
1679{
1680 make_current ();
1681
1682 update_background_ev.stop ();
1683 bg_render ();
1684 refresh_check ();
1685}
1686
1687#endif /* HAVE_BG_PIXMAP */
1640 1688
1641/*----------------------- end-of-file (C source) -----------------------*/ 1689/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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