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.381 by root, Tue Jun 5 12:04:33 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 sprintf (number, "%d", event->minor_code);
438 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
439 rxvt_warn ("+ (which is %s)\n", buffer);
440 }
441
442 XFreeExtensionList (exts);
390 } 443 }
444 else
445 {
446 sprintf (number, "%d", event->request_code);
447 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
448 rxvt_warn ("+ (which is %s)\n", buffer);
449 }
450
391 if ((event->error_code == BadWindow) || 451 if (event->error_code == BadWindow
392 (event->error_code == BadPixmap) || 452 || event->error_code == BadPixmap
393 (event->error_code == BadCursor) || 453 || event->error_code == BadCursor
394 (event->error_code == BadFont) || 454 || event->error_code == BadFont
395 (event->error_code == BadDrawable) || 455 || event->error_code == BadDrawable
396 (event->error_code == BadColor) || 456 || event->error_code == BadColor
397 (event->error_code == BadGC) || 457 || event->error_code == BadGC
398 (event->error_code == BadIDChoice) || 458 || event->error_code == BadIDChoice
399 (event->error_code == BadValue) || 459 || event->error_code == BadValue
400 (event->error_code == BadAtom)) { 460 || event->error_code == BadAtom)
461 {
401 if (event->error_code == BadValue) 462 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 463 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
403 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 464 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 465 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
406 mesg, BUFSIZ); 466 else
407 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 467 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 468
418int 469 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
470 }
471}
472#endif
473
474int ecb_cold
419rxvt_xerror_handler (Display *display, XErrorEvent *event) 475rxvt_xerror_handler (Display *display, XErrorEvent *event)
420{ 476{
421 if (GET_R->allowedxerror == -1) 477 if (GET_R->allowedxerror == -1)
422 GET_R->allowedxerror = event->error_code; 478 GET_R->allowedxerror = event->error_code;
423 else 479 else
… …
432 } 488 }
433 489
434 return 0; 490 return 0;
435} 491}
436 492
437int 493int ecb_cold
438rxvt_xioerror_handler (Display *display) 494rxvt_xioerror_handler (Display *display)
439{ 495{
440 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 496 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
441 DisplayString (display)); 497 DisplayString (display));
442 rxvt_emergency_cleanup (); 498 rxvt_emergency_cleanup ();
… …
465 rxvt_emergency_cleanup (); 521 rxvt_emergency_cleanup ();
466 w.stop (); 522 w.stop ();
467 kill (getpid (), w.signum); 523 kill (getpid (), w.signum);
468} 524}
469 525
526static void
527rxvt_get_ttymode (struct termios *tio)
528{
529 if (tcgetattr (STDIN_FILENO, tio) < 0)
530 memset (tio, 0, sizeof (struct termios));
531
532 for (int i = 0; i < NCCS; i++)
533 tio->c_cc[i] = VDISABLE;
534
535 tio->c_cc[VINTR] = CINTR;
536 tio->c_cc[VQUIT] = CQUIT;
537 tio->c_cc[VERASE] = CERASE;
538#ifdef VERASE2
539 tio->c_cc[VERASE2] = CERASE2;
540#endif
541 tio->c_cc[VKILL] = CKILL;
542 tio->c_cc[VEOF] = CEOF;
543 tio->c_cc[VSTART] = CSTART;
544 tio->c_cc[VSTOP] = CSTOP;
545 tio->c_cc[VSUSP] = CSUSP;
546# ifdef VDSUSP
547 tio->c_cc[VDSUSP] = CDSUSP;
548# endif
549# ifdef VREPRINT
550 tio->c_cc[VREPRINT] = CRPRNT;
551# endif
552# ifdef VDISCRD
553 tio->c_cc[VDISCRD] = CFLUSH;
554# endif
555# ifdef VWERSE
556 tio->c_cc[VWERSE] = CWERASE;
557# endif
558# ifdef VLNEXT
559 tio->c_cc[VLNEXT] = CLNEXT;
560# endif
561# ifdef VSTATUS
562 tio->c_cc[VSTATUS] = CSTATUS;
563# endif
564
565# if VMIN != VEOF
566 tio->c_cc[VMIN] = 1;
567# endif
568# if VTIME != VEOL
569 tio->c_cc[VTIME] = 0;
570# endif
571
572 /* input modes */
573 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
574# ifdef IMAXBEL
575 | IMAXBEL
576# endif
577 | IXON);
578
579 /* output modes */
580 tio->c_oflag = (OPOST | ONLCR);
581
582 /* control modes */
583 tio->c_cflag = (CS8 | CREAD);
584
585 /* local modes */
586 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
587# if defined (ECHOCTL) && defined (ECHOKE)
588 | ECHOCTL | ECHOKE
589# endif
590 | ECHOE | ECHOK);
591}
592
470char **rxvt_environ; // startup environment 593char **rxvt_environ; // startup environment
471 594
472void 595void
473rxvt_init () 596rxvt_init ()
474{ 597{
475 ptytty::init (); 598 assert (("fontMask must not overlap other RS masks",
599 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
476 600
601 rxvt_get_ttymode (&rxvt_term::def_tio);
602
603 // get rid of stdin/stdout as we don't need them, to free resources
604 dup2 (STDERR_FILENO, STDIN_FILENO);
605 dup2 (STDERR_FILENO, STDOUT_FILENO);
606
477 if (!ev_default_loop (0)) 607 if (!ev_default_loop ())
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 608 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 609
480 rxvt_environ = environ; 610 rxvt_environ = environ;
481 611
482 signal (SIGHUP, SIG_IGN); 612 signal (SIGHUP, SIG_IGN);
483 signal (SIGPIPE, SIG_IGN); 613 signal (SIGPIPE, SIG_IGN);
484 614
485 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 615 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486 sig_handlers.sw_int.start (SIGINT); ev_unref (); 616 sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
489 /* signal (SIGURG, SIG_DFL); */
490 617
491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 618 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492 // TODO: handle this with exceptions and tolerate the memory loss 619 // TODO: handle this with exceptions and tolerate the memory loss
493 XSetIOErrorHandler (rxvt_xioerror_handler); 620 XSetIOErrorHandler (rxvt_xioerror_handler);
494 621
495 XrmInitialize (); 622 XrmInitialize ();
623
624#if HAVE_PIXBUF
625 g_type_init ();
626#endif
496} 627}
497 628
498/*----------------------------------------------------------------------*/ 629/*----------------------------------------------------------------------*/
499/* 630/*
500 * window size/position calculations for XSizeHint and other storage. 631 * window size/position calculations for XSizeHint and other storage.
… …
522 if (rs[Rs_geometry]) 653 if (rs[Rs_geometry])
523 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 654 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
524 655
525 if (flags & WidthValue) 656 if (flags & WidthValue)
526 { 657 {
658 if (!w)
659 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
660
527 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 661 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
528 szHint.flags |= USSize; 662 szHint.flags |= USSize;
529 } 663 }
530 664
531 if (flags & HeightValue) 665 if (flags & HeightValue)
532 { 666 {
667 if (!h)
668 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
669
533 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 670 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
534 szHint.flags |= USSize; 671 szHint.flags |= USSize;
535 } 672 }
536 673
537 if (flags & XValue) 674 if (flags & XValue)
538 { 675 {
… …
613 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 750 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
614 751
615 if (recalc_y) 752 if (recalc_y)
616 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 753 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
617 754
618 ncol = width / fwidth; 755 ncol = width / fwidth;
619 nrow = height / fheight; 756 nrow = height / fheight;
757
758 // When the size of the vt window is not a multiple of the cell
759 // size, i.e., when the wm does not honour our size hints, there are
760 // extra areas not covered by the terminal screen. Such gaps, when a
761 // bg pixmap is set, would have to be cleared manually to properly
762 // refresh the background. We take the simpler route and shrink the
763 // vt window so as to avoid creating gaps.
764 vt_width = ncol * fwidth;
765 vt_height = nrow * fheight;
620} 766}
621 767
622/*----------------------------------------------------------------------*/ 768/*----------------------------------------------------------------------*/
623/* 769/*
624 * Tell the teletype handler what size the window is. 770 * Tell the teletype handler what size the window is.
… …
632 778
633 struct winsize ws; 779 struct winsize ws;
634 780
635 ws.ws_col = ncol; 781 ws.ws_col = ncol;
636 ws.ws_row = nrow; 782 ws.ws_row = nrow;
637 ws.ws_xpixel = width; 783 ws.ws_xpixel = vt_width;
638 ws.ws_ypixel = height; 784 ws.ws_ypixel = vt_height;
639 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 785 ioctl (pty->pty, TIOCSWINSZ, &ws);
640 786
641#if 0 787#if 0
642 // TIOCSWINSZ is supposed to do this automatically and correctly 788 // TIOCSWINSZ is supposed to do this automatically and correctly
643 if (cmd_pid) /* force through to the command */ 789 if (cmd_pid) /* force through to the command */
644 kill (-cmd_pid, SIGWINCH); 790 kill (-cmd_pid, SIGWINCH);
645#endif 791#endif
646} 792}
647 793
648/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
649/* set_fonts () - load and set the various fonts 795/* 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 796bool
657rxvt_term::set_fonts () 797rxvt_term::set_fonts ()
658{ 798{
659 rxvt_fontset *fs = new rxvt_fontset (this); 799 rxvt_fontset *fs = new rxvt_fontset (this);
660 rxvt_fontprop prop; 800 rxvt_fontprop prop;
… …
674#endif 814#endif
675 815
676 delete fontset[0]; 816 delete fontset[0];
677 fontset[0] = fs; 817 fontset[0] = fs;
678 818
679 prop = (*fs)[1]->properties (); 819 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
680 prop.height += lineSpace; 820 prop.width += letterSpace;
681 821
682 fs->set_prop (prop, false); 822 fs->set_prop (prop, false);
683 823
684 fwidth = prop.width; 824 fwidth = prop.width;
685 fheight = prop.height; 825 fheight = prop.height + lineSpace;
686 fbase = prop.ascent; 826 fbase = prop.ascent;
687 827
688 for (int style = 1; style < 4; style++) 828 for (int style = 1; style < 4; style++)
689 { 829 {
690#if ENABLE_STYLES 830#if ENABLE_STYLES
… …
716#else 856#else
717 fontset[style] = fontset[0]; 857 fontset[style] = fontset[0];
718#endif 858#endif
719 } 859 }
720 860
721 if (parent[0]) 861 if (parent)
722 { 862 {
723 resize_all_windows (0, 0, 0); 863 resize_all_windows (0, 0, 0);
724 scr_remap_chars (); 864 scr_remap_chars ();
725 scr_touch (true); 865 scr_touch (true);
726 } 866 }
… …
729} 869}
730 870
731void 871void
732rxvt_term::set_string_property (Atom prop, const char *str, int len) 872rxvt_term::set_string_property (Atom prop, const char *str, int len)
733{ 873{
734 XChangeProperty (dpy, parent[0], 874 XChangeProperty (dpy, parent,
735 prop, XA_STRING, 8, PropModeReplace, 875 prop, XA_STRING, 8, PropModeReplace,
736 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 876 (const unsigned char *)str, len >= 0 ? len : strlen (str));
737} 877}
738 878
739void 879void
880rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
881{
882 XTextProperty ct;
883
884 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
885 {
886 XSetTextProperty (dpy, parent, &ct, prop);
887 XFree (ct.value);
888 }
889}
890
891void
740rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 892rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
741{ 893{
742 wchar_t *ws = rxvt_mbstowcs (str, len); 894 wchar_t *ws = rxvt_mbstowcs (str, len);
743 char *s = rxvt_wcstoutf8 (ws); 895 char *s = rxvt_wcstoutf8 (ws);
744 896
745 XChangeProperty (dpy, parent[0], 897 XChangeProperty (dpy, parent,
746 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 898 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
747 (const unsigned char *)s, strlen (s)); 899 (const unsigned char *)s, strlen (s));
748 900
749 free (s); 901 free (s);
750 free (ws); 902 free (ws);
… …
754/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
755/* xterm sequences - title, iconName, color (exptl) */ 907/* xterm sequences - title, iconName, color (exptl) */
756void 908void
757rxvt_term::set_title (const char *str) 909rxvt_term::set_title (const char *str)
758{ 910{
759 set_string_property (XA_WM_NAME, str); 911 set_mbstring_property (XA_WM_NAME, str);
760#if ENABLE_EWMH 912#if ENABLE_EWMH
761 set_utf8_property (xa[XA_NET_WM_NAME], str); 913 set_utf8_property (xa[XA_NET_WM_NAME], str);
762#endif 914#endif
763} 915}
764 916
765void 917void
766rxvt_term::set_icon_name (const char *str) 918rxvt_term::set_icon_name (const char *str)
767{ 919{
768 set_string_property (XA_WM_ICON_NAME, str); 920 set_mbstring_property (XA_WM_ICON_NAME, str);
769#if ENABLE_EWMH 921#if ENABLE_EWMH
770 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 922 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
771#endif 923#endif
772} 924}
773 925
… …
840 992
841/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
842/* 994/*
843 * find if fg/bg matches any of the normal (low-intensity) colors 995 * find if fg/bg matches any of the normal (low-intensity) colors
844 */ 996 */
845void 997char *
846rxvt_term::set_colorfgbg () 998rxvt_term::get_colorfgbg ()
847{ 999{
848 unsigned int i; 1000 unsigned int i;
849 const char *xpmb = ""; 1001 const char *xpmb = "";
850 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1002 char fstr[] = "default";
1003 char bstr[] = "default";
1004 char *env_colorfgbg;
851 1005
852 strcpy (fstr, "default");
853 strcpy (bstr, "default");
854 for (i = Color_Black; i <= Color_White; i++) 1006 for (i = Color_Black; i <= Color_White; i++)
855 if (pix_colors[Color_fg] == pix_colors[i]) 1007 if (pix_colors[Color_fg] == pix_colors[i])
856 { 1008 {
857 sprintf (fstr, "%d", (i - Color_Black)); 1009 sprintf (fstr, "%d", i - Color_Black);
858 break; 1010 break;
859 } 1011 }
860 1012
861 for (i = Color_Black; i <= Color_White; i++) 1013 for (i = Color_Black; i <= Color_White; i++)
862 if (pix_colors[Color_bg] == pix_colors[i]) 1014 if (pix_colors[Color_bg] == pix_colors[i])
863 { 1015 {
864 sprintf (bstr, "%d", (i - Color_Black)); 1016 sprintf (bstr, "%d", i - Color_Black);
865#ifdef BG_IMAGE_FROM_FILE 1017#if BG_IMAGE_FROM_FILE
866 xpmb = "default;"; 1018 xpmb = "default;";
867#endif 1019#endif
868 break; 1020 break;
869 } 1021 }
870 1022
1023 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
871 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1024 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1025 return env_colorfgbg;
872} 1026}
873 1027
874/*----------------------------------------------------------------------*/ 1028/*----------------------------------------------------------------------*/
875 1029
876bool 1030bool
… …
899 int old_width = szHint.width; 1053 int old_width = szHint.width;
900 int old_height = szHint.height; 1054 int old_height = szHint.height;
901 1055
902 window_calc (newwidth, newheight); 1056 window_calc (newwidth, newheight);
903 1057
904 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1058 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1059
1060 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1061 if (set_hint)
1062 {
1063 szHint.flags &= ~(PBaseSize | PResizeInc);
905 XSetWMNormalHints (dpy, parent[0], &szHint); 1064 XSetWMNormalHints (dpy, parent, &szHint);
1065 szHint.flags |= PBaseSize | PResizeInc;
1066 }
906 1067
907 if (!ignoreparent) 1068 if (!ignoreparent)
908 { 1069 {
909#ifdef SMART_RESIZE 1070#ifdef SMART_RESIZE
910 /* 1071 /*
… …
914 int x, y, x1, y1; 1075 int x, y, x1, y1;
915 int dx, dy; 1076 int dx, dy;
916 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1077 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
917 Window unused_cr; 1078 Window unused_cr;
918 1079
919 XTranslateCoordinates (dpy, parent[0], display->root, 1080 XTranslateCoordinates (dpy, parent, display->root,
920 0, 0, &x, &y, &unused_cr); 1081 0, 0, &x, &y, &unused_cr);
921 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1082 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
922 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1083 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
923 /* 1084 /*
924 * if display->root isn't the parent window, a WM will probably have offset 1085 * if display->root isn't the parent window, a WM will probably have offset
925 * our position for handles and decorations. Counter it 1086 * our position for handles and decorations. Counter it
926 */ 1087 */
… …
943 if (y < y1) /* top half */ 1104 if (y < y1) /* top half */
944 dy = 0; 1105 dy = 0;
945 else if (y == y1) /* exact center */ 1106 else if (y == y1) /* exact center */
946 dy /= 2; 1107 dy /= 2;
947 1108
948 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1109 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
949 szHint.width, szHint.height); 1110 szHint.width, szHint.height);
950#else 1111#else
951 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1112 XResizeWindow (dpy, parent, szHint.width, szHint.height);
952#endif 1113#endif
953 } 1114 }
1115
1116 if (set_hint)
1117 XSetWMNormalHints (dpy, parent, &szHint);
954 1118
955 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1119 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
956 1120
957 if (fix_screen || newwidth != old_width || newheight != old_height) 1121 if (fix_screen || newwidth != old_width || newheight != old_height)
958 { 1122 {
959 if (scrollBar.state) 1123 if (scrollBar.state)
960 scrollBar.resize (); 1124 scrollBar.resize ();
961 1125
962 XMoveResizeWindow (dpy, vt, 1126 XMoveResizeWindow (dpy, vt,
963 window_vt_x, window_vt_y, 1127 window_vt_x, window_vt_y,
964 width, height); 1128 vt_width, vt_height);
1129
1130 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
965 1131
966#ifdef HAVE_BG_PIXMAP 1132#ifdef HAVE_BG_PIXMAP
967 if (bgPixmap.window_size_sensitive ()) 1133 if (bg_window_size_sensitive ())
968 update_background (); 1134 update_background ();
969#endif 1135#endif
970
971 scr_clear ();
972 } 1136 }
973 1137
974 if (fix_screen || old_height == 0) 1138 if (fix_screen || old_height == 0)
975 scr_reset (); 1139 scr_reset ();
976 1140
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 1141#if USE_XIM
987 IMSetPosition (); 1142 im_set_position ();
988#endif 1143#endif
989} 1144}
990 1145
991/* 1146/*
992 * Set the width/height of the vt window in characters. Units are pixels. 1147 * Set the width/height of the vt window in characters. Units are pixels.
… …
1005 newwidth = wattr.width - szHint.base_width; 1160 newwidth = wattr.width - szHint.base_width;
1006 if (newheight == 0) 1161 if (newheight == 0)
1007 newheight = wattr.height - szHint.base_height; 1162 newheight = wattr.height - szHint.base_height;
1008 } 1163 }
1009 1164
1010 if (newwidth != width || newheight != height) 1165 if (newwidth != vt_width || newheight != vt_height)
1011 { 1166 {
1012 newwidth += szHint.base_width; 1167 newwidth += szHint.base_width;
1013 newheight += szHint.base_height; 1168 newheight += szHint.base_height;
1014 resize_all_windows (newwidth, newheight, 0); 1169 resize_all_windows (newwidth, newheight, 0);
1015 } 1170 }
1016} 1171}
1017 1172
1018/* -------------------------------------------------------------------- * 1173/* -------------------------------------------------------------------- *
1019 * - X INPUT METHOD ROUTINES - * 1174 * - X INPUT METHOD ROUTINES - *
1020 * -------------------------------------------------------------------- */ 1175 * -------------------------------------------------------------------- */
1021#ifdef USE_XIM 1176#if USE_XIM
1022 1177
1023void 1178void
1024rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1179rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1025{ 1180{
1026 fg = pix_colors [Color_fg]; 1181 fg = pix_colors [Color_fg];
… …
1053 status_rect.height = fheight; 1208 status_rect.height = fheight;
1054} 1209}
1055 1210
1056/* Checking whether input method is running. */ 1211/* Checking whether input method is running. */
1057bool 1212bool
1058rxvt_term::IMisRunning () 1213rxvt_term::im_is_running ()
1059{ 1214{
1060 char *p;
1061 Atom atom; 1215 Atom atom;
1062 Window win; 1216 Window win;
1063 char server[IMBUFSIZ]; 1217 char server[IMBUFSIZ];
1064 1218
1065 /* get current locale modifier */ 1219 /* get current locale modifier */
1066 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1220 if (char *p = XSetLocaleModifiers (0))
1067 { 1221 {
1068 strcpy (server, "@server="); 1222 strcpy (server, "@server=");
1069 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1223 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1070 1224
1071 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1225 if (p = strchr (server + 1, '@')) /* first one only */
1072 *p = '\0'; 1226 *p = '\0';
1073 1227
1074 atom = XInternAtom (dpy, server, False); 1228 atom = XInternAtom (dpy, server, False);
1075 win = XGetSelectionOwner (dpy, atom); 1229 win = XGetSelectionOwner (dpy, atom);
1076 1230
1077 if (win != None) 1231 if (win != None)
1078 return True; 1232 return true;
1079 } 1233 }
1080 1234
1081 return False; 1235 return false;
1082} 1236}
1083 1237
1084void 1238void
1085rxvt_term::IMSendSpot () 1239rxvt_term::im_send_spot ()
1086{ 1240{
1087 XPoint nspot; 1241 XPoint nspot;
1088 XVaNestedList preedit_attr; 1242 XVaNestedList preedit_attr;
1089 1243
1090 if (!Input_Context 1244 if (!Input_Context
… …
1143 1297
1144 term->make_current (); 1298 term->make_current ();
1145 1299
1146 if (text) 1300 if (text)
1147 { 1301 {
1148 void *str; 1302 wchar_t *str;
1149 1303
1150 if (!text->encoding_is_wchar && text->string.multi_byte) 1304 if (!text->encoding_is_wchar && text->string.multi_byte)
1151 { 1305 {
1152 // of course, X makes it ugly again 1306 // of course, X makes it ugly again
1153 if (term->rs[Rs_imLocale]) 1307 if (term->rs[Rs_imLocale])
1154 SET_LOCALE (term->rs[Rs_imLocale]); 1308 SET_LOCALE (term->rs[Rs_imLocale]);
1155 1309
1156 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1310 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1157 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1311 mbstowcs (str, text->string.multi_byte, text->length + 1);
1158 1312
1159 if (term->rs[Rs_imLocale]) 1313 if (term->rs[Rs_imLocale])
1160 SET_LOCALE (term->locale); 1314 SET_LOCALE (term->locale);
1161 } 1315 }
1162 else 1316 else
1163 str = (void *)text->string.wide_char; 1317 str = text->string.wide_char;
1164 1318
1165 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1319 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1166 DT_INT, call_data->caret, 1320 DT_INT, call_data->caret,
1167 DT_INT, call_data->chg_first, 1321 DT_INT, call_data->chg_first,
1168 DT_INT, call_data->chg_length, 1322 DT_INT, call_data->chg_length,
… …
1196/* 1350/*
1197 * Try to open a XIM with the current modifiers, then see if we can 1351 * Try to open a XIM with the current modifiers, then see if we can
1198 * open a suitable preedit type 1352 * open a suitable preedit type
1199 */ 1353 */
1200bool 1354bool
1201rxvt_term::IM_get_IC (const char *modifiers) 1355rxvt_term::im_get_ic (const char *modifiers)
1202{ 1356{
1203 int i, j, found; 1357 int i, j, found;
1204 XIM xim; 1358 XIM xim;
1205 XPoint spot; 1359 XPoint spot;
1206 XRectangle rect, status_rect, needed_rect; 1360 XRectangle rect, status_rect, needed_rect;
1207 unsigned long fg, bg; 1361 unsigned long fg, bg;
1208 const char *p; 1362 const char *p;
1209 char **s; 1363 char **s;
1210 XIMStyles *xim_styles; 1364 XIMStyles *xim_styles;
1211#ifdef ENABLE_XIM_ONTHESPOT
1212 XIMCallback xcb[4];
1213#endif
1214 1365
1215 set_environ (envv); 1366 set_environ (envv);
1216 1367
1217 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1368 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1218 return false; 1369 return false;
… …
1239 p = pet[pi]; 1390 p = pet[pi];
1240 1391
1241 if (!p) 1392 if (!p)
1242 continue; 1393 continue;
1243 1394
1244 s = rxvt_splitcommastring (p); 1395 s = rxvt_strsplit (',', p);
1245 1396
1246 for (i = found = 0; !found && s[i]; i++) 1397 for (i = found = 0; !found && s[i]; i++)
1247 { 1398 {
1248 if (!strcmp (s[i], "OverTheSpot")) 1399 if (!strcmp (s[i], "OverTheSpot"))
1249 input_style = XIMPreeditPosition | XIMStatusNothing; 1400 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1261 input_style = XIMPreeditNothing | XIMStatusNothing; 1412 input_style = XIMPreeditNothing | XIMStatusNothing;
1262 1413
1263 for (j = 0; j < xim_styles->count_styles; j++) 1414 for (j = 0; j < xim_styles->count_styles; j++)
1264 if (input_style == xim_styles->supported_styles[j]) 1415 if (input_style == xim_styles->supported_styles[j])
1265 { 1416 {
1266 rxvt_freecommastring (s); 1417 rxvt_free_strsplit (s);
1267 1418
1268 found = 1; 1419 found = 1;
1269 goto foundpet; 1420 goto foundpet;
1270 } 1421 }
1271 1422
1272 } 1423 }
1273 1424
1274 rxvt_freecommastring (s); 1425 rxvt_free_strsplit (s);
1275 } 1426 }
1276 1427
1277foundpet: 1428foundpet:
1278 1429
1279 XFree (xim_styles); 1430 XFree (xim_styles);
… …
1358 NULL); 1509 NULL);
1359 } 1510 }
1360#if ENABLE_XIM_ONTHESPOT 1511#if ENABLE_XIM_ONTHESPOT
1361 else if (input_style & XIMPreeditCallbacks) 1512 else if (input_style & XIMPreeditCallbacks)
1362 { 1513 {
1514 XIMCallback xcb[4];
1515
1363 im_set_position (spot); 1516 im_set_position (spot);
1364 1517
1365 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1518 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; 1519 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; 1520 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1382#endif 1535#endif
1383 1536
1384 Input_Context = XCreateIC (xim, 1537 Input_Context = XCreateIC (xim,
1385 XNInputStyle, input_style, 1538 XNInputStyle, input_style,
1386 XNClientWindow, vt, 1539 XNClientWindow, vt,
1387 XNFocusWindow, parent[0], 1540 XNFocusWindow, parent,
1388 preedit_attr ? XNPreeditAttributes : NULL, 1541 preedit_attr ? XNPreeditAttributes : NULL,
1389 preedit_attr, 1542 preedit_attr,
1390 status_attr ? XNStatusAttributes : NULL, 1543 status_attr ? XNStatusAttributes : NULL,
1391 status_attr, NULL); 1544 status_attr, NULL);
1392 1545
… …
1405 // unfortunately, only the focus window is used by XIM, hard to fix 1558 // unfortunately, only the focus window is used by XIM, hard to fix
1406 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1559 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1407 vt_select_input (); 1560 vt_select_input ();
1408#endif 1561#endif
1409 1562
1410 IMSetPosition (); 1563 im_set_position ();
1411 1564
1412 return true; 1565 return true;
1413} 1566}
1414 1567
1415void 1568void
… …
1425 im_destroy (); 1578 im_destroy ();
1426 1579
1427 if (Input_Context) 1580 if (Input_Context)
1428 return; 1581 return;
1429 1582
1430#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1431 if (rs[Rs_imLocale]) 1583 if (rs[Rs_imLocale])
1432 SET_LOCALE (rs[Rs_imLocale]); 1584 SET_LOCALE (rs[Rs_imLocale]);
1433#endif
1434 1585
1435 p = rs[Rs_inputMethod]; 1586 p = rs[Rs_inputMethod];
1436 if (p && *p) 1587 if (p && *p)
1437 { 1588 {
1438 bool found = false; 1589 bool found = false;
1439 1590
1440 s = rxvt_splitcommastring (p); 1591 s = rxvt_strsplit (',', p);
1441 1592
1442 for (i = 0; s[i]; i++) 1593 for (i = 0; s[i]; i++)
1443 { 1594 {
1444 if (*s[i]) 1595 if (*s[i])
1445 { 1596 {
1446 strcpy (buf, "@im="); 1597 strcpy (buf, "@im=");
1447 strncat (buf, s[i], IMBUFSIZ - 5); 1598 strncat (buf, s[i], IMBUFSIZ - 5);
1448 if (IM_get_IC (buf)) 1599 if (im_get_ic (buf))
1449 { 1600 {
1450 found = true; 1601 found = true;
1451 break; 1602 break;
1452 } 1603 }
1453 } 1604 }
1454 } 1605 }
1455 1606
1456 rxvt_freecommastring (s); 1607 rxvt_free_strsplit (s);
1457 1608
1458 if (found) 1609 if (found)
1459 goto done; 1610 goto done;
1460 } 1611 }
1461 1612
1462 /* try with XMODIFIERS env. var. */ 1613 /* try with XMODIFIERS env. var. */
1463 if (IM_get_IC ("")) 1614 if (im_get_ic (""))
1464 goto done; 1615 goto done;
1465 1616
1466 /* try with no modifiers base IF the user didn't specify an IM */ 1617 /* try with no modifiers base IF the user didn't specify an IM */
1467 if (IM_get_IC ("@im=none")) 1618 if (im_get_ic ("@im=none"))
1468 goto done; 1619 goto done;
1469 1620
1470done: 1621done:
1471#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1472 if (rs[Rs_imLocale]) 1622 if (rs[Rs_imLocale])
1473 SET_LOCALE (locale); 1623 SET_LOCALE (locale);
1474#endif
1475} 1624}
1476 1625
1477void 1626void
1478rxvt_term::IMSetPosition () 1627rxvt_term::im_set_position ()
1479{ 1628{
1480 XRectangle preedit_rect, status_rect, *needed_rect; 1629 XRectangle preedit_rect, status_rect, *needed_rect;
1481 XVaNestedList preedit_attr, status_attr; 1630 XVaNestedList preedit_attr, status_attr;
1482 1631
1483 if (!Input_Context 1632 if (!Input_Context
1484 || !focus 1633 || !focus
1485 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1634 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1486 || !IMisRunning ()) 1635 || !im_is_running ())
1487 return; 1636 return;
1488 1637
1489 if (input_style & XIMPreeditPosition) 1638 if (input_style & XIMPreeditPosition)
1490 { 1639 {
1491 im_set_size (preedit_rect); 1640 im_set_size (preedit_rect);
… …
1521 1670
1522void 1671void
1523rxvt_term::get_window_origin (int &x, int &y) 1672rxvt_term::get_window_origin (int &x, int &y)
1524{ 1673{
1525 Window cr; 1674 Window cr;
1526 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1675 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} 1676}
1549 1677
1550#ifdef HAVE_BG_PIXMAP 1678#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 1679
1561void 1680void
1562rxvt_term::update_background () 1681rxvt_term::update_background ()
1563{ 1682{
1564 if (update_background_ev.is_active ()) 1683 if (update_background_ev.is_active ())
1565 return; 1684 return;
1566 1685
1567 bgPixmap.invalidate (); 1686 bg_invalidate ();
1568 1687
1688 if (!mapped)
1689 return;
1690
1569 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1691 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1570 1692
1571 if (to_wait <= 0.) 1693 if (to_wait <= 0.)
1572 bgPixmap.render (); 1694 bg_render ();
1573 else 1695 else
1574 update_background_ev.start (to_wait); 1696 update_background_ev.start (to_wait);
1575} 1697}
1576 1698
1577void 1699void
1578rxvt_term::update_background_cb (ev::timer &w, int revents) 1700rxvt_term::update_background_cb (ev::timer &w, int revents)
1579{ 1701{
1580 make_current (); 1702 make_current ();
1581 1703
1582 update_background_ev.stop (); 1704 update_background_ev.stop ();
1583 bgPixmap.render (); 1705 bg_render ();
1584 refresh_check (); 1706 refresh_check ();
1585} 1707}
1586 1708
1587#endif /* HAVE_BG_PIXMAP */ 1709#endif /* HAVE_BG_PIXMAP */
1588 1710

Diff Legend

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