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.329 by sf-exg, Wed Jul 21 11:02:14 2010 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * 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 20 * 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 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 32 *---------------------------------------------------------------------*/
32 33
33#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h"
35#include "keyboard.h" 37#include "keyboard.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include <limits> 40#include <limits>
39 41
40#include <cassert> 42#include <assert.h>
41#include <csignal> 43#include <signal.h>
42#include <cstring> 44#include <string.h>
43 45
44#include <termios.h> 46#include <termios.h>
45 47
46#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
47# define X_LOCALE 49# define X_LOCALE
48# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
49#else 51#else
50# ifdef HAVE_SETLOCALE
51# include <clocale> 52# include <locale.h>
52# endif 53#endif
53#endif
54 54
55struct termios rxvt_term::def_tio;
55vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
56 57
57// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
58rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
59 60
… …
94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
95{ 96{
96 compose_char *cc; 97 compose_char *cc;
97 98
98 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
99 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
100 cc = (*this)[c1]; 101 cc = (*this)[c1];
101 while (cc) 102 while (cc)
102 { 103 {
103 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
104 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
105 } 106 }
106 107
107 // check to see whether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
108 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
109 {
110 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
111 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
112 }
113 112
114 // allocate a new combination 113 // allocate a new combination
115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
116 { 115 {
117 static int seen; 116 static int seen;
118 117
119 if (!seen++) 118 if (!seen++)
120 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
121 120
122 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
123 } 122 }
124 123
125 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
… …
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this); 169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif 170#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this); 172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif 173#endif
175#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
177#endif 176#endif
178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
179#ifdef USE_XIM 178#if USE_XIM
180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
181#endif 180#endif
182#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif 183#endif
… …
187#endif 186#endif
188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 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); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
195 193
196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
197 195
… …
226 delete fontset[i]; 224 delete fontset[i];
227#endif 225#endif
228 delete fontset[0]; 226 delete fontset[0];
229 227
230#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy (); 229 bg_destroy ();
232#endif 230#endif
233#ifdef HAVE_AFTERIMAGE 231
234 if (asv) 232#if HAVE_IMG
235 destroy_asvisual (asv, 0); 233 delete bg_img;
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif 234#endif
239 235
240 if (display) 236 if (display)
241 { 237 {
242 selection_clear (); 238 selection_clear ();
243 selection_clear (true); 239 selection_clear (true);
244 240
245#ifdef USE_XIM 241#if USE_XIM
246 im_destroy (); 242 im_destroy ();
247#endif 243#endif
248 scrollBar.destroy (); 244 scrollBar.destroy ();
245
246 if (gc)
249 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
250 248
251 delete drawable; 249 delete drawable;
250
252 // destroy all windows 251 // destroy all windows
253 if (parent[0]) 252 if (parent)
254 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
255 254
256 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
257 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
258 { 257 {
259 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
260#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
261 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
262#endif 262#endif
263 } 263 }
264 264
265 clear (); 265 clear ();
266 266
… …
274 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
275 free (allocated [i]); 275 free (allocated [i]);
276 276
277 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text); 278 free (selection.clip_text);
279 // TODO: manage env vars in child only(!)
280 free (env_display);
281 free (env_term);
282 free (locale); 279 free (locale);
283 free (v_buffer); 280 free (v_buffer);
284 free (incr_buf); 281
282 delete selection_req;
283
284 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
285 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
286
287 delete [] env;
285 288
286 delete envv; 289 delete envv;
287 delete argv; 290 delete argv;
288 291
289#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
290 delete keyboard; 293 delete keyboard;
291#endif 294#endif
292#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
294#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
295} 300}
296 301
297// child has exited, usually destroys 302// child has exited, usually destroys
298void 303void
299rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
322 { 327 {
323#if USE_XIM 328#if USE_XIM
324 im_ev.stop (display); 329 im_ev.stop (display);
325#endif 330#endif
326 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
327#if ENABLE_TRANSPARENCY || ENABLE_PERL 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
328 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
329#endif 334#endif
330 incr_ev.stop ();
331 termwin_ev.stop (display); 335 termwin_ev.stop (display);
332 vt_ev.stop (display); 336 vt_ev.stop (display);
333 } 337 }
334 338
335 flush_ev.stop (); 339 flush_ev.stop ();
… …
359 make_current (); 363 make_current ();
360 364
361 delete this; 365 delete this;
362} 366}
363 367
368void
369rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
370{
371 if (!opt)
372 return;
373
374 uint8_t mask = 1 << (opt & 7);
375 uint8_t &val = options [opt >> 3];
376
377 val = val & ~mask | (set ? mask : 0);
378}
379
364/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
365/* 381/*
366 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * 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 */ 383 */
369static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
370 385
371static void 386static void
372rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 389 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
375 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
376} 391}
377 392
378#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
379static void 394static void ecb_cold
380print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
381{ 396{
382 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
383 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
384 char number[32]; 399 char number[32];
385 char *mtype = "XlibMessage"; 400
386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
388 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 401 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402
403 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
404 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
405
406 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
407 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
389 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 411 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
412
413 if (event->request_code >= 128)
414 {
415#if 0
416 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
417 int nexts;
418 char **exts = XListExtensions (dpy, &nexts);
419
420 while (nexts)
421 {
422 char *extname = exts [nexts - 1];
423 int major, first_event, first_error;
424
425 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
426 {
427 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
428 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
429
430 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
431 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
432 rxvt_warn ("+ (which is %s)\n", buffer);
433
434 break;
435 }
436
437 printf ("nextss %d %s\n", nexts, extname);//D
438 --nexts;
439 ++exts;
440 }
441#else
442 int nexts = 0;
443 char **exts = 0;
444#endif
445
446 if (!nexts)
447 {
448 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
449
450 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
451 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
452
453#if 0
454 sprintf (number, "RENDER.%d", event->minor_code);
455 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
456 rxvt_warn ("+ (which is %s)\n", buffer);
457#endif
458 }
459
460 XFreeExtensionList (exts);
461 }
462 else
463 {
392 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
394 rxvt_warn ("(which is %s)\n", buffer); 466 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 } 467 }
468
400 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
401 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
402 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
403 (event->error_code == BadFont) || 472 || event->error_code == BadFont
404 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
405 (event->error_code == BadColor) || 474 || event->error_code == BadColor
406 (event->error_code == BadGC) || 475 || event->error_code == BadGC
407 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
408 (event->error_code == BadValue) || 477 || event->error_code == BadValue
409 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
410 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ);
413 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 else 484 else
417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 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 486
427int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
428rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
429{ 494{
430 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
431 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
432 else 497 else
433 { 498 {
434 // GET_R is most likely not the terminal which caused the error, 499 // GET_R is most likely not the terminal which caused the error,
435 // so just output the error and continue 500 // so just output the error and continue
… …
441 } 506 }
442 507
443 return 0; 508 return 0;
444} 509}
445 510
446int 511int ecb_cold
447rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
448{ 513{
449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 514 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
450 DisplayString (display)); 515 DisplayString (display));
451 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
… …
474 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
475 w.stop (); 540 w.stop ();
476 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
477} 542}
478 543
544static void
545rxvt_get_ttymode (struct termios *tio)
546{
547 if (tcgetattr (STDIN_FILENO, tio) < 0)
548 memset (tio, 0, sizeof (struct termios));
549
550 for (int i = 0; i < NCCS; i++)
551 tio->c_cc[i] = VDISABLE;
552
553 tio->c_cc[VINTR] = CINTR;
554 tio->c_cc[VQUIT] = CQUIT;
555 tio->c_cc[VERASE] = CERASE;
556#ifdef VERASE2
557 tio->c_cc[VERASE2] = CERASE2;
558#endif
559 tio->c_cc[VKILL] = CKILL;
560 tio->c_cc[VEOF] = CEOF;
561 tio->c_cc[VSTART] = CSTART;
562 tio->c_cc[VSTOP] = CSTOP;
563 tio->c_cc[VSUSP] = CSUSP;
564# ifdef VDSUSP
565 tio->c_cc[VDSUSP] = CDSUSP;
566# endif
567# ifdef VREPRINT
568 tio->c_cc[VREPRINT] = CRPRNT;
569# endif
570# ifdef VDISCRD
571 tio->c_cc[VDISCRD] = CFLUSH;
572# endif
573# ifdef VWERSE
574 tio->c_cc[VWERSE] = CWERASE;
575# endif
576# ifdef VLNEXT
577 tio->c_cc[VLNEXT] = CLNEXT;
578# endif
579# ifdef VSTATUS
580 tio->c_cc[VSTATUS] = CSTATUS;
581# endif
582
583# if VMIN != VEOF
584 tio->c_cc[VMIN] = 1;
585# endif
586# if VTIME != VEOL
587 tio->c_cc[VTIME] = 0;
588# endif
589
590 /* input modes */
591 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
592# ifdef IMAXBEL
593 | IMAXBEL
594# endif
595 | IXON);
596
597 /* output modes */
598 tio->c_oflag = (OPOST | ONLCR);
599
600 /* control modes */
601 tio->c_cflag = (CS8 | CREAD);
602
603 /* local modes */
604 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
605# if defined (ECHOCTL) && defined (ECHOKE)
606 | ECHOCTL | ECHOKE
607# endif
608 | ECHOE | ECHOK);
609}
610
479char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
480 612
481void 613void
482rxvt_init () 614rxvt_init ()
483{ 615{
484 assert (("fontMask must not overlap other RS masks", 616 assert (("fontMask must not overlap other RS masks",
485 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask)))); 617 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
486 618
487 ptytty::init (); 619 rxvt_get_ttymode (&rxvt_term::def_tio);
488 620
621 // get rid of stdin/stdout as we don't need them, to free resources
622 dup2 (STDERR_FILENO, STDIN_FILENO);
623 dup2 (STDERR_FILENO, STDOUT_FILENO);
624
489 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
490 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
491 627
492 rxvt_environ = environ; 628 rxvt_environ = environ;
493 629
494 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
… …
500 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
501 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
502 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
503 639
504 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
505} 645}
506 646
507/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
508/* 648/*
509 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
630 if (recalc_y) 770 if (recalc_y)
631 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
632 772
633 ncol = width / fwidth; 773 ncol = width / fwidth;
634 nrow = height / fheight; 774 nrow = height / fheight;
775
776 // When the size of the vt window is not a multiple of the cell
777 // size, i.e., when the wm does not honour our size hints, there are
778 // extra areas not covered by the terminal screen. Such gaps, when a
779 // bg pixmap is set, would have to be cleared manually to properly
780 // refresh the background. We take the simpler route and shrink the
781 // vt window so as to avoid creating gaps.
782 vt_width = ncol * fwidth;
783 vt_height = nrow * fheight;
635} 784}
636 785
637/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
638/* 787/*
639 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
647 796
648 struct winsize ws; 797 struct winsize ws;
649 798
650 ws.ws_col = ncol; 799 ws.ws_col = ncol;
651 ws.ws_row = nrow; 800 ws.ws_row = nrow;
652 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
653 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
654 ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
655 804
656#if 0 805#if 0
657 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
658 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
659 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
660#endif 809#endif
661} 810}
662 811
663/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
664/* set_fonts () - load and set the various fonts 813/* 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 814bool
672rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
673{ 816{
674 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
675 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
690 833
691 delete fontset[0]; 834 delete fontset[0];
692 fontset[0] = fs; 835 fontset[0] = fs;
693 836
694 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
695 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
696 prop.width += letterSpace;
697 839
698 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
699 841
700 fwidth = prop.width; 842 fwidth = prop.width;
701 fheight = prop.height; 843 fheight = prop.height + lineSpace;
702 fbase = prop.ascent; 844 fbase = prop.ascent;
703 845
704 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
705 { 847 {
706#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
732#else 874#else
733 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
734#endif 876#endif
735 } 877 }
736 878
737 if (parent[0]) 879 if (parent)
738 { 880 {
739 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
740 scr_remap_chars (); 882 scr_remap_chars ();
741 scr_touch (true); 883 scr_touch (true);
742 } 884 }
… …
745} 887}
746 888
747void 889void
748rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
749{ 891{
750 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
751 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
752 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
753} 895}
754 896
755void 897void
… …
757{ 899{
758 XTextProperty ct; 900 XTextProperty ct;
759 901
760 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
761 { 903 {
762 XSetTextProperty (dpy, parent[0], &ct, prop); 904 XSetTextProperty (dpy, parent, &ct, prop);
763 XFree (ct.value); 905 XFree (ct.value);
764 } 906 }
765} 907}
766 908
767void 909void
768rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
769{ 911{
770 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
771 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
772 914
773 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
774 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
775 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
776 918
777 free (s); 919 free (s);
778 free (ws); 920 free (ws);
… …
801 943
802void 944void
803rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
804{ 946{
805#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
806 rxvt_color xcol;
807
808 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
809 return; 949 return;
810 950
811 color = strdup (color); 951 color = strdup (color);
812 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
818 int i = atoi (color); 958 int i = atoi (color);
819 959
820 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
821 { 961 {
822 /* bright colors */ 962 /* bright colors */
823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
824 goto done; 964 goto done;
825 } 965 }
826 966
827 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
828 { 968 {
829 /* normal colors */ 969 /* normal colors */
830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
831 goto done; 971 goto done;
832 } 972 }
833 } 973 }
834 974
835 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
836 976 set_color (pix_colors_focused[idx], color);
837 /*
838 * FIXME: should free colors here, but no idea how to do it so instead,
839 * so just keep gobbling up the colormap
840 */
841
842 pix_colors_focused[idx] = xcol;
843 977
844done: 978done:
845 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
846 980
847 update_fade_color (idx); 981 update_fade_color (idx);
848 recolour_cursor (); 982 recolor_cursor ();
849 scr_recolour (); 983 scr_recolor ();
850#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
851} 985}
852 986
853void 987void
854rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
855{ 989{
856 XColor fg, bg; 990 XColor fg, bg;
857 991
858 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
859 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
868 1002
869/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
870/* 1004/*
871 * find if fg/bg matches any of the normal (low-intensity) colors 1005 * find if fg/bg matches any of the normal (low-intensity) colors
872 */ 1006 */
873void 1007char *
874rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
875{ 1009{
876 unsigned int i; 1010 unsigned int i;
877 const char *xpmb = ""; 1011 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
879 1015
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
884 { 1018 {
885 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
886 break; 1020 break;
887 } 1021 }
888 1022
889 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
891 { 1025 {
892 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
894 xpmb = "default;"; 1028 xpmb = "default;";
895#endif 1029#endif
896 break; 1030 break;
897 } 1031 }
898 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
899 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1034 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1035 return env_colorfgbg;
900} 1036}
901 1037
902/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
903 1039
904bool 1040bool
… …
912} 1048}
913 1049
914void 1050void
915rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
916{ 1052{
1053 pix_colors[dst].free (this);
917 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1054 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
918} 1055}
1056
1057#ifdef SMART_RESIZE
1058static unsigned int
1059get_parent_bw (Display *dpy, Window w)
1060{
1061 int idummy;
1062 unsigned int udummy;
1063 Window wdummy, parent;
1064 Window *children;
1065 unsigned int nchildren, border_width;
1066
1067 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1068 XFree (children);
1069 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1070 &udummy, &udummy, &border_width, &udummy);
1071
1072 return border_width;
1073}
1074#endif
919 1075
920/* -------------------------------------------------------------------- * 1076/* -------------------------------------------------------------------- *
921 * - WINDOW RESIZING - * 1077 * - WINDOW RESIZING - *
922 * -------------------------------------------------------------------- */ 1078 * -------------------------------------------------------------------- */
923void 1079void
… …
933 1089
934 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1090 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
935 if (set_hint) 1091 if (set_hint)
936 { 1092 {
937 szHint.flags &= ~(PBaseSize | PResizeInc); 1093 szHint.flags &= ~(PBaseSize | PResizeInc);
938 XSetWMNormalHints (dpy, parent[0], &szHint); 1094 XSetWMNormalHints (dpy, parent, &szHint);
939 szHint.flags |= PBaseSize | PResizeInc; 1095 szHint.flags |= PBaseSize | PResizeInc;
940 } 1096 }
941 1097
942 if (!ignoreparent) 1098 if (!ignoreparent)
943 { 1099 {
… …
949 int x, y, x1, y1; 1105 int x, y, x1, y1;
950 int dx, dy; 1106 int dx, dy;
951 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
952 Window unused_cr; 1108 Window unused_cr;
953 1109
954 XTranslateCoordinates (dpy, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent, display->root,
955 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
956 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
957 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
958 /* 1114 /*
959 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
960 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
961 */ 1117 */
962 if (x1 != x || y1 != y) 1118 if (x1 != x || y1 != y)
963 { 1119 {
964 x -= x1; 1120 unsigned int border_width = get_parent_bw (dpy, parent);
965 y -= y1; 1121
1122 x -= x1 + border_width;
1123 y -= y1 + border_width;
966 } 1124 }
967 1125
968 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1126 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
969 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1127 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
970 dx = old_width - szHint.width; 1128 dx = old_width - szHint.width;
… …
978 if (y < y1) /* top half */ 1136 if (y < y1) /* top half */
979 dy = 0; 1137 dy = 0;
980 else if (y == y1) /* exact center */ 1138 else if (y == y1) /* exact center */
981 dy /= 2; 1139 dy /= 2;
982 1140
983 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1141 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
984 szHint.width, szHint.height); 1142 szHint.width, szHint.height);
985#else 1143#else
986 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1144 XResizeWindow (dpy, parent, szHint.width, szHint.height);
987#endif 1145#endif
988 } 1146 }
989 1147
990 if (set_hint) 1148 if (set_hint)
991 XSetWMNormalHints (dpy, parent[0], &szHint); 1149 XSetWMNormalHints (dpy, parent, &szHint);
992 1150
993 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1151 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
994 1152
995 if (fix_screen || newwidth != old_width || newheight != old_height) 1153 if (fix_screen || newwidth != old_width || newheight != old_height)
996 { 1154 {
997 if (scrollBar.state) 1155 if (scrollBar.state)
998 scrollBar.resize (); 1156 scrollBar.resize ();
999 1157
1000 XMoveResizeWindow (dpy, vt, 1158 XMoveResizeWindow (dpy, vt,
1001 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
1002 width, height); 1160 vt_width, vt_height);
1161
1162 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1003 1163
1004#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
1005 if (bgPixmap.window_size_sensitive ()) 1165 if (bg_window_size_sensitive ())
1006 update_background (); 1166 update_background ();
1007#endif 1167#endif
1008 } 1168 }
1009 1169
1010 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
1011 scr_reset (); 1171 scr_reset ();
1012 1172
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 1173#if USE_XIM
1020 IMSetPosition (); 1174 im_set_position ();
1021#endif 1175#endif
1022} 1176}
1023 1177
1024/* 1178/*
1025 * Set the width/height of the vt window in characters. Units are pixels. 1179 * Set the width/height of the vt window in characters. Units are pixels.
… …
1038 newwidth = wattr.width - szHint.base_width; 1192 newwidth = wattr.width - szHint.base_width;
1039 if (newheight == 0) 1193 if (newheight == 0)
1040 newheight = wattr.height - szHint.base_height; 1194 newheight = wattr.height - szHint.base_height;
1041 } 1195 }
1042 1196
1043 if (newwidth != width || newheight != height) 1197 if (newwidth != vt_width || newheight != vt_height)
1044 { 1198 {
1045 newwidth += szHint.base_width; 1199 newwidth += szHint.base_width;
1046 newheight += szHint.base_height; 1200 newheight += szHint.base_height;
1047 resize_all_windows (newwidth, newheight, 0); 1201 resize_all_windows (newwidth, newheight, 0);
1048 } 1202 }
1049} 1203}
1050 1204
1051/* -------------------------------------------------------------------- * 1205/* -------------------------------------------------------------------- *
1052 * - X INPUT METHOD ROUTINES - * 1206 * - X INPUT METHOD ROUTINES - *
1053 * -------------------------------------------------------------------- */ 1207 * -------------------------------------------------------------------- */
1054#ifdef USE_XIM 1208#if USE_XIM
1055 1209
1056void 1210void
1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1211rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1058{ 1212{
1059 fg = pix_colors [Color_fg]; 1213 fg = pix_colors [Color_fg];
… …
1086 status_rect.height = fheight; 1240 status_rect.height = fheight;
1087} 1241}
1088 1242
1089/* Checking whether input method is running. */ 1243/* Checking whether input method is running. */
1090bool 1244bool
1091rxvt_term::IMisRunning () 1245rxvt_term::im_is_running ()
1092{ 1246{
1093 Atom atom; 1247 Atom atom;
1094 Window win; 1248 Window win;
1095 char server[IMBUFSIZ]; 1249 char server[IMBUFSIZ];
1096 1250
… …
1105 1259
1106 atom = XInternAtom (dpy, server, False); 1260 atom = XInternAtom (dpy, server, False);
1107 win = XGetSelectionOwner (dpy, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1108 1262
1109 if (win != None) 1263 if (win != None)
1110 return True; 1264 return true;
1111 } 1265 }
1112 1266
1113 return False; 1267 return false;
1114} 1268}
1115 1269
1116void 1270void
1117rxvt_term::IMSendSpot () 1271rxvt_term::im_send_spot ()
1118{ 1272{
1119 XPoint nspot; 1273 XPoint nspot;
1120 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1121 1275
1122 if (!Input_Context 1276 if (!Input_Context
… …
1228/* 1382/*
1229 * Try to open a XIM with the current modifiers, then see if we can 1383 * Try to open a XIM with the current modifiers, then see if we can
1230 * open a suitable preedit type 1384 * open a suitable preedit type
1231 */ 1385 */
1232bool 1386bool
1233rxvt_term::IM_get_IC (const char *modifiers) 1387rxvt_term::im_get_ic (const char *modifiers)
1234{ 1388{
1235 int i, j, found; 1389 int i, j, found;
1236 XIM xim; 1390 XIM xim;
1237 XPoint spot; 1391 XPoint spot;
1238 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1239 unsigned long fg, bg; 1393 unsigned long fg, bg;
1240 const char *p; 1394 const char *p;
1241 char **s; 1395 char **s;
1242 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1243#ifdef ENABLE_XIM_ONTHESPOT
1244 XIMCallback xcb[4];
1245#endif
1246 1397
1247 set_environ (envv); 1398 set_environ (env);
1248 1399
1249 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1250 return false; 1401 return false;
1251 1402
1252 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1253 if (input_method == NULL) 1404 if (input_method == NULL)
1254 return false; 1405 return false;
… …
1271 p = pet[pi]; 1422 p = pet[pi];
1272 1423
1273 if (!p) 1424 if (!p)
1274 continue; 1425 continue;
1275 1426
1276 s = rxvt_splitcommastring (p); 1427 s = rxvt_strsplit (',', p);
1277 1428
1278 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1279 { 1430 {
1280 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1281 input_style = XIMPreeditPosition | XIMStatusNothing; 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1293 input_style = XIMPreeditNothing | XIMStatusNothing; 1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1294 1445
1295 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1296 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1297 { 1448 {
1298 rxvt_freecommastring (s); 1449 rxvt_free_strsplit (s);
1299 1450
1300 found = 1; 1451 found = 1;
1301 goto foundpet; 1452 goto foundpet;
1302 } 1453 }
1303 1454
1304 } 1455 }
1305 1456
1306 rxvt_freecommastring (s); 1457 rxvt_free_strsplit (s);
1307 } 1458 }
1308 1459
1309foundpet: 1460foundpet:
1310 1461
1311 XFree (xim_styles); 1462 XFree (xim_styles);
… …
1390 NULL); 1541 NULL);
1391 } 1542 }
1392#if ENABLE_XIM_ONTHESPOT 1543#if ENABLE_XIM_ONTHESPOT
1393 else if (input_style & XIMPreeditCallbacks) 1544 else if (input_style & XIMPreeditCallbacks)
1394 { 1545 {
1546 XIMCallback xcb[4];
1547
1395 im_set_position (spot); 1548 im_set_position (spot);
1396 1549
1397 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1550 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; 1551 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; 1552 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1414#endif 1567#endif
1415 1568
1416 Input_Context = XCreateIC (xim, 1569 Input_Context = XCreateIC (xim,
1417 XNInputStyle, input_style, 1570 XNInputStyle, input_style,
1418 XNClientWindow, vt, 1571 XNClientWindow, vt,
1419 XNFocusWindow, parent[0], 1572 XNFocusWindow, parent,
1420 preedit_attr ? XNPreeditAttributes : NULL, 1573 preedit_attr ? XNPreeditAttributes : NULL,
1421 preedit_attr, 1574 preedit_attr,
1422 status_attr ? XNStatusAttributes : NULL, 1575 status_attr ? XNStatusAttributes : NULL,
1423 status_attr, NULL); 1576 status_attr, NULL);
1424 1577
… …
1437 // unfortunately, only the focus window is used by XIM, hard to fix 1590 // unfortunately, only the focus window is used by XIM, hard to fix
1438 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1591 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1439 vt_select_input (); 1592 vt_select_input ();
1440#endif 1593#endif
1441 1594
1442 IMSetPosition (); 1595 im_set_position ();
1443 1596
1444 return true; 1597 return true;
1445} 1598}
1446 1599
1447void 1600void
… …
1457 im_destroy (); 1610 im_destroy ();
1458 1611
1459 if (Input_Context) 1612 if (Input_Context)
1460 return; 1613 return;
1461 1614
1462#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1463 if (rs[Rs_imLocale]) 1615 if (rs[Rs_imLocale])
1464 SET_LOCALE (rs[Rs_imLocale]); 1616 SET_LOCALE (rs[Rs_imLocale]);
1465#endif
1466 1617
1467 p = rs[Rs_inputMethod]; 1618 p = rs[Rs_inputMethod];
1468 if (p && *p) 1619 if (p && *p)
1469 { 1620 {
1470 bool found = false; 1621 bool found = false;
1471 1622
1472 s = rxvt_splitcommastring (p); 1623 s = rxvt_strsplit (',', p);
1473 1624
1474 for (i = 0; s[i]; i++) 1625 for (i = 0; s[i]; i++)
1475 { 1626 {
1476 if (*s[i]) 1627 if (*s[i])
1477 { 1628 {
1478 strcpy (buf, "@im="); 1629 strcpy (buf, "@im=");
1479 strncat (buf, s[i], IMBUFSIZ - 5); 1630 strncat (buf, s[i], IMBUFSIZ - 5);
1480 if (IM_get_IC (buf)) 1631 if (im_get_ic (buf))
1481 { 1632 {
1482 found = true; 1633 found = true;
1483 break; 1634 break;
1484 } 1635 }
1485 } 1636 }
1486 } 1637 }
1487 1638
1488 rxvt_freecommastring (s); 1639 rxvt_free_strsplit (s);
1489 1640
1490 if (found) 1641 if (found)
1491 goto done; 1642 goto done;
1492 } 1643 }
1493 1644
1494 /* try with XMODIFIERS env. var. */ 1645 /* try with XMODIFIERS env. var. */
1495 if (IM_get_IC ("")) 1646 if (im_get_ic (""))
1496 goto done; 1647 goto done;
1497 1648
1498 /* try with no modifiers base IF the user didn't specify an IM */ 1649 /* try with no modifiers base IF the user didn't specify an IM */
1499 if (IM_get_IC ("@im=none")) 1650 if (im_get_ic ("@im=none"))
1500 goto done; 1651 goto done;
1501 1652
1502done: 1653done:
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1654 if (rs[Rs_imLocale])
1505 SET_LOCALE (locale); 1655 SET_LOCALE (locale);
1506#endif
1507} 1656}
1508 1657
1509void 1658void
1510rxvt_term::IMSetPosition () 1659rxvt_term::im_set_position ()
1511{ 1660{
1512 XRectangle preedit_rect, status_rect, *needed_rect; 1661 XRectangle preedit_rect, status_rect, *needed_rect;
1513 XVaNestedList preedit_attr, status_attr; 1662 XVaNestedList preedit_attr, status_attr;
1514 1663
1515 if (!Input_Context 1664 if (!Input_Context
1516 || !focus 1665 || !focus
1517 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1666 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1518 || !IMisRunning ()) 1667 || !im_is_running ())
1519 return; 1668 return;
1520 1669
1521 if (input_style & XIMPreeditPosition) 1670 if (input_style & XIMPreeditPosition)
1522 { 1671 {
1523 im_set_size (preedit_rect); 1672 im_set_size (preedit_rect);
… …
1553 1702
1554void 1703void
1555rxvt_term::get_window_origin (int &x, int &y) 1704rxvt_term::get_window_origin (int &x, int &y)
1556{ 1705{
1557 Window cr; 1706 Window cr;
1558 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1707 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} 1708}
1581 1709
1582#ifdef HAVE_BG_PIXMAP 1710#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 1711
1593void 1712void
1594rxvt_term::update_background () 1713rxvt_term::update_background ()
1595{ 1714{
1596 if (update_background_ev.is_active ()) 1715 if (update_background_ev.is_active ())
1597 return; 1716 return;
1598 1717
1599 bgPixmap.invalidate ();
1600
1601 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1718 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1602 1719
1603 if (to_wait <= 0.) 1720 if (to_wait <= 0.)
1604 bgPixmap.render (); 1721 bg_render ();
1605 else 1722 else
1606 update_background_ev.start (to_wait); 1723 update_background_ev.start (to_wait);
1607} 1724}
1608 1725
1609void 1726void
1610rxvt_term::update_background_cb (ev::timer &w, int revents) 1727rxvt_term::update_background_cb (ev::timer &w, int revents)
1611{ 1728{
1612 make_current (); 1729 make_current ();
1613 1730
1614 update_background_ev.stop (); 1731 update_background_ev.stop ();
1615 bgPixmap.render (); 1732 bg_render ();
1616 refresh_check (); 1733 refresh_check ();
1617} 1734}
1618 1735
1619#endif /* HAVE_BG_PIXMAP */ 1736#endif /* HAVE_BG_PIXMAP */
1620 1737

Diff Legend

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