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.328 by sf-exg, Mon Jul 19 16:43:21 2010 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 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
40#include <cassert> 41#include <assert.h>
41#include <csignal> 42#include <signal.h>
42#include <cstring> 43#include <string.h>
43 44
44#include <termios.h> 45#include <termios.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 51# include <locale.h>
52# endif 52#endif
53#endif
54 53
54struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
56 56
57// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
59 59
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 95{
96 compose_char *cc; 96 compose_char *cc;
97 97
98 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 100 cc = (*this)[c1];
101 while (cc) 101 while (cc)
102 { 102 {
103 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
105 } 105 }
106 106
107 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
112 }
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 { 114 {
117 static int seen; 115 static int seen;
118 116
119 if (!seen++) 117 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 119
122 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
123 } 121 }
124 122
125 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
170 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);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 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);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif 229#endif
233#ifdef HAVE_AFTERIMAGE 230
234 if (asv) 231#if HAVE_IMG
235 destroy_asvisual (asv, 0); 232 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 233#endif
239 234
240 if (display) 235 if (display)
241 { 236 {
242 selection_clear (); 237 selection_clear ();
243 selection_clear (true); 238 selection_clear (true);
244 239
245#ifdef USE_XIM 240#if USE_XIM
246 im_destroy (); 241 im_destroy ();
247#endif 242#endif
248 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
249 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
250 247
251 delete drawable; 248 delete drawable;
249
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent)
254 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
255 253
256 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
258 { 256 {
259 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
274 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 273 free (allocated [i]);
276 274
277 free (selection.text); 275 free (selection.text);
278 free (selection.clip_text); 276 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 277 free (locale);
283 free (v_buffer); 278 free (v_buffer);
284 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
285 286
286 delete envv; 287 delete envv;
287 delete argv; 288 delete argv;
288 289
289#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
… …
322 { 323 {
323#if USE_XIM 324#if USE_XIM
324 im_ev.stop (display); 325 im_ev.stop (display);
325#endif 326#endif
326 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
329#endif 330#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 331 termwin_ev.stop (display);
332 vt_ev.stop (display); 332 vt_ev.stop (display);
333 } 333 }
334 334
335 flush_ev.stop (); 335 flush_ev.stop ();
… …
359 make_current (); 359 make_current ();
360 360
361 delete this; 361 delete this;
362} 362}
363 363
364void
365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
364/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
365/* 377/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 379 */
369static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
370 381
371static void 382static void
372rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
376} 387}
377 388
378#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
379static void 390static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
381{ 392{
382 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
384 char number[32]; 395 char number[32];
385 char *mtype = "XlibMessage"; 396
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
392 sprintf(number, "%d", event->request_code); 408
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer);
395 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
397 mesg, BUFSIZ); 447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
399 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
400 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 468 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 470 || event->error_code == BadColor
406 (event->error_code == BadGC) || 471 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 473 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
410 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 480 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424}
425#endif
426 482
427int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 490{
430 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
432 else 493 else
… …
441 } 502 }
442 503
443 return 0; 504 return 0;
444} 505}
445 506
446int 507int ecb_cold
447rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
448{ 509{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display)); 511 DisplayString (display));
451 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
474 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
475 w.stop (); 536 w.stop ();
476 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
477} 538}
478 539
540static void
541rxvt_get_ttymode (struct termios *tio)
542{
543 if (tcgetattr (STDIN_FILENO, tio) < 0)
544 memset (tio, 0, sizeof (struct termios));
545
546 for (int i = 0; i < NCCS; i++)
547 tio->c_cc[i] = VDISABLE;
548
549 tio->c_cc[VINTR] = CINTR;
550 tio->c_cc[VQUIT] = CQUIT;
551 tio->c_cc[VERASE] = CERASE;
552#ifdef VERASE2
553 tio->c_cc[VERASE2] = CERASE2;
554#endif
555 tio->c_cc[VKILL] = CKILL;
556 tio->c_cc[VEOF] = CEOF;
557 tio->c_cc[VSTART] = CSTART;
558 tio->c_cc[VSTOP] = CSTOP;
559 tio->c_cc[VSUSP] = CSUSP;
560# ifdef VDSUSP
561 tio->c_cc[VDSUSP] = CDSUSP;
562# endif
563# ifdef VREPRINT
564 tio->c_cc[VREPRINT] = CRPRNT;
565# endif
566# ifdef VDISCRD
567 tio->c_cc[VDISCRD] = CFLUSH;
568# endif
569# ifdef VWERSE
570 tio->c_cc[VWERSE] = CWERASE;
571# endif
572# ifdef VLNEXT
573 tio->c_cc[VLNEXT] = CLNEXT;
574# endif
575# ifdef VSTATUS
576 tio->c_cc[VSTATUS] = CSTATUS;
577# endif
578
579# if VMIN != VEOF
580 tio->c_cc[VMIN] = 1;
581# endif
582# if VTIME != VEOL
583 tio->c_cc[VTIME] = 0;
584# endif
585
586 /* input modes */
587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
588# ifdef IMAXBEL
589 | IMAXBEL
590# endif
591 | IXON);
592
593 /* output modes */
594 tio->c_oflag = (OPOST | ONLCR);
595
596 /* control modes */
597 tio->c_cflag = (CS8 | CREAD);
598
599 /* local modes */
600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
601# if defined (ECHOCTL) && defined (ECHOKE)
602 | ECHOCTL | ECHOKE
603# endif
604 | ECHOE | ECHOK);
605}
606
479char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
480 608
481void 609void
482rxvt_init () 610rxvt_init ()
483{ 611{
484 assert (("fontMask must not overlap other RS masks", 612 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 614
487 ptytty::init (); 615 rxvt_get_ttymode (&rxvt_term::def_tio);
488 616
617 // get rid of stdin/stdout as we don't need them, to free resources
618 dup2 (STDERR_FILENO, STDIN_FILENO);
619 dup2 (STDERR_FILENO, STDOUT_FILENO);
620
489 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 623
492 rxvt_environ = environ; 624 rxvt_environ = environ;
493 625
494 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
495 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
496 628
497 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
498 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
499
500 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
501 /* signal (SIGURG, SIG_DFL); */
502 631
503 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
504 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
505 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
506 635
507 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
508} 641}
509 642
510/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
511/* 644/*
512 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
633 if (recalc_y) 766 if (recalc_y)
634 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
635 768
636 ncol = width / fwidth; 769 ncol = width / fwidth;
637 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
638} 780}
639 781
640/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
641/* 783/*
642 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
650 792
651 struct winsize ws; 793 struct winsize ws;
652 794
653 ws.ws_col = ncol; 795 ws.ws_col = ncol;
654 ws.ws_row = nrow; 796 ws.ws_row = nrow;
655 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
656 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
657 ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
658 800
659#if 0 801#if 0
660 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
661 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
662 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
663#endif 805#endif
664} 806}
665 807
666/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
667/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
668 *
669 * init = 1 - initialize
670 *
671 * fontname == FONT_UP - switch to bigger font
672 * fontname == FONT_DN - switch to smaller font
673 */
674bool 810bool
675rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
676{ 812{
677 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
678 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
693 829
694 delete fontset[0]; 830 delete fontset[0];
695 fontset[0] = fs; 831 fontset[0] = fs;
696 832
697 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
698 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
699 prop.width += letterSpace;
700 835
701 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
702 837
703 fwidth = prop.width; 838 fwidth = prop.width;
704 fheight = prop.height; 839 fheight = prop.height + lineSpace;
705 fbase = prop.ascent; 840 fbase = prop.ascent;
706 841
707 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
708 { 843 {
709#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
735#else 870#else
736 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
737#endif 872#endif
738 } 873 }
739 874
740 if (parent[0]) 875 if (parent)
741 { 876 {
742 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
743 scr_remap_chars (); 878 scr_remap_chars ();
744 scr_touch (true); 879 scr_touch (true);
745 } 880 }
… …
748} 883}
749 884
750void 885void
751rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
752{ 887{
753 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
754 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
755 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
756} 891}
757 892
758void 893void
… …
760{ 895{
761 XTextProperty ct; 896 XTextProperty ct;
762 897
763 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
764 { 899 {
765 XSetTextProperty (dpy, parent[0], &ct, prop); 900 XSetTextProperty (dpy, parent, &ct, prop);
766 XFree (ct.value); 901 XFree (ct.value);
767 } 902 }
768} 903}
769 904
770void 905void
771rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
772{ 907{
773 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
774 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
775 910
776 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
778 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
779 914
780 free (s); 915 free (s);
781 free (ws); 916 free (ws);
… …
871 1006
872/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
873/* 1008/*
874 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
875 */ 1010 */
876void 1011char *
877rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
878{ 1013{
879 unsigned int i; 1014 unsigned int i;
880 const char *xpmb = ""; 1015 const char *xpmb = "";
881 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
882 1019
883 strcpy (fstr, "default");
884 strcpy (bstr, "default");
885 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
886 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
887 { 1022 {
888 sprintf (fstr, "%d", (i - Color_Black)); 1023 sprintf (fstr, "%d", i - Color_Black);
889 break; 1024 break;
890 } 1025 }
891 1026
892 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
893 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
894 { 1029 {
895 sprintf (bstr, "%d", (i - Color_Black)); 1030 sprintf (bstr, "%d", i - Color_Black);
896#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
897 xpmb = "default;"; 1032 xpmb = "default;";
898#endif 1033#endif
899 break; 1034 break;
900 } 1035 }
901 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
902 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
903} 1040}
904 1041
905/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
906 1043
907bool 1044bool
… …
936 1073
937 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
938 if (set_hint) 1075 if (set_hint)
939 { 1076 {
940 szHint.flags &= ~(PBaseSize | PResizeInc); 1077 szHint.flags &= ~(PBaseSize | PResizeInc);
941 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
942 szHint.flags |= PBaseSize | PResizeInc; 1079 szHint.flags |= PBaseSize | PResizeInc;
943 } 1080 }
944 1081
945 if (!ignoreparent) 1082 if (!ignoreparent)
946 { 1083 {
… …
952 int x, y, x1, y1; 1089 int x, y, x1, y1;
953 int dx, dy; 1090 int dx, dy;
954 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
955 Window unused_cr; 1092 Window unused_cr;
956 1093
957 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
958 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
959 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
960 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
961 /* 1098 /*
962 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
963 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
964 */ 1101 */
… …
981 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
982 dy = 0; 1119 dy = 0;
983 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
984 dy /= 2; 1121 dy /= 2;
985 1122
986 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
987 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
988#else 1125#else
989 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
990#endif 1127#endif
991 } 1128 }
992 1129
993 if (set_hint) 1130 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint); 1131 XSetWMNormalHints (dpy, parent, &szHint);
995 1132
996 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
997 1134
998 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
999 { 1136 {
1000 if (scrollBar.state) 1137 if (scrollBar.state)
1001 scrollBar.resize (); 1138 scrollBar.resize ();
1002 1139
1003 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1004 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1005 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006 1145
1007#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1008 if (bgPixmap.window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1009 update_background (); 1148 update_background ();
1010#endif 1149#endif
1011 } 1150 }
1012 1151
1013 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1014 scr_reset (); 1153 scr_reset ();
1015 1154
1016#ifdef HAVE_BG_PIXMAP
1017// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1018// if (bgPixmap.pixmap)
1019// scr_touch (false);
1020#endif
1021
1022#ifdef USE_XIM 1155#if USE_XIM
1023 IMSetPosition (); 1156 im_set_position ();
1024#endif 1157#endif
1025} 1158}
1026 1159
1027/* 1160/*
1028 * Set the width/height of the vt window in characters. Units are pixels. 1161 * Set the width/height of the vt window in characters. Units are pixels.
… …
1041 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1042 if (newheight == 0) 1175 if (newheight == 0)
1043 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1044 } 1177 }
1045 1178
1046 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1047 { 1180 {
1048 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1049 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1050 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1051 } 1184 }
1052} 1185}
1053 1186
1054/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1055 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1056 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1057#ifdef USE_XIM 1190#if USE_XIM
1058 1191
1059void 1192void
1060rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1061{ 1194{
1062 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1089 status_rect.height = fheight; 1222 status_rect.height = fheight;
1090} 1223}
1091 1224
1092/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1093bool 1226bool
1094rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1095{ 1228{
1096 Atom atom; 1229 Atom atom;
1097 Window win; 1230 Window win;
1098 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1099 1232
… …
1108 1241
1109 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1110 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1111 1244
1112 if (win != None) 1245 if (win != None)
1113 return True; 1246 return true;
1114 } 1247 }
1115 1248
1116 return False; 1249 return false;
1117} 1250}
1118 1251
1119void 1252void
1120rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1121{ 1254{
1122 XPoint nspot; 1255 XPoint nspot;
1123 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1124 1257
1125 if (!Input_Context 1258 if (!Input_Context
… …
1231/* 1364/*
1232 * Try to open a XIM with the current modifiers, then see if we can 1365 * Try to open a XIM with the current modifiers, then see if we can
1233 * open a suitable preedit type 1366 * open a suitable preedit type
1234 */ 1367 */
1235bool 1368bool
1236rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1237{ 1370{
1238 int i, j, found; 1371 int i, j, found;
1239 XIM xim; 1372 XIM xim;
1240 XPoint spot; 1373 XPoint spot;
1241 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1242 unsigned long fg, bg; 1375 unsigned long fg, bg;
1243 const char *p; 1376 const char *p;
1244 char **s; 1377 char **s;
1245 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1246#ifdef ENABLE_XIM_ONTHESPOT
1247 XIMCallback xcb[4];
1248#endif
1249 1379
1250 set_environ (envv); 1380 set_environ (env);
1251 1381
1252 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1253 return false; 1383 return false;
1254 1384
1255 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1256 if (input_method == NULL) 1386 if (input_method == NULL)
1257 return false; 1387 return false;
… …
1274 p = pet[pi]; 1404 p = pet[pi];
1275 1405
1276 if (!p) 1406 if (!p)
1277 continue; 1407 continue;
1278 1408
1279 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1280 1410
1281 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1282 { 1412 {
1283 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1284 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1296 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1297 1427
1298 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1299 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1300 { 1430 {
1301 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1302 1432
1303 found = 1; 1433 found = 1;
1304 goto foundpet; 1434 goto foundpet;
1305 } 1435 }
1306 1436
1307 } 1437 }
1308 1438
1309 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1310 } 1440 }
1311 1441
1312foundpet: 1442foundpet:
1313 1443
1314 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1393 NULL); 1523 NULL);
1394 } 1524 }
1395#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1396 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1397 { 1527 {
1528 XIMCallback xcb[4];
1529
1398 im_set_position (spot); 1530 im_set_position (spot);
1399 1531
1400 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1532 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1401 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1533 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1402 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1534 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1417#endif 1549#endif
1418 1550
1419 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1420 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1421 XNClientWindow, vt, 1553 XNClientWindow, vt,
1422 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1423 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1424 preedit_attr, 1556 preedit_attr,
1425 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1426 status_attr, NULL); 1558 status_attr, NULL);
1427 1559
… …
1440 // unfortunately, only the focus window is used by XIM, hard to fix 1572 // unfortunately, only the focus window is used by XIM, hard to fix
1441 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1442 vt_select_input (); 1574 vt_select_input ();
1443#endif 1575#endif
1444 1576
1445 IMSetPosition (); 1577 im_set_position ();
1446 1578
1447 return true; 1579 return true;
1448} 1580}
1449 1581
1450void 1582void
… …
1460 im_destroy (); 1592 im_destroy ();
1461 1593
1462 if (Input_Context) 1594 if (Input_Context)
1463 return; 1595 return;
1464 1596
1465#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1466 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1467 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1468#endif
1469 1599
1470 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1471 if (p && *p) 1601 if (p && *p)
1472 { 1602 {
1473 bool found = false; 1603 bool found = false;
1474 1604
1475 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1476 1606
1477 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1478 { 1608 {
1479 if (*s[i]) 1609 if (*s[i])
1480 { 1610 {
1481 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1482 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1483 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1484 { 1614 {
1485 found = true; 1615 found = true;
1486 break; 1616 break;
1487 } 1617 }
1488 } 1618 }
1489 } 1619 }
1490 1620
1491 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1492 1622
1493 if (found) 1623 if (found)
1494 goto done; 1624 goto done;
1495 } 1625 }
1496 1626
1497 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1498 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1499 goto done; 1629 goto done;
1500 1630
1501 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1502 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1503 goto done; 1633 goto done;
1504 1634
1505done: 1635done:
1506#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1507 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1508 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1509#endif
1510} 1638}
1511 1639
1512void 1640void
1513rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1514{ 1642{
1515 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1516 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1517 1645
1518 if (!Input_Context 1646 if (!Input_Context
1519 || !focus 1647 || !focus
1520 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1521 || !IMisRunning ()) 1649 || !im_is_running ())
1522 return; 1650 return;
1523 1651
1524 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1525 { 1653 {
1526 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
… …
1556 1684
1557void 1685void
1558rxvt_term::get_window_origin (int &x, int &y) 1686rxvt_term::get_window_origin (int &x, int &y)
1559{ 1687{
1560 Window cr; 1688 Window cr;
1561 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1562/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1563}
1564
1565Pixmap
1566rxvt_term::get_pixmap_property (int prop_id)
1567{
1568 if (prop_id > 0 && prop_id < NUM_XA)
1569 if (xa[prop_id])
1570 {
1571 int aformat;
1572 unsigned long nitems, bytes_after;
1573 Atom atype;
1574 unsigned char *prop = NULL;
1575 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1576 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1577 &nitems, &bytes_after, &prop);
1578 if (result == Success && prop && atype == XA_PIXMAP)
1579 return *(Pixmap *)prop;
1580 }
1581
1582 return None;
1583} 1690}
1584 1691
1585#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1586# if TRACE_PIXMAPS
1587# undef update_background
1588void
1589rxvt_term::trace_update_background (const char *file, int line)
1590{
1591 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1592 update_background ();
1593}
1594# endif
1595 1693
1596void 1694void
1597rxvt_term::update_background () 1695rxvt_term::update_background ()
1598{ 1696{
1599 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1600 return; 1698 return;
1601 1699
1602 bgPixmap.invalidate ();
1603
1604 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1605 1701
1606 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1607 bgPixmap.render (); 1703 bg_render ();
1608 else 1704 else
1609 update_background_ev.start (to_wait); 1705 update_background_ev.start (to_wait);
1610} 1706}
1611 1707
1612void 1708void
1613rxvt_term::update_background_cb (ev::timer &w, int revents) 1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1614{ 1710{
1615 make_current (); 1711 make_current ();
1616 1712
1617 update_background_ev.stop (); 1713 update_background_ev.stop ();
1618 bgPixmap.render (); 1714 bg_render ();
1619 refresh_check (); 1715 refresh_check ();
1620} 1716}
1621 1717
1622#endif /* HAVE_BG_PIXMAP */ 1718#endif /* HAVE_BG_PIXMAP */
1623 1719

Diff Legend

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