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

Diff Legend

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