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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines