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.274 by ayin, Tue Dec 11 11:53:48 2007 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 2015 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-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 32 *---------------------------------------------------------------------*/
32 33
33#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h"
35#include "keyboard.h" 37#include "keyboard.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include <limits> 40#include <limits>
39 41
42#include <assert.h>
40#include <csignal> 43#include <signal.h>
41#include <cstring> 44#include <string.h>
42 45
43# include <termios.h> 46#include <termios.h>
44 47
45#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 49# define X_LOCALE
47# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
48#else 51#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <locale.h>
51# endif 53#endif
52#endif
53 54
55struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
55 57
56// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
58 60
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 96{
95 compose_char *cc; 97 compose_char *cc;
96 98
97 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 101 cc = (*this)[c1];
100 while (cc) 102 while (cc)
101 { 103 {
102 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
104 } 106 }
105 107
106 // check to see wether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 }
112 112
113 // allocate a new combination 113 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 115 {
116 static int seen; 116 static int seen;
117 117
118 if (!seen++) 118 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 120
121 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
122 } 122 }
123 123
124 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
… …
155{ 155{
156#if HAVE_BG_PIXMAP 156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this); 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif 158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif 164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this); 166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif 167#endif
168#ifdef SELECTION_SCROLLING 168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 178#if USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 180#endif
183#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
185#endif 183#endif
186#ifndef NO_BELL 184#ifndef NO_BELL
187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this); 185 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
188#endif 186#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 prepare_ev.set <rxvt_term, &rxvt_term::prepare_cb> (this);
191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 193
198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
199 195
… …
227 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
228 delete fontset[i]; 224 delete fontset[i];
229#endif 225#endif
230 delete fontset[0]; 226 delete fontset[0];
231 227
228#ifdef HAVE_BG_PIXMAP
229 bg_destroy ();
230#endif
231
232#if HAVE_IMG
233 delete bg_img;
234#endif
235
232 if (display) 236 if (display)
233 { 237 {
234 selection_clear (); 238 selection_clear ();
239 selection_clear (true);
235 240
236#ifdef USE_XIM 241#if USE_XIM
237 im_destroy (); 242 im_destroy ();
238#endif 243#endif
239#ifdef XTERM_SCROLLBAR 244 scrollBar.destroy ();
240 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 245
241 if (ShadowGC) XFreeGC (dpy, ShadowGC); 246 if (gc)
242#endif
243#ifdef PLAIN_SCROLLBAR
244 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
245#endif
246#ifdef NEXT_SCROLLBAR
247 if (blackGC) XFreeGC (dpy, blackGC);
248 if (whiteGC) XFreeGC (dpy, whiteGC);
249 if (grayGC) XFreeGC (dpy, grayGC);
250 if (darkGC) XFreeGC (dpy, darkGC);
251 if (stippleGC) XFreeGC (dpy, stippleGC);
252 if (dimple) XFreePixmap (dpy, dimple);
253 if (upArrow) XFreePixmap (dpy, upArrow);
254 if (downArrow) XFreePixmap (dpy, downArrow);
255 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
256 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
257#endif
258#ifdef RXVT_SCROLLBAR
259 if (topShadowGC) XFreeGC (dpy, topShadowGC);
260 if (botShadowGC) XFreeGC (dpy, botShadowGC);
261 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
262#endif
263 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
264 248
265 delete drawable; 249 delete drawable;
250
266 // destroy all windows 251 // destroy all windows
267 if (parent[0]) 252 if (parent)
268 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
269 254
270 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
271 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
272 { 257 {
273 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
274#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
275 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
276#endif 262#endif
277 } 263 }
278 264
279 clear (); 265 clear ();
280 }
281 266
282 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
283#if OFF_FOCUS_FADING
284 delete [] pix_colors_unfocused;
285#endif
286
287#ifdef HAVE_BG_PIXMAP
288 bgPixmap.destroy ();
289#endif
290 displays.put (display); 268 displays.put (display);
269 }
291 270
292 scr_release (); 271 scr_release ();
293 272
294 /* clear all resources */ 273 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 275 free (allocated [i]);
297 276
298 free (selection.text); 277 free (selection.text);
299 // TODO: manage env vars in child only(!) 278 free (selection.clip_text);
300 free (env_display);
301 free (env_term);
302 free (locale); 279 free (locale);
303 free (v_buffer); 280 free (v_buffer);
304 free (incr_buf); 281
282 delete selection_req;
283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
305 288
306 delete envv; 289 delete envv;
307 delete argv; 290 delete argv;
308 291
309#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
310 delete keyboard; 293 delete keyboard;
311#endif 294#endif
312#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
313 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
314#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
315} 300}
316 301
317// child has exited, usually destroys 302// child has exited, usually destroys
318void 303void
319rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
327} 312}
328 313
329void 314void
330rxvt_term::destroy () 315rxvt_term::destroy ()
331{ 316{
332 if (ev_is_active (&destroy_ev)) 317 if (destroy_ev.is_active ())
333 return; 318 return;
334 319
335 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 320 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
336 321
337#if ENABLE_OVERLAY 322#if ENABLE_OVERLAY
… …
341 if (display) 326 if (display)
342 { 327 {
343#if USE_XIM 328#if USE_XIM
344 im_ev.stop (display); 329 im_ev.stop (display);
345#endif 330#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
348#endif 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
349#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
351#endif 334#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 335 termwin_ev.stop (display);
354 vt_ev.stop (display); 336 vt_ev.stop (display);
355 } 337 }
356 338
357 prepare_ev.stop (); 339 flush_ev.stop ();
358 pty_ev.stop (); 340 pty_ev.stop ();
359#ifdef CURSOR_BLINK 341#ifdef CURSOR_BLINK
360 cursor_blink_ev.stop (); 342 cursor_blink_ev.stop ();
361#endif 343#endif
362#ifdef TEXT_BLINK 344#ifdef TEXT_BLINK
… …
381 make_current (); 363 make_current ();
382 364
383 delete this; 365 delete this;
384} 366}
385 367
368void
369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
370{
371 if (!opt)
372 return;
373
374 uint8_t mask = 1 << (opt & 7);
375 uint8_t &val = options [opt >> 3];
376
377 val = val & ~mask | (set ? mask : 0);
378}
379
386/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
387/* 381/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
389 * TODO: if debugging, this should free up any known resources if we can
390 */ 383 */
391static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
392 385
393static void 386static void
394rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
396 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
397 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
398} 391}
399 392
400#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
401static void 394static void ecb_cold
402print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
403{ 396{
404 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
406 char number[32]; 399 char number[32];
407 char *mtype = "XlibMessage"; 400
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
411 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
414 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
417 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 467 }
468
422 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
423 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
424 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
425 (event->error_code == BadFont) || 472 || event->error_code == BadFont
426 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
427 (event->error_code == BadColor) || 474 || event->error_code == BadColor
428 (event->error_code == BadGC) || 475 || event->error_code == BadGC
429 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
430 (event->error_code == BadValue) || 477 || event->error_code == BadValue
431 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
432 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
434 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
437 mesg, BUFSIZ); 484 else
438 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
440 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446}
447#endif
448 486
449int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
450rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
451{ 494{
452 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
453 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
454 else 497 else
455 { 498 {
456 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
457 // so just output the error and continue 500 // so just output the error and continue
… …
463 } 506 }
464 507
465 return 0; 508 return 0;
466} 509}
467 510
468int 511int ecb_cold
469rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
470{ 513{
471 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
472 DisplayString (display)); 515 DisplayString (display));
473 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 517 _exit (EXIT_FAILURE);
475}
476
477/*----------------------------------------------------------------------*/
478bool
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 if (!init_vars ())
488 return false;
489
490 init_secondary ();
491
492 const char **cmd_argv = init_resources (argc, argv);
493
494#ifdef KEYSYM_RESOURCE
495 keyboard->register_done ();
496#endif
497
498#ifdef HAVE_SCROLLBARS
499 if (option (Opt_scrollBar))
500 scrollBar.setIdle (); /* set existence for size calculations */
501#endif
502
503 pty = ptytty::create ();
504
505 create_windows (argc, argv);
506
507 init_xlocale ();
508
509 scr_reset (); // initialize screen
510
511#if 0
512 XSynchronize (dpy, True);
513#endif
514
515#ifdef HAVE_SCROLLBARS
516 if (option (Opt_scrollBar))
517 resize_scrollbar (); /* create and map scrollbar */
518#endif
519#ifdef HAVE_BG_PIXMAP
520 {
521 bgPixmap.set_target (this);
522
523#ifdef ENABLE_TRANSPARENCY
524 if (option (Opt_transparent))
525 {
526 bgPixmap.set_transparent ();
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533 if (rs [Rs_shade])
534 bgPixmap.set_shade (rs [Rs_shade]);
535
536 bgPixmap.set_root_pixmap ();
537 XSelectInput (dpy, display->root, PropertyChangeMask);
538 rootwin_ev.start (display, display->root);
539 }
540#endif
541
542#ifdef BG_IMAGE_FROM_FILE
543 if (rs[Rs_backgroundPixmap] != NULL)
544 {
545 const char *p = rs[Rs_backgroundPixmap];
546
547 if ((p = strchr (p, ';')) != NULL)
548 {
549 p++;
550 bgPixmap.set_geometry (p);
551 }
552 else
553 bgPixmap.set_defaultGeometry ();
554
555 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
556 if (!bgPixmap.window_position_sensitive ())
557 update_background ();
558 }
559#endif
560 }
561#endif
562
563#if ENABLE_PERL
564 rootwin_ev.start (display, display->root);
565#endif
566
567 set_colorfgbg ();
568
569 init_command (cmd_argv);
570
571 free (cmd_argv);
572
573 if (pty->pty >= 0)
574 pty_ev.start (pty->pty, ev::READ);
575
576 prepare_ev.start ();
577
578 HOOK_INVOKE ((this, HOOK_START, DT_END));
579
580#if ENABLE_XEMBED
581 if (rs[Rs_embed])
582 {
583 long info[2] = { 0, XEMBED_MAPPED };
584
585 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
586 32, PropModeReplace, (unsigned char *)&info, 2);
587 }
588#endif
589
590 XMapWindow (dpy, vt);
591 XMapWindow (dpy, parent[0]);
592
593 return true;
594} 518}
595 519
596static struct sig_handlers 520static struct sig_handlers
597{ 521{
598 ev::sig sw_term, sw_int; 522 ev::sig sw_term, sw_int;
… …
615 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
616 w.stop (); 540 w.stop ();
617 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
618} 542}
619 543
544static void
545rxvt_get_ttymode (struct termios *tio)
546{
547 if (tcgetattr (STDIN_FILENO, tio) < 0)
548 memset (tio, 0, sizeof (struct termios));
549
550 for (int i = 0; i < NCCS; i++)
551 tio->c_cc[i] = VDISABLE;
552
553 tio->c_cc[VINTR] = CINTR;
554 tio->c_cc[VQUIT] = CQUIT;
555 tio->c_cc[VERASE] = CERASE;
556#ifdef VERASE2
557 tio->c_cc[VERASE2] = CERASE2;
558#endif
559 tio->c_cc[VKILL] = CKILL;
560 tio->c_cc[VEOF] = CEOF;
561 tio->c_cc[VSTART] = CSTART;
562 tio->c_cc[VSTOP] = CSTOP;
563 tio->c_cc[VSUSP] = CSUSP;
564# ifdef VDSUSP
565 tio->c_cc[VDSUSP] = CDSUSP;
566# endif
567# ifdef VREPRINT
568 tio->c_cc[VREPRINT] = CRPRNT;
569# endif
570# ifdef VDISCRD
571 tio->c_cc[VDISCRD] = CFLUSH;
572# endif
573# ifdef VWERSE
574 tio->c_cc[VWERSE] = CWERASE;
575# endif
576# ifdef VLNEXT
577 tio->c_cc[VLNEXT] = CLNEXT;
578# endif
579# ifdef VSTATUS
580 tio->c_cc[VSTATUS] = CSTATUS;
581# endif
582
583# if VMIN != VEOF
584 tio->c_cc[VMIN] = 1;
585# endif
586# if VTIME != VEOL
587 tio->c_cc[VTIME] = 0;
588# endif
589
590 /* input modes */
591 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
592# ifdef IMAXBEL
593 | IMAXBEL
594# endif
595 | IXON);
596
597 /* output modes */
598 tio->c_oflag = (OPOST | ONLCR);
599
600 /* control modes */
601 tio->c_cflag = (CS8 | CREAD);
602
603 /* local modes */
604 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
605# if defined (ECHOCTL) && defined (ECHOKE)
606 | ECHOCTL | ECHOKE
607# endif
608 | ECHOE | ECHOK);
609}
610
620char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
621 612
622void 613void
623rxvt_init () 614rxvt_init ()
624{ 615{
625 ptytty::init (); 616 assert (("fontMask must not overlap other RS masks",
617 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
626 618
619 rxvt_get_ttymode (&rxvt_term::def_tio);
620
621 // get rid of stdin/stdout as we don't need them, to free resources
622 dup2 (STDERR_FILENO, STDIN_FILENO);
623 dup2 (STDERR_FILENO, STDOUT_FILENO);
624
627 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 627
630 rxvt_environ = environ; 628 rxvt_environ = environ;
631 629
632 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
634 632
635 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 633 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev_unref (); 634 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */
640 635
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
644 639
645 XrmInitialize (); 640 XrmInitialize ();
646}
647 641
648/* ------------------------------------------------------------------------- * 642#if HAVE_PIXBUF
649 * MEMORY ALLOCATION WRAPPERS * 643 g_type_init ();
650 * ------------------------------------------------------------------------- */ 644#endif
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 645}
683 646
684/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
685/* 648/*
686 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 651 */
689void 652void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 653rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 654{
692 short recalc_x, recalc_y; 655 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 656 int x, y, flags;
694 unsigned int w, h; 657 unsigned int w, h;
695 unsigned int max_width, max_height; 658 unsigned int max_width, max_height;
696 659
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 660 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 661 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 671 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 672 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 673
711 if (flags & WidthValue) 674 if (flags & WidthValue)
712 { 675 {
676 if (!w)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 679 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 680 szHint.flags |= USSize;
715 } 681 }
716 682
717 if (flags & HeightValue) 683 if (flags & HeightValue)
718 { 684 {
685 if (!h)
686 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
687
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 688 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 689 szHint.flags |= USSize;
721 } 690 }
722 691
723 if (flags & XValue) 692 if (flags & XValue)
724 { 693 {
… …
755 max_width = MAX_COLS * fwidth; 724 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 725 max_height = MAX_ROWS * fheight;
757 726
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 727 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 728
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 729 window_vt_x = window_vt_y = int_bwidth;
762 730
763 if (scrollBar.state) 731 if (scrollBar.state)
764 { 732 {
765 sb_w = scrollbar_TotalWidth (); 733 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 734 szHint.base_width += sb_w;
767 735
768 if (!option (Opt_scrollBar_right)) 736 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 737 window_vt_x += sb_w;
770 } 738 }
… …
794 { 762 {
795 min_it (height, max_height); 763 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 764 szHint.height = szHint.base_height + height;
797 } 765 }
798 766
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 767 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 768 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 769
805 if (recalc_y) 770 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 772
808 ncol = width / fwidth; 773 ncol = width / fwidth;
809 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
810} 784}
811 785
812/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
813/* 787/*
814 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
822 796
823 struct winsize ws; 797 struct winsize ws;
824 798
825 ws.ws_col = ncol; 799 ws.ws_col = ncol;
826 ws.ws_row = nrow; 800 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
828 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 804
831#if 0 805#if 0
832 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
835#endif 809#endif
836} 810}
837 811
838/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
839/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
840 *
841 * init = 1 - initialize
842 *
843 * fontname == FONT_UP - switch to bigger font
844 * fontname == FONT_DN - switch to smaller font
845 */
846bool 814bool
847rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
848{ 816{
849 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
850 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
864#endif 832#endif
865 833
866 delete fontset[0]; 834 delete fontset[0];
867 fontset[0] = fs; 835 fontset[0] = fs;
868 836
869 prop = (*fs)[1]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
871 839
872 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
873 841
874 fwidth = prop.width; 842 fwidth = prop.width;
875 fheight = prop.height; 843 fheight = prop.height + lineSpace;
876 fbase = prop.ascent; 844 fbase = prop.ascent;
877 845
878 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
879 { 847 {
880#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
906#else 874#else
907 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
908#endif 876#endif
909 } 877 }
910 878
911 if (parent[0]) 879 if (parent)
912 { 880 {
913 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
914 scr_remap_chars (); 882 scr_remap_chars ();
915 scr_touch (true); 883 scr_touch (true);
916 } 884 }
… …
919} 887}
920 888
921void 889void
922rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
923{ 891{
924 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
925 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
926 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
927} 895}
928 896
929void 897void
898rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
899{
900 XTextProperty ct;
901
902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
903 {
904 XSetTextProperty (dpy, parent, &ct, prop);
905 XFree (ct.value);
906 }
907}
908
909void
930rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931{ 911{
932 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
933 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
934 914
935 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
937 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
938 918
939 free (s); 919 free (s);
940 free (ws); 920 free (ws);
… …
944/*----------------------------------------------------------------------*/ 924/*----------------------------------------------------------------------*/
945/* xterm sequences - title, iconName, color (exptl) */ 925/* xterm sequences - title, iconName, color (exptl) */
946void 926void
947rxvt_term::set_title (const char *str) 927rxvt_term::set_title (const char *str)
948{ 928{
949 set_string_property (XA_WM_NAME, str); 929 set_mbstring_property (XA_WM_NAME, str);
950#if ENABLE_EWMH 930#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_NAME], str);
952#endif 932#endif
953} 933}
954 934
955void 935void
956rxvt_term::set_icon_name (const char *str) 936rxvt_term::set_icon_name (const char *str)
957{ 937{
958 set_string_property (XA_WM_ICON_NAME, str); 938 set_mbstring_property (XA_WM_ICON_NAME, str);
959#if ENABLE_EWMH 939#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 940 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961#endif 941#endif
962} 942}
963 943
964void 944void
965rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
966{ 946{
967#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol;
969 int i;
970
971 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
972 return; 949 return;
973 950
974 color = strdup (color); 951 color = strdup (color);
975 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color; 953 rs[Rs_color + idx] = color;
977 954
978 /* handle color aliases */ 955 /* handle color aliases */
979 if (isdigit (*color)) 956 if (isdigit (*color))
980 { 957 {
981 i = atoi (color); 958 int i = atoi (color);
982 959
983 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
984 { 961 {
985 /* bright colors */ 962 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
987 goto done; 964 goto done;
988 } 965 }
989 966
990 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
991 { 968 {
992 /* normal colors */ 969 /* normal colors */
993 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
994 goto done; 971 goto done;
995 } 972 }
996 } 973 }
997 974
998 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
999 976 set_color (pix_colors_focused[idx], color);
1000 /*
1001 * FIXME: should free colors here, but no idea how to do it so instead,
1002 * so just keep gobbling up the colormap
1003 */
1004
1005 pix_colors_focused[idx] = xcol;
1006 977
1007done: 978done:
1008 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
1009 980
1010 update_fade_color (idx); 981 update_fade_color (idx);
1011 recolour_cursor (); 982 recolor_cursor ();
1012 scr_recolour (); 983 scr_recolor ();
1013#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
1014} 985}
1015 986
1016void 987void
1017rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
1018{ 989{
1019 XColor fg, bg; 990 XColor fg, bg;
1020 991
1021 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
1022 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
1031 1002
1032/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
1033/* 1004/*
1034 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
1035 */ 1006 */
1036void 1007char *
1037rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
1038{ 1009{
1039 unsigned int i; 1010 unsigned int i;
1040 const char *xpmb = ""; 1011 const char *xpmb = "";
1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
1042 1015
1043 strcpy (fstr, "default");
1044 strcpy (bstr, "default");
1045 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
1046 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
1047 { 1018 {
1048 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
1049 break; 1020 break;
1050 } 1021 }
1051 1022
1052 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
1053 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
1054 { 1025 {
1055 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
1056#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
1057 xpmb = "default;"; 1028 xpmb = "default;";
1058#endif 1029#endif
1059 break; 1030 break;
1060 } 1031 }
1061 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1062 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
1063} 1036}
1064 1037
1065/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
1066 1039
1067bool 1040bool
… …
1075} 1048}
1076 1049
1077void 1050void
1078rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
1079{ 1052{
1053 pix_colors[dst].free (this);
1080 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1081} 1055}
1082 1056
1083/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
1084 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
1090 int old_width = szHint.width; 1064 int old_width = szHint.width;
1091 int old_height = szHint.height; 1065 int old_height = szHint.height;
1092 1066
1093 window_calc (newwidth, newheight); 1067 window_calc (newwidth, newheight);
1094 1068
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1069 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1070
1071 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1072 if (set_hint)
1073 {
1074 szHint.flags &= ~(PBaseSize | PResizeInc);
1096 XSetWMNormalHints (dpy, parent[0], &szHint); 1075 XSetWMNormalHints (dpy, parent, &szHint);
1076 szHint.flags |= PBaseSize | PResizeInc;
1077 }
1097 1078
1098 if (!ignoreparent) 1079 if (!ignoreparent)
1099 { 1080 {
1100#ifdef SMART_RESIZE 1081#ifdef SMART_RESIZE
1101 /* 1082 /*
… …
1105 int x, y, x1, y1; 1086 int x, y, x1, y1;
1106 int dx, dy; 1087 int dx, dy;
1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1108 Window unused_cr; 1089 Window unused_cr;
1109 1090
1110 XTranslateCoordinates (dpy, parent[0], display->root, 1091 XTranslateCoordinates (dpy, parent, display->root,
1111 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1114 /* 1095 /*
1115 * if display->root isn't the parent window, a WM will probably have offset 1096 * if display->root isn't the parent window, a WM will probably have offset
1116 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
1117 */ 1098 */
… …
1134 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
1135 dy = 0; 1116 dy = 0;
1136 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
1137 dy /= 2; 1118 dy /= 2;
1138 1119
1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1140 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
1141#else 1122#else
1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1123 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1143#endif 1124#endif
1144 } 1125 }
1126
1127 if (set_hint)
1128 XSetWMNormalHints (dpy, parent, &szHint);
1145 1129
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 1131
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 1133 {
1150 if (scrollBar.state) 1134 if (scrollBar.state)
1151 { 1135 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 1136
1158 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
1160 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1161 1142
1162#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
1164 update_background (); 1145 update_background ();
1165#endif 1146#endif
1166
1167 scr_clear ();
1168 } 1147 }
1169 1148
1170 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
1171 scr_reset (); 1150 scr_reset ();
1172 1151
1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174 //scr_touch (false);
1175
1176#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap)
1179// scr_touch (false);
1180#endif
1181
1182#ifdef USE_XIM 1152#if USE_XIM
1183 IMSetPosition (); 1153 im_set_position ();
1184#endif 1154#endif
1185} 1155}
1186 1156
1187/* 1157/*
1188 * Set the width/height of the vt window in characters. Units are pixels. 1158 * Set the width/height of the vt window in characters. Units are pixels.
… …
1201 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1202 if (newheight == 0) 1172 if (newheight == 0)
1203 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1204 } 1174 }
1205 1175
1206 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1207 { 1177 {
1208 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1209 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1210 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1211 } 1181 }
1212} 1182}
1213 1183
1214/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1215 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1216 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1217#ifdef USE_XIM 1187#if USE_XIM
1218 1188
1219void 1189void
1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1221{ 1191{
1222 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1249 status_rect.height = fheight; 1219 status_rect.height = fheight;
1250} 1220}
1251 1221
1252/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1253bool 1223bool
1254rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1255{ 1225{
1256 char *p;
1257 Atom atom; 1226 Atom atom;
1258 Window win; 1227 Window win;
1259 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1260 1229
1261 /* get current locale modifier */ 1230 /* get current locale modifier */
1262 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if (char *p = XSetLocaleModifiers (0))
1263 { 1232 {
1264 strcpy (server, "@server="); 1233 strcpy (server, "@server=");
1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266 1235
1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1236 if (p = strchr (server + 1, '@')) /* first one only */
1268 *p = '\0'; 1237 *p = '\0';
1269 1238
1270 atom = XInternAtom (dpy, server, False); 1239 atom = XInternAtom (dpy, server, False);
1271 win = XGetSelectionOwner (dpy, atom); 1240 win = XGetSelectionOwner (dpy, atom);
1272 1241
1273 if (win != None) 1242 if (win != None)
1274 return True; 1243 return true;
1275 } 1244 }
1276 1245
1277 return False; 1246 return false;
1278} 1247}
1279 1248
1280void 1249void
1281rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1282{ 1251{
1283 XPoint nspot; 1252 XPoint nspot;
1284 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1285 1254
1286 if (!Input_Context 1255 if (!Input_Context
… …
1339 1308
1340 term->make_current (); 1309 term->make_current ();
1341 1310
1342 if (text) 1311 if (text)
1343 { 1312 {
1344 void *str; 1313 wchar_t *str;
1345 1314
1346 if (!text->encoding_is_wchar && text->string.multi_byte) 1315 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 { 1316 {
1348 // of course, X makes it ugly again 1317 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale]) 1318 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]); 1319 SET_LOCALE (term->rs[Rs_imLocale]);
1351 1320
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1321 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1322 mbstowcs (str, text->string.multi_byte, text->length + 1);
1354 1323
1355 if (term->rs[Rs_imLocale]) 1324 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale); 1325 SET_LOCALE (term->locale);
1357 } 1326 }
1358 else 1327 else
1359 str = (void *)text->string.wide_char; 1328 str = text->string.wide_char;
1360 1329
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1330 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret, 1331 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first, 1332 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length, 1333 DT_INT, call_data->chg_length,
… …
1392/* 1361/*
1393 * Try to open a XIM with the current modifiers, then see if we can 1362 * Try to open a XIM with the current modifiers, then see if we can
1394 * open a suitable preedit type 1363 * open a suitable preedit type
1395 */ 1364 */
1396bool 1365bool
1397rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1398{ 1367{
1399 int i, j, found; 1368 int i, j, found;
1400 XIM xim; 1369 XIM xim;
1401 XPoint spot; 1370 XPoint spot;
1402 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1403 unsigned long fg, bg; 1372 unsigned long fg, bg;
1404 const char *p; 1373 const char *p;
1405 char **s; 1374 char **s;
1406 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1407#ifdef ENABLE_XIM_ONTHESPOT
1408 XIMCallback xcb[4];
1409#endif
1410 1376
1411 set_environ (envv); 1377 set_environ (env);
1412 1378
1413 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1414 return false; 1380 return false;
1415 1381
1416 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1417 if (input_method == NULL) 1383 if (input_method == NULL)
1418 return false; 1384 return false;
… …
1435 p = pet[pi]; 1401 p = pet[pi];
1436 1402
1437 if (!p) 1403 if (!p)
1438 continue; 1404 continue;
1439 1405
1440 s = rxvt_splitcommastring (p); 1406 s = rxvt_strsplit (',', p);
1441 1407
1442 for (i = found = 0; !found && s[i]; i++) 1408 for (i = found = 0; !found && s[i]; i++)
1443 { 1409 {
1444 if (!strcmp (s[i], "OverTheSpot")) 1410 if (!strcmp (s[i], "OverTheSpot"))
1445 input_style = XIMPreeditPosition | XIMStatusNothing; 1411 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1457 input_style = XIMPreeditNothing | XIMStatusNothing; 1423 input_style = XIMPreeditNothing | XIMStatusNothing;
1458 1424
1459 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1460 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1461 { 1427 {
1462 rxvt_freecommastring (s); 1428 rxvt_free_strsplit (s);
1463 1429
1464 found = 1; 1430 found = 1;
1465 goto foundpet; 1431 goto foundpet;
1466 } 1432 }
1467 1433
1468 } 1434 }
1469 1435
1470 rxvt_freecommastring (s); 1436 rxvt_free_strsplit (s);
1471 } 1437 }
1472 1438
1473foundpet: 1439foundpet:
1474 1440
1475 XFree (xim_styles); 1441 XFree (xim_styles);
… …
1554 NULL); 1520 NULL);
1555 } 1521 }
1556#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1557 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1558 { 1524 {
1525 XIMCallback xcb[4];
1526
1559 im_set_position (spot); 1527 im_set_position (spot);
1560 1528
1561 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1529 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1562 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1530 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1563 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1531 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1578#endif 1546#endif
1579 1547
1580 Input_Context = XCreateIC (xim, 1548 Input_Context = XCreateIC (xim,
1581 XNInputStyle, input_style, 1549 XNInputStyle, input_style,
1582 XNClientWindow, vt, 1550 XNClientWindow, vt,
1583 XNFocusWindow, parent[0], 1551 XNFocusWindow, parent,
1584 preedit_attr ? XNPreeditAttributes : NULL, 1552 preedit_attr ? XNPreeditAttributes : NULL,
1585 preedit_attr, 1553 preedit_attr,
1586 status_attr ? XNStatusAttributes : NULL, 1554 status_attr ? XNStatusAttributes : NULL,
1587 status_attr, NULL); 1555 status_attr, NULL);
1588 1556
… …
1601 // unfortunately, only the focus window is used by XIM, hard to fix 1569 // unfortunately, only the focus window is used by XIM, hard to fix
1602 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1603 vt_select_input (); 1571 vt_select_input ();
1604#endif 1572#endif
1605 1573
1606 IMSetPosition (); 1574 im_set_position ();
1607 1575
1608 return true; 1576 return true;
1609} 1577}
1610 1578
1611void 1579void
… …
1621 im_destroy (); 1589 im_destroy ();
1622 1590
1623 if (Input_Context) 1591 if (Input_Context)
1624 return; 1592 return;
1625 1593
1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1627 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1628 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1629#endif
1630 1596
1631 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1632 if (p && *p) 1598 if (p && *p)
1633 { 1599 {
1634 bool found = false; 1600 bool found = false;
1635 1601
1636 s = rxvt_splitcommastring (p); 1602 s = rxvt_strsplit (',', p);
1637 1603
1638 for (i = 0; s[i]; i++) 1604 for (i = 0; s[i]; i++)
1639 { 1605 {
1640 if (*s[i]) 1606 if (*s[i])
1641 { 1607 {
1642 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1643 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1644 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1645 { 1611 {
1646 found = true; 1612 found = true;
1647 break; 1613 break;
1648 } 1614 }
1649 } 1615 }
1650 } 1616 }
1651 1617
1652 rxvt_freecommastring (s); 1618 rxvt_free_strsplit (s);
1653 1619
1654 if (found) 1620 if (found)
1655 goto done; 1621 goto done;
1656 } 1622 }
1657 1623
1658 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1659 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1660 goto done; 1626 goto done;
1661 1627
1662 /* try with no modifiers base IF the user didn't specify an IM */ 1628 /* try with no modifiers base IF the user didn't specify an IM */
1663 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1664 goto done; 1630 goto done;
1665 1631
1666done: 1632done:
1667#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1668 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1669 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1670#endif
1671} 1635}
1672 1636
1673void 1637void
1674rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1675{ 1639{
1676 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1677 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1678 1642
1679 if (!Input_Context 1643 if (!Input_Context
1680 || !focus 1644 || !focus
1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1682 || !IMisRunning ()) 1646 || !im_is_running ())
1683 return; 1647 return;
1684 1648
1685 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1686 { 1650 {
1687 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
… …
1717 1681
1718void 1682void
1719rxvt_term::get_window_origin (int &x, int &y) 1683rxvt_term::get_window_origin (int &x, int &y)
1720{ 1684{
1721 Window cr; 1685 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724}
1725
1726Pixmap
1727rxvt_term::get_pixmap_property (int prop_id)
1728{
1729 if (prop_id > 0 && prop_id < NUM_XA)
1730 if (xa[prop_id])
1731 {
1732 int aformat;
1733 unsigned long nitems, bytes_after;
1734 Atom atype;
1735 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop;
1742 }
1743 }
1744 return None;
1745} 1687}
1746 1688
1747#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756 1690
1757int 1691void
1758rxvt_term::update_background () 1692rxvt_term::update_background ()
1759{ 1693{
1760 bgPixmap.invalidate (); 1694 if (update_background_ev.is_active ())
1695 return;
1761 1696
1762 /* no chance of real time refresh if we are blurring! */ 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1698
1699 if (to_wait <= 0.)
1764 bgPixmap.render (); 1700 bg_render ();
1765 else 1701 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1702 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1703}
1779 1704
1780void 1705void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1707{
1708 make_current ();
1709
1710 update_background_ev.stop ();
1783 bgPixmap.render (); 1711 bg_render ();
1712 refresh_check ();
1784} 1713}
1785 1714
1786#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1787 1716
1788/*----------------------- end-of-file (C source) -----------------------*/ 1717/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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