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

Diff Legend

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