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.330 by sf-exg, Mon Jul 26 09:57:53 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
40#include <cassert> 41#include <assert.h>
41#include <csignal> 42#include <signal.h>
42#include <cstring> 43#include <string.h>
43 44
44#include <termios.h> 45#include <termios.h>
45 46
46#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 48# define X_LOCALE
48# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
49#else 50#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 51# include <locale.h>
52# endif 52#endif
53#endif
54 53
54struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
56 56
57// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
59 59
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 95{
96 compose_char *cc; 96 compose_char *cc;
97 97
98 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 100 cc = (*this)[c1];
101 while (cc) 101 while (cc)
102 { 102 {
103 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
105 } 105 }
106 106
107 // check to see whether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
112 }
113 111
114 // allocate a new combination 112 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 { 114 {
117 static int seen; 115 static int seen;
118 116
119 if (!seen++) 117 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 119
122 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
123 } 121 }
124 122
125 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
170 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);
171#endif 169#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 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);
174#endif 172#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 175#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 177#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 179#endif
182#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 182#endif
… …
187#endif 185#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 192
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 194
… …
226 delete fontset[i]; 223 delete fontset[i];
227#endif 224#endif
228 delete fontset[0]; 225 delete fontset[0];
229 226
230#ifdef HAVE_BG_PIXMAP 227#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 228 bg_destroy ();
232#endif 229#endif
233#ifdef HAVE_AFTERIMAGE 230
234 if (asv) 231#if HAVE_IMG
235 destroy_asvisual (asv, 0); 232 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 233#endif
239 234
240 if (display) 235 if (display)
241 { 236 {
242 selection_clear (); 237 selection_clear ();
243 selection_clear (true); 238 selection_clear (true);
244 239
245#ifdef USE_XIM 240#if USE_XIM
246 im_destroy (); 241 im_destroy ();
247#endif 242#endif
248 scrollBar.destroy (); 243 scrollBar.destroy ();
244
245 if (gc)
249 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
250 247
251 delete drawable; 248 delete drawable;
249
252 // destroy all windows 250 // destroy all windows
253 if (parent[0]) 251 if (parent)
254 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
255 253
256 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
258 { 256 {
259 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING 258#if OFF_FOCUS_FADING
259 if (rs[Rs_fade])
261 pix_colors_unfocused [i].free (this); 260 pix_colors_unfocused [i].free (this);
262#endif 261#endif
263 } 262 }
264 263
265 clear (); 264 clear ();
266 265
… …
274 for (int i = 0; i < allocated.size (); i++) 273 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 274 free (allocated [i]);
276 275
277 free (selection.text); 276 free (selection.text);
278 free (selection.clip_text); 277 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 278 free (locale);
283 free (v_buffer); 279 free (v_buffer);
284 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;
285 287
286 delete envv; 288 delete envv;
287 delete argv; 289 delete argv;
288 290
289#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
290 delete keyboard; 292 delete keyboard;
291#endif 293#endif
292#ifndef NO_RESOURCES 294#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db); 295 XrmDestroyDatabase (option_db);
294#endif 296#endif
297
298 SET_R ((rxvt_term *)0);
295} 299}
296 300
297// child has exited, usually destroys 301// child has exited, usually destroys
298void 302void
299rxvt_term::child_cb (ev::child &w, int status) 303rxvt_term::child_cb (ev::child &w, int status)
… …
322 { 326 {
323#if USE_XIM 327#if USE_XIM
324 im_ev.stop (display); 328 im_ev.stop (display);
325#endif 329#endif
326 scrollbar_ev.stop (display); 330 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 331#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 332 rootwin_ev.stop (display);
329#endif 333#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 334 termwin_ev.stop (display);
332 vt_ev.stop (display); 335 vt_ev.stop (display);
333 } 336 }
334 337
335 flush_ev.stop (); 338 flush_ev.stop ();
… …
359 make_current (); 362 make_current ();
360 363
361 delete this; 364 delete this;
362} 365}
363 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
364/*----------------------------------------------------------------------*/ 379/*----------------------------------------------------------------------*/
365/* 380/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 381 * Exit gracefully, clearing the utmp entry and restoring tty attributes
367 * TODO: if debugging, this should free up any known resources if we can
368 */ 382 */
369static XErrorHandler old_xerror_handler; 383static XErrorHandler old_xerror_handler;
370 384
371static void 385static void
372rxvt_emergency_cleanup () 386rxvt_emergency_cleanup ()
… …
374 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++)
375 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
376} 390}
377 391
378#if !ENABLE_MINIMAL 392#if !ENABLE_MINIMAL
379static void 393static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
381{ 395{
382 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
384 char number[32]; 398 char number[32];
385 char *mtype = "XlibMessage"; 399
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occurred, 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);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 407 rxvt_warn ("+ %s: %s\n", mesg, buffer);
408
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 409 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 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 {
392 sprintf(number, "%d", event->request_code); 463 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 464 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 465 rxvt_warn ("+ (which is %s)\n", buffer);
395 if (event->request_code >= 128) {
396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
397 mesg, BUFSIZ);
398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
399 } 466 }
467
400 if ((event->error_code == BadWindow) || 468 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 469 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 470 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 471 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 472 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 473 || event->error_code == BadColor
406 (event->error_code == BadGC) || 474 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 475 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 476 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 477 || event->error_code == BadAtom)
478 {
410 if (event->error_code == BadValue) 479 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 480 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 481 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 482 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 483 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 484 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
418 mesg, BUFSIZ);
419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
420 }
421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
422 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
424}
425#endif
426 485
427int 486 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
487 }
488}
489#endif
490
491int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 492rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 493{
430 if (GET_R->allowedxerror == -1) 494 if (GET_R && GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 495 GET_R->allowedxerror = event->error_code;
432 else 496 else
433 { 497 {
434 // 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,
435 // so just output the error and continue 499 // so just output the error and continue
… …
441 } 505 }
442 506
443 return 0; 507 return 0;
444} 508}
445 509
446int 510int ecb_cold
447rxvt_xioerror_handler (Display *display) 511rxvt_xioerror_handler (Display *display)
448{ 512{
449 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",
450 DisplayString (display)); 514 DisplayString (display));
451 rxvt_emergency_cleanup (); 515 rxvt_emergency_cleanup ();
… …
474 rxvt_emergency_cleanup (); 538 rxvt_emergency_cleanup ();
475 w.stop (); 539 w.stop ();
476 kill (getpid (), w.signum); 540 kill (getpid (), w.signum);
477} 541}
478 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
479char **rxvt_environ; // startup environment 610char **rxvt_environ; // startup environment
480 611
481void 612void
482rxvt_init () 613rxvt_init ()
483{ 614{
484 assert (("fontMask must not overlap other RS masks", 615 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 616 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 617
487 ptytty::init (); 618 rxvt_get_ttymode (&rxvt_term::def_tio);
488 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
489 if (!ev_default_loop (0)) 624 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 626
492 rxvt_environ = environ; 627 rxvt_environ = environ;
493 628
494 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
… …
500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
501 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
502 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
503 638
504 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
505} 644}
506 645
507/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
508/* 647/*
509 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
630 if (recalc_y) 769 if (recalc_y)
631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
632 771
633 ncol = width / fwidth; 772 ncol = width / fwidth;
634 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;
635} 783}
636 784
637/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
638/* 786/*
639 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
647 795
648 struct winsize ws; 796 struct winsize ws;
649 797
650 ws.ws_col = ncol; 798 ws.ws_col = ncol;
651 ws.ws_row = nrow; 799 ws.ws_row = nrow;
652 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
653 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
654 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
655 803
656#if 0 804#if 0
657 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
658 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
659 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
660#endif 808#endif
661} 809}
662 810
663/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
664/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
665 *
666 * init = 1 - initialize
667 *
668 * fontname == FONT_UP - switch to bigger font
669 * fontname == FONT_DN - switch to smaller font
670 */
671bool 813bool
672rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
673{ 815{
674 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
675 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
690 832
691 delete fontset[0]; 833 delete fontset[0];
692 fontset[0] = fs; 834 fontset[0] = fs;
693 835
694 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
695 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
696 prop.width += letterSpace;
697 838
698 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
699 840
700 fwidth = prop.width; 841 fwidth = prop.width;
701 fheight = prop.height; 842 fheight = prop.height + lineSpace;
702 fbase = prop.ascent; 843 fbase = prop.ascent;
703 844
704 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
705 { 846 {
706#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
732#else 873#else
733 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
734#endif 875#endif
735 } 876 }
736 877
737 if (parent[0]) 878 if (parent)
738 { 879 {
739 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
740 scr_remap_chars (); 881 scr_remap_chars ();
741 scr_touch (true); 882 scr_touch (true);
742 } 883 }
… …
745} 886}
746 887
747void 888void
748rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
749{ 890{
750 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
751 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
752 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
753} 894}
754 895
755void 896void
… …
757{ 898{
758 XTextProperty ct; 899 XTextProperty ct;
759 900
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 { 902 {
762 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
763 XFree (ct.value); 904 XFree (ct.value);
764 } 905 }
765} 906}
766 907
767void 908void
768rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
769{ 910{
770 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
771 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
772 913
773 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
775 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
776 917
777 free (s); 918 free (s);
778 free (ws); 919 free (ws);
… …
868 1009
869/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
870/* 1011/*
871 * 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
872 */ 1013 */
873void 1014char *
874rxvt_term::set_colorfgbg () 1015rxvt_term::get_colorfgbg ()
875{ 1016{
876 unsigned int i; 1017 unsigned int i;
877 const char *xpmb = ""; 1018 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1019 char fstr[] = "default";
1020 char bstr[] = "default";
1021 char *env_colorfgbg;
879 1022
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 1024 if (pix_colors[Color_fg] == pix_colors[i])
884 { 1025 {
885 sprintf (fstr, "%d", (i - Color_Black)); 1026 sprintf (fstr, "%d", i - Color_Black);
886 break; 1027 break;
887 } 1028 }
888 1029
889 for (i = Color_Black; i <= Color_White; i++) 1030 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 1031 if (pix_colors[Color_bg] == pix_colors[i])
891 { 1032 {
892 sprintf (bstr, "%d", (i - Color_Black)); 1033 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 1034#if BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 1035 xpmb = "default;";
895#endif 1036#endif
896 break; 1037 break;
897 } 1038 }
898 1039
1040 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
899 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;
900} 1043}
901 1044
902/*----------------------------------------------------------------------*/ 1045/*----------------------------------------------------------------------*/
903 1046
904bool 1047bool
… …
933 1076
934 // 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
935 if (set_hint) 1078 if (set_hint)
936 { 1079 {
937 szHint.flags &= ~(PBaseSize | PResizeInc); 1080 szHint.flags &= ~(PBaseSize | PResizeInc);
938 XSetWMNormalHints (dpy, parent[0], &szHint); 1081 XSetWMNormalHints (dpy, parent, &szHint);
939 szHint.flags |= PBaseSize | PResizeInc; 1082 szHint.flags |= PBaseSize | PResizeInc;
940 } 1083 }
941 1084
942 if (!ignoreparent) 1085 if (!ignoreparent)
943 { 1086 {
… …
949 int x, y, x1, y1; 1092 int x, y, x1, y1;
950 int dx, dy; 1093 int dx, dy;
951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
952 Window unused_cr; 1095 Window unused_cr;
953 1096
954 XTranslateCoordinates (dpy, parent[0], display->root, 1097 XTranslateCoordinates (dpy, parent, display->root,
955 0, 0, &x, &y, &unused_cr); 1098 0, 0, &x, &y, &unused_cr);
956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1099 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
957 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
958 /* 1101 /*
959 * 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
960 * our position for handles and decorations. Counter it 1103 * our position for handles and decorations. Counter it
961 */ 1104 */
… …
978 if (y < y1) /* top half */ 1121 if (y < y1) /* top half */
979 dy = 0; 1122 dy = 0;
980 else if (y == y1) /* exact center */ 1123 else if (y == y1) /* exact center */
981 dy /= 2; 1124 dy /= 2;
982 1125
983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1126 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
984 szHint.width, szHint.height); 1127 szHint.width, szHint.height);
985#else 1128#else
986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1129 XResizeWindow (dpy, parent, szHint.width, szHint.height);
987#endif 1130#endif
988 } 1131 }
989 1132
990 if (set_hint) 1133 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint); 1134 XSetWMNormalHints (dpy, parent, &szHint);
992 1135
993 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1136 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
994 1137
995 if (fix_screen || newwidth != old_width || newheight != old_height) 1138 if (fix_screen || newwidth != old_width || newheight != old_height)
996 { 1139 {
997 if (scrollBar.state) 1140 if (scrollBar.state)
998 scrollBar.resize (); 1141 scrollBar.resize ();
999 1142
1000 XMoveResizeWindow (dpy, vt, 1143 XMoveResizeWindow (dpy, vt,
1001 window_vt_x, window_vt_y, 1144 window_vt_x, window_vt_y,
1002 width, height); 1145 vt_width, vt_height);
1146
1147 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1003 1148
1004#ifdef HAVE_BG_PIXMAP 1149#ifdef HAVE_BG_PIXMAP
1005 if (bgPixmap.window_size_sensitive ()) 1150 if (bg_window_size_sensitive ())
1006 update_background (); 1151 update_background ();
1007#endif 1152#endif
1008 } 1153 }
1009 1154
1010 if (fix_screen || old_height == 0) 1155 if (fix_screen || old_height == 0)
1011 scr_reset (); 1156 scr_reset ();
1012 1157
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1016// scr_touch (false);
1017#endif
1018
1019#ifdef USE_XIM 1158#if USE_XIM
1020 IMSetPosition (); 1159 im_set_position ();
1021#endif 1160#endif
1022} 1161}
1023 1162
1024/* 1163/*
1025 * 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.
… …
1038 newwidth = wattr.width - szHint.base_width; 1177 newwidth = wattr.width - szHint.base_width;
1039 if (newheight == 0) 1178 if (newheight == 0)
1040 newheight = wattr.height - szHint.base_height; 1179 newheight = wattr.height - szHint.base_height;
1041 } 1180 }
1042 1181
1043 if (newwidth != width || newheight != height) 1182 if (newwidth != vt_width || newheight != vt_height)
1044 { 1183 {
1045 newwidth += szHint.base_width; 1184 newwidth += szHint.base_width;
1046 newheight += szHint.base_height; 1185 newheight += szHint.base_height;
1047 resize_all_windows (newwidth, newheight, 0); 1186 resize_all_windows (newwidth, newheight, 0);
1048 } 1187 }
1049} 1188}
1050 1189
1051/* -------------------------------------------------------------------- * 1190/* -------------------------------------------------------------------- *
1052 * - X INPUT METHOD ROUTINES - * 1191 * - X INPUT METHOD ROUTINES - *
1053 * -------------------------------------------------------------------- */ 1192 * -------------------------------------------------------------------- */
1054#ifdef USE_XIM 1193#if USE_XIM
1055 1194
1056void 1195void
1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1196rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1058{ 1197{
1059 fg = pix_colors [Color_fg]; 1198 fg = pix_colors [Color_fg];
… …
1086 status_rect.height = fheight; 1225 status_rect.height = fheight;
1087} 1226}
1088 1227
1089/* Checking whether input method is running. */ 1228/* Checking whether input method is running. */
1090bool 1229bool
1091rxvt_term::IMisRunning () 1230rxvt_term::im_is_running ()
1092{ 1231{
1093 Atom atom; 1232 Atom atom;
1094 Window win; 1233 Window win;
1095 char server[IMBUFSIZ]; 1234 char server[IMBUFSIZ];
1096 1235
… …
1105 1244
1106 atom = XInternAtom (dpy, server, False); 1245 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1246 win = XGetSelectionOwner (dpy, atom);
1108 1247
1109 if (win != None) 1248 if (win != None)
1110 return True; 1249 return true;
1111 } 1250 }
1112 1251
1113 return False; 1252 return false;
1114} 1253}
1115 1254
1116void 1255void
1117rxvt_term::IMSendSpot () 1256rxvt_term::im_send_spot ()
1118{ 1257{
1119 XPoint nspot; 1258 XPoint nspot;
1120 XVaNestedList preedit_attr; 1259 XVaNestedList preedit_attr;
1121 1260
1122 if (!Input_Context 1261 if (!Input_Context
… …
1228/* 1367/*
1229 * 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
1230 * open a suitable preedit type 1369 * open a suitable preedit type
1231 */ 1370 */
1232bool 1371bool
1233rxvt_term::IM_get_IC (const char *modifiers) 1372rxvt_term::im_get_ic (const char *modifiers)
1234{ 1373{
1235 int i, j, found; 1374 int i, j, found;
1236 XIM xim; 1375 XIM xim;
1237 XPoint spot; 1376 XPoint spot;
1238 XRectangle rect, status_rect, needed_rect; 1377 XRectangle rect, status_rect, needed_rect;
1239 unsigned long fg, bg; 1378 unsigned long fg, bg;
1240 const char *p; 1379 const char *p;
1241 char **s; 1380 char **s;
1242 XIMStyles *xim_styles; 1381 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246 1382
1247 set_environ (envv); 1383 set_environ (env);
1248 1384
1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1385 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1250 return false; 1386 return false;
1251 1387
1252 input_method = display->get_xim (locale, modifiers); 1388 input_method = display->get_xim (locale, modifiers);
1253 if (input_method == NULL) 1389 if (input_method == NULL)
1254 return false; 1390 return false;
… …
1271 p = pet[pi]; 1407 p = pet[pi];
1272 1408
1273 if (!p) 1409 if (!p)
1274 continue; 1410 continue;
1275 1411
1276 s = rxvt_splitcommastring (p); 1412 s = rxvt_strsplit (',', p);
1277 1413
1278 for (i = found = 0; !found && s[i]; i++) 1414 for (i = found = 0; !found && s[i]; i++)
1279 { 1415 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1416 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1417 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1429 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1430
1295 for (j = 0; j < xim_styles->count_styles; j++) 1431 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1432 if (input_style == xim_styles->supported_styles[j])
1297 { 1433 {
1298 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1299 1435
1300 found = 1; 1436 found = 1;
1301 goto foundpet; 1437 goto foundpet;
1302 } 1438 }
1303 1439
1304 } 1440 }
1305 1441
1306 rxvt_freecommastring (s); 1442 rxvt_free_strsplit (s);
1307 } 1443 }
1308 1444
1309foundpet: 1445foundpet:
1310 1446
1311 XFree (xim_styles); 1447 XFree (xim_styles);
… …
1390 NULL); 1526 NULL);
1391 } 1527 }
1392#if ENABLE_XIM_ONTHESPOT 1528#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks) 1529 else if (input_style & XIMPreeditCallbacks)
1394 { 1530 {
1531 XIMCallback xcb[4];
1532
1395 im_set_position (spot); 1533 im_set_position (spot);
1396 1534
1397 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;
1398 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;
1399 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;
… …
1414#endif 1552#endif
1415 1553
1416 Input_Context = XCreateIC (xim, 1554 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style, 1555 XNInputStyle, input_style,
1418 XNClientWindow, vt, 1556 XNClientWindow, vt,
1419 XNFocusWindow, parent[0], 1557 XNFocusWindow, parent,
1420 preedit_attr ? XNPreeditAttributes : NULL, 1558 preedit_attr ? XNPreeditAttributes : NULL,
1421 preedit_attr, 1559 preedit_attr,
1422 status_attr ? XNStatusAttributes : NULL, 1560 status_attr ? XNStatusAttributes : NULL,
1423 status_attr, NULL); 1561 status_attr, NULL);
1424 1562
… …
1437 // 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
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1576 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input (); 1577 vt_select_input ();
1440#endif 1578#endif
1441 1579
1442 IMSetPosition (); 1580 im_set_position ();
1443 1581
1444 return true; 1582 return true;
1445} 1583}
1446 1584
1447void 1585void
… …
1457 im_destroy (); 1595 im_destroy ();
1458 1596
1459 if (Input_Context) 1597 if (Input_Context)
1460 return; 1598 return;
1461 1599
1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1463 if (rs[Rs_imLocale]) 1600 if (rs[Rs_imLocale])
1464 SET_LOCALE (rs[Rs_imLocale]); 1601 SET_LOCALE (rs[Rs_imLocale]);
1465#endif
1466 1602
1467 p = rs[Rs_inputMethod]; 1603 p = rs[Rs_inputMethod];
1468 if (p && *p) 1604 if (p && *p)
1469 { 1605 {
1470 bool found = false; 1606 bool found = false;
1471 1607
1472 s = rxvt_splitcommastring (p); 1608 s = rxvt_strsplit (',', p);
1473 1609
1474 for (i = 0; s[i]; i++) 1610 for (i = 0; s[i]; i++)
1475 { 1611 {
1476 if (*s[i]) 1612 if (*s[i])
1477 { 1613 {
1478 strcpy (buf, "@im="); 1614 strcpy (buf, "@im=");
1479 strncat (buf, s[i], IMBUFSIZ - 5); 1615 strncat (buf, s[i], IMBUFSIZ - 5);
1480 if (IM_get_IC (buf)) 1616 if (im_get_ic (buf))
1481 { 1617 {
1482 found = true; 1618 found = true;
1483 break; 1619 break;
1484 } 1620 }
1485 } 1621 }
1486 } 1622 }
1487 1623
1488 rxvt_freecommastring (s); 1624 rxvt_free_strsplit (s);
1489 1625
1490 if (found) 1626 if (found)
1491 goto done; 1627 goto done;
1492 } 1628 }
1493 1629
1494 /* try with XMODIFIERS env. var. */ 1630 /* try with XMODIFIERS env. var. */
1495 if (IM_get_IC ("")) 1631 if (im_get_ic (""))
1496 goto done; 1632 goto done;
1497 1633
1498 /* 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 */
1499 if (IM_get_IC ("@im=none")) 1635 if (im_get_ic ("@im=none"))
1500 goto done; 1636 goto done;
1501 1637
1502done: 1638done:
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1639 if (rs[Rs_imLocale])
1505 SET_LOCALE (locale); 1640 SET_LOCALE (locale);
1506#endif
1507} 1641}
1508 1642
1509void 1643void
1510rxvt_term::IMSetPosition () 1644rxvt_term::im_set_position ()
1511{ 1645{
1512 XRectangle preedit_rect, status_rect, *needed_rect; 1646 XRectangle preedit_rect, status_rect, *needed_rect;
1513 XVaNestedList preedit_attr, status_attr; 1647 XVaNestedList preedit_attr, status_attr;
1514 1648
1515 if (!Input_Context 1649 if (!Input_Context
1516 || !focus 1650 || !focus
1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1651 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1518 || !IMisRunning ()) 1652 || !im_is_running ())
1519 return; 1653 return;
1520 1654
1521 if (input_style & XIMPreeditPosition) 1655 if (input_style & XIMPreeditPosition)
1522 { 1656 {
1523 im_set_size (preedit_rect); 1657 im_set_size (preedit_rect);
… …
1553 1687
1554void 1688void
1555rxvt_term::get_window_origin (int &x, int &y) 1689rxvt_term::get_window_origin (int &x, int &y)
1556{ 1690{
1557 Window cr; 1691 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1692 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1559/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1560}
1561
1562Pixmap
1563rxvt_term::get_pixmap_property (int prop_id)
1564{
1565 if (prop_id > 0 && prop_id < NUM_XA)
1566 if (xa[prop_id])
1567 {
1568 int aformat;
1569 unsigned long nitems, bytes_after;
1570 Atom atype;
1571 unsigned char *prop = NULL;
1572 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1573 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1574 &nitems, &bytes_after, &prop);
1575 if (result == Success && prop && atype == XA_PIXMAP)
1576 return *(Pixmap *)prop;
1577 }
1578
1579 return None;
1580} 1693}
1581 1694
1582#ifdef HAVE_BG_PIXMAP 1695#ifdef HAVE_BG_PIXMAP
1583# if TRACE_PIXMAPS
1584# undef update_background
1585void
1586rxvt_term::trace_update_background (const char *file, int line)
1587{
1588 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1589 update_background ();
1590}
1591# endif
1592 1696
1593void 1697void
1594rxvt_term::update_background () 1698rxvt_term::update_background ()
1595{ 1699{
1596 if (update_background_ev.is_active ()) 1700 if (update_background_ev.is_active ())
1597 return; 1701 return;
1598 1702
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1703 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1704
1603 if (to_wait <= 0.) 1705 if (to_wait <= 0.)
1604 bgPixmap.render (); 1706 bg_render ();
1605 else 1707 else
1606 update_background_ev.start (to_wait); 1708 update_background_ev.start (to_wait);
1607} 1709}
1608 1710
1609void 1711void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1712rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1713{
1612 make_current (); 1714 make_current ();
1613 1715
1614 update_background_ev.stop (); 1716 update_background_ev.stop ();
1615 bgPixmap.render (); 1717 bg_render ();
1616 refresh_check (); 1718 refresh_check ();
1617} 1719}
1618 1720
1619#endif /* HAVE_BG_PIXMAP */ 1721#endif /* HAVE_BG_PIXMAP */
1620 1722

Diff Legend

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