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.291 by root, Mon Dec 24 06:51:37 2007 UTC vs.
Revision 1.356 by sf-exg, Fri Apr 29 10:10:20 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-2007 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 <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
49# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <clocale>
51# endif 53# endif
52#endif 54#endif
53 55
56struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
55 58
56// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
58 61
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 97{
95 compose_char *cc; 98 compose_char *cc;
96 99
97 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 102 cc = (*this)[c1];
100 while (cc) 103 while (cc)
101 { 104 {
102 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
104 } 107 }
105 108
106 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
111 }
112 113
113 // allocate a new combination 114 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 116 {
116 static int seen; 117 static int seen;
117 118
118 if (!seen++) 119 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 121
121 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
122 } 123 }
123 124
124 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 174#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 177#endif
177#ifdef HAVE_SCROLLBARS
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#endif
180#ifdef USE_XIM 179#ifdef USE_XIM
181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
182#endif 181#endif
183#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
188#endif 187#endif
189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 194
197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
198 196
226 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
231 if (display) 233 if (display)
232 { 234 {
233 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
234 237
235#ifdef USE_XIM 238#ifdef USE_XIM
236 im_destroy (); 239 im_destroy ();
237#endif 240#endif
238#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
239 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
240 if (ShadowGC) XFreeGC (dpy, ShadowGC);
241#endif
242#ifdef PLAIN_SCROLLBAR
243 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
244#endif
245#ifdef NEXT_SCROLLBAR
246 if (blackGC) XFreeGC (dpy, blackGC);
247 if (whiteGC) XFreeGC (dpy, whiteGC);
248 if (grayGC) XFreeGC (dpy, grayGC);
249 if (darkGC) XFreeGC (dpy, darkGC);
250 if (stippleGC) XFreeGC (dpy, stippleGC);
251 if (dimple) XFreePixmap (dpy, dimple);
252 if (upArrow) XFreePixmap (dpy, upArrow);
253 if (downArrow) XFreePixmap (dpy, downArrow);
254 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
255 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
256#endif
257#ifdef RXVT_SCROLLBAR
258 if (topShadowGC) XFreeGC (dpy, topShadowGC);
259 if (botShadowGC) XFreeGC (dpy, botShadowGC);
260 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
261#endif
262 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
263 243
264 delete drawable; 244 delete drawable;
265 // destroy all windows 245 // destroy all windows
266 if (parent[0]) 246 if (parent)
267 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
268 248
269 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
270 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
271 { 251 {
272 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
274 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
275#endif 255#endif
276 } 256 }
277 257
278 clear (); 258 clear ();
279 }
280 259
281 delete [] pix_colors_focused;
282#if OFF_FOCUS_FADING
283 delete [] pix_colors_unfocused;
284#endif
285
286#ifdef HAVE_BG_PIXMAP
287 bgPixmap.destroy ();
288#endif
289 display->flush (); /* ideally .put should do this */ 260 display->flush (); /* ideally .put should do this */
290 displays.put (display); 261 displays.put (display);
262 }
291 263
292 scr_release (); 264 scr_release ();
293 265
294 /* clear all resources */ 266 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 268 free (allocated [i]);
297 269
298 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
300 free (env_display); 273 free (env_display);
301 free (env_term); 274 free (env_term);
302 free (locale); 275 free (locale);
303 free (v_buffer); 276 free (v_buffer);
304 free (incr_buf); 277
278 delete selection_req;
305 279
306 delete envv; 280 delete envv;
307 delete argv; 281 delete argv;
308 282
309#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
341 if (display) 315 if (display)
342 { 316 {
343#if USE_XIM 317#if USE_XIM
344 im_ev.stop (display); 318 im_ev.stop (display);
345#endif 319#endif
346#if HAVE_SCROLLBARS
347 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
348#endif
349#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
350 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
351#endif 323#endif
352 incr_ev.stop ();
353 termwin_ev.stop (display); 324 termwin_ev.stop (display);
354 vt_ev.stop (display); 325 vt_ev.stop (display);
355 } 326 }
356 327
357 flush_ev.stop (); 328 flush_ev.stop ();
379rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
380{ 351{
381 make_current (); 352 make_current ();
382 353
383 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
384} 367}
385 368
386/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
387/* 370/*
388 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
402print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
403{ 386{
404 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
405 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
406 char number[32]; 389 char number[32];
407 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
408 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
409 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
410 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
411 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
412 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
413 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
414 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
415 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
416 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
417 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
418 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
419 mesg, BUFSIZ); 402 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
421 } 404 }
422 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
423 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
424 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
425 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
426 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
427 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
428 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
429 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
430 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
431 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
432 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
433 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
434 mesg, BUFSIZ); 417 mesg, BUFSIZ);
435 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
436 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
437 mesg, BUFSIZ); 420 mesg, BUFSIZ);
438 else 421 else
439 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
440 mesg, BUFSIZ); 423 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
442 } 425 }
443 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
444 mesg, BUFSIZ); 427 mesg, BUFSIZ);
445 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
446} 429}
447#endif 430#endif
448 431
449int 432int
472 DisplayString (display)); 455 DisplayString (display));
473 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
474 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
475} 458}
476 459
477/*----------------------------------------------------------------------*/
478void
479rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
480{
481 this->envv = envv;
482
483 SET_R (this);
484 set_locale ("");
485 set_environ (envv); // few things in X do not call setlocale :(
486
487 init_vars ();
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
527#ifdef HAVE_AFTERIMAGE
528 if (rs [Rs_blurradius])
529 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
530#endif
531 if (ISSET_PIXCOLOR (Color_tint))
532 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
533
534 if (rs [Rs_shade])
535 bgPixmap.set_shade (rs [Rs_shade]);
536
537 bgPixmap.set_root_pixmap ();
538 XSelectInput (dpy, display->root, PropertyChangeMask);
539 rootwin_ev.start (display, display->root);
540 }
541#endif
542
543#ifdef BG_IMAGE_FROM_FILE
544 if (rs[Rs_backgroundPixmap])
545 {
546 const char *p = rs[Rs_backgroundPixmap];
547
548 if ((p = strchr (p, ';')) != 0)
549 {
550 p++;
551 bgPixmap.set_geometry (p);
552 }
553 else
554 bgPixmap.set_defaultGeometry ();
555
556 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
557 if (!bgPixmap.window_position_sensitive ())
558 update_background ();
559 }
560#endif
561 }
562#endif
563
564#if ENABLE_PERL
565 rootwin_ev.start (display, display->root);
566#endif
567
568 set_colorfgbg ();
569
570 init_command (cmd_argv);
571
572 free (cmd_argv);
573
574 if (pty->pty >= 0)
575 pty_ev.start (pty->pty, ev::READ);
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
593static struct sig_handlers 460static struct sig_handlers
594{ 461{
595 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
596 463
597 /* 464 /*
612 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
613 w.stop (); 480 w.stop ();
614 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
615} 482}
616 483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
617char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
618 552
619void 553void
620rxvt_init () 554rxvt_init ()
621{ 555{
622 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
623 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
624 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
626 567
627 rxvt_environ = environ; 568 rxvt_environ = environ;
628 569
629 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
630 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
631 572
632 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
633 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
634
635 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
636 /* signal (SIGURG, SIG_DFL); */
637 575
638 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
639 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
640 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
641 579
649 */ 587 */
650void 588void
651rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
652{ 590{
653 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
654 int x, y, sb_w, flags; 592 int x, y, flags;
655 unsigned int w, h; 593 unsigned int w, h;
656 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
657 595
658 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
659 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
669 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
670 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
671 609
672 if (flags & WidthValue) 610 if (flags & WidthValue)
673 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
674 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
675 szHint.flags |= USSize; 616 szHint.flags |= USSize;
676 } 617 }
677 618
678 if (flags & HeightValue) 619 if (flags & HeightValue)
679 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
680 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
681 szHint.flags |= USSize; 625 szHint.flags |= USSize;
682 } 626 }
683 627
684 if (flags & XValue) 628 if (flags & XValue)
685 { 629 {
716 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
717 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
718 662
719 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
720 664
721 sb_w = 0;
722 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
723 666
724 if (scrollBar.state) 667 if (scrollBar.state)
725 { 668 {
726 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
727 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
728 671
729 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
730 window_vt_x += sb_w; 673 window_vt_x += sb_w;
731 } 674 }
755 { 698 {
756 min_it (height, max_height); 699 min_it (height, max_height);
757 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
758 } 701 }
759 702
760 if (scrollBar.state && option (Opt_scrollBar_right))
761 window_sb_x = szHint.width - sb_w;
762
763 if (recalc_x) 703 if (recalc_x)
764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
765 705
766 if (recalc_y) 706 if (recalc_y)
767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
768 708
769 ncol = width / fwidth; 709 ncol = width / fwidth;
770 nrow = height / fheight; 710 nrow = height / fheight;
771} 711}
772 712
773/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
774/* 714/*
785 725
786 ws.ws_col = ncol; 726 ws.ws_col = ncol;
787 ws.ws_row = nrow; 727 ws.ws_row = nrow;
788 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
789 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
790 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
791 731
792#if 0 732#if 0
793 // TIOCSWINSZ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
794 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
795 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
796#endif 736#endif
797} 737}
798 738
799/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
800/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
801 *
802 * init = 1 - initialize
803 *
804 * fontname == FONT_UP - switch to bigger font
805 * fontname == FONT_DN - switch to smaller font
806 */
807bool 741bool
808rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
809{ 743{
810 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
811 rxvt_fontprop prop; 745 rxvt_fontprop prop;
825#endif 759#endif
826 760
827 delete fontset[0]; 761 delete fontset[0];
828 fontset[0] = fs; 762 fontset[0] = fs;
829 763
830 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
831 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
832 767
833 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
834 769
835 fwidth = prop.width; 770 fwidth = prop.width;
836 fheight = prop.height; 771 fheight = prop.height;
867#else 802#else
868 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
869#endif 804#endif
870 } 805 }
871 806
872 if (parent[0]) 807 if (parent)
873 { 808 {
874 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
875 scr_remap_chars (); 810 scr_remap_chars ();
876 scr_touch (true); 811 scr_touch (true);
877 } 812 }
880} 815}
881 816
882void 817void
883rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
884{ 819{
885 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
886 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
887 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
888} 823}
889 824
890void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
891rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
892{ 839{
893 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
894 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
895 842
896 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
897 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
898 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
899 846
900 free (s); 847 free (s);
901 free (ws); 848 free (ws);
905/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
906/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
907void 854void
908rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
909{ 856{
910 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
911#if ENABLE_EWMH 858#if ENABLE_EWMH
912 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
913#endif 860#endif
914} 861}
915 862
916void 863void
917rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
918{ 865{
919 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
920#if ENABLE_EWMH 867#if ENABLE_EWMH
921 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
922#endif 869#endif
923} 870}
924 871
925void 872void
926rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
927{ 874{
928#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
929 rxvt_color xcol; 876 rxvt_color xcol;
930 int i;
931 877
932 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
933 return; 879 return;
934 880
935 color = strdup (color); 881 color = strdup (color);
937 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
938 884
939 /* handle color aliases */ 885 /* handle color aliases */
940 if (isdigit (*color)) 886 if (isdigit (*color))
941 { 887 {
942 i = atoi (color); 888 int i = atoi (color);
943 889
944 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
945 { 891 {
946 /* bright colors */ 892 /* bright colors */
947 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
997void 943void
998rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
999{ 945{
1000 unsigned int i; 946 unsigned int i;
1001 const char *xpmb = ""; 947 const char *xpmb = "";
1002 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
1003 950
1004 strcpy (fstr, "default");
1005 strcpy (bstr, "default");
1006 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
1007 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
1008 { 953 {
1009 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
1010 break; 955 break;
1011 } 956 }
1012 957
1013 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1014 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
1015 { 960 {
1016 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
1017#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
1018 xpmb = "default;"; 963 xpmb = "default;";
1019#endif 964#endif
1020 break; 965 break;
1021 } 966 }
1051 int old_width = szHint.width; 996 int old_width = szHint.width;
1052 int old_height = szHint.height; 997 int old_height = szHint.height;
1053 998
1054 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1055 1000
1056 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1001 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002
1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1004 if (set_hint)
1005 {
1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1057 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1058 1010
1059 if (!ignoreparent) 1011 if (!ignoreparent)
1060 { 1012 {
1061#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1062 /* 1014 /*
1066 int x, y, x1, y1; 1018 int x, y, x1, y1;
1067 int dx, dy; 1019 int dx, dy;
1068 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1069 Window unused_cr; 1021 Window unused_cr;
1070 1022
1071 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1072 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1073 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1074 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1075 /* 1027 /*
1076 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1077 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1078 */ 1030 */
1095 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1096 dy = 0; 1048 dy = 0;
1097 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1098 dy /= 2; 1050 dy /= 2;
1099 1051
1100 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1101 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1102#else 1054#else
1103 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1104#endif 1056#endif
1105 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1106 1061
1107 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1108 1063
1109 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1110 { 1065 {
1111 if (scrollBar.state) 1066 if (scrollBar.state)
1112 { 1067 scrollBar.resize ();
1113 XMoveResizeWindow (dpy, scrollBar.win,
1114 window_sb_x, 0,
1115 scrollbar_TotalWidth (), szHint.height);
1116 resize_scrollbar ();
1117 }
1118 1068
1119 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1120 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1121 width, height); 1071 width, height);
1122 1072
1123#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1124 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1125 update_background (); 1075 update_background ();
1126#endif 1076#endif
1127
1128 scr_clear ();
1129 } 1077 }
1130 1078
1131 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1132 scr_reset (); 1080 scr_reset ();
1133
1134 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1135 //scr_touch (false);
1136
1137#ifdef HAVE_BG_PIXMAP
1138// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1139// if (bgPixmap.pixmap)
1140// scr_touch (false);
1141#endif
1142 1081
1143#ifdef USE_XIM 1082#ifdef USE_XIM
1144 IMSetPosition (); 1083 IMSetPosition ();
1145#endif 1084#endif
1146} 1085}
1212 1151
1213/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1214bool 1153bool
1215rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1216{ 1155{
1217 char *p;
1218 Atom atom; 1156 Atom atom;
1219 Window win; 1157 Window win;
1220 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1221 1159
1222 /* get current locale modifier */ 1160 /* get current locale modifier */
1223 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1224 { 1162 {
1225 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1226 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1227 1165
1228 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1229 *p = '\0'; 1167 *p = '\0';
1230 1168
1231 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1232 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1233 1171
1234 if (win != None) 1172 if (win != None)
1235 return True; 1173 return true;
1236 } 1174 }
1237 1175
1238 return False; 1176 return false;
1239} 1177}
1240 1178
1241void 1179void
1242rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1243{ 1181{
1300 1238
1301 term->make_current (); 1239 term->make_current ();
1302 1240
1303 if (text) 1241 if (text)
1304 { 1242 {
1305 void *str; 1243 wchar_t *str;
1306 1244
1307 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1308 { 1246 {
1309 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1310 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1311 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1312 1250
1313 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1314 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1315 1253
1316 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1317 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1318 } 1256 }
1319 else 1257 else
1320 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1321 1259
1322 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1323 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1324 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1325 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
1396 p = pet[pi]; 1334 p = pet[pi];
1397 1335
1398 if (!p) 1336 if (!p)
1399 continue; 1337 continue;
1400 1338
1401 s = rxvt_splitcommastring (p); 1339 s = rxvt_strsplit (',', p);
1402 1340
1403 for (i = found = 0; !found && s[i]; i++) 1341 for (i = found = 0; !found && s[i]; i++)
1404 { 1342 {
1405 if (!strcmp (s[i], "OverTheSpot")) 1343 if (!strcmp (s[i], "OverTheSpot"))
1406 input_style = XIMPreeditPosition | XIMStatusNothing; 1344 input_style = XIMPreeditPosition | XIMStatusNothing;
1418 input_style = XIMPreeditNothing | XIMStatusNothing; 1356 input_style = XIMPreeditNothing | XIMStatusNothing;
1419 1357
1420 for (j = 0; j < xim_styles->count_styles; j++) 1358 for (j = 0; j < xim_styles->count_styles; j++)
1421 if (input_style == xim_styles->supported_styles[j]) 1359 if (input_style == xim_styles->supported_styles[j])
1422 { 1360 {
1423 rxvt_freecommastring (s); 1361 rxvt_free_strsplit (s);
1424 1362
1425 found = 1; 1363 found = 1;
1426 goto foundpet; 1364 goto foundpet;
1427 } 1365 }
1428 1366
1429 } 1367 }
1430 1368
1431 rxvt_freecommastring (s); 1369 rxvt_free_strsplit (s);
1432 } 1370 }
1433 1371
1434foundpet: 1372foundpet:
1435 1373
1436 XFree (xim_styles); 1374 XFree (xim_styles);
1539#endif 1477#endif
1540 1478
1541 Input_Context = XCreateIC (xim, 1479 Input_Context = XCreateIC (xim,
1542 XNInputStyle, input_style, 1480 XNInputStyle, input_style,
1543 XNClientWindow, vt, 1481 XNClientWindow, vt,
1544 XNFocusWindow, parent[0], 1482 XNFocusWindow, parent,
1545 preedit_attr ? XNPreeditAttributes : NULL, 1483 preedit_attr ? XNPreeditAttributes : NULL,
1546 preedit_attr, 1484 preedit_attr,
1547 status_attr ? XNStatusAttributes : NULL, 1485 status_attr ? XNStatusAttributes : NULL,
1548 status_attr, NULL); 1486 status_attr, NULL);
1549 1487
1592 p = rs[Rs_inputMethod]; 1530 p = rs[Rs_inputMethod];
1593 if (p && *p) 1531 if (p && *p)
1594 { 1532 {
1595 bool found = false; 1533 bool found = false;
1596 1534
1597 s = rxvt_splitcommastring (p); 1535 s = rxvt_strsplit (',', p);
1598 1536
1599 for (i = 0; s[i]; i++) 1537 for (i = 0; s[i]; i++)
1600 { 1538 {
1601 if (*s[i]) 1539 if (*s[i])
1602 { 1540 {
1608 break; 1546 break;
1609 } 1547 }
1610 } 1548 }
1611 } 1549 }
1612 1550
1613 rxvt_freecommastring (s); 1551 rxvt_free_strsplit (s);
1614 1552
1615 if (found) 1553 if (found)
1616 goto done; 1554 goto done;
1617 } 1555 }
1618 1556
1678 1616
1679void 1617void
1680rxvt_term::get_window_origin (int &x, int &y) 1618rxvt_term::get_window_origin (int &x, int &y)
1681{ 1619{
1682 Window cr; 1620 Window cr;
1683 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1621 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1684/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1685} 1622}
1686 1623
1687Pixmap 1624Pixmap
1688rxvt_term::get_pixmap_property (int prop_id) 1625rxvt_term::get_pixmap_property (Atom property)
1689{ 1626{
1690 if (prop_id > 0 && prop_id < NUM_XA) 1627 Pixmap pixmap = None;
1691 if (xa[prop_id]) 1628
1692 {
1693 int aformat; 1629 int aformat;
1694 unsigned long nitems, bytes_after; 1630 unsigned long nitems, bytes_after;
1695 Atom atype; 1631 Atom atype;
1696 unsigned char *prop = NULL; 1632 unsigned char *prop;
1697 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1633 int result = XGetWindowProperty (dpy, display->root, property,
1698 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1634 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1699 &nitems, &bytes_after, &prop); 1635 &nitems, &bytes_after, &prop);
1700 if (result == Success && prop && atype == XA_PIXMAP) 1636 if (result == Success)
1701 { 1637 {
1702 return *(Pixmap *)prop; 1638 if (atype == XA_PIXMAP)
1703 } 1639 pixmap = *(Pixmap *)prop;
1640 XFree (prop);
1704 } 1641 }
1705 return None; 1642
1643 return pixmap;
1706} 1644}
1707 1645
1708#ifdef HAVE_BG_PIXMAP 1646#ifdef HAVE_BG_PIXMAP
1709# if TRACE_PIXMAPS
1710# undef update_background
1711void
1712rxvt_term::trace_update_background (const char *file, int line)
1713{
1714 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1715 update_background ();
1716}
1717# endif
1718 1647
1719void 1648void
1720rxvt_term::update_background () 1649rxvt_term::update_background ()
1721{ 1650{
1651 if (update_background_ev.is_active ())
1652 return;
1653
1722 bgPixmap.invalidate (); 1654 bg_invalidate ();
1723 1655
1724 /* no chance of real time refresh if we are blurring! */ 1656 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1725 if (bgPixmap.invalid_since + 0.50 < ev::now () 1657
1726 && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1658 if (to_wait <= 0.)
1727 {
1728 update_background_ev.stop ();
1729 bgPixmap.render (); 1659 bg_render ();
1730 }
1731 else 1660 else
1732 {
1733 ev_tstamp refresh;
1734
1735 if (!bgPixmap.need_client_side_rendering ())
1736 refresh = .05;
1737 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1738 refresh = .20; /* very slow !!! */
1739 else
1740 refresh = .07;
1741
1742 update_background_ev.start (refresh); 1661 update_background_ev.start (to_wait);
1743 }
1744} 1662}
1745 1663
1746void 1664void
1747rxvt_term::update_background_cb (ev::timer &w, int revents) 1665rxvt_term::update_background_cb (ev::timer &w, int revents)
1748{ 1666{
1749 make_current (); 1667 make_current ();
1668
1669 update_background_ev.stop ();
1750 bgPixmap.render (); 1670 bg_render ();
1751 refresh_check (); 1671 refresh_check ();
1752} 1672}
1753 1673
1754#endif /* HAVE_BG_PIXMAP */ 1674#endif /* HAVE_BG_PIXMAP */
1755 1675

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines