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.300 by root, Sat Jan 19 00:24:53 2008 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 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
227 delete fontset[i]; 225 delete fontset[i];
228#endif 226#endif
229 delete fontset[0]; 227 delete fontset[0];
230 228
231#ifdef HAVE_BG_PIXMAP 229#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy (); 230 bg_destroy ();
233#endif 231#endif
234 232
235 if (display) 233 if (display)
236 { 234 {
237 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
238 237
239#ifdef USE_XIM 238#ifdef USE_XIM
240 im_destroy (); 239 im_destroy ();
241#endif 240#endif
242#ifdef XTERM_SCROLLBAR 241 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); 242 if (gc) XFreeGC (dpy, gc);
267 243
268 delete drawable; 244 delete drawable;
269 // destroy all windows 245 // destroy all windows
270 if (parent[0]) 246 if (parent)
271 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
272 248
273 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
275 { 251 {
276 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
290 /* clear all resources */ 266 /* clear all resources */
291 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
292 free (allocated [i]); 268 free (allocated [i]);
293 269
294 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
295 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
296 free (env_display); 273 free (env_display);
297 free (env_term); 274 free (env_term);
298 free (locale); 275 free (locale);
299 free (v_buffer); 276 free (v_buffer);
300 free (incr_buf); 277
278 delete selection_req;
301 279
302 delete envv; 280 delete envv;
303 delete argv; 281 delete argv;
304 282
305#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
337 if (display) 315 if (display)
338 { 316 {
339#if USE_XIM 317#if USE_XIM
340 im_ev.stop (display); 318 im_ev.stop (display);
341#endif 319#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
347#endif 323#endif
348 incr_ev.stop ();
349 termwin_ev.stop (display); 324 termwin_ev.stop (display);
350 vt_ev.stop (display); 325 vt_ev.stop (display);
351 } 326 }
352 327
353 flush_ev.stop (); 328 flush_ev.stop ();
375rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 351{
377 make_current (); 352 make_current ();
378 353
379 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);
380} 367}
381 368
382/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
383/* 370/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
398print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
399{ 386{
400 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
402 char number[32]; 389 char number[32];
403 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 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");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 402 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 404 }
418 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 417 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 420 mesg, BUFSIZ);
434 else 421 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 423 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 425 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 427 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 429}
443#endif 430#endif
444 431
445int 432int
468 DisplayString (display)); 455 DisplayString (display));
469 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
471} 458}
472 459
473/*----------------------------------------------------------------------*/
474void
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 init_vars ();
484
485 init_secondary ();
486
487 const char **cmd_argv = init_resources (argc, argv);
488
489#ifdef KEYSYM_RESOURCE
490 keyboard->register_done ();
491#endif
492
493#ifdef HAVE_SCROLLBARS
494 if (option (Opt_scrollBar))
495 scrollBar.setIdle (); /* set existence for size calculations */
496#endif
497
498 pty = ptytty::create ();
499
500 create_windows (argc, argv);
501
502 init_xlocale ();
503
504 scr_reset (); // initialize screen
505
506#if 0
507 XSynchronize (dpy, True);
508#endif
509
510#ifdef HAVE_SCROLLBARS
511 if (option (Opt_scrollBar))
512 resize_scrollbar (); /* create and map scrollbar */
513#endif
514#ifdef HAVE_BG_PIXMAP
515 {
516 bgPixmap.set_target (this);
517 bgPixmap.invalidate ();
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530
531 if (rs [Rs_shade])
532 bgPixmap.set_shade (rs [Rs_shade]);
533
534 bgPixmap.set_root_pixmap ();
535 XSelectInput (dpy, display->root, PropertyChangeMask);
536 rootwin_ev.start (display, display->root);
537 }
538#endif
539
540#ifdef BG_IMAGE_FROM_FILE
541 if (rs[Rs_backgroundPixmap])
542 {
543 const char *p = rs[Rs_backgroundPixmap];
544
545 if ((p = strchr (p, ';')) != 0)
546 {
547 p++;
548 bgPixmap.set_geometry (p);
549 }
550 else
551 bgPixmap.set_defaultGeometry ();
552
553 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
554 if (!bgPixmap.window_position_sensitive ())
555 update_background ();
556 }
557#endif
558 }
559#endif
560
561#if ENABLE_PERL
562 rootwin_ev.start (display, display->root);
563#endif
564
565 set_colorfgbg ();
566
567 init_command (cmd_argv);
568
569 free (cmd_argv);
570
571 if (pty->pty >= 0)
572 pty_ev.start (pty->pty, ev::READ);
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 refresh_check ();
590}
591
592static struct sig_handlers 460static struct sig_handlers
593{ 461{
594 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
595 463
596 /* 464 /*
611 rxvt_emergency_cleanup (); 479 rxvt_emergency_cleanup ();
612 w.stop (); 480 w.stop ();
613 kill (getpid (), w.signum); 481 kill (getpid (), w.signum);
614} 482}
615 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
616char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
617 552
618void 553void
619rxvt_init () 554rxvt_init ()
620{ 555{
621 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))));
622 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
623 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
625 567
626 rxvt_environ = environ; 568 rxvt_environ = environ;
627 569
628 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
629 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
630 572
631 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
632 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
633
634 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
635 /* signal (SIGURG, SIG_DFL); */
636 575
637 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
638 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
639 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
640 579
648 */ 587 */
649void 588void
650rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
651{ 590{
652 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
653 int x, y, sb_w, flags; 592 int x, y, flags;
654 unsigned int w, h; 593 unsigned int w, h;
655 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
656 595
657 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
658 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
668 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
669 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
670 609
671 if (flags & WidthValue) 610 if (flags & WidthValue)
672 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
673 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
674 szHint.flags |= USSize; 616 szHint.flags |= USSize;
675 } 617 }
676 618
677 if (flags & HeightValue) 619 if (flags & HeightValue)
678 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
679 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
680 szHint.flags |= USSize; 625 szHint.flags |= USSize;
681 } 626 }
682 627
683 if (flags & XValue) 628 if (flags & XValue)
684 { 629 {
715 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
716 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
717 662
718 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
719 664
720 sb_w = 0;
721 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
722 666
723 if (scrollBar.state) 667 if (scrollBar.state)
724 { 668 {
725 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
726 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
727 671
728 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
729 window_vt_x += sb_w; 673 window_vt_x += sb_w;
730 } 674 }
754 { 698 {
755 min_it (height, max_height); 699 min_it (height, max_height);
756 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
757 } 701 }
758 702
759 if (scrollBar.state && option (Opt_scrollBar_right))
760 window_sb_x = szHint.width - sb_w;
761
762 if (recalc_x) 703 if (recalc_x)
763 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
764 705
765 if (recalc_y) 706 if (recalc_y)
766 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
767 708
768 ncol = width / fwidth; 709 ncol = width / fwidth;
769 nrow = height / fheight; 710 nrow = height / fheight;
770} 711}
771 712
772/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
773/* 714/*
784 725
785 ws.ws_col = ncol; 726 ws.ws_col = ncol;
786 ws.ws_row = nrow; 727 ws.ws_row = nrow;
787 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
788 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
789 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
790 731
791#if 0 732#if 0
792 // TIOCSWINSZ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
793 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
794 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
795#endif 736#endif
796} 737}
797 738
798/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
799/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
800 *
801 * init = 1 - initialize
802 *
803 * fontname == FONT_UP - switch to bigger font
804 * fontname == FONT_DN - switch to smaller font
805 */
806bool 741bool
807rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
808{ 743{
809 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
810 rxvt_fontprop prop; 745 rxvt_fontprop prop;
824#endif 759#endif
825 760
826 delete fontset[0]; 761 delete fontset[0];
827 fontset[0] = fs; 762 fontset[0] = fs;
828 763
829 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
830 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
831 767
832 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
833 769
834 fwidth = prop.width; 770 fwidth = prop.width;
835 fheight = prop.height; 771 fheight = prop.height;
866#else 802#else
867 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
868#endif 804#endif
869 } 805 }
870 806
871 if (parent[0]) 807 if (parent)
872 { 808 {
873 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
874 scr_remap_chars (); 810 scr_remap_chars ();
875 scr_touch (true); 811 scr_touch (true);
876 } 812 }
879} 815}
880 816
881void 817void
882rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
883{ 819{
884 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
885 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
886 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
887} 823}
888 824
889void 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
890rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
891{ 839{
892 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
893 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
894 842
895 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
896 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
897 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
898 846
899 free (s); 847 free (s);
900 free (ws); 848 free (ws);
904/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
905/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
906void 854void
907rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
908{ 856{
909 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
910#if ENABLE_EWMH 858#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
912#endif 860#endif
913} 861}
914 862
915void 863void
916rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
917{ 865{
918 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
919#if ENABLE_EWMH 867#if ENABLE_EWMH
920 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
921#endif 869#endif
922} 870}
923 871
924void 872void
925rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
926{ 874{
927#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
928 rxvt_color xcol; 876 rxvt_color xcol;
929 int i;
930 877
931 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
932 return; 879 return;
933 880
934 color = strdup (color); 881 color = strdup (color);
936 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
937 884
938 /* handle color aliases */ 885 /* handle color aliases */
939 if (isdigit (*color)) 886 if (isdigit (*color))
940 { 887 {
941 i = atoi (color); 888 int i = atoi (color);
942 889
943 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
944 { 891 {
945 /* bright colors */ 892 /* bright colors */
946 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
996void 943void
997rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
998{ 945{
999 unsigned int i; 946 unsigned int i;
1000 const char *xpmb = ""; 947 const char *xpmb = "";
1001 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
1002 950
1003 strcpy (fstr, "default");
1004 strcpy (bstr, "default");
1005 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
1006 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
1007 { 953 {
1008 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
1009 break; 955 break;
1010 } 956 }
1011 957
1012 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1013 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
1014 { 960 {
1015 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
1016#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
1017 xpmb = "default;"; 963 xpmb = "default;";
1018#endif 964#endif
1019 break; 965 break;
1020 } 966 }
1050 int old_width = szHint.width; 996 int old_width = szHint.width;
1051 int old_height = szHint.height; 997 int old_height = szHint.height;
1052 998
1053 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1054 1000
1055 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);
1056 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1057 1010
1058 if (!ignoreparent) 1011 if (!ignoreparent)
1059 { 1012 {
1060#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1061 /* 1014 /*
1065 int x, y, x1, y1; 1018 int x, y, x1, y1;
1066 int dx, dy; 1019 int dx, dy;
1067 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1068 Window unused_cr; 1021 Window unused_cr;
1069 1022
1070 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1071 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1072 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1073 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1074 /* 1027 /*
1075 * 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
1076 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1077 */ 1030 */
1094 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1095 dy = 0; 1048 dy = 0;
1096 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1097 dy /= 2; 1050 dy /= 2;
1098 1051
1099 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1100 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1101#else 1054#else
1102 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1103#endif 1056#endif
1104 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1105 1061
1106 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1107 1063
1108 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1109 { 1065 {
1110 if (scrollBar.state) 1066 if (scrollBar.state)
1111 { 1067 scrollBar.resize ();
1112 XMoveResizeWindow (dpy, scrollBar.win,
1113 window_sb_x, 0,
1114 scrollbar_TotalWidth (), szHint.height);
1115 resize_scrollbar ();
1116 }
1117 1068
1118 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1119 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1120 width, height); 1071 width, height);
1121 1072
1122#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1123 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1124 update_background (); 1075 update_background ();
1125#endif 1076#endif
1126
1127 scr_clear ();
1128 } 1077 }
1129 1078
1130 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1131 scr_reset (); 1080 scr_reset ();
1132
1133 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1134 //scr_touch (false);
1135
1136#ifdef HAVE_BG_PIXMAP
1137// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1138// if (bgPixmap.pixmap)
1139// scr_touch (false);
1140#endif
1141 1081
1142#ifdef USE_XIM 1082#ifdef USE_XIM
1143 IMSetPosition (); 1083 IMSetPosition ();
1144#endif 1084#endif
1145} 1085}
1211 1151
1212/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1213bool 1153bool
1214rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1215{ 1155{
1216 char *p;
1217 Atom atom; 1156 Atom atom;
1218 Window win; 1157 Window win;
1219 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1220 1159
1221 /* get current locale modifier */ 1160 /* get current locale modifier */
1222 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1223 { 1162 {
1224 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1225 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1226 1165
1227 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1228 *p = '\0'; 1167 *p = '\0';
1229 1168
1230 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1231 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1232 1171
1233 if (win != None) 1172 if (win != None)
1234 return True; 1173 return true;
1235 } 1174 }
1236 1175
1237 return False; 1176 return false;
1238} 1177}
1239 1178
1240void 1179void
1241rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1242{ 1181{
1299 1238
1300 term->make_current (); 1239 term->make_current ();
1301 1240
1302 if (text) 1241 if (text)
1303 { 1242 {
1304 void *str; 1243 wchar_t *str;
1305 1244
1306 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1307 { 1246 {
1308 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1309 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1310 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1311 1250
1312 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1313 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1314 1253
1315 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1316 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1317 } 1256 }
1318 else 1257 else
1319 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1320 1259
1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1322 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1323 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1324 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
1362 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1363 unsigned long fg, bg; 1302 unsigned long fg, bg;
1364 const char *p; 1303 const char *p;
1365 char **s; 1304 char **s;
1366 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1367#ifdef ENABLE_XIM_ONTHESPOT
1368 XIMCallback xcb[4];
1369#endif
1370 1306
1371 set_environ (envv); 1307 set_environ (envv);
1372 1308
1373 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1374 return false; 1310 return false;
1395 p = pet[pi]; 1331 p = pet[pi];
1396 1332
1397 if (!p) 1333 if (!p)
1398 continue; 1334 continue;
1399 1335
1400 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1401 1337
1402 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1403 { 1339 {
1404 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1405 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
1417 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1418 1354
1419 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1420 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1421 { 1357 {
1422 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1423 1359
1424 found = 1; 1360 found = 1;
1425 goto foundpet; 1361 goto foundpet;
1426 } 1362 }
1427 1363
1428 } 1364 }
1429 1365
1430 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1431 } 1367 }
1432 1368
1433foundpet: 1369foundpet:
1434 1370
1435 XFree (xim_styles); 1371 XFree (xim_styles);
1514 NULL); 1450 NULL);
1515 } 1451 }
1516#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1517 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1518 { 1454 {
1455 XIMCallback xcb[4];
1456
1519 im_set_position (spot); 1457 im_set_position (spot);
1520 1458
1521 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1522 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1523 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1538#endif 1476#endif
1539 1477
1540 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1541 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1542 XNClientWindow, vt, 1480 XNClientWindow, vt,
1543 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1544 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1545 preedit_attr, 1483 preedit_attr,
1546 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1547 status_attr, NULL); 1485 status_attr, NULL);
1548 1486
1591 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1592 if (p && *p) 1530 if (p && *p)
1593 { 1531 {
1594 bool found = false; 1532 bool found = false;
1595 1533
1596 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1597 1535
1598 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1599 { 1537 {
1600 if (*s[i]) 1538 if (*s[i])
1601 { 1539 {
1607 break; 1545 break;
1608 } 1546 }
1609 } 1547 }
1610 } 1548 }
1611 1549
1612 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1613 1551
1614 if (found) 1552 if (found)
1615 goto done; 1553 goto done;
1616 } 1554 }
1617 1555
1677 1615
1678void 1616void
1679rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1680{ 1618{
1681 Window cr; 1619 Window cr;
1682 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1683/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1684} 1621}
1685 1622
1686Pixmap 1623Pixmap
1687rxvt_term::get_pixmap_property (int prop_id) 1624rxvt_term::get_pixmap_property (Atom property)
1688{ 1625{
1689 if (prop_id > 0 && prop_id < NUM_XA) 1626 Pixmap pixmap = None;
1690 if (xa[prop_id]) 1627
1691 {
1692 int aformat; 1628 int aformat;
1693 unsigned long nitems, bytes_after; 1629 unsigned long nitems, bytes_after;
1694 Atom atype; 1630 Atom atype;
1695 unsigned char *prop = NULL; 1631 unsigned char *prop;
1696 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1632 int result = XGetWindowProperty (dpy, display->root, property,
1697 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1698 &nitems, &bytes_after, &prop); 1634 &nitems, &bytes_after, &prop);
1699 if (result == Success && prop && atype == XA_PIXMAP) 1635 if (result == Success)
1636 {
1637 if (atype == XA_PIXMAP)
1700 return *(Pixmap *)prop; 1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1701 } 1640 }
1702 1641
1703 return None; 1642 return pixmap;
1704} 1643}
1705 1644
1706#ifdef HAVE_BG_PIXMAP 1645#ifdef HAVE_BG_PIXMAP
1707# if TRACE_PIXMAPS
1708# undef update_background
1709void
1710rxvt_term::trace_update_background (const char *file, int line)
1711{
1712 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1713 update_background ();
1714}
1715# endif
1716 1646
1717void 1647void
1718rxvt_term::update_background () 1648rxvt_term::update_background ()
1719{ 1649{
1720 if (update_background_ev.is_active ()) 1650 if (update_background_ev.is_active ())
1721 return; 1651 return;
1722 1652
1723 bgPixmap.invalidate (); 1653 bg_invalidate ();
1724 1654
1725 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1726 1656
1727 if (to_wait <= 0.) 1657 if (to_wait <= 0.)
1728 bgPixmap.render (); 1658 bg_render ();
1729 else 1659 else
1730 update_background_ev.start (to_wait); 1660 update_background_ev.start (to_wait);
1731} 1661}
1732 1662
1733void 1663void
1734rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1735{ 1665{
1736 make_current (); 1666 make_current ();
1737 1667
1738 update_background_ev.stop (); 1668 update_background_ev.stop ();
1739 bgPixmap.render (); 1669 bg_render ();
1740 refresh_check (); 1670 refresh_check ();
1741} 1671}
1742 1672
1743#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1744 1674

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines