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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.351 by sf-exg, Tue Feb 1 00:41:01 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{
158#if HAVE_BG_PIXMAP 157#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 159#endif
161#ifdef CURSOR_BLINK 160#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 162#endif
164#ifdef TEXT_BLINK 163#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 165#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 168#endif
170#ifdef SELECTION_SCROLLING 169#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 171#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 181#endif
176#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 184#endif
179#ifndef NO_BELL 185#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 187#endif
182 child_ev (this, &rxvt_term::child_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{ 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 195
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 197
203 termlist.push_back (this); 198 termlist.push_back (this);
204 199
230 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
231 delete fontset[i]; 226 delete fontset[i];
232#endif 227#endif
233 delete fontset[0]; 228 delete fontset[0];
234 229
230#ifdef HAVE_BG_PIXMAP
231 bg_destroy ();
232#endif
233
235 if (display) 234 if (display)
236 { 235 {
237 selection_clear (); 236 selection_clear ();
237 selection_clear (true);
238 238
239#ifdef USE_XIM 239#ifdef USE_XIM
240 im_destroy (); 240 im_destroy ();
241#endif 241#endif
242#ifdef XTERM_SCROLLBAR 242 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 243 if (gc) XFreeGC (dpy, gc);
267 244
268 delete drawable; 245 delete drawable;
269 // destroy all windows 246 // destroy all windows
270 if (parent[0]) 247 if (parent[0])
278 pix_colors_unfocused [i].free (this); 255 pix_colors_unfocused [i].free (this);
279#endif 256#endif
280 } 257 }
281 258
282 clear (); 259 clear ();
283 }
284 260
285 delete [] pix_colors_focused; 261 display->flush (); /* ideally .put should do this */
286#if OFF_FOCUS_FADING
287 delete [] pix_colors_unfocused;
288#endif
289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
293 displays.put (display); 262 displays.put (display);
263 }
294 264
295 scr_release (); 265 scr_release ();
296 266
297 /* clear all resources */ 267 /* clear all resources */
298 for (int i = 0; i < allocated.size (); i++) 268 for (int i = 0; i < allocated.size (); i++)
299 free (allocated [i]); 269 free (allocated [i]);
300 270
301 free (selection.text); 271 free (selection.text);
272 free (selection.clip_text);
302 // TODO: manage env vars in child only(!) 273 // TODO: manage env vars in child only(!)
303 free (env_display); 274 free (env_display);
304 free (env_term); 275 free (env_term);
305 free (locale); 276 free (locale);
306 free (v_buffer); 277 free (v_buffer);
330} 301}
331 302
332void 303void
333rxvt_term::destroy () 304rxvt_term::destroy ()
334{ 305{
335 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
336 return; 307 return;
337 308
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 310
340#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
344 if (display) 315 if (display)
345 { 316 {
346#if USE_XIM 317#if USE_XIM
347 im_ev.stop (display); 318 im_ev.stop (display);
348#endif 319#endif
349#if HAVE_SCROLLBARS
350 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
351#endif
352#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
353 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
354#endif 323#endif
355 incr_ev.stop (); 324 incr_ev.stop ();
356 termwin_ev.stop (display); 325 termwin_ev.stop (display);
357 vt_ev.stop (display); 326 vt_ev.stop (display);
358 } 327 }
359 328
360 prepare_ev.stop (); 329 flush_ev.stop ();
361 pty_ev.stop (); 330 pty_ev.stop ();
362#ifdef CURSOR_BLINK 331#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 332 cursor_blink_ev.stop ();
364#endif 333#endif
365#ifdef TEXT_BLINK 334#ifdef TEXT_BLINK
382rxvt_term::destroy_cb (ev::idle &w, int revents) 351rxvt_term::destroy_cb (ev::idle &w, int revents)
383{ 352{
384 make_current (); 353 make_current ();
385 354
386 delete this; 355 delete this;
356}
357
358void
359rxvt_term::set_option (uint8_t opt, bool set)
360{
361 if (!opt)
362 return;
363
364 uint8_t mask = 1 << (opt & 7);
365 uint8_t &val = options [opt >> 3];
366
367 val = val & ~mask | (set ? mask : 0);
387} 368}
388 369
389/*----------------------------------------------------------------------*/ 370/*----------------------------------------------------------------------*/
390/* 371/*
391 * Exit gracefully, clearing the utmp entry and restoring tty attributes 372 * Exit gracefully, clearing the utmp entry and restoring tty attributes
405print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
406{ 387{
407 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
408 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
409 char number[32]; 390 char number[32];
410 char *mtype = "XlibMessage"; 391 const char mtype[] = "XlibMessage";
411 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 392 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
412 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 393 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 394 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
414 rxvt_warn ("%s: %s\n", mesg, buffer); 395 rxvt_warn ("%s: %s\n", mesg, buffer);
415 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 396 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
417 sprintf(number, "%d", event->request_code); 398 sprintf(number, "%d", event->request_code);
418 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 399 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
419 rxvt_warn ("(which is %s)\n", buffer); 400 rxvt_warn ("(which is %s)\n", buffer);
420 if (event->request_code >= 128) { 401 if (event->request_code >= 128) {
421 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 402 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
422 mesg, BUFSIZ); 403 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
424 } 405 }
425 if ((event->error_code == BadWindow) || 406 if ((event->error_code == BadWindow) ||
426 (event->error_code == BadPixmap) || 407 (event->error_code == BadPixmap) ||
427 (event->error_code == BadCursor) || 408 (event->error_code == BadCursor) ||
428 (event->error_code == BadFont) || 409 (event->error_code == BadFont) ||
429 (event->error_code == BadDrawable) || 410 (event->error_code == BadDrawable) ||
430 (event->error_code == BadColor) || 411 (event->error_code == BadColor) ||
431 (event->error_code == BadGC) || 412 (event->error_code == BadGC) ||
432 (event->error_code == BadIDChoice) || 413 (event->error_code == BadIDChoice) ||
433 (event->error_code == BadValue) || 414 (event->error_code == BadValue) ||
434 (event->error_code == BadAtom)) { 415 (event->error_code == BadAtom)) {
435 if (event->error_code == BadValue) 416 if (event->error_code == BadValue)
436 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
437 mesg, BUFSIZ); 418 mesg, BUFSIZ);
438 else if (event->error_code == BadAtom) 419 else if (event->error_code == BadAtom)
439 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 420 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
440 mesg, BUFSIZ); 421 mesg, BUFSIZ);
441 else 422 else
442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
443 mesg, BUFSIZ); 424 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
445 } 426 }
446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 427 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
447 mesg, BUFSIZ); 428 mesg, BUFSIZ);
448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 429 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
449} 430}
450#endif 431#endif
451 432
452int 433int
475 DisplayString (display)); 456 DisplayString (display));
476 rxvt_emergency_cleanup (); 457 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 458 _exit (EXIT_FAILURE);
478} 459}
479 460
480/*----------------------------------------------------------------------*/
481bool
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{
484 this->envv = envv;
485
486 SET_R (this);
487 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :(
489
490 if (!init_vars ())
491 return false;
492
493 init_secondary ();
494
495 const char **cmd_argv = init_resources (argc, argv);
496
497#ifdef KEYSYM_RESOURCE
498 keyboard->register_done ();
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (option (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */
504#endif
505
506 pty = ptytty::create ();
507
508 create_windows (argc, argv);
509
510 init_xlocale ();
511
512 scr_reset (); // initialize screen
513
514#if 0
515 XSynchronize (dpy, True);
516#endif
517
518#ifdef HAVE_SCROLLBARS
519 if (option (Opt_scrollBar))
520 resize_scrollbar (); /* create and map scrollbar */
521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
526#ifdef ENABLE_TRANSPARENCY
527 if (option (Opt_transparent))
528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
540 XSelectInput (dpy, display->root, PropertyChangeMask);
541 rootwin_ev.start (display, display->root);
542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
568#endif
569
570 set_colorfgbg ();
571
572 init_command (cmd_argv);
573
574 free (cmd_argv);
575
576 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ);
578
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583#if ENABLE_XEMBED
584 if (rs[Rs_embed])
585 {
586 long info[2] = { 0, XEMBED_MAPPED };
587
588 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589 32, PropModeReplace, (unsigned char *)&info, 2);
590 }
591#endif
592
593 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]);
595
596 return true;
597}
598
599static struct sig_handlers 461static struct sig_handlers
600{ 462{
601 ev::sig sw_term, sw_int; 463 ev::sig sw_term, sw_int;
602 464
603 /* 465 /*
604 * Catch a fatal signal and tidy up before quitting 466 * Catch a fatal signal and tidy up before quitting
605 */ 467 */
606 void
607 sig_term (ev::sig &w, int revents) 468 void sig_term (ev::sig &w, int revents);
469
470 sig_handlers ()
608 { 471 {
609 rxvt_emergency_cleanup (); 472 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 473 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 474 }
619} sig_handlers; 475} sig_handlers;
620 476
477void
478sig_handlers::sig_term (ev::sig &w, int revents)
479{
480 rxvt_emergency_cleanup ();
481 w.stop ();
482 kill (getpid (), w.signum);
483}
484
485static void
486rxvt_get_ttymode (struct termios *tio)
487{
488 if (tcgetattr (STDIN_FILENO, tio) < 0)
489 memset (tio, 0, sizeof (struct termios));
490
491 for (int i = 0; i < NCCS; i++)
492 tio->c_cc[i] = VDISABLE;
493
494 tio->c_cc[VINTR] = CINTR;
495 tio->c_cc[VQUIT] = CQUIT;
496 tio->c_cc[VERASE] = CERASE;
497#ifdef VERASE2
498 tio->c_cc[VERASE2] = CERASE2;
499#endif
500 tio->c_cc[VKILL] = CKILL;
501 tio->c_cc[VEOF] = CEOF;
502 tio->c_cc[VSTART] = CSTART;
503 tio->c_cc[VSTOP] = CSTOP;
504 tio->c_cc[VSUSP] = CSUSP;
505# ifdef VDSUSP
506 tio->c_cc[VDSUSP] = CDSUSP;
507# endif
508# ifdef VREPRINT
509 tio->c_cc[VREPRINT] = CRPRNT;
510# endif
511# ifdef VDISCRD
512 tio->c_cc[VDISCRD] = CFLUSH;
513# endif
514# ifdef VWERSE
515 tio->c_cc[VWERSE] = CWERASE;
516# endif
517# ifdef VLNEXT
518 tio->c_cc[VLNEXT] = CLNEXT;
519# endif
520# ifdef VSTATUS
521 tio->c_cc[VSTATUS] = CSTATUS;
522# endif
523
524# if VMIN != VEOF
525 tio->c_cc[VMIN] = 1;
526# endif
527# if VTIME != VEOL
528 tio->c_cc[VTIME] = 0;
529# endif
530
531 /* input modes */
532 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
533# ifdef IMAXBEL
534 | IMAXBEL
535# endif
536 | IXON);
537
538 /* output modes */
539 tio->c_oflag = (OPOST | ONLCR);
540
541 /* control modes */
542 tio->c_cflag = (CS8 | CREAD);
543
544 /* local modes */
545 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
546# if defined (ECHOCTL) && defined (ECHOKE)
547 | ECHOCTL | ECHOKE
548# endif
549 | ECHOE | ECHOK);
550}
551
621char **rxvt_environ; // startup environment 552char **rxvt_environ; // startup environment
622 553
623void 554void
624rxvt_init () 555rxvt_init ()
625{ 556{
626 ptytty::init (); 557 assert (("fontMask must not overlap other RS masks",
558 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
627 559
560 rxvt_get_ttymode (&rxvt_term::def_tio);
561
562 // get rid of stdin/stdout as we don't need them, to free resources
563 dup2 (STDERR_FILENO, STDIN_FILENO);
564 dup2 (STDERR_FILENO, STDOUT_FILENO);
565
628 if (!ev_default_loop (0)) 566 if (!ev_default_loop ())
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 567 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630 568
631 rxvt_environ = environ; 569 rxvt_environ = environ;
632 570
633 signal (SIGHUP, SIG_IGN); 571 signal (SIGHUP, SIG_IGN);
634 signal (SIGPIPE, SIG_IGN); 572 signal (SIGPIPE, SIG_IGN);
635 573
636 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 574 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
637 sig_handlers.sw_int.start (SIGINT); ev_unref (); 575 sig_handlers.sw_int.start (SIGINT); ev_unref ();
638
639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
640 /* signal (SIGURG, SIG_DFL); */
641 576
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 577 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 578 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 579 XSetIOErrorHandler (rxvt_xioerror_handler);
645 580
646 XrmInitialize (); 581 XrmInitialize ();
647}
648
649/* ------------------------------------------------------------------------- *
650 * MEMORY ALLOCATION WRAPPERS *
651 * ------------------------------------------------------------------------- */
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 582}
684 583
685/*----------------------------------------------------------------------*/ 584/*----------------------------------------------------------------------*/
686/* 585/*
687 * window size/position calculations for XSizeHint and other storage. 586 * window size/position calculations for XSizeHint and other storage.
689 */ 588 */
690void 589void
691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 590rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692{ 591{
693 short recalc_x, recalc_y; 592 short recalc_x, recalc_y;
694 int x, y, sb_w, flags; 593 int x, y, flags;
695 unsigned int w, h; 594 unsigned int w, h;
696 unsigned int max_width, max_height; 595 unsigned int max_width, max_height;
697 596
698 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 597 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
699 szHint.win_gravity = NorthWestGravity; 598 szHint.win_gravity = NorthWestGravity;
709 if (rs[Rs_geometry]) 608 if (rs[Rs_geometry])
710 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 609 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711 610
712 if (flags & WidthValue) 611 if (flags & WidthValue)
713 { 612 {
613 if (!w)
614 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
615
714 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 616 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 617 szHint.flags |= USSize;
716 } 618 }
717 619
718 if (flags & HeightValue) 620 if (flags & HeightValue)
719 { 621 {
622 if (!h)
623 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
624
720 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 625 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 626 szHint.flags |= USSize;
722 } 627 }
723 628
724 if (flags & XValue) 629 if (flags & XValue)
725 { 630 {
756 max_width = MAX_COLS * fwidth; 661 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * fheight; 662 max_height = MAX_ROWS * fheight;
758 663
759 szHint.base_width = szHint.base_height = 2 * int_bwidth; 664 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 665
761 sb_w = 0;
762 window_vt_x = window_vt_y = int_bwidth; 666 window_vt_x = window_vt_y = int_bwidth;
763 667
764 if (scrollBar.state) 668 if (scrollBar.state)
765 { 669 {
766 sb_w = scrollbar_TotalWidth (); 670 int sb_w = scrollBar.total_width ();
767 szHint.base_width += sb_w; 671 szHint.base_width += sb_w;
768 672
769 if (!option (Opt_scrollBar_right)) 673 if (!option (Opt_scrollBar_right))
770 window_vt_x += sb_w; 674 window_vt_x += sb_w;
771 } 675 }
795 { 699 {
796 min_it (height, max_height); 700 min_it (height, max_height);
797 szHint.height = szHint.base_height + height; 701 szHint.height = szHint.base_height + height;
798 } 702 }
799 703
800 if (scrollBar.state && option (Opt_scrollBar_right))
801 window_sb_x = szHint.width - sb_w;
802
803 if (recalc_x) 704 if (recalc_x)
804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 705 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805 706
806 if (recalc_y) 707 if (recalc_y)
807 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 708 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808 709
809 ncol = width / fwidth; 710 ncol = width / fwidth;
810 nrow = height / fheight; 711 nrow = height / fheight;
811} 712}
812 713
813/*----------------------------------------------------------------------*/ 714/*----------------------------------------------------------------------*/
814/* 715/*
825 726
826 ws.ws_col = ncol; 727 ws.ws_col = ncol;
827 ws.ws_row = nrow; 728 ws.ws_row = nrow;
828 ws.ws_xpixel = width; 729 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 730 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 731 ioctl (pty->pty, TIOCSWINSZ, &ws);
831 732
832#if 0 733#if 0
833 // TIOCSWINSZ is supposed to do this automatically and correctly 734 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 735 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 736 kill (-cmd_pid, SIGWINCH);
836#endif 737#endif
837} 738}
838 739
865#endif 766#endif
866 767
867 delete fontset[0]; 768 delete fontset[0];
868 fontset[0] = fs; 769 fontset[0] = fs;
869 770
870 prop = (*fs)[1]->properties (); 771 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
871 prop.height += lineSpace; 772 prop.height += lineSpace;
773 prop.width += letterSpace;
872 774
873 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
874 776
875 fwidth = prop.width; 777 fwidth = prop.width;
876 fheight = prop.height; 778 fheight = prop.height;
926 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
927 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
928} 830}
929 831
930void 832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent[0], &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
931rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
932{ 846{
933 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
934 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
935 849
945/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
946/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
947void 861void
948rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
949{ 863{
950 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
951#if ENABLE_EWMH 865#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
953#endif 867#endif
954} 868}
955 869
956void 870void
957rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
958{ 872{
959 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
960#if ENABLE_EWMH 874#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
962#endif 876#endif
963} 877}
964 878
965void 879void
966rxvt_term::set_window_color (int idx, const char *color) 880rxvt_term::set_window_color (int idx, const char *color)
967{ 881{
968#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
969 rxvt_color xcol; 883 rxvt_color xcol;
970 int i;
971 884
972 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
973 return; 886 return;
974 887
975 color = strdup (color); 888 color = strdup (color);
977 rs[Rs_color + idx] = color; 890 rs[Rs_color + idx] = color;
978 891
979 /* handle color aliases */ 892 /* handle color aliases */
980 if (isdigit (*color)) 893 if (isdigit (*color))
981 { 894 {
982 i = atoi (color); 895 int i = atoi (color);
983 896
984 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
985 { 898 {
986 /* bright colors */ 899 /* bright colors */
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
1037void 950void
1038rxvt_term::set_colorfgbg () 951rxvt_term::set_colorfgbg ()
1039{ 952{
1040 unsigned int i; 953 unsigned int i;
1041 const char *xpmb = ""; 954 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
1043 957
1044 strcpy (fstr, "default");
1045 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1047 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
1048 { 960 {
1049 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
1050 break; 962 break;
1051 } 963 }
1052 964
1053 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1054 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1055 { 967 {
1056 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1057#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
1058 xpmb = "default;"; 970 xpmb = "default;";
1059#endif 971#endif
1060 break; 972 break;
1061 } 973 }
1091 int old_width = szHint.width; 1003 int old_width = szHint.width;
1092 int old_height = szHint.height; 1004 int old_height = szHint.height;
1093 1005
1094 window_calc (newwidth, newheight); 1006 window_calc (newwidth, newheight);
1095 1007
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1008 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1009
1010 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1011 if (set_hint)
1012 {
1013 szHint.flags &= ~(PBaseSize | PResizeInc);
1097 XSetWMNormalHints (dpy, parent[0], &szHint); 1014 XSetWMNormalHints (dpy, parent[0], &szHint);
1015 szHint.flags |= PBaseSize | PResizeInc;
1016 }
1098 1017
1099 if (!ignoreparent) 1018 if (!ignoreparent)
1100 { 1019 {
1101#ifdef SMART_RESIZE 1020#ifdef SMART_RESIZE
1102 /* 1021 /*
1142#else 1061#else
1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1062 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1144#endif 1063#endif
1145 } 1064 }
1146 1065
1066 if (set_hint)
1067 XSetWMNormalHints (dpy, parent[0], &szHint);
1068
1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1069 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1148 1070
1149 if (fix_screen || newwidth != old_width || newheight != old_height) 1071 if (fix_screen || newwidth != old_width || newheight != old_height)
1150 { 1072 {
1151 if (scrollBar.state) 1073 if (scrollBar.state)
1152 { 1074 scrollBar.resize ();
1153 XMoveResizeWindow (dpy, scrollBar.win,
1154 window_sb_x, 0,
1155 scrollbar_TotalWidth (), szHint.height);
1156 resize_scrollbar ();
1157 }
1158 1075
1159 XMoveResizeWindow (dpy, vt, 1076 XMoveResizeWindow (dpy, vt,
1160 window_vt_x, window_vt_y, 1077 window_vt_x, window_vt_y,
1161 width, height); 1078 width, height);
1162 1079
1163#ifdef HAVE_BG_PIXMAP 1080#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ()) 1081 if (bg_window_size_sensitive ())
1165 update_background (); 1082 update_background ();
1166#endif 1083#endif
1167
1168 scr_clear ();
1169 } 1084 }
1170 1085
1171 if (fix_screen || old_height == 0) 1086 if (fix_screen || old_height == 0)
1172 scr_reset (); 1087 scr_reset ();
1173
1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175 //scr_touch (false);
1176
1177#ifdef HAVE_BG_PIXMAP
1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap)
1180// scr_touch (false);
1181#endif
1182 1088
1183#ifdef USE_XIM 1089#ifdef USE_XIM
1184 IMSetPosition (); 1090 IMSetPosition ();
1185#endif 1091#endif
1186} 1092}
1252 1158
1253/* Checking whether input method is running. */ 1159/* Checking whether input method is running. */
1254bool 1160bool
1255rxvt_term::IMisRunning () 1161rxvt_term::IMisRunning ()
1256{ 1162{
1257 char *p;
1258 Atom atom; 1163 Atom atom;
1259 Window win; 1164 Window win;
1260 char server[IMBUFSIZ]; 1165 char server[IMBUFSIZ];
1261 1166
1262 /* get current locale modifier */ 1167 /* get current locale modifier */
1263 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1168 if (char *p = XSetLocaleModifiers (0))
1264 { 1169 {
1265 strcpy (server, "@server="); 1170 strcpy (server, "@server=");
1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1171 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267 1172
1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1173 if (p = strchr (server + 1, '@')) /* first one only */
1269 *p = '\0'; 1174 *p = '\0';
1270 1175
1271 atom = XInternAtom (dpy, server, False); 1176 atom = XInternAtom (dpy, server, False);
1272 win = XGetSelectionOwner (dpy, atom); 1177 win = XGetSelectionOwner (dpy, atom);
1273 1178
1274 if (win != None) 1179 if (win != None)
1275 return True; 1180 return true;
1276 } 1181 }
1277 1182
1278 return False; 1183 return false;
1279} 1184}
1280 1185
1281void 1186void
1282rxvt_term::IMSendSpot () 1187rxvt_term::IMSendSpot ()
1283{ 1188{
1340 1245
1341 term->make_current (); 1246 term->make_current ();
1342 1247
1343 if (text) 1248 if (text)
1344 { 1249 {
1345 void *str; 1250 wchar_t *str;
1346 1251
1347 if (!text->encoding_is_wchar && text->string.multi_byte) 1252 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 { 1253 {
1349 // of course, X makes it ugly again 1254 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale]) 1255 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]); 1256 SET_LOCALE (term->rs[Rs_imLocale]);
1352 1257
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1258 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1259 mbstowcs (str, text->string.multi_byte, text->length + 1);
1355 1260
1356 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale); 1262 SET_LOCALE (term->locale);
1358 } 1263 }
1359 else 1264 else
1360 str = (void *)text->string.wide_char; 1265 str = text->string.wide_char;
1361 1266
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1267 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret, 1268 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first, 1269 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length, 1270 DT_INT, call_data->chg_length,
1436 p = pet[pi]; 1341 p = pet[pi];
1437 1342
1438 if (!p) 1343 if (!p)
1439 continue; 1344 continue;
1440 1345
1441 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1442 1347
1443 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1444 { 1349 {
1445 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1446 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
1458 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1459 1364
1460 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1461 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1462 { 1367 {
1463 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1464 1369
1465 found = 1; 1370 found = 1;
1466 goto foundpet; 1371 goto foundpet;
1467 } 1372 }
1468 1373
1469 } 1374 }
1470 1375
1471 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1472 } 1377 }
1473 1378
1474foundpet: 1379foundpet:
1475 1380
1476 XFree (xim_styles); 1381 XFree (xim_styles);
1632 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1633 if (p && *p) 1538 if (p && *p)
1634 { 1539 {
1635 bool found = false; 1540 bool found = false;
1636 1541
1637 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1638 1543
1639 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1640 { 1545 {
1641 if (*s[i]) 1546 if (*s[i])
1642 { 1547 {
1648 break; 1553 break;
1649 } 1554 }
1650 } 1555 }
1651 } 1556 }
1652 1557
1653 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1654 1559
1655 if (found) 1560 if (found)
1656 goto done; 1561 goto done;
1657 } 1562 }
1658 1563
1719void 1624void
1720rxvt_term::get_window_origin (int &x, int &y) 1625rxvt_term::get_window_origin (int &x, int &y)
1721{ 1626{
1722 Window cr; 1627 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1628 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725} 1629}
1726 1630
1727Pixmap 1631Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1632rxvt_term::get_pixmap_property (Atom property)
1729{ 1633{
1730 if (prop_id > 0 && prop_id < NUM_XA) 1634 Pixmap pixmap = None;
1731 if (xa[prop_id]) 1635
1732 {
1733 int aformat; 1636 int aformat;
1734 unsigned long nitems, bytes_after; 1637 unsigned long nitems, bytes_after;
1735 Atom atype; 1638 Atom atype;
1736 unsigned char *prop = NULL; 1639 unsigned char *prop;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1640 int result = XGetWindowProperty (dpy, display->root, property,
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1641 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1642 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1643 if (result == Success)
1741 { 1644 {
1742 return *(Pixmap *)prop; 1645 if (atype == XA_PIXMAP)
1743 } 1646 pixmap = *(Pixmap *)prop;
1647 XFree (prop);
1744 } 1648 }
1745 return None; 1649
1650 return pixmap;
1746} 1651}
1747 1652
1748#ifdef HAVE_BG_PIXMAP 1653#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char *file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757 1654
1758int 1655void
1759rxvt_term::update_background () 1656rxvt_term::update_background ()
1760{ 1657{
1658 if (update_background_ev.is_active ())
1659 return;
1660
1761 bgPixmap.invalidate (); 1661 bg_invalidate ();
1762 1662
1763 /* no chance of real time refresh if we are blurring! */ 1663 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1664
1665 if (to_wait <= 0.)
1765 bgPixmap.render (); 1666 bg_render ();
1766 else 1667 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1668 update_background_ev.start (to_wait);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779} 1669}
1780 1670
1781void 1671void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1672rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1673{
1674 make_current ();
1675
1676 update_background_ev.stop ();
1784 bgPixmap.render (); 1677 bg_render ();
1678 refresh_check ();
1785} 1679}
1786 1680
1787#endif /* HAVE_BG_PIXMAP */ 1681#endif /* HAVE_BG_PIXMAP */
1788 1682
1789/*----------------------- end-of-file (C source) -----------------------*/ 1683/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines