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.226 by root, Thu Jul 6 23:48:11 2006 UTC vs.
Revision 1.382 by root, Tue Jun 5 12:04:55 2012 UTC

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

Diff Legend

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