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

Diff Legend

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