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.313 by root, Tue Nov 4 16:43:50 2008 UTC vs.
Revision 1.394 by root, Sat Dec 13 10:07:30 2014 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#include <termios.h> 45#include <termios.h>
44 46
45#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 48# define X_LOCALE
47# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
48#else 50#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 51# include <locale.h>
51# endif 52#endif
52#endif
53 53
54struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
55 56
56// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
58 59
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 95{
95 compose_char *cc; 96 compose_char *cc;
96 97
97 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 100 cc = (*this)[c1];
100 while (cc) 101 while (cc)
101 { 102 {
102 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
104 } 105 }
105 106
106 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
111 }
112 111
113 // allocate a new combination 112 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 114 {
116 static int seen; 115 static int seen;
117 116
118 if (!seen++) 117 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 119
121 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
122 } 121 }
123 122
124 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif 169#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif 172#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 175#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 177#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 179#endif
181#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 182#endif
… …
186#endif 185#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 192
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
… …
225 delete fontset[i]; 223 delete fontset[i];
226#endif 224#endif
227 delete fontset[0]; 225 delete fontset[0];
228 226
229#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 228 bg_destroy ();
231#endif 229#endif
232#ifdef HAVE_AFTERIMAGE 230
233 if (asv) 231#if HAVE_IMG
234 destroy_asvisual (asv, 0); 232 delete bg_img;
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 233#endif
238 234
239 if (display) 235 if (display)
240 { 236 {
241 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
242 239
243#ifdef USE_XIM 240#if USE_XIM
244 im_destroy (); 241 im_destroy ();
245#endif 242#endif
246 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
247 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
248 247
249 delete drawable; 248 delete drawable;
249
250 // destroy all windows 250 // destroy all windows
251 if (parent[0]) 251 if (parent)
252 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
253 253
254 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
256 { 256 {
257 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
271 /* clear all resources */ 271 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 273 free (allocated [i]);
274 274
275 free (selection.text); 275 free (selection.text);
276 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
277 free (env_display);
278 free (env_term);
279 free (locale); 277 free (locale);
280 free (v_buffer); 278 free (v_buffer);
281 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
282 286
283 delete envv; 287 delete envv;
284 delete argv; 288 delete argv;
285 289
286#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
287 delete keyboard; 291 delete keyboard;
288#endif 292#endif
289#ifndef NO_RESOURCES 293#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db); 294 XrmDestroyDatabase (option_db);
291#endif 295#endif
296
297 SET_R ((rxvt_term *)0);
292} 298}
293 299
294// child has exited, usually destroys 300// child has exited, usually destroys
295void 301void
296rxvt_term::child_cb (ev::child &w, int status) 302rxvt_term::child_cb (ev::child &w, int status)
… …
319 { 325 {
320#if USE_XIM 326#if USE_XIM
321 im_ev.stop (display); 327 im_ev.stop (display);
322#endif 328#endif
323 scrollbar_ev.stop (display); 329 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 330#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
325 rootwin_ev.stop (display); 331 rootwin_ev.stop (display);
326#endif 332#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 333 termwin_ev.stop (display);
329 vt_ev.stop (display); 334 vt_ev.stop (display);
330 } 335 }
331 336
332 flush_ev.stop (); 337 flush_ev.stop ();
… …
356 make_current (); 361 make_current ();
357 362
358 delete this; 363 delete this;
359} 364}
360 365
366void
367rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
376}
377
361/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
362/* 379/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
364 * TODO: if debugging, this should free up any known resources if we can
365 */ 381 */
366static XErrorHandler old_xerror_handler; 382static XErrorHandler old_xerror_handler;
367 383
368static void 384static void
369rxvt_emergency_cleanup () 385rxvt_emergency_cleanup ()
… …
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 387 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 388 (*t)->emergency_cleanup ();
373} 389}
374 390
375#if !ENABLE_MINIMAL 391#if !ENABLE_MINIMAL
376static void 392static void ecb_cold
377print_x_error (Display *dpy, XErrorEvent *event) 393print_x_error (Display *dpy, XErrorEvent *event)
378{ 394{
379 char buffer[BUFSIZ]; 395 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 396 char mesg[BUFSIZ];
381 char number[32]; 397 char number[32];
382 char *mtype = "XlibMessage"; 398
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 399 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
400
401 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
403
404 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("%s: %s\n", mesg, buffer); 406 rxvt_warn ("+ %s: %s\n", mesg, buffer);
407
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 408 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 409 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
410
411 if (event->request_code >= 128)
412 {
413#if 0
414 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
415 int nexts;
416 char **exts = XListExtensions (dpy, &nexts);
417
418 while (nexts)
419 {
420 char *extname = exts [nexts - 1];
421 int major, first_event, first_error;
422
423 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
424 {
425 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
426 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
427
428 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
429 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
430 rxvt_warn ("+ (which is %s)\n", buffer);
431
432 break;
433 }
434
435 printf ("nextss %d %s\n", nexts, extname);//D
436 --nexts;
437 ++exts;
438 }
439#else
440 int nexts = 0;
441 char **exts = 0;
442#endif
443
444 if (!nexts)
445 {
446 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
447
448 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
449 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
450
451#if 0
452 sprintf (number, "RENDER.%d", event->minor_code);
453 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
454 rxvt_warn ("+ (which is %s)\n", buffer);
455#endif
456 }
457
458 XFreeExtensionList (exts);
459 }
460 else
461 {
389 sprintf(number, "%d", event->request_code); 462 sprintf (number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 463 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 464 rxvt_warn ("+ (which is %s)\n", buffer);
392 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 465 }
466
397 if ((event->error_code == BadWindow) || 467 if (event->error_code == BadWindow
398 (event->error_code == BadPixmap) || 468 || event->error_code == BadPixmap
399 (event->error_code == BadCursor) || 469 || event->error_code == BadCursor
400 (event->error_code == BadFont) || 470 || event->error_code == BadFont
401 (event->error_code == BadDrawable) || 471 || event->error_code == BadDrawable
402 (event->error_code == BadColor) || 472 || event->error_code == BadColor
403 (event->error_code == BadGC) || 473 || event->error_code == BadGC
404 (event->error_code == BadIDChoice) || 474 || event->error_code == BadIDChoice
405 (event->error_code == BadValue) || 475 || event->error_code == BadValue
406 (event->error_code == BadAtom)) { 476 || event->error_code == BadAtom)
477 {
407 if (event->error_code == BadValue) 478 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 480 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ); 482 else
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421}
422#endif
423 484
424int 485 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
486 }
487}
488#endif
489
490int ecb_cold
425rxvt_xerror_handler (Display *display, XErrorEvent *event) 491rxvt_xerror_handler (Display *display, XErrorEvent *event)
426{ 492{
427 if (GET_R->allowedxerror == -1) 493 if (GET_R && GET_R->allowedxerror == -1)
428 GET_R->allowedxerror = event->error_code; 494 GET_R->allowedxerror = event->error_code;
429 else 495 else
430 { 496 {
431 // GET_R is most likely not the terminal which caused the error, 497 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 498 // so just output the error and continue
… …
438 } 504 }
439 505
440 return 0; 506 return 0;
441} 507}
442 508
443int 509int ecb_cold
444rxvt_xioerror_handler (Display *display) 510rxvt_xioerror_handler (Display *display)
445{ 511{
446 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 512 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
447 DisplayString (display)); 513 DisplayString (display));
448 rxvt_emergency_cleanup (); 514 rxvt_emergency_cleanup ();
… …
471 rxvt_emergency_cleanup (); 537 rxvt_emergency_cleanup ();
472 w.stop (); 538 w.stop ();
473 kill (getpid (), w.signum); 539 kill (getpid (), w.signum);
474} 540}
475 541
542static void
543rxvt_get_ttymode (struct termios *tio)
544{
545 if (tcgetattr (STDIN_FILENO, tio) < 0)
546 memset (tio, 0, sizeof (struct termios));
547
548 for (int i = 0; i < NCCS; i++)
549 tio->c_cc[i] = VDISABLE;
550
551 tio->c_cc[VINTR] = CINTR;
552 tio->c_cc[VQUIT] = CQUIT;
553 tio->c_cc[VERASE] = CERASE;
554#ifdef VERASE2
555 tio->c_cc[VERASE2] = CERASE2;
556#endif
557 tio->c_cc[VKILL] = CKILL;
558 tio->c_cc[VEOF] = CEOF;
559 tio->c_cc[VSTART] = CSTART;
560 tio->c_cc[VSTOP] = CSTOP;
561 tio->c_cc[VSUSP] = CSUSP;
562# ifdef VDSUSP
563 tio->c_cc[VDSUSP] = CDSUSP;
564# endif
565# ifdef VREPRINT
566 tio->c_cc[VREPRINT] = CRPRNT;
567# endif
568# ifdef VDISCRD
569 tio->c_cc[VDISCRD] = CFLUSH;
570# endif
571# ifdef VWERSE
572 tio->c_cc[VWERSE] = CWERASE;
573# endif
574# ifdef VLNEXT
575 tio->c_cc[VLNEXT] = CLNEXT;
576# endif
577# ifdef VSTATUS
578 tio->c_cc[VSTATUS] = CSTATUS;
579# endif
580
581# if VMIN != VEOF
582 tio->c_cc[VMIN] = 1;
583# endif
584# if VTIME != VEOL
585 tio->c_cc[VTIME] = 0;
586# endif
587
588 /* input modes */
589 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
590# ifdef IMAXBEL
591 | IMAXBEL
592# endif
593 | IXON);
594
595 /* output modes */
596 tio->c_oflag = (OPOST | ONLCR);
597
598 /* control modes */
599 tio->c_cflag = (CS8 | CREAD);
600
601 /* local modes */
602 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
603# if defined (ECHOCTL) && defined (ECHOKE)
604 | ECHOCTL | ECHOKE
605# endif
606 | ECHOE | ECHOK);
607}
608
476char **rxvt_environ; // startup environment 609char **rxvt_environ; // startup environment
477 610
478void 611void
479rxvt_init () 612rxvt_init ()
480{ 613{
481 ptytty::init (); 614 assert (("fontMask must not overlap other RS masks",
615 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 616
617 rxvt_get_ttymode (&rxvt_term::def_tio);
618
619 // get rid of stdin/stdout as we don't need them, to free resources
620 dup2 (STDERR_FILENO, STDIN_FILENO);
621 dup2 (STDERR_FILENO, STDOUT_FILENO);
622
483 if (!ev_default_loop (0)) 623 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 624 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 625
486 rxvt_environ = environ; 626 rxvt_environ = environ;
487 627
488 signal (SIGHUP, SIG_IGN); 628 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 629 signal (SIGPIPE, SIG_IGN);
490 630
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 631 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 632 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 633
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 634 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 635 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 636 XSetIOErrorHandler (rxvt_xioerror_handler);
500 637
501 XrmInitialize (); 638 XrmInitialize ();
639
640#if HAVE_PIXBUF
641 g_type_init ();
642#endif
502} 643}
503 644
504/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
505/* 646/*
506 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
627 if (recalc_y) 768 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 770
630 ncol = width / fwidth; 771 ncol = width / fwidth;
631 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
632} 782}
633 783
634/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
635/* 785/*
636 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
644 794
645 struct winsize ws; 795 struct winsize ws;
646 796
647 ws.ws_col = ncol; 797 ws.ws_col = ncol;
648 ws.ws_row = nrow; 798 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 802
653#if 0 803#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
657#endif 807#endif
658} 808}
659 809
660/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 811/* load and set the various fonts */
662 *
663 * init = 1 - initialize
664 *
665 * fontname == FONT_UP - switch to bigger font
666 * fontname == FONT_DN - switch to smaller font
667 */
668bool 812bool
669rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
670{ 814{
671 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
686#endif 830#endif
687 831
688 delete fontset[0]; 832 delete fontset[0];
689 fontset[0] = fs; 833 fontset[0] = fs;
690 834
691 prop = (*fs)[1]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
693 837
694 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
695 839
696 fwidth = prop.width; 840 fwidth = prop.width;
697 fheight = prop.height; 841 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 842 fbase = prop.ascent;
699 843
700 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
701 { 845 {
702#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
728#else 872#else
729 fontset[style] = fontset[0]; 873 fontset[style] = fontset[0];
730#endif 874#endif
731 } 875 }
732 876
733 if (parent[0]) 877 if (parent)
734 { 878 {
735 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 880 scr_remap_chars ();
737 scr_touch (true); 881 scr_touch (true);
738 } 882 }
… …
741} 885}
742 886
743void 887void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 888rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 889{
746 XChangeProperty (dpy, parent[0], 890 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 891 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 892 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 893}
750 894
751void 895void
896rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
897{
898 XTextProperty ct;
899
900 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
901 {
902 XSetTextProperty (dpy, parent, &ct, prop);
903 XFree (ct.value);
904 }
905}
906
907void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 908rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 909{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 910 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 911 char *s = rxvt_wcstoutf8 (ws);
756 912
757 XChangeProperty (dpy, parent[0], 913 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 914 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 915 (const unsigned char *)s, strlen (s));
760 916
761 free (s); 917 free (s);
762 free (ws); 918 free (ws);
… …
766/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 923/* xterm sequences - title, iconName, color (exptl) */
768void 924void
769rxvt_term::set_title (const char *str) 925rxvt_term::set_title (const char *str)
770{ 926{
771 set_string_property (XA_WM_NAME, str); 927 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 928#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 929 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 930#endif
775} 931}
776 932
777void 933void
778rxvt_term::set_icon_name (const char *str) 934rxvt_term::set_icon_name (const char *str)
779{ 935{
780 set_string_property (XA_WM_ICON_NAME, str); 936 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 937#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 938 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 939#endif
784} 940}
785 941
… …
852 1008
853/*----------------------------------------------------------------------*/ 1009/*----------------------------------------------------------------------*/
854/* 1010/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 1011 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 1012 */
857void 1013char *
858rxvt_term::set_colorfgbg () 1014rxvt_term::get_colorfgbg ()
859{ 1015{
860 unsigned int i; 1016 unsigned int i;
861 const char *xpmb = ""; 1017 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1018 char fstr[] = "default";
1019 char bstr[] = "default";
1020 char *env_colorfgbg;
863 1021
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 1023 if (pix_colors[Color_fg] == pix_colors[i])
868 { 1024 {
869 sprintf (fstr, "%d", (i - Color_Black)); 1025 sprintf (fstr, "%d", i - Color_Black);
870 break; 1026 break;
871 } 1027 }
872 1028
873 for (i = Color_Black; i <= Color_White; i++) 1029 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 1030 if (pix_colors[Color_bg] == pix_colors[i])
875 { 1031 {
876 sprintf (bstr, "%d", (i - Color_Black)); 1032 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 1033#if BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 1034 xpmb = "default;";
879#endif 1035#endif
880 break; 1036 break;
881 } 1037 }
882 1038
1039 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1040 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1041 return env_colorfgbg;
884} 1042}
885 1043
886/*----------------------------------------------------------------------*/ 1044/*----------------------------------------------------------------------*/
887 1045
888bool 1046bool
… …
917 1075
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1076 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint) 1077 if (set_hint)
920 { 1078 {
921 szHint.flags &= ~(PBaseSize | PResizeInc); 1079 szHint.flags &= ~(PBaseSize | PResizeInc);
922 XSetWMNormalHints (dpy, parent[0], &szHint); 1080 XSetWMNormalHints (dpy, parent, &szHint);
923 szHint.flags |= PBaseSize | PResizeInc; 1081 szHint.flags |= PBaseSize | PResizeInc;
924 } 1082 }
925 1083
926 if (!ignoreparent) 1084 if (!ignoreparent)
927 { 1085 {
… …
933 int x, y, x1, y1; 1091 int x, y, x1, y1;
934 int dx, dy; 1092 int dx, dy;
935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1093 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
936 Window unused_cr; 1094 Window unused_cr;
937 1095
938 XTranslateCoordinates (dpy, parent[0], display->root, 1096 XTranslateCoordinates (dpy, parent, display->root,
939 0, 0, &x, &y, &unused_cr); 1097 0, 0, &x, &y, &unused_cr);
940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1098 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
941 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1099 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
942 /* 1100 /*
943 * if display->root isn't the parent window, a WM will probably have offset 1101 * if display->root isn't the parent window, a WM will probably have offset
944 * our position for handles and decorations. Counter it 1102 * our position for handles and decorations. Counter it
945 */ 1103 */
… …
962 if (y < y1) /* top half */ 1120 if (y < y1) /* top half */
963 dy = 0; 1121 dy = 0;
964 else if (y == y1) /* exact center */ 1122 else if (y == y1) /* exact center */
965 dy /= 2; 1123 dy /= 2;
966 1124
967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1125 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
968 szHint.width, szHint.height); 1126 szHint.width, szHint.height);
969#else 1127#else
970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1128 XResizeWindow (dpy, parent, szHint.width, szHint.height);
971#endif 1129#endif
972 } 1130 }
1131
1132 if (set_hint)
1133 XSetWMNormalHints (dpy, parent, &szHint);
973 1134
974 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1135 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
975 1136
976 if (fix_screen || newwidth != old_width || newheight != old_height) 1137 if (fix_screen || newwidth != old_width || newheight != old_height)
977 { 1138 {
978 if (scrollBar.state) 1139 if (scrollBar.state)
979 scrollBar.resize (); 1140 scrollBar.resize ();
980 1141
981 XMoveResizeWindow (dpy, vt, 1142 XMoveResizeWindow (dpy, vt,
982 window_vt_x, window_vt_y, 1143 window_vt_x, window_vt_y,
983 width, height); 1144 vt_width, vt_height);
1145
1146 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
984 1147
985#ifdef HAVE_BG_PIXMAP 1148#ifdef HAVE_BG_PIXMAP
986 if (bgPixmap.window_size_sensitive ()) 1149 if (bg_window_size_sensitive ())
987 update_background (); 1150 update_background ();
988#endif 1151#endif
989
990 scr_clear ();
991 } 1152 }
992
993 if (set_hint)
994 XSetWMNormalHints (dpy, parent[0], &szHint);
995 1153
996 if (fix_screen || old_height == 0) 1154 if (fix_screen || old_height == 0)
997 scr_reset (); 1155 scr_reset ();
998 1156
999 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1000 //scr_touch (false);
1001
1002#ifdef HAVE_BG_PIXMAP
1003// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1004// if (bgPixmap.pixmap)
1005// scr_touch (false);
1006#endif
1007
1008#ifdef USE_XIM 1157#if USE_XIM
1009 IMSetPosition (); 1158 im_set_position ();
1010#endif 1159#endif
1011} 1160}
1012 1161
1013/* 1162/*
1014 * Set the width/height of the vt window in characters. Units are pixels. 1163 * Set the width/height of the vt window in characters. Units are pixels.
… …
1027 newwidth = wattr.width - szHint.base_width; 1176 newwidth = wattr.width - szHint.base_width;
1028 if (newheight == 0) 1177 if (newheight == 0)
1029 newheight = wattr.height - szHint.base_height; 1178 newheight = wattr.height - szHint.base_height;
1030 } 1179 }
1031 1180
1032 if (newwidth != width || newheight != height) 1181 if (newwidth != vt_width || newheight != vt_height)
1033 { 1182 {
1034 newwidth += szHint.base_width; 1183 newwidth += szHint.base_width;
1035 newheight += szHint.base_height; 1184 newheight += szHint.base_height;
1036 resize_all_windows (newwidth, newheight, 0); 1185 resize_all_windows (newwidth, newheight, 0);
1037 } 1186 }
1038} 1187}
1039 1188
1040/* -------------------------------------------------------------------- * 1189/* -------------------------------------------------------------------- *
1041 * - X INPUT METHOD ROUTINES - * 1190 * - X INPUT METHOD ROUTINES - *
1042 * -------------------------------------------------------------------- */ 1191 * -------------------------------------------------------------------- */
1043#ifdef USE_XIM 1192#if USE_XIM
1044 1193
1045void 1194void
1046rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1195rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1047{ 1196{
1048 fg = pix_colors [Color_fg]; 1197 fg = pix_colors [Color_fg];
… …
1075 status_rect.height = fheight; 1224 status_rect.height = fheight;
1076} 1225}
1077 1226
1078/* Checking whether input method is running. */ 1227/* Checking whether input method is running. */
1079bool 1228bool
1080rxvt_term::IMisRunning () 1229rxvt_term::im_is_running ()
1081{ 1230{
1082 char *p;
1083 Atom atom; 1231 Atom atom;
1084 Window win; 1232 Window win;
1085 char server[IMBUFSIZ]; 1233 char server[IMBUFSIZ];
1086 1234
1087 /* get current locale modifier */ 1235 /* get current locale modifier */
1088 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1236 if (char *p = XSetLocaleModifiers (0))
1089 { 1237 {
1090 strcpy (server, "@server="); 1238 strcpy (server, "@server=");
1091 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1239 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1092 1240
1093 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1241 if (p = strchr (server + 1, '@')) /* first one only */
1094 *p = '\0'; 1242 *p = '\0';
1095 1243
1096 atom = XInternAtom (dpy, server, False); 1244 atom = XInternAtom (dpy, server, False);
1097 win = XGetSelectionOwner (dpy, atom); 1245 win = XGetSelectionOwner (dpy, atom);
1098 1246
1099 if (win != None) 1247 if (win != None)
1100 return True; 1248 return true;
1101 } 1249 }
1102 1250
1103 return False; 1251 return false;
1104} 1252}
1105 1253
1106void 1254void
1107rxvt_term::IMSendSpot () 1255rxvt_term::im_send_spot ()
1108{ 1256{
1109 XPoint nspot; 1257 XPoint nspot;
1110 XVaNestedList preedit_attr; 1258 XVaNestedList preedit_attr;
1111 1259
1112 if (!Input_Context 1260 if (!Input_Context
… …
1165 1313
1166 term->make_current (); 1314 term->make_current ();
1167 1315
1168 if (text) 1316 if (text)
1169 { 1317 {
1170 void *str; 1318 wchar_t *str;
1171 1319
1172 if (!text->encoding_is_wchar && text->string.multi_byte) 1320 if (!text->encoding_is_wchar && text->string.multi_byte)
1173 { 1321 {
1174 // of course, X makes it ugly again 1322 // of course, X makes it ugly again
1175 if (term->rs[Rs_imLocale]) 1323 if (term->rs[Rs_imLocale])
1176 SET_LOCALE (term->rs[Rs_imLocale]); 1324 SET_LOCALE (term->rs[Rs_imLocale]);
1177 1325
1178 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1326 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1179 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1327 mbstowcs (str, text->string.multi_byte, text->length + 1);
1180 1328
1181 if (term->rs[Rs_imLocale]) 1329 if (term->rs[Rs_imLocale])
1182 SET_LOCALE (term->locale); 1330 SET_LOCALE (term->locale);
1183 } 1331 }
1184 else 1332 else
1185 str = (void *)text->string.wide_char; 1333 str = text->string.wide_char;
1186 1334
1187 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1335 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1188 DT_INT, call_data->caret, 1336 DT_INT, call_data->caret,
1189 DT_INT, call_data->chg_first, 1337 DT_INT, call_data->chg_first,
1190 DT_INT, call_data->chg_length, 1338 DT_INT, call_data->chg_length,
… …
1218/* 1366/*
1219 * Try to open a XIM with the current modifiers, then see if we can 1367 * Try to open a XIM with the current modifiers, then see if we can
1220 * open a suitable preedit type 1368 * open a suitable preedit type
1221 */ 1369 */
1222bool 1370bool
1223rxvt_term::IM_get_IC (const char *modifiers) 1371rxvt_term::im_get_ic (const char *modifiers)
1224{ 1372{
1225 int i, j, found; 1373 int i, j, found;
1226 XIM xim; 1374 XIM xim;
1227 XPoint spot; 1375 XPoint spot;
1228 XRectangle rect, status_rect, needed_rect; 1376 XRectangle rect, status_rect, needed_rect;
1229 unsigned long fg, bg; 1377 unsigned long fg, bg;
1230 const char *p; 1378 const char *p;
1231 char **s; 1379 char **s;
1232 XIMStyles *xim_styles; 1380 XIMStyles *xim_styles;
1233#ifdef ENABLE_XIM_ONTHESPOT
1234 XIMCallback xcb[4];
1235#endif
1236 1381
1237 set_environ (envv); 1382 set_environ (env);
1238 1383
1239 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1384 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1240 return false; 1385 return false;
1241 1386
1242 input_method = display->get_xim (locale, modifiers); 1387 input_method = display->get_xim (locale, modifiers);
1243 if (input_method == NULL) 1388 if (input_method == NULL)
1244 return false; 1389 return false;
… …
1261 p = pet[pi]; 1406 p = pet[pi];
1262 1407
1263 if (!p) 1408 if (!p)
1264 continue; 1409 continue;
1265 1410
1266 s = rxvt_splitcommastring (p); 1411 s = rxvt_strsplit (',', p);
1267 1412
1268 for (i = found = 0; !found && s[i]; i++) 1413 for (i = found = 0; !found && s[i]; i++)
1269 { 1414 {
1270 if (!strcmp (s[i], "OverTheSpot")) 1415 if (!strcmp (s[i], "OverTheSpot"))
1271 input_style = XIMPreeditPosition | XIMStatusNothing; 1416 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1283 input_style = XIMPreeditNothing | XIMStatusNothing; 1428 input_style = XIMPreeditNothing | XIMStatusNothing;
1284 1429
1285 for (j = 0; j < xim_styles->count_styles; j++) 1430 for (j = 0; j < xim_styles->count_styles; j++)
1286 if (input_style == xim_styles->supported_styles[j]) 1431 if (input_style == xim_styles->supported_styles[j])
1287 { 1432 {
1288 rxvt_freecommastring (s); 1433 rxvt_free_strsplit (s);
1289 1434
1290 found = 1; 1435 found = 1;
1291 goto foundpet; 1436 goto foundpet;
1292 } 1437 }
1293 1438
1294 } 1439 }
1295 1440
1296 rxvt_freecommastring (s); 1441 rxvt_free_strsplit (s);
1297 } 1442 }
1298 1443
1299foundpet: 1444foundpet:
1300 1445
1301 XFree (xim_styles); 1446 XFree (xim_styles);
… …
1380 NULL); 1525 NULL);
1381 } 1526 }
1382#if ENABLE_XIM_ONTHESPOT 1527#if ENABLE_XIM_ONTHESPOT
1383 else if (input_style & XIMPreeditCallbacks) 1528 else if (input_style & XIMPreeditCallbacks)
1384 { 1529 {
1530 XIMCallback xcb[4];
1531
1385 im_set_position (spot); 1532 im_set_position (spot);
1386 1533
1387 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1534 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1388 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1535 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1389 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1536 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1404#endif 1551#endif
1405 1552
1406 Input_Context = XCreateIC (xim, 1553 Input_Context = XCreateIC (xim,
1407 XNInputStyle, input_style, 1554 XNInputStyle, input_style,
1408 XNClientWindow, vt, 1555 XNClientWindow, vt,
1409 XNFocusWindow, parent[0], 1556 XNFocusWindow, parent,
1410 preedit_attr ? XNPreeditAttributes : NULL, 1557 preedit_attr ? XNPreeditAttributes : NULL,
1411 preedit_attr, 1558 preedit_attr,
1412 status_attr ? XNStatusAttributes : NULL, 1559 status_attr ? XNStatusAttributes : NULL,
1413 status_attr, NULL); 1560 status_attr, NULL);
1414 1561
… …
1427 // unfortunately, only the focus window is used by XIM, hard to fix 1574 // unfortunately, only the focus window is used by XIM, hard to fix
1428 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1575 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1429 vt_select_input (); 1576 vt_select_input ();
1430#endif 1577#endif
1431 1578
1432 IMSetPosition (); 1579 im_set_position ();
1433 1580
1434 return true; 1581 return true;
1435} 1582}
1436 1583
1437void 1584void
… …
1447 im_destroy (); 1594 im_destroy ();
1448 1595
1449 if (Input_Context) 1596 if (Input_Context)
1450 return; 1597 return;
1451 1598
1452#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1453 if (rs[Rs_imLocale]) 1599 if (rs[Rs_imLocale])
1454 SET_LOCALE (rs[Rs_imLocale]); 1600 SET_LOCALE (rs[Rs_imLocale]);
1455#endif
1456 1601
1457 p = rs[Rs_inputMethod]; 1602 p = rs[Rs_inputMethod];
1458 if (p && *p) 1603 if (p && *p)
1459 { 1604 {
1460 bool found = false; 1605 bool found = false;
1461 1606
1462 s = rxvt_splitcommastring (p); 1607 s = rxvt_strsplit (',', p);
1463 1608
1464 for (i = 0; s[i]; i++) 1609 for (i = 0; s[i]; i++)
1465 { 1610 {
1466 if (*s[i]) 1611 if (*s[i])
1467 { 1612 {
1468 strcpy (buf, "@im="); 1613 strcpy (buf, "@im=");
1469 strncat (buf, s[i], IMBUFSIZ - 5); 1614 strncat (buf, s[i], IMBUFSIZ - 5);
1470 if (IM_get_IC (buf)) 1615 if (im_get_ic (buf))
1471 { 1616 {
1472 found = true; 1617 found = true;
1473 break; 1618 break;
1474 } 1619 }
1475 } 1620 }
1476 } 1621 }
1477 1622
1478 rxvt_freecommastring (s); 1623 rxvt_free_strsplit (s);
1479 1624
1480 if (found) 1625 if (found)
1481 goto done; 1626 goto done;
1482 } 1627 }
1483 1628
1484 /* try with XMODIFIERS env. var. */ 1629 /* try with XMODIFIERS env. var. */
1485 if (IM_get_IC ("")) 1630 if (im_get_ic (""))
1486 goto done; 1631 goto done;
1487 1632
1488 /* try with no modifiers base IF the user didn't specify an IM */ 1633 /* try with no modifiers base IF the user didn't specify an IM */
1489 if (IM_get_IC ("@im=none")) 1634 if (im_get_ic ("@im=none"))
1490 goto done; 1635 goto done;
1491 1636
1492done: 1637done:
1493#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1494 if (rs[Rs_imLocale]) 1638 if (rs[Rs_imLocale])
1495 SET_LOCALE (locale); 1639 SET_LOCALE (locale);
1496#endif
1497} 1640}
1498 1641
1499void 1642void
1500rxvt_term::IMSetPosition () 1643rxvt_term::im_set_position ()
1501{ 1644{
1502 XRectangle preedit_rect, status_rect, *needed_rect; 1645 XRectangle preedit_rect, status_rect, *needed_rect;
1503 XVaNestedList preedit_attr, status_attr; 1646 XVaNestedList preedit_attr, status_attr;
1504 1647
1505 if (!Input_Context 1648 if (!Input_Context
1506 || !focus 1649 || !focus
1507 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1650 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1508 || !IMisRunning ()) 1651 || !im_is_running ())
1509 return; 1652 return;
1510 1653
1511 if (input_style & XIMPreeditPosition) 1654 if (input_style & XIMPreeditPosition)
1512 { 1655 {
1513 im_set_size (preedit_rect); 1656 im_set_size (preedit_rect);
… …
1543 1686
1544void 1687void
1545rxvt_term::get_window_origin (int &x, int &y) 1688rxvt_term::get_window_origin (int &x, int &y)
1546{ 1689{
1547 Window cr; 1690 Window cr;
1548 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1691 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1549/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1550}
1551
1552Pixmap
1553rxvt_term::get_pixmap_property (int prop_id)
1554{
1555 if (prop_id > 0 && prop_id < NUM_XA)
1556 if (xa[prop_id])
1557 {
1558 int aformat;
1559 unsigned long nitems, bytes_after;
1560 Atom atype;
1561 unsigned char *prop = NULL;
1562 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1563 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1564 &nitems, &bytes_after, &prop);
1565 if (result == Success && prop && atype == XA_PIXMAP)
1566 return *(Pixmap *)prop;
1567 }
1568
1569 return None;
1570} 1692}
1571 1693
1572#ifdef HAVE_BG_PIXMAP 1694#ifdef HAVE_BG_PIXMAP
1573# if TRACE_PIXMAPS
1574# undef update_background
1575void
1576rxvt_term::trace_update_background (const char *file, int line)
1577{
1578 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1579 update_background ();
1580}
1581# endif
1582 1695
1583void 1696void
1584rxvt_term::update_background () 1697rxvt_term::update_background ()
1585{ 1698{
1586 if (update_background_ev.is_active ()) 1699 if (update_background_ev.is_active ())
1587 return; 1700 return;
1588 1701
1589 bgPixmap.invalidate ();
1590
1591 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1702 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1592 1703
1593 if (to_wait <= 0.) 1704 if (to_wait <= 0.)
1594 bgPixmap.render (); 1705 bg_render ();
1595 else 1706 else
1596 update_background_ev.start (to_wait); 1707 update_background_ev.start (to_wait);
1597} 1708}
1598 1709
1599void 1710void
1600rxvt_term::update_background_cb (ev::timer &w, int revents) 1711rxvt_term::update_background_cb (ev::timer &w, int revents)
1601{ 1712{
1602 make_current (); 1713 make_current ();
1603 1714
1604 update_background_ev.stop (); 1715 update_background_ev.stop ();
1605 bgPixmap.render (); 1716 bg_render ();
1606 refresh_check (); 1717 refresh_check ();
1607} 1718}
1608 1719
1609#endif /* HAVE_BG_PIXMAP */ 1720#endif /* HAVE_BG_PIXMAP */
1610 1721

Diff Legend

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