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

Diff Legend

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