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.308 by ayin, Tue Feb 19 13:01:32 2008 UTC vs.
Revision 1.387 by sf-exg, Sun Dec 30 15:38:04 2012 UTC

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

Diff Legend

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