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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.385 by sf-exg, Sun Dec 30 11:34:43 2012 UTC

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

Diff Legend

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