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.312 by root, Tue Nov 4 16:41:12 2008 UTC vs.
Revision 1.391 by sf-exg, Mon Oct 6 11:11:19 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;
281
282 if (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;
282 286
283 delete envv; 287 delete envv;
284 delete argv; 288 delete argv;
285 289
286#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
… …
319 { 323 {
320#if USE_XIM 324#if USE_XIM
321 im_ev.stop (display); 325 im_ev.stop (display);
322#endif 326#endif
323 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
325 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
326#endif 330#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 331 termwin_ev.stop (display);
329 vt_ev.stop (display); 332 vt_ev.stop (display);
330 } 333 }
331 334
332 flush_ev.stop (); 335 flush_ev.stop ();
… …
356 make_current (); 359 make_current ();
357 360
358 delete this; 361 delete this;
359} 362}
360 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
361/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
362/* 377/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * 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 */ 379 */
366static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
367 381
368static void 382static void
369rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
371 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++)
372 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
373} 387}
374 388
375#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
376static void 390static void ecb_cold
377print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
378{ 392{
379 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
381 char number[32]; 395 char number[32];
382 char *mtype = "XlibMessage"; 396
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"); 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);
386 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
389 sprintf(number, "%d", event->request_code); 408
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer);
392 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 {
394 mesg, BUFSIZ); 411#if 0
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 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
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, 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);
396 } 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
397 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
398 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
399 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
400 (event->error_code == BadFont) || 468 || event->error_code == BadFont
401 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
402 (event->error_code == BadColor) || 470 || event->error_code == BadColor
403 (event->error_code == BadGC) || 471 || event->error_code == BadGC
404 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
405 (event->error_code == BadValue) || 473 || event->error_code == BadValue
406 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
407 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ); 480 else
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 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 482
424int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
425rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
426{ 490{
427 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
428 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
429 else 493 else
… …
438 } 502 }
439 503
440 return 0; 504 return 0;
441} 505}
442 506
443int 507int ecb_cold
444rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
445{ 509{
446 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",
447 DisplayString (display)); 511 DisplayString (display));
448 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
471 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
472 w.stop (); 536 w.stop ();
473 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
474} 538}
475 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
476char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
477 608
478void 609void
479rxvt_init () 610rxvt_init ()
480{ 611{
481 ptytty::init (); 612 assert (("fontMask must not overlap other RS masks",
613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 614
615 rxvt_get_ttymode (&rxvt_term::def_tio);
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
483 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 623
486 rxvt_environ = environ; 624 rxvt_environ = environ;
487 625
488 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
490 628
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 631
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
500 635
501 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
502} 641}
503 642
504/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
505/* 644/*
506 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
627 if (recalc_y) 766 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 768
630 ncol = width / fwidth; 769 ncol = width / fwidth;
631 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;
632} 780}
633 781
634/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
635/* 783/*
636 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
644 792
645 struct winsize ws; 793 struct winsize ws;
646 794
647 ws.ws_col = ncol; 795 ws.ws_col = ncol;
648 ws.ws_row = nrow; 796 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 800
653#if 0 801#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
657#endif 805#endif
658} 806}
659 807
660/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 809/* 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 810bool
669rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
670{ 812{
671 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
686#endif 828#endif
687 829
688 delete fontset[0]; 830 delete fontset[0];
689 fontset[0] = fs; 831 fontset[0] = fs;
690 832
691 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
693 835
694 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
695 837
696 fwidth = prop.width; 838 fwidth = prop.width;
697 fheight = prop.height; 839 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 840 fbase = prop.ascent;
699 841
700 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
701 { 843 {
702#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
728#else 870#else
729 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
730#endif 872#endif
731 } 873 }
732 874
733 if (parent[0]) 875 if (parent)
734 { 876 {
735 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 878 scr_remap_chars ();
737 scr_touch (true); 879 scr_touch (true);
738 } 880 }
… …
741} 883}
742 884
743void 885void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 887{
746 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 891}
750 892
751void 893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 907{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
756 910
757 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
760 914
761 free (s); 915 free (s);
762 free (ws); 916 free (ws);
… …
766/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
768void 922void
769rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
770{ 924{
771 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 926#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 928#endif
775} 929}
776 930
777void 931void
778rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
779{ 933{
780 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 935#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 937#endif
784} 938}
785 939
… …
852 1006
853/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
854/* 1008/*
855 * 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
856 */ 1010 */
857void 1011char *
858rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
859{ 1013{
860 unsigned int i; 1014 unsigned int i;
861 const char *xpmb = ""; 1015 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
863 1019
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
868 { 1022 {
869 sprintf (fstr, "%d", (i - Color_Black)); 1023 sprintf (fstr, "%d", i - Color_Black);
870 break; 1024 break;
871 } 1025 }
872 1026
873 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
875 { 1029 {
876 sprintf (bstr, "%d", (i - Color_Black)); 1030 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 1032 xpmb = "default;";
879#endif 1033#endif
880 break; 1034 break;
881 } 1035 }
882 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 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;
884} 1040}
885 1041
886/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
887 1043
888bool 1044bool
… …
913 1069
914 window_calc (newwidth, newheight); 1070 window_calc (newwidth, newheight);
915 1071
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); 1072 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917 1073
1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
918 if (set_hint) 1075 if (set_hint)
919 { 1076 {
920 szHint.flags &= ~(PBaseSize | PResizeInc); 1077 szHint.flags &= ~(PBaseSize | PResizeInc);
921 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
922 szHint.flags |= PBaseSize | PResizeInc; 1079 szHint.flags |= PBaseSize | PResizeInc;
923 } 1080 }
924 1081
925 if (!ignoreparent) 1082 if (!ignoreparent)
926 { 1083 {
… …
932 int x, y, x1, y1; 1089 int x, y, x1, y1;
933 int dx, dy; 1090 int dx, dy;
934 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
935 Window unused_cr; 1092 Window unused_cr;
936 1093
937 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
938 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
939 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
940 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
941 /* 1098 /*
942 * 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
943 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
944 */ 1101 */
… …
961 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
962 dy = 0; 1119 dy = 0;
963 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
964 dy /= 2; 1121 dy /= 2;
965 1122
966 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
967 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
968#else 1125#else
969 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
970#endif 1127#endif
971 } 1128 }
1129
1130 if (set_hint)
1131 XSetWMNormalHints (dpy, parent, &szHint);
972 1132
973 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
974 1134
975 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
976 { 1136 {
977 if (scrollBar.state) 1137 if (scrollBar.state)
978 scrollBar.resize (); 1138 scrollBar.resize ();
979 1139
980 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
981 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
982 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
983 1145
984#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
985 if (bgPixmap.window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
986 update_background (); 1148 update_background ();
987#endif 1149#endif
988
989 scr_clear ();
990 } 1150 }
991
992 if (set_hint)
993 XSetWMNormalHints (dpy, parent[0], &szHint);
994 1151
995 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
996 scr_reset (); 1153 scr_reset ();
997 1154
998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
999 //scr_touch (false);
1000
1001#ifdef HAVE_BG_PIXMAP
1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap)
1004// scr_touch (false);
1005#endif
1006
1007#ifdef USE_XIM 1155#if USE_XIM
1008 IMSetPosition (); 1156 im_set_position ();
1009#endif 1157#endif
1010} 1158}
1011 1159
1012/* 1160/*
1013 * 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.
… …
1026 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1027 if (newheight == 0) 1175 if (newheight == 0)
1028 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1029 } 1177 }
1030 1178
1031 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1032 { 1180 {
1033 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1034 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1035 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1036 } 1184 }
1037} 1185}
1038 1186
1039/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1040 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1041 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1042#ifdef USE_XIM 1190#if USE_XIM
1043 1191
1044void 1192void
1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1046{ 1194{
1047 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1074 status_rect.height = fheight; 1222 status_rect.height = fheight;
1075} 1223}
1076 1224
1077/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1078bool 1226bool
1079rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1080{ 1228{
1081 char *p;
1082 Atom atom; 1229 Atom atom;
1083 Window win; 1230 Window win;
1084 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1085 1232
1086 /* get current locale modifier */ 1233 /* get current locale modifier */
1087 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1234 if (char *p = XSetLocaleModifiers (0))
1088 { 1235 {
1089 strcpy (server, "@server="); 1236 strcpy (server, "@server=");
1090 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1237 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1091 1238
1092 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1239 if (p = strchr (server + 1, '@')) /* first one only */
1093 *p = '\0'; 1240 *p = '\0';
1094 1241
1095 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1096 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1097 1244
1098 if (win != None) 1245 if (win != None)
1099 return True; 1246 return true;
1100 } 1247 }
1101 1248
1102 return False; 1249 return false;
1103} 1250}
1104 1251
1105void 1252void
1106rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1107{ 1254{
1108 XPoint nspot; 1255 XPoint nspot;
1109 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1110 1257
1111 if (!Input_Context 1258 if (!Input_Context
… …
1164 1311
1165 term->make_current (); 1312 term->make_current ();
1166 1313
1167 if (text) 1314 if (text)
1168 { 1315 {
1169 void *str; 1316 wchar_t *str;
1170 1317
1171 if (!text->encoding_is_wchar && text->string.multi_byte) 1318 if (!text->encoding_is_wchar && text->string.multi_byte)
1172 { 1319 {
1173 // of course, X makes it ugly again 1320 // of course, X makes it ugly again
1174 if (term->rs[Rs_imLocale]) 1321 if (term->rs[Rs_imLocale])
1175 SET_LOCALE (term->rs[Rs_imLocale]); 1322 SET_LOCALE (term->rs[Rs_imLocale]);
1176 1323
1177 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1324 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1178 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1325 mbstowcs (str, text->string.multi_byte, text->length + 1);
1179 1326
1180 if (term->rs[Rs_imLocale]) 1327 if (term->rs[Rs_imLocale])
1181 SET_LOCALE (term->locale); 1328 SET_LOCALE (term->locale);
1182 } 1329 }
1183 else 1330 else
1184 str = (void *)text->string.wide_char; 1331 str = text->string.wide_char;
1185 1332
1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1333 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1187 DT_INT, call_data->caret, 1334 DT_INT, call_data->caret,
1188 DT_INT, call_data->chg_first, 1335 DT_INT, call_data->chg_first,
1189 DT_INT, call_data->chg_length, 1336 DT_INT, call_data->chg_length,
… …
1217/* 1364/*
1218 * 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
1219 * open a suitable preedit type 1366 * open a suitable preedit type
1220 */ 1367 */
1221bool 1368bool
1222rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1223{ 1370{
1224 int i, j, found; 1371 int i, j, found;
1225 XIM xim; 1372 XIM xim;
1226 XPoint spot; 1373 XPoint spot;
1227 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1228 unsigned long fg, bg; 1375 unsigned long fg, bg;
1229 const char *p; 1376 const char *p;
1230 char **s; 1377 char **s;
1231 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1232#ifdef ENABLE_XIM_ONTHESPOT
1233 XIMCallback xcb[4];
1234#endif
1235 1379
1236 set_environ (envv); 1380 set_environ (env);
1237 1381
1238 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1239 return false; 1383 return false;
1240 1384
1241 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1242 if (input_method == NULL) 1386 if (input_method == NULL)
1243 return false; 1387 return false;
… …
1260 p = pet[pi]; 1404 p = pet[pi];
1261 1405
1262 if (!p) 1406 if (!p)
1263 continue; 1407 continue;
1264 1408
1265 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1266 1410
1267 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1268 { 1412 {
1269 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1270 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1282 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1283 1427
1284 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1285 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1286 { 1430 {
1287 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1288 1432
1289 found = 1; 1433 found = 1;
1290 goto foundpet; 1434 goto foundpet;
1291 } 1435 }
1292 1436
1293 } 1437 }
1294 1438
1295 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1296 } 1440 }
1297 1441
1298foundpet: 1442foundpet:
1299 1443
1300 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1379 NULL); 1523 NULL);
1380 } 1524 }
1381#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1382 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1383 { 1527 {
1528 XIMCallback xcb[4];
1529
1384 im_set_position (spot); 1530 im_set_position (spot);
1385 1531
1386 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;
1387 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;
1388 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;
… …
1403#endif 1549#endif
1404 1550
1405 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1406 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1407 XNClientWindow, vt, 1553 XNClientWindow, vt,
1408 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1409 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1410 preedit_attr, 1556 preedit_attr,
1411 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1412 status_attr, NULL); 1558 status_attr, NULL);
1413 1559
… …
1426 // 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
1427 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1428 vt_select_input (); 1574 vt_select_input ();
1429#endif 1575#endif
1430 1576
1431 IMSetPosition (); 1577 im_set_position ();
1432 1578
1433 return true; 1579 return true;
1434} 1580}
1435 1581
1436void 1582void
… …
1446 im_destroy (); 1592 im_destroy ();
1447 1593
1448 if (Input_Context) 1594 if (Input_Context)
1449 return; 1595 return;
1450 1596
1451#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1452 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1453 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1454#endif
1455 1599
1456 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1457 if (p && *p) 1601 if (p && *p)
1458 { 1602 {
1459 bool found = false; 1603 bool found = false;
1460 1604
1461 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1462 1606
1463 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1464 { 1608 {
1465 if (*s[i]) 1609 if (*s[i])
1466 { 1610 {
1467 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1468 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1469 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1470 { 1614 {
1471 found = true; 1615 found = true;
1472 break; 1616 break;
1473 } 1617 }
1474 } 1618 }
1475 } 1619 }
1476 1620
1477 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1478 1622
1479 if (found) 1623 if (found)
1480 goto done; 1624 goto done;
1481 } 1625 }
1482 1626
1483 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1484 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1485 goto done; 1629 goto done;
1486 1630
1487 /* 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 */
1488 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1489 goto done; 1633 goto done;
1490 1634
1491done: 1635done:
1492#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1493 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1494 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1495#endif
1496} 1638}
1497 1639
1498void 1640void
1499rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1500{ 1642{
1501 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1502 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1503 1645
1504 if (!Input_Context 1646 if (!Input_Context
1505 || !focus 1647 || !focus
1506 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1507 || !IMisRunning ()) 1649 || !im_is_running ())
1508 return; 1650 return;
1509 1651
1510 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1511 { 1653 {
1512 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
… …
1542 1684
1543void 1685void
1544rxvt_term::get_window_origin (int &x, int &y) 1686rxvt_term::get_window_origin (int &x, int &y)
1545{ 1687{
1546 Window cr; 1688 Window cr;
1547 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1548/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1549}
1550
1551Pixmap
1552rxvt_term::get_pixmap_property (int prop_id)
1553{
1554 if (prop_id > 0 && prop_id < NUM_XA)
1555 if (xa[prop_id])
1556 {
1557 int aformat;
1558 unsigned long nitems, bytes_after;
1559 Atom atype;
1560 unsigned char *prop = NULL;
1561 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1562 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1563 &nitems, &bytes_after, &prop);
1564 if (result == Success && prop && atype == XA_PIXMAP)
1565 return *(Pixmap *)prop;
1566 }
1567
1568 return None;
1569} 1690}
1570 1691
1571#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1572# if TRACE_PIXMAPS
1573# undef update_background
1574void
1575rxvt_term::trace_update_background (const char *file, int line)
1576{
1577 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1578 update_background ();
1579}
1580# endif
1581 1693
1582void 1694void
1583rxvt_term::update_background () 1695rxvt_term::update_background ()
1584{ 1696{
1585 if (update_background_ev.is_active ()) 1697 if (update_background_ev.is_active ())
1586 return; 1698 return;
1587 1699
1588 bgPixmap.invalidate ();
1589
1590 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1591 1701
1592 if (to_wait <= 0.) 1702 if (to_wait <= 0.)
1593 bgPixmap.render (); 1703 bg_render ();
1594 else 1704 else
1595 update_background_ev.start (to_wait); 1705 update_background_ev.start (to_wait);
1596} 1706}
1597 1707
1598void 1708void
1599rxvt_term::update_background_cb (ev::timer &w, int revents) 1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1600{ 1710{
1601 make_current (); 1711 make_current ();
1602 1712
1603 update_background_ev.stop (); 1713 update_background_ev.stop ();
1604 bgPixmap.render (); 1714 bg_render ();
1605 refresh_check (); 1715 refresh_check ();
1606} 1716}
1607 1717
1608#endif /* HAVE_BG_PIXMAP */ 1718#endif /* HAVE_BG_PIXMAP */
1609 1719

Diff Legend

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