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

Diff Legend

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