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.262 by ayin, Wed Nov 21 09:15:33 2007 UTC vs.
Revision 1.346 by sf-exg, Sat Jan 8 10:37:21 2011 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 <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 97{
97 compose_char *cc; 98 compose_char *cc;
98 99
99 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 102 cc = (*this)[c1];
102 while (cc) 103 while (cc)
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 }
114 113
115 // allocate a new combination 114 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 116 {
118 static int seen; 117 static int seen;
119 118
120 if (!seen++) 119 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 121
123 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
124 } 123 }
125 124
126 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
152 151
153} 152}
154#endif 153#endif
155 154
156rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
157 : 156{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif
163#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 177#endif
161#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
163#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 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 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 195
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 197
202 termlist.push_back (this); 198 termlist.push_back (this);
203 199
204#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
230 delete fontset[i]; 226 delete fontset[i];
231#endif 227#endif
232 delete fontset[0]; 228 delete fontset[0];
233 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
234 if (display) 240 if (display)
235 { 241 {
236 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
237 244
238#ifdef USE_XIM 245#ifdef USE_XIM
239 im_destroy (); 246 im_destroy ();
240#endif 247#endif
241#ifdef XTERM_SCROLLBAR 248 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
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); 249 if (gc) XFreeGC (dpy, gc);
266 250
267 delete drawable; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
… …
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#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 268 displays.put (display);
269 }
293 270
294 scr_release (); 271 scr_release ();
295 272
296 /* clear all resources */ 273 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 275 free (allocated [i]);
299 276
300 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
301 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
302 free (env_display); 280 free (env_display);
303 free (env_term); 281 free (env_term);
304 free (locale); 282 free (locale);
305 free (v_buffer); 283 free (v_buffer);
… …
309 delete argv; 287 delete argv;
310 288
311#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
312 delete keyboard; 290 delete keyboard;
313#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
314} 295}
315 296
316// child has exited, usually destroys 297// child has exited, usually destroys
317void 298void
318rxvt_term::child_cb (ev::child &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
… …
326} 307}
327 308
328void 309void
329rxvt_term::destroy () 310rxvt_term::destroy ()
330{ 311{
331 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
332 return; 313 return;
333 314
334 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
335 316
336#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
340 if (display) 321 if (display)
341 { 322 {
342#if USE_XIM 323#if USE_XIM
343 im_ev.stop (display); 324 im_ev.stop (display);
344#endif 325#endif
345#if HAVE_SCROLLBARS
346 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
347#endif
348#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
349 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
350#endif 329#endif
351 incr_ev.stop (); 330 incr_ev.stop ();
352 termwin_ev.stop (display); 331 termwin_ev.stop (display);
353 vt_ev.stop (display); 332 vt_ev.stop (display);
354 } 333 }
355 334
356 prepare_ev.stop (); 335 flush_ev.stop ();
357 pty_ev.stop (); 336 pty_ev.stop ();
358#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
359 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
360#endif 339#endif
361#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
378rxvt_term::destroy_cb (ev::idle &w, int revents) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
379{ 358{
380 make_current (); 359 make_current ();
381 360
382 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
383} 374}
384 375
385/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
386/* 377/*
387 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
401print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
402{ 393{
403 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
404 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
405 char number[32]; 396 char number[32];
406 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
407 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
408 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
409 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
410 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
411 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
413 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
414 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
415 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
416 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
417 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
418 mesg, BUFSIZ); 409 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
420 } 411 }
421 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
422 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
423 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
424 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
425 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
426 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
427 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
428 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
429 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
430 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
431 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
432 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
433 mesg, BUFSIZ); 424 mesg, BUFSIZ);
434 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
435 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
436 mesg, BUFSIZ); 427 mesg, BUFSIZ);
437 else 428 else
438 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
439 mesg, BUFSIZ); 430 mesg, BUFSIZ);
440 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
441 } 432 }
442 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
443 mesg, BUFSIZ); 434 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
445} 436}
446#endif 437#endif
447 438
448int 439int
… …
471 DisplayString (display)); 462 DisplayString (display));
472 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
473 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
474} 465}
475 466
476/*----------------------------------------------------------------------*/
477bool
478rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
479{
480 this->envv = envv;
481
482 SET_R (this);
483 set_locale ("");
484 set_environ (envv); // few things in X do not call setlocale :(
485
486 if (!init_vars ())
487 return false;
488
489 init_secondary ();
490
491 const char **cmd_argv = init_resources (argc, argv);
492
493#ifdef KEYSYM_RESOURCE
494 keyboard->register_done ();
495#endif
496
497#ifdef HAVE_SCROLLBARS
498 if (option (Opt_scrollBar))
499 scrollBar.setIdle (); /* set existence for size calculations */
500#endif
501
502 pty = ptytty::create ();
503
504 create_windows (argc, argv);
505
506 init_xlocale ();
507
508 scr_reset (); // initialize screen
509
510#if 0
511 XSynchronize (dpy, True);
512#endif
513
514#ifdef HAVE_SCROLLBARS
515 if (option (Opt_scrollBar))
516 resize_scrollbar (); /* create and map scrollbar */
517#endif
518#ifdef HAVE_BG_PIXMAP
519 {
520 bgPixmap.set_target (this);
521
522#ifdef ENABLE_TRANSPARENCY
523 if (option (Opt_transparent))
524 {
525 bgPixmap.set_transparent ();
526#ifdef HAVE_AFTERIMAGE
527 if (rs [Rs_blurradius])
528 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
529#endif
530 if (ISSET_PIXCOLOR (Color_tint))
531 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
532 if (rs [Rs_shade])
533 bgPixmap.set_shade (rs [Rs_shade]);
534
535 bgPixmap.set_root_pixmap ();
536 XSelectInput (dpy, display->root, PropertyChangeMask);
537 rootwin_ev.start (display, display->root);
538 }
539#endif
540
541#ifdef BG_IMAGE_FROM_FILE
542 if (rs[Rs_backgroundPixmap] != NULL)
543 {
544 const char *p = rs[Rs_backgroundPixmap];
545
546 if ((p = strchr (p, ';')) != NULL)
547 {
548 p++;
549 bgPixmap.set_geometry (p);
550 }
551 else
552 bgPixmap.set_defaultGeometry ();
553
554 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
555 if (!bgPixmap.window_position_sensitive ())
556 update_background ();
557 }
558#endif
559 }
560#endif
561
562#if ENABLE_PERL
563 rootwin_ev.start (display, display->root);
564#endif
565
566 set_colorfgbg ();
567
568 init_command (cmd_argv);
569
570 free (cmd_argv);
571
572 if (pty->pty >= 0)
573 pty_ev.start (pty->pty, ev::READ);
574
575 prepare_ev.start ();
576
577 HOOK_INVOKE ((this, HOOK_START, DT_END));
578
579#if ENABLE_XEMBED
580 if (rs[Rs_embed])
581 {
582 long info[2] = { 0, XEMBED_MAPPED };
583
584 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
585 32, PropModeReplace, (unsigned char *)&info, 2);
586 }
587#endif
588
589 XMapWindow (dpy, vt);
590 XMapWindow (dpy, parent[0]);
591
592 return true;
593}
594
595static struct sig_handlers 467static struct sig_handlers
596{ 468{
597 ev::sig sw_term, sw_int; 469 ev::sig sw_term, sw_int;
598 470
599 /* 471 /*
600 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
601 */ 473 */
602 void
603 sig_term (ev::sig &w, int revents) 474 void sig_term (ev::sig &w, int revents);
475
476 sig_handlers ()
604 { 477 {
605 rxvt_emergency_cleanup (); 478 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
606 w.stop ();
607 kill (getpid (), w.signum);
608 }
609
610 sig_handlers ()
611 : sw_term (this, &sig_handlers::sig_term),
612 sw_int (this, &sig_handlers::sig_term) 479 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
613 {
614 } 480 }
615} sig_handlers; 481} sig_handlers;
616 482
483void
484sig_handlers::sig_term (ev::sig &w, int revents)
485{
486 rxvt_emergency_cleanup ();
487 w.stop ();
488 kill (getpid (), w.signum);
489}
490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
617char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
618 559
619void 560void
620rxvt_init () 561rxvt_init ()
621{ 562{
622 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
623 565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
624 if (!ev::ev_default_loop (0)) 572 if (!ev_default_loop ())
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 574
627 rxvt_environ = environ; 575 rxvt_environ = environ;
628 576
629 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
631 579
632 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 582
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
641 586
642 XrmInitialize (); 587 XrmInitialize ();
643}
644
645/* ------------------------------------------------------------------------- *
646 * MEMORY ALLOCATION WRAPPERS *
647 * ------------------------------------------------------------------------- */
648void *
649rxvt_malloc (size_t size)
650{
651 void *p = malloc (size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_calloc (size_t number, size_t size)
661{
662 void *p = calloc (number, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668}
669
670void *
671rxvt_realloc (void *ptr, size_t size)
672{
673 void *p = realloc (ptr, size);
674
675 if (!p)
676 rxvt_fatal ("memory allocation failure. aborting.\n");
677
678 return p;
679} 588}
680 589
681/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
682/* 591/*
683 * window size/position calculations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
… …
685 */ 594 */
686void 595void
687rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
688{ 597{
689 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
690 int x, y, sb_w, flags; 599 int x, y, flags;
691 unsigned int w, h; 600 unsigned int w, h;
692 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
693 602
694 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
695 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
… …
705 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
706 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
707 616
708 if (flags & WidthValue) 617 if (flags & WidthValue)
709 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
710 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 623 szHint.flags |= USSize;
712 } 624 }
713 625
714 if (flags & HeightValue) 626 if (flags & HeightValue)
715 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
716 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
717 szHint.flags |= USSize; 632 szHint.flags |= USSize;
718 } 633 }
719 634
720 if (flags & XValue) 635 if (flags & XValue)
721 { 636 {
… …
752 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
753 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
754 669
755 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
756 671
757 sb_w = 0;
758 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
759 673
760 if (scrollBar.state) 674 if (scrollBar.state)
761 { 675 {
762 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
763 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
764 678
765 if (!option (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
766 window_vt_x += sb_w; 680 window_vt_x += sb_w;
767 } 681 }
… …
791 { 705 {
792 min_it (height, max_height); 706 min_it (height, max_height);
793 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
794 } 708 }
795 709
796 if (scrollBar.state && option (Opt_scrollBar_right))
797 window_sb_x = szHint.width - sb_w;
798
799 if (recalc_x) 710 if (recalc_x)
800 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
801 712
802 if (recalc_y) 713 if (recalc_y)
803 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
804 715
805 ncol = width / fwidth; 716 ncol = width / fwidth;
806 nrow = height / fheight; 717 nrow = height / fheight;
807} 718}
808 719
809/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
810/* 721/*
… …
821 732
822 ws.ws_col = ncol; 733 ws.ws_col = ncol;
823 ws.ws_row = nrow; 734 ws.ws_row = nrow;
824 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
825 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
826 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
827 738
828#if 0 739#if 0
829 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
830 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
831 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
832#endif 743#endif
833} 744}
834 745
… …
861#endif 772#endif
862 773
863 delete fontset[0]; 774 delete fontset[0];
864 fontset[0] = fs; 775 fontset[0] = fs;
865 776
866 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
867 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
868 780
869 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
870 782
871 fwidth = prop.width; 783 fwidth = prop.width;
872 fheight = prop.height; 784 fheight = prop.height;
… …
922 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
923 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
924} 836}
925 837
926void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
927rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
928{ 852{
929 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
930 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
931 855
… …
941/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
942/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
943void 867void
944rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
945{ 869{
946 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
947#if ENABLE_EWMH 871#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
949#endif 873#endif
950} 874}
951 875
952void 876void
953rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
954{ 878{
955 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
956#if ENABLE_EWMH 880#if ENABLE_EWMH
957 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
958#endif 882#endif
959} 883}
960 884
961void 885void
962rxvt_term::set_window_color (int idx, const char *color) 886rxvt_term::set_window_color (int idx, const char *color)
963{ 887{
964#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
965 rxvt_color xcol; 889 rxvt_color xcol;
966 int i;
967 890
968 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
969 return; 892 return;
970 893
971 color = strdup (color); 894 color = strdup (color);
… …
973 rs[Rs_color + idx] = color; 896 rs[Rs_color + idx] = color;
974 897
975 /* handle color aliases */ 898 /* handle color aliases */
976 if (isdigit (*color)) 899 if (isdigit (*color))
977 { 900 {
978 i = atoi (color); 901 int i = atoi (color);
979 902
980 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
904 {
981 { /* bright colors */ 905 /* bright colors */
982 i -= 8;
983 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
984 goto done; 907 goto done;
985 } 908 }
986 909
987 if (i >= 0 && i <= 7) 910 if (i >= 0 && i <= 7)
911 {
988 { /* normal colors */ 912 /* normal colors */
989 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
990 goto done; 914 goto done;
991 } 915 }
992 } 916 }
993 917
… …
998 * so just keep gobbling up the colormap 922 * so just keep gobbling up the colormap
999 */ 923 */
1000 924
1001 pix_colors_focused[idx] = xcol; 925 pix_colors_focused[idx] = xcol;
1002 926
1003 /* XSetWindowAttributes attr; */
1004 /* Cursor cursor; */
1005done: 927done:
1006 /*TODO: handle Color_BD, scrollbar background, etc. */ 928 /*TODO: handle Color_BD, scrollbar background, etc. */
1007 929
1008 update_fade_color (idx); 930 update_fade_color (idx);
1009 recolour_cursor (); 931 recolour_cursor ();
… …
1033 */ 955 */
1034void 956void
1035rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
1036{ 958{
1037 unsigned int i; 959 unsigned int i;
1038 const char *xpmb = "\0"; 960 const char *xpmb = "";
1039 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
1040 963
1041 strcpy (fstr, "default");
1042 strcpy (bstr, "default");
1043 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
1045 { 966 {
1046 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
1047 break; 968 break;
1048 } 969 }
1049 970
1050 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
1051 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
1052 { 973 {
1053 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
1054#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
1055 xpmb = "default;"; 976 xpmb = "default;";
1056#endif 977#endif
1057 break; 978 break;
1058 } 979 }
… …
1088 int old_width = szHint.width; 1009 int old_width = szHint.width;
1089 int old_height = szHint.height; 1010 int old_height = szHint.height;
1090 1011
1091 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
1092 1013
1093 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1094 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent[0], &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
1095 1023
1096 if (!ignoreparent) 1024 if (!ignoreparent)
1097 { 1025 {
1098#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
1099 /* 1027 /*
… …
1139#else 1067#else
1140 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1141#endif 1069#endif
1142 } 1070 }
1143 1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint);
1074
1144 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1145 1076
1146 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1147 { 1078 {
1148 if (scrollBar.state) 1079 if (scrollBar.state)
1149 { 1080 scrollBar.resize ();
1150 XMoveResizeWindow (dpy, scrollBar.win,
1151 window_sb_x, 0,
1152 scrollbar_TotalWidth (), szHint.height);
1153 resize_scrollbar ();
1154 }
1155 1081
1156 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1157 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1158 width, height); 1084 width, height);
1159 1085
1160#ifdef HAVE_BG_PIXMAP 1086#ifdef HAVE_BG_PIXMAP
1161 if (bgPixmap.window_size_sensitive ()) 1087 if (bgPixmap.window_size_sensitive ())
1162 update_background (); 1088 update_background ();
1163#endif 1089#endif
1164
1165 scr_clear ();
1166 } 1090 }
1167 1091
1168 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
1169 scr_reset (); 1093 scr_reset ();
1170
1171 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1172 //scr_touch (false);
1173 1094
1174#ifdef HAVE_BG_PIXMAP 1095#ifdef HAVE_BG_PIXMAP
1175// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ? 1096// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1176// if (bgPixmap.pixmap) 1097// if (bgPixmap.pixmap)
1177// scr_touch (false); 1098// scr_touch (false);
… …
1249 1170
1250/* Checking whether input method is running. */ 1171/* Checking whether input method is running. */
1251bool 1172bool
1252rxvt_term::IMisRunning () 1173rxvt_term::IMisRunning ()
1253{ 1174{
1254 char *p;
1255 Atom atom; 1175 Atom atom;
1256 Window win; 1176 Window win;
1257 char server[IMBUFSIZ]; 1177 char server[IMBUFSIZ];
1258 1178
1259 /* get current locale modifier */ 1179 /* get current locale modifier */
1260 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1180 if (char *p = XSetLocaleModifiers (0))
1261 { 1181 {
1262 strcpy (server, "@server="); 1182 strcpy (server, "@server=");
1263 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1183 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1264 1184
1265 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1185 if (p = strchr (server + 1, '@')) /* first one only */
1266 *p = '\0'; 1186 *p = '\0';
1267 1187
1268 atom = XInternAtom (dpy, server, False); 1188 atom = XInternAtom (dpy, server, False);
1269 win = XGetSelectionOwner (dpy, atom); 1189 win = XGetSelectionOwner (dpy, atom);
1270 1190
… …
1337 1257
1338 term->make_current (); 1258 term->make_current ();
1339 1259
1340 if (text) 1260 if (text)
1341 { 1261 {
1342 void *str; 1262 wchar_t *str;
1343 1263
1344 if (!text->encoding_is_wchar && text->string.multi_byte) 1264 if (!text->encoding_is_wchar && text->string.multi_byte)
1345 { 1265 {
1346 // of course, X makes it ugly again 1266 // of course, X makes it ugly again
1347 if (term->rs[Rs_imLocale]) 1267 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->rs[Rs_imLocale]); 1268 SET_LOCALE (term->rs[Rs_imLocale]);
1349 1269
1350 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1270 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1351 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1271 mbstowcs (str, text->string.multi_byte, text->length + 1);
1352 1272
1353 if (term->rs[Rs_imLocale]) 1273 if (term->rs[Rs_imLocale])
1354 SET_LOCALE (term->locale); 1274 SET_LOCALE (term->locale);
1355 } 1275 }
1356 else 1276 else
1357 str = (void *)text->string.wide_char; 1277 str = text->string.wide_char;
1358 1278
1359 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1279 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1360 DT_INT, call_data->caret, 1280 DT_INT, call_data->caret,
1361 DT_INT, call_data->chg_first, 1281 DT_INT, call_data->chg_first,
1362 DT_INT, call_data->chg_length, 1282 DT_INT, call_data->chg_length,
… …
1716void 1636void
1717rxvt_term::get_window_origin (int &x, int &y) 1637rxvt_term::get_window_origin (int &x, int &y)
1718{ 1638{
1719 Window cr; 1639 Window cr;
1720 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1640 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1721/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1722} 1641}
1723 1642
1724Pixmap 1643Pixmap
1725rxvt_term::get_pixmap_property (int prop_id) 1644rxvt_term::get_pixmap_property (Atom property)
1726{ 1645{
1727 if (prop_id > 0 && prop_id < NUM_XA) 1646 Pixmap pixmap = None;
1728 if (xa[prop_id]) 1647
1729 {
1730 int aformat; 1648 int aformat;
1731 unsigned long nitems, bytes_after; 1649 unsigned long nitems, bytes_after;
1732 Atom atype; 1650 Atom atype;
1733 unsigned char *prop = NULL; 1651 unsigned char *prop;
1734 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1652 int result = XGetWindowProperty (dpy, display->root, property,
1735 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1653 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1736 &nitems, &bytes_after, &prop); 1654 &nitems, &bytes_after, &prop);
1737 if (result == Success && prop && atype == XA_PIXMAP) 1655 if (result == Success)
1738 { 1656 {
1739 return *(Pixmap *)prop; 1657 if (atype == XA_PIXMAP)
1740 } 1658 pixmap = *(Pixmap *)prop;
1659 XFree (prop);
1741 } 1660 }
1742 return None; 1661
1662 return pixmap;
1743} 1663}
1744 1664
1745#ifdef HAVE_BG_PIXMAP 1665#ifdef HAVE_BG_PIXMAP
1746# if TRACE_PIXMAPS 1666
1747# undef update_background 1667void
1748int rxvt_term::trace_update_background (const char* file, int line)
1749{
1750 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1751 update_background ();
1752}
1753# endif
1754int
1755rxvt_term::update_background () 1668rxvt_term::update_background ()
1756{ 1669{
1670 if (update_background_ev.is_active ())
1671 return;
1672
1757 bgPixmap.invalidate (); 1673 bgPixmap.invalidate ();
1758 1674
1759 /* no chance of real time refresh if we are blurring! */ 1675 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1760 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1676
1677 if (to_wait <= 0.)
1761 bgPixmap.render (); 1678 bgPixmap.render ();
1762 else 1679 else
1763 {
1764 update_background_ev.stop ();
1765
1766 if (!bgPixmap.need_client_side_rendering())
1767 update_background_ev.start (.05); 1680 update_background_ev.start (to_wait);
1768 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1769 update_background_ev.start (.20); /* very slow !!! */
1770 else
1771 update_background_ev.start (.07);
1772 }
1773
1774 return 0;
1775} 1681}
1776 1682
1777void 1683void
1778rxvt_term::update_background_cb (ev::timer &w, int revents) 1684rxvt_term::update_background_cb (ev::timer &w, int revents)
1779{ 1685{
1686 make_current ();
1687
1688 update_background_ev.stop ();
1780 bgPixmap.render (); 1689 bgPixmap.render ();
1690 refresh_check ();
1781} 1691}
1782 1692
1783#endif /* HAVE_BG_PIXMAP */ 1693#endif /* HAVE_BG_PIXMAP */
1784 1694
1785/*----------------------- end-of-file (C source) -----------------------*/ 1695/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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