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.319 by sf-exg, Sun Jan 24 21:53:13 2010 UTC vs.
Revision 1.384 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 229#endif
238 230
239 if (display) 231 if (display)
240 { 232 {
241 selection_clear (); 233 selection_clear ();
242 selection_clear (true); 234 selection_clear (true);
243 235
244#ifdef USE_XIM 236#if USE_XIM
245 im_destroy (); 237 im_destroy ();
246#endif 238#endif
247 scrollBar.destroy (); 239 scrollBar.destroy ();
248 if (gc) XFreeGC (dpy, gc); 240 if (gc) XFreeGC (dpy, gc);
249 241
250 delete drawable; 242 delete drawable;
251 // destroy all windows 243 // destroy all windows
252 if (parent[0]) 244 if (parent)
253 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
254 246
255 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
256 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
257 { 249 {
258 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
273 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
274 free (allocated [i]); 266 free (allocated [i]);
275 267
276 free (selection.text); 268 free (selection.text);
277 free (selection.clip_text); 269 free (selection.clip_text);
278 // TODO: manage env vars in child only(!)
279 free (env_display);
280 free (env_term);
281 free (locale); 270 free (locale);
282 free (v_buffer); 271 free (v_buffer);
283 free (incr_buf); 272
273 delete selection_req;
284 274
285 delete envv; 275 delete envv;
286 delete argv; 276 delete argv;
287 277
288#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
… …
321 { 311 {
322#if USE_XIM 312#if USE_XIM
323 im_ev.stop (display); 313 im_ev.stop (display);
324#endif 314#endif
325 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
326#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
327 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
328#endif 318#endif
329 incr_ev.stop ();
330 termwin_ev.stop (display); 319 termwin_ev.stop (display);
331 vt_ev.stop (display); 320 vt_ev.stop (display);
332 } 321 }
333 322
334 flush_ev.stop (); 323 flush_ev.stop ();
… …
358 make_current (); 347 make_current ();
359 348
360 delete this; 349 delete this;
361} 350}
362 351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
362}
363
363/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
364/* 365/*
365 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
366 * TODO: if debugging, this should free up any known resources if we can
367 */ 367 */
368static XErrorHandler old_xerror_handler; 368static XErrorHandler old_xerror_handler;
369 369
370static void 370static void
371rxvt_emergency_cleanup () 371rxvt_emergency_cleanup ()
… …
373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 373 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
374 (*t)->emergency_cleanup (); 374 (*t)->emergency_cleanup ();
375} 375}
376 376
377#if !ENABLE_MINIMAL 377#if !ENABLE_MINIMAL
378static void 378static void ecb_cold
379print_x_error (Display *dpy, XErrorEvent *event) 379print_x_error (Display *dpy, XErrorEvent *event)
380{ 380{
381 char buffer[BUFSIZ]; 381 char buffer[BUFSIZ];
382 char mesg[BUFSIZ]; 382 char mesg[BUFSIZ];
383 char number[32]; 383 char number[32];
384 char *mtype = "XlibMessage"; 384
385 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
386 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
387 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 385 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
386
387 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
388 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
389
390 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
391 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("%s: %s\n", mesg, buffer); 392 rxvt_warn ("+ %s: %s\n", mesg, buffer);
393
389 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 394 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
390 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
391 sprintf(number, "%d", event->request_code); 396
392 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
393 rxvt_warn ("(which is %s)\n", buffer);
394 if (event->request_code >= 128) { 397 if (event->request_code >= 128)
395 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 {
396 mesg, BUFSIZ); 399#if 0
397 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
401 int nexts;
402 char **exts = XListExtensions (dpy, &nexts);
403
404 while (nexts)
405 {
406 char *extname = exts [nexts - 1];
407 int major, first_event, first_error;
408
409 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
410 {
411 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
412 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
413
414 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
415 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
416 rxvt_warn ("+ (which is %s)\n", buffer);
417
418 break;
419 }
420
421 printf ("nextss %d %s\n", nexts, extname);//D
422 --nexts;
423 ++exts;
424 }
425#else
426 int nexts = 0;
427 char **exts = 0;
428#endif
429
430 if (!nexts)
431 {
432 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
433
434 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
435 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
436
437#if 0
438 sprintf (number, "RENDER.%d", event->minor_code);
439 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
440 rxvt_warn ("+ (which is %s)\n", buffer);
441#endif
442 }
443
444 XFreeExtensionList (exts);
398 } 445 }
446 else
447 {
448 sprintf (number, "%d", event->request_code);
449 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
450 rxvt_warn ("+ (which is %s)\n", buffer);
451 }
452
399 if ((event->error_code == BadWindow) || 453 if (event->error_code == BadWindow
400 (event->error_code == BadPixmap) || 454 || event->error_code == BadPixmap
401 (event->error_code == BadCursor) || 455 || event->error_code == BadCursor
402 (event->error_code == BadFont) || 456 || event->error_code == BadFont
403 (event->error_code == BadDrawable) || 457 || event->error_code == BadDrawable
404 (event->error_code == BadColor) || 458 || event->error_code == BadColor
405 (event->error_code == BadGC) || 459 || event->error_code == BadGC
406 (event->error_code == BadIDChoice) || 460 || event->error_code == BadIDChoice
407 (event->error_code == BadValue) || 461 || event->error_code == BadValue
408 (event->error_code == BadAtom)) { 462 || event->error_code == BadAtom)
463 {
409 if (event->error_code == BadValue) 464 if (event->error_code == BadValue)
410 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
411 mesg, BUFSIZ);
412 else if (event->error_code == BadAtom) 466 else if (event->error_code == BadAtom)
413 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 467 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
414 mesg, BUFSIZ); 468 else
415 else
416 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 469 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
417 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
419 }
420 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
421 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
423}
424#endif
425 470
426int 471 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
472 }
473}
474#endif
475
476int ecb_cold
427rxvt_xerror_handler (Display *display, XErrorEvent *event) 477rxvt_xerror_handler (Display *display, XErrorEvent *event)
428{ 478{
429 if (GET_R->allowedxerror == -1) 479 if (GET_R->allowedxerror == -1)
430 GET_R->allowedxerror = event->error_code; 480 GET_R->allowedxerror = event->error_code;
431 else 481 else
… …
440 } 490 }
441 491
442 return 0; 492 return 0;
443} 493}
444 494
445int 495int ecb_cold
446rxvt_xioerror_handler (Display *display) 496rxvt_xioerror_handler (Display *display)
447{ 497{
448 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 498 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
449 DisplayString (display)); 499 DisplayString (display));
450 rxvt_emergency_cleanup (); 500 rxvt_emergency_cleanup ();
… …
473 rxvt_emergency_cleanup (); 523 rxvt_emergency_cleanup ();
474 w.stop (); 524 w.stop ();
475 kill (getpid (), w.signum); 525 kill (getpid (), w.signum);
476} 526}
477 527
528static void
529rxvt_get_ttymode (struct termios *tio)
530{
531 if (tcgetattr (STDIN_FILENO, tio) < 0)
532 memset (tio, 0, sizeof (struct termios));
533
534 for (int i = 0; i < NCCS; i++)
535 tio->c_cc[i] = VDISABLE;
536
537 tio->c_cc[VINTR] = CINTR;
538 tio->c_cc[VQUIT] = CQUIT;
539 tio->c_cc[VERASE] = CERASE;
540#ifdef VERASE2
541 tio->c_cc[VERASE2] = CERASE2;
542#endif
543 tio->c_cc[VKILL] = CKILL;
544 tio->c_cc[VEOF] = CEOF;
545 tio->c_cc[VSTART] = CSTART;
546 tio->c_cc[VSTOP] = CSTOP;
547 tio->c_cc[VSUSP] = CSUSP;
548# ifdef VDSUSP
549 tio->c_cc[VDSUSP] = CDSUSP;
550# endif
551# ifdef VREPRINT
552 tio->c_cc[VREPRINT] = CRPRNT;
553# endif
554# ifdef VDISCRD
555 tio->c_cc[VDISCRD] = CFLUSH;
556# endif
557# ifdef VWERSE
558 tio->c_cc[VWERSE] = CWERASE;
559# endif
560# ifdef VLNEXT
561 tio->c_cc[VLNEXT] = CLNEXT;
562# endif
563# ifdef VSTATUS
564 tio->c_cc[VSTATUS] = CSTATUS;
565# endif
566
567# if VMIN != VEOF
568 tio->c_cc[VMIN] = 1;
569# endif
570# if VTIME != VEOL
571 tio->c_cc[VTIME] = 0;
572# endif
573
574 /* input modes */
575 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
576# ifdef IMAXBEL
577 | IMAXBEL
578# endif
579 | IXON);
580
581 /* output modes */
582 tio->c_oflag = (OPOST | ONLCR);
583
584 /* control modes */
585 tio->c_cflag = (CS8 | CREAD);
586
587 /* local modes */
588 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
589# if defined (ECHOCTL) && defined (ECHOKE)
590 | ECHOCTL | ECHOKE
591# endif
592 | ECHOE | ECHOK);
593}
594
478char **rxvt_environ; // startup environment 595char **rxvt_environ; // startup environment
479 596
480void 597void
481rxvt_init () 598rxvt_init ()
482{ 599{
483 ptytty::init (); 600 assert (("fontMask must not overlap other RS masks",
601 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
484 602
603 rxvt_get_ttymode (&rxvt_term::def_tio);
604
605 // get rid of stdin/stdout as we don't need them, to free resources
606 dup2 (STDERR_FILENO, STDIN_FILENO);
607 dup2 (STDERR_FILENO, STDOUT_FILENO);
608
485 if (!ev_default_loop (0)) 609 if (!ev_default_loop ())
486 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 610 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
487 611
488 rxvt_environ = environ; 612 rxvt_environ = environ;
489 613
490 signal (SIGHUP, SIG_IGN); 614 signal (SIGHUP, SIG_IGN);
491 signal (SIGPIPE, SIG_IGN); 615 signal (SIGPIPE, SIG_IGN);
492 616
493 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 617 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
494 sig_handlers.sw_int.start (SIGINT); ev_unref (); 618 sig_handlers.sw_int.start (SIGINT); ev_unref ();
495
496 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
497 /* signal (SIGURG, SIG_DFL); */
498 619
499 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 620 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
500 // TODO: handle this with exceptions and tolerate the memory loss 621 // TODO: handle this with exceptions and tolerate the memory loss
501 XSetIOErrorHandler (rxvt_xioerror_handler); 622 XSetIOErrorHandler (rxvt_xioerror_handler);
502 623
503 XrmInitialize (); 624 XrmInitialize ();
625
626#if HAVE_PIXBUF
627 g_type_init ();
628#endif
504} 629}
505 630
506/*----------------------------------------------------------------------*/ 631/*----------------------------------------------------------------------*/
507/* 632/*
508 * window size/position calculations for XSizeHint and other storage. 633 * window size/position calculations for XSizeHint and other storage.
… …
629 if (recalc_y) 754 if (recalc_y)
630 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 755 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
631 756
632 ncol = width / fwidth; 757 ncol = width / fwidth;
633 nrow = height / fheight; 758 nrow = height / fheight;
759
760 // When the size of the vt window is not a multiple of the cell
761 // size, i.e., when the wm does not honour our size hints, there are
762 // extra areas not covered by the terminal screen. Such gaps, when a
763 // bg pixmap is set, would have to be cleared manually to properly
764 // refresh the background. We take the simpler route and shrink the
765 // vt window so as to avoid creating gaps.
766 vt_width = ncol * fwidth;
767 vt_height = nrow * fheight;
634} 768}
635 769
636/*----------------------------------------------------------------------*/ 770/*----------------------------------------------------------------------*/
637/* 771/*
638 * Tell the teletype handler what size the window is. 772 * Tell the teletype handler what size the window is.
… …
646 780
647 struct winsize ws; 781 struct winsize ws;
648 782
649 ws.ws_col = ncol; 783 ws.ws_col = ncol;
650 ws.ws_row = nrow; 784 ws.ws_row = nrow;
651 ws.ws_xpixel = width; 785 ws.ws_xpixel = vt_width;
652 ws.ws_ypixel = height; 786 ws.ws_ypixel = vt_height;
653 ioctl (pty->pty, TIOCSWINSZ, &ws); 787 ioctl (pty->pty, TIOCSWINSZ, &ws);
654 788
655#if 0 789#if 0
656 // TIOCSWINSZ is supposed to do this automatically and correctly 790 // TIOCSWINSZ is supposed to do this automatically and correctly
657 if (cmd_pid) /* force through to the command */ 791 if (cmd_pid) /* force through to the command */
658 kill (-cmd_pid, SIGWINCH); 792 kill (-cmd_pid, SIGWINCH);
659#endif 793#endif
660} 794}
661 795
662/*----------------------------------------------------------------------*/ 796/*----------------------------------------------------------------------*/
663/* set_fonts () - load and set the various fonts 797/* load and set the various fonts */
664 *
665 * init = 1 - initialize
666 *
667 * fontname == FONT_UP - switch to bigger font
668 * fontname == FONT_DN - switch to smaller font
669 */
670bool 798bool
671rxvt_term::set_fonts () 799rxvt_term::set_fonts ()
672{ 800{
673 rxvt_fontset *fs = new rxvt_fontset (this); 801 rxvt_fontset *fs = new rxvt_fontset (this);
674 rxvt_fontprop prop; 802 rxvt_fontprop prop;
… …
688#endif 816#endif
689 817
690 delete fontset[0]; 818 delete fontset[0];
691 fontset[0] = fs; 819 fontset[0] = fs;
692 820
693 prop = (*fs)[1]->properties (); 821 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
694 prop.height += lineSpace; 822 prop.width = max (prop.width + letterSpace, 1);
695 prop.width += letterSpace;
696 823
697 fs->set_prop (prop, false); 824 fs->set_prop (prop, false);
698 825
699 fwidth = prop.width; 826 fwidth = prop.width;
700 fheight = prop.height; 827 fheight = prop.height + lineSpace;
701 fbase = prop.ascent; 828 fbase = prop.ascent;
702 829
703 for (int style = 1; style < 4; style++) 830 for (int style = 1; style < 4; style++)
704 { 831 {
705#if ENABLE_STYLES 832#if ENABLE_STYLES
… …
731#else 858#else
732 fontset[style] = fontset[0]; 859 fontset[style] = fontset[0];
733#endif 860#endif
734 } 861 }
735 862
736 if (parent[0]) 863 if (parent)
737 { 864 {
738 resize_all_windows (0, 0, 0); 865 resize_all_windows (0, 0, 0);
739 scr_remap_chars (); 866 scr_remap_chars ();
740 scr_touch (true); 867 scr_touch (true);
741 } 868 }
… …
744} 871}
745 872
746void 873void
747rxvt_term::set_string_property (Atom prop, const char *str, int len) 874rxvt_term::set_string_property (Atom prop, const char *str, int len)
748{ 875{
749 XChangeProperty (dpy, parent[0], 876 XChangeProperty (dpy, parent,
750 prop, XA_STRING, 8, PropModeReplace, 877 prop, XA_STRING, 8, PropModeReplace,
751 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 878 (const unsigned char *)str, len >= 0 ? len : strlen (str));
752} 879}
753 880
754void 881void
882rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
883{
884 XTextProperty ct;
885
886 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
887 {
888 XSetTextProperty (dpy, parent, &ct, prop);
889 XFree (ct.value);
890 }
891}
892
893void
755rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 894rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
756{ 895{
757 wchar_t *ws = rxvt_mbstowcs (str, len); 896 wchar_t *ws = rxvt_mbstowcs (str, len);
758 char *s = rxvt_wcstoutf8 (ws); 897 char *s = rxvt_wcstoutf8 (ws);
759 898
760 XChangeProperty (dpy, parent[0], 899 XChangeProperty (dpy, parent,
761 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 900 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
762 (const unsigned char *)s, strlen (s)); 901 (const unsigned char *)s, strlen (s));
763 902
764 free (s); 903 free (s);
765 free (ws); 904 free (ws);
… …
769/*----------------------------------------------------------------------*/ 908/*----------------------------------------------------------------------*/
770/* xterm sequences - title, iconName, color (exptl) */ 909/* xterm sequences - title, iconName, color (exptl) */
771void 910void
772rxvt_term::set_title (const char *str) 911rxvt_term::set_title (const char *str)
773{ 912{
774 set_string_property (XA_WM_NAME, str); 913 set_mbstring_property (XA_WM_NAME, str);
775#if ENABLE_EWMH 914#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_NAME], str); 915 set_utf8_property (xa[XA_NET_WM_NAME], str);
777#endif 916#endif
778} 917}
779 918
780void 919void
781rxvt_term::set_icon_name (const char *str) 920rxvt_term::set_icon_name (const char *str)
782{ 921{
783 set_string_property (XA_WM_ICON_NAME, str); 922 set_mbstring_property (XA_WM_ICON_NAME, str);
784#if ENABLE_EWMH 923#if ENABLE_EWMH
785 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 924 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
786#endif 925#endif
787} 926}
788 927
… …
855 994
856/*----------------------------------------------------------------------*/ 995/*----------------------------------------------------------------------*/
857/* 996/*
858 * find if fg/bg matches any of the normal (low-intensity) colors 997 * find if fg/bg matches any of the normal (low-intensity) colors
859 */ 998 */
860void 999char *
861rxvt_term::set_colorfgbg () 1000rxvt_term::get_colorfgbg ()
862{ 1001{
863 unsigned int i; 1002 unsigned int i;
864 const char *xpmb = ""; 1003 const char *xpmb = "";
865 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1004 char fstr[] = "default";
1005 char bstr[] = "default";
1006 char *env_colorfgbg;
866 1007
867 strcpy (fstr, "default");
868 strcpy (bstr, "default");
869 for (i = Color_Black; i <= Color_White; i++) 1008 for (i = Color_Black; i <= Color_White; i++)
870 if (pix_colors[Color_fg] == pix_colors[i]) 1009 if (pix_colors[Color_fg] == pix_colors[i])
871 { 1010 {
872 sprintf (fstr, "%d", (i - Color_Black)); 1011 sprintf (fstr, "%d", i - Color_Black);
873 break; 1012 break;
874 } 1013 }
875 1014
876 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
877 if (pix_colors[Color_bg] == pix_colors[i]) 1016 if (pix_colors[Color_bg] == pix_colors[i])
878 { 1017 {
879 sprintf (bstr, "%d", (i - Color_Black)); 1018 sprintf (bstr, "%d", i - Color_Black);
880#ifdef BG_IMAGE_FROM_FILE 1019#if BG_IMAGE_FROM_FILE
881 xpmb = "default;"; 1020 xpmb = "default;";
882#endif 1021#endif
883 break; 1022 break;
884 } 1023 }
885 1024
1025 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
886 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1026 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1027 return env_colorfgbg;
887} 1028}
888 1029
889/*----------------------------------------------------------------------*/ 1030/*----------------------------------------------------------------------*/
890 1031
891bool 1032bool
… …
920 1061
921 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1062 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
922 if (set_hint) 1063 if (set_hint)
923 { 1064 {
924 szHint.flags &= ~(PBaseSize | PResizeInc); 1065 szHint.flags &= ~(PBaseSize | PResizeInc);
925 XSetWMNormalHints (dpy, parent[0], &szHint); 1066 XSetWMNormalHints (dpy, parent, &szHint);
926 szHint.flags |= PBaseSize | PResizeInc; 1067 szHint.flags |= PBaseSize | PResizeInc;
927 } 1068 }
928 1069
929 if (!ignoreparent) 1070 if (!ignoreparent)
930 { 1071 {
… …
936 int x, y, x1, y1; 1077 int x, y, x1, y1;
937 int dx, dy; 1078 int dx, dy;
938 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1079 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
939 Window unused_cr; 1080 Window unused_cr;
940 1081
941 XTranslateCoordinates (dpy, parent[0], display->root, 1082 XTranslateCoordinates (dpy, parent, display->root,
942 0, 0, &x, &y, &unused_cr); 1083 0, 0, &x, &y, &unused_cr);
943 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1084 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
944 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1085 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
945 /* 1086 /*
946 * if display->root isn't the parent window, a WM will probably have offset 1087 * if display->root isn't the parent window, a WM will probably have offset
947 * our position for handles and decorations. Counter it 1088 * our position for handles and decorations. Counter it
948 */ 1089 */
… …
965 if (y < y1) /* top half */ 1106 if (y < y1) /* top half */
966 dy = 0; 1107 dy = 0;
967 else if (y == y1) /* exact center */ 1108 else if (y == y1) /* exact center */
968 dy /= 2; 1109 dy /= 2;
969 1110
970 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1111 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
971 szHint.width, szHint.height); 1112 szHint.width, szHint.height);
972#else 1113#else
973 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1114 XResizeWindow (dpy, parent, szHint.width, szHint.height);
974#endif 1115#endif
975 } 1116 }
976 1117
977 if (set_hint) 1118 if (set_hint)
978 XSetWMNormalHints (dpy, parent[0], &szHint); 1119 XSetWMNormalHints (dpy, parent, &szHint);
979 1120
980 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1121 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
981 1122
982 if (fix_screen || newwidth != old_width || newheight != old_height) 1123 if (fix_screen || newwidth != old_width || newheight != old_height)
983 { 1124 {
984 if (scrollBar.state) 1125 if (scrollBar.state)
985 scrollBar.resize (); 1126 scrollBar.resize ();
986 1127
987 XMoveResizeWindow (dpy, vt, 1128 XMoveResizeWindow (dpy, vt,
988 window_vt_x, window_vt_y, 1129 window_vt_x, window_vt_y,
989 width, height); 1130 vt_width, vt_height);
1131
1132 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
990 1133
991#ifdef HAVE_BG_PIXMAP 1134#ifdef HAVE_BG_PIXMAP
992 if (bgPixmap.window_size_sensitive ()) 1135 if (bg_window_size_sensitive ())
993 update_background (); 1136 update_background ();
994#endif 1137#endif
995 } 1138 }
996 1139
997 if (fix_screen || old_height == 0) 1140 if (fix_screen || old_height == 0)
998 scr_reset (); 1141 scr_reset ();
999 1142
1000 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1001 //scr_touch (false);
1002
1003#ifdef HAVE_BG_PIXMAP
1004// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1005// if (bgPixmap.pixmap)
1006// scr_touch (false);
1007#endif
1008
1009#ifdef USE_XIM 1143#if USE_XIM
1010 IMSetPosition (); 1144 im_set_position ();
1011#endif 1145#endif
1012} 1146}
1013 1147
1014/* 1148/*
1015 * Set the width/height of the vt window in characters. Units are pixels. 1149 * Set the width/height of the vt window in characters. Units are pixels.
… …
1028 newwidth = wattr.width - szHint.base_width; 1162 newwidth = wattr.width - szHint.base_width;
1029 if (newheight == 0) 1163 if (newheight == 0)
1030 newheight = wattr.height - szHint.base_height; 1164 newheight = wattr.height - szHint.base_height;
1031 } 1165 }
1032 1166
1033 if (newwidth != width || newheight != height) 1167 if (newwidth != vt_width || newheight != vt_height)
1034 { 1168 {
1035 newwidth += szHint.base_width; 1169 newwidth += szHint.base_width;
1036 newheight += szHint.base_height; 1170 newheight += szHint.base_height;
1037 resize_all_windows (newwidth, newheight, 0); 1171 resize_all_windows (newwidth, newheight, 0);
1038 } 1172 }
1039} 1173}
1040 1174
1041/* -------------------------------------------------------------------- * 1175/* -------------------------------------------------------------------- *
1042 * - X INPUT METHOD ROUTINES - * 1176 * - X INPUT METHOD ROUTINES - *
1043 * -------------------------------------------------------------------- */ 1177 * -------------------------------------------------------------------- */
1044#ifdef USE_XIM 1178#if USE_XIM
1045 1179
1046void 1180void
1047rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1181rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1048{ 1182{
1049 fg = pix_colors [Color_fg]; 1183 fg = pix_colors [Color_fg];
… …
1076 status_rect.height = fheight; 1210 status_rect.height = fheight;
1077} 1211}
1078 1212
1079/* Checking whether input method is running. */ 1213/* Checking whether input method is running. */
1080bool 1214bool
1081rxvt_term::IMisRunning () 1215rxvt_term::im_is_running ()
1082{ 1216{
1083 Atom atom; 1217 Atom atom;
1084 Window win; 1218 Window win;
1085 char server[IMBUFSIZ]; 1219 char server[IMBUFSIZ];
1086 1220
… …
1095 1229
1096 atom = XInternAtom (dpy, server, False); 1230 atom = XInternAtom (dpy, server, False);
1097 win = XGetSelectionOwner (dpy, atom); 1231 win = XGetSelectionOwner (dpy, atom);
1098 1232
1099 if (win != None) 1233 if (win != None)
1100 return True; 1234 return true;
1101 } 1235 }
1102 1236
1103 return False; 1237 return false;
1104} 1238}
1105 1239
1106void 1240void
1107rxvt_term::IMSendSpot () 1241rxvt_term::im_send_spot ()
1108{ 1242{
1109 XPoint nspot; 1243 XPoint nspot;
1110 XVaNestedList preedit_attr; 1244 XVaNestedList preedit_attr;
1111 1245
1112 if (!Input_Context 1246 if (!Input_Context
… …
1165 1299
1166 term->make_current (); 1300 term->make_current ();
1167 1301
1168 if (text) 1302 if (text)
1169 { 1303 {
1170 void *str; 1304 wchar_t *str;
1171 1305
1172 if (!text->encoding_is_wchar && text->string.multi_byte) 1306 if (!text->encoding_is_wchar && text->string.multi_byte)
1173 { 1307 {
1174 // of course, X makes it ugly again 1308 // of course, X makes it ugly again
1175 if (term->rs[Rs_imLocale]) 1309 if (term->rs[Rs_imLocale])
1176 SET_LOCALE (term->rs[Rs_imLocale]); 1310 SET_LOCALE (term->rs[Rs_imLocale]);
1177 1311
1178 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1312 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1179 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1313 mbstowcs (str, text->string.multi_byte, text->length + 1);
1180 1314
1181 if (term->rs[Rs_imLocale]) 1315 if (term->rs[Rs_imLocale])
1182 SET_LOCALE (term->locale); 1316 SET_LOCALE (term->locale);
1183 } 1317 }
1184 else 1318 else
1185 str = (void *)text->string.wide_char; 1319 str = text->string.wide_char;
1186 1320
1187 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1321 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1188 DT_INT, call_data->caret, 1322 DT_INT, call_data->caret,
1189 DT_INT, call_data->chg_first, 1323 DT_INT, call_data->chg_first,
1190 DT_INT, call_data->chg_length, 1324 DT_INT, call_data->chg_length,
… …
1218/* 1352/*
1219 * Try to open a XIM with the current modifiers, then see if we can 1353 * Try to open a XIM with the current modifiers, then see if we can
1220 * open a suitable preedit type 1354 * open a suitable preedit type
1221 */ 1355 */
1222bool 1356bool
1223rxvt_term::IM_get_IC (const char *modifiers) 1357rxvt_term::im_get_ic (const char *modifiers)
1224{ 1358{
1225 int i, j, found; 1359 int i, j, found;
1226 XIM xim; 1360 XIM xim;
1227 XPoint spot; 1361 XPoint spot;
1228 XRectangle rect, status_rect, needed_rect; 1362 XRectangle rect, status_rect, needed_rect;
1229 unsigned long fg, bg; 1363 unsigned long fg, bg;
1230 const char *p; 1364 const char *p;
1231 char **s; 1365 char **s;
1232 XIMStyles *xim_styles; 1366 XIMStyles *xim_styles;
1233#ifdef ENABLE_XIM_ONTHESPOT
1234 XIMCallback xcb[4];
1235#endif
1236 1367
1237 set_environ (envv); 1368 set_environ (envv);
1238 1369
1239 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1370 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1240 return false; 1371 return false;
… …
1261 p = pet[pi]; 1392 p = pet[pi];
1262 1393
1263 if (!p) 1394 if (!p)
1264 continue; 1395 continue;
1265 1396
1266 s = rxvt_splitcommastring (p); 1397 s = rxvt_strsplit (',', p);
1267 1398
1268 for (i = found = 0; !found && s[i]; i++) 1399 for (i = found = 0; !found && s[i]; i++)
1269 { 1400 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1401 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1402 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1414 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1415
1285 for (j = 0; j < xim_styles->count_styles; j++) 1416 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1417 if (input_style == xim_styles->supported_styles[j])
1287 { 1418 {
1288 rxvt_freecommastring (s); 1419 rxvt_free_strsplit (s);
1289 1420
1290 found = 1; 1421 found = 1;
1291 goto foundpet; 1422 goto foundpet;
1292 } 1423 }
1293 1424
1294 } 1425 }
1295 1426
1296 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1297 } 1428 }
1298 1429
1299foundpet: 1430foundpet:
1300 1431
1301 XFree (xim_styles); 1432 XFree (xim_styles);
… …
1380 NULL); 1511 NULL);
1381 } 1512 }
1382#if ENABLE_XIM_ONTHESPOT 1513#if ENABLE_XIM_ONTHESPOT
1383 else if (input_style & XIMPreeditCallbacks) 1514 else if (input_style & XIMPreeditCallbacks)
1384 { 1515 {
1516 XIMCallback xcb[4];
1517
1385 im_set_position (spot); 1518 im_set_position (spot);
1386 1519
1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1520 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1521 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1522 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1404#endif 1537#endif
1405 1538
1406 Input_Context = XCreateIC (xim, 1539 Input_Context = XCreateIC (xim,
1407 XNInputStyle, input_style, 1540 XNInputStyle, input_style,
1408 XNClientWindow, vt, 1541 XNClientWindow, vt,
1409 XNFocusWindow, parent[0], 1542 XNFocusWindow, parent,
1410 preedit_attr ? XNPreeditAttributes : NULL, 1543 preedit_attr ? XNPreeditAttributes : NULL,
1411 preedit_attr, 1544 preedit_attr,
1412 status_attr ? XNStatusAttributes : NULL, 1545 status_attr ? XNStatusAttributes : NULL,
1413 status_attr, NULL); 1546 status_attr, NULL);
1414 1547
… …
1427 // unfortunately, only the focus window is used by XIM, hard to fix 1560 // unfortunately, only the focus window is used by XIM, hard to fix
1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1561 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1429 vt_select_input (); 1562 vt_select_input ();
1430#endif 1563#endif
1431 1564
1432 IMSetPosition (); 1565 im_set_position ();
1433 1566
1434 return true; 1567 return true;
1435} 1568}
1436 1569
1437void 1570void
… …
1447 im_destroy (); 1580 im_destroy ();
1448 1581
1449 if (Input_Context) 1582 if (Input_Context)
1450 return; 1583 return;
1451 1584
1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1453 if (rs[Rs_imLocale]) 1585 if (rs[Rs_imLocale])
1454 SET_LOCALE (rs[Rs_imLocale]); 1586 SET_LOCALE (rs[Rs_imLocale]);
1455#endif
1456 1587
1457 p = rs[Rs_inputMethod]; 1588 p = rs[Rs_inputMethod];
1458 if (p && *p) 1589 if (p && *p)
1459 { 1590 {
1460 bool found = false; 1591 bool found = false;
1461 1592
1462 s = rxvt_splitcommastring (p); 1593 s = rxvt_strsplit (',', p);
1463 1594
1464 for (i = 0; s[i]; i++) 1595 for (i = 0; s[i]; i++)
1465 { 1596 {
1466 if (*s[i]) 1597 if (*s[i])
1467 { 1598 {
1468 strcpy (buf, "@im="); 1599 strcpy (buf, "@im=");
1469 strncat (buf, s[i], IMBUFSIZ - 5); 1600 strncat (buf, s[i], IMBUFSIZ - 5);
1470 if (IM_get_IC (buf)) 1601 if (im_get_ic (buf))
1471 { 1602 {
1472 found = true; 1603 found = true;
1473 break; 1604 break;
1474 } 1605 }
1475 } 1606 }
1476 } 1607 }
1477 1608
1478 rxvt_freecommastring (s); 1609 rxvt_free_strsplit (s);
1479 1610
1480 if (found) 1611 if (found)
1481 goto done; 1612 goto done;
1482 } 1613 }
1483 1614
1484 /* try with XMODIFIERS env. var. */ 1615 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC ("")) 1616 if (im_get_ic (""))
1486 goto done; 1617 goto done;
1487 1618
1488 /* try with no modifiers base IF the user didn't specify an IM */ 1619 /* try with no modifiers base IF the user didn't specify an IM */
1489 if (IM_get_IC ("@im=none")) 1620 if (im_get_ic ("@im=none"))
1490 goto done; 1621 goto done;
1491 1622
1492done: 1623done:
1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1494 if (rs[Rs_imLocale]) 1624 if (rs[Rs_imLocale])
1495 SET_LOCALE (locale); 1625 SET_LOCALE (locale);
1496#endif
1497} 1626}
1498 1627
1499void 1628void
1500rxvt_term::IMSetPosition () 1629rxvt_term::im_set_position ()
1501{ 1630{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1631 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1632 XVaNestedList preedit_attr, status_attr;
1504 1633
1505 if (!Input_Context 1634 if (!Input_Context
1506 || !focus 1635 || !focus
1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1636 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1508 || !IMisRunning ()) 1637 || !im_is_running ())
1509 return; 1638 return;
1510 1639
1511 if (input_style & XIMPreeditPosition) 1640 if (input_style & XIMPreeditPosition)
1512 { 1641 {
1513 im_set_size (preedit_rect); 1642 im_set_size (preedit_rect);
… …
1543 1672
1544void 1673void
1545rxvt_term::get_window_origin (int &x, int &y) 1674rxvt_term::get_window_origin (int &x, int &y)
1546{ 1675{
1547 Window cr; 1676 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1677 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550}
1551
1552Pixmap
1553rxvt_term::get_pixmap_property (int prop_id)
1554{
1555 if (prop_id > 0 && prop_id < NUM_XA)
1556 if (xa[prop_id])
1557 {
1558 int aformat;
1559 unsigned long nitems, bytes_after;
1560 Atom atype;
1561 unsigned char *prop = NULL;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP)
1566 return *(Pixmap *)prop;
1567 }
1568
1569 return None;
1570} 1678}
1571 1679
1572#ifdef HAVE_BG_PIXMAP 1680#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582 1681
1583void 1682void
1584rxvt_term::update_background () 1683rxvt_term::update_background ()
1585{ 1684{
1586 if (update_background_ev.is_active ()) 1685 if (update_background_ev.is_active ())
1587 return; 1686 return;
1588 1687
1589 bgPixmap.invalidate (); 1688 bg_invalidate ();
1590 1689
1690 if (!mapped)
1691 return;
1692
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1693 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592 1694
1593 if (to_wait <= 0.) 1695 if (to_wait <= 0.)
1594 bgPixmap.render (); 1696 bg_render ();
1595 else 1697 else
1596 update_background_ev.start (to_wait); 1698 update_background_ev.start (to_wait);
1597} 1699}
1598 1700
1599void 1701void
1600rxvt_term::update_background_cb (ev::timer &w, int revents) 1702rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{ 1703{
1602 make_current (); 1704 make_current ();
1603 1705
1604 update_background_ev.stop (); 1706 update_background_ev.stop ();
1605 bgPixmap.render (); 1707 bg_render ();
1606 refresh_check (); 1708 refresh_check ();
1607} 1709}
1608 1710
1609#endif /* HAVE_BG_PIXMAP */ 1711#endif /* HAVE_BG_PIXMAP */
1610 1712

Diff Legend

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