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.331 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.398 by sf-exg, Tue Sep 8 07:54:58 2015 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))));
617
618 rxvt_get_ttymode (&rxvt_term::def_tio);
486 619
487 // get rid of stdin/stdout as we don't need them, to free resources 620 // get rid of stdin/stdout as we don't need them, to free resources
488 dup2 (STDERR_FILENO, STDIN_FILENO); 621 dup2 (STDERR_FILENO, STDIN_FILENO);
489 dup2 (STDERR_FILENO, STDOUT_FILENO); 622 dup2 (STDERR_FILENO, STDOUT_FILENO);
490 623
491 ptytty::init ();
492
493 if (!ev_default_loop (0)) 624 if (!ev_default_loop ())
494 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 625 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
495 626
496 rxvt_environ = environ; 627 rxvt_environ = environ;
497 628
498 signal (SIGHUP, SIG_IGN); 629 signal (SIGHUP, SIG_IGN);
… …
504 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 635 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
505 // TODO: handle this with exceptions and tolerate the memory loss 636 // TODO: handle this with exceptions and tolerate the memory loss
506 XSetIOErrorHandler (rxvt_xioerror_handler); 637 XSetIOErrorHandler (rxvt_xioerror_handler);
507 638
508 XrmInitialize (); 639 XrmInitialize ();
640
641#if HAVE_PIXBUF
642 g_type_init ();
643#endif
509} 644}
510 645
511/*----------------------------------------------------------------------*/ 646/*----------------------------------------------------------------------*/
512/* 647/*
513 * window size/position calculations for XSizeHint and other storage. 648 * window size/position calculations for XSizeHint and other storage.
… …
634 if (recalc_y) 769 if (recalc_y)
635 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 770 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
636 771
637 ncol = width / fwidth; 772 ncol = width / fwidth;
638 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;
639} 783}
640 784
641/*----------------------------------------------------------------------*/ 785/*----------------------------------------------------------------------*/
642/* 786/*
643 * Tell the teletype handler what size the window is. 787 * Tell the teletype handler what size the window is.
… …
651 795
652 struct winsize ws; 796 struct winsize ws;
653 797
654 ws.ws_col = ncol; 798 ws.ws_col = ncol;
655 ws.ws_row = nrow; 799 ws.ws_row = nrow;
656 ws.ws_xpixel = width; 800 ws.ws_xpixel = vt_width;
657 ws.ws_ypixel = height; 801 ws.ws_ypixel = vt_height;
658 ioctl (pty->pty, TIOCSWINSZ, &ws); 802 ioctl (pty->pty, TIOCSWINSZ, &ws);
659 803
660#if 0 804#if 0
661 // TIOCSWINSZ is supposed to do this automatically and correctly 805 // TIOCSWINSZ is supposed to do this automatically and correctly
662 if (cmd_pid) /* force through to the command */ 806 if (cmd_pid) /* force through to the command */
663 kill (-cmd_pid, SIGWINCH); 807 kill (-cmd_pid, SIGWINCH);
664#endif 808#endif
665} 809}
666 810
667/*----------------------------------------------------------------------*/ 811/*----------------------------------------------------------------------*/
668/* set_fonts () - load and set the various fonts 812/* load and set the various fonts */
669 *
670 * init = 1 - initialize
671 *
672 * fontname == FONT_UP - switch to bigger font
673 * fontname == FONT_DN - switch to smaller font
674 */
675bool 813bool
676rxvt_term::set_fonts () 814rxvt_term::set_fonts ()
677{ 815{
678 rxvt_fontset *fs = new rxvt_fontset (this); 816 rxvt_fontset *fs = new rxvt_fontset (this);
679 rxvt_fontprop prop; 817 rxvt_fontprop prop;
… …
694 832
695 delete fontset[0]; 833 delete fontset[0];
696 fontset[0] = fs; 834 fontset[0] = fs;
697 835
698 prop = (*fs)[rxvt_fontset::firstFont]->properties (); 836 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
699 prop.height += lineSpace; 837 prop.width = max (prop.width + letterSpace, 1);
700 prop.width += letterSpace;
701 838
702 fs->set_prop (prop, false); 839 fs->set_prop (prop, false);
703 840
704 fwidth = prop.width; 841 fwidth = prop.width;
705 fheight = prop.height; 842 fheight = prop.height + lineSpace;
706 fbase = prop.ascent; 843 fbase = prop.ascent;
707 844
708 for (int style = 1; style < 4; style++) 845 for (int style = 1; style < 4; style++)
709 { 846 {
710#if ENABLE_STYLES 847#if ENABLE_STYLES
… …
736#else 873#else
737 fontset[style] = fontset[0]; 874 fontset[style] = fontset[0];
738#endif 875#endif
739 } 876 }
740 877
741 if (parent[0]) 878 if (parent)
742 { 879 {
743 resize_all_windows (0, 0, 0); 880 resize_all_windows (0, 0, 0);
744 scr_remap_chars (); 881 scr_remap_chars ();
745 scr_touch (true); 882 scr_touch (true);
746 } 883 }
… …
749} 886}
750 887
751void 888void
752rxvt_term::set_string_property (Atom prop, const char *str, int len) 889rxvt_term::set_string_property (Atom prop, const char *str, int len)
753{ 890{
754 XChangeProperty (dpy, parent[0], 891 XChangeProperty (dpy, parent,
755 prop, XA_STRING, 8, PropModeReplace, 892 prop, XA_STRING, 8, PropModeReplace,
756 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 893 (const unsigned char *)str, len >= 0 ? len : strlen (str));
757} 894}
758 895
759void 896void
… …
761{ 898{
762 XTextProperty ct; 899 XTextProperty ct;
763 900
764 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0) 901 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
765 { 902 {
766 XSetTextProperty (dpy, parent[0], &ct, prop); 903 XSetTextProperty (dpy, parent, &ct, prop);
767 XFree (ct.value); 904 XFree (ct.value);
768 } 905 }
769} 906}
770 907
771void 908void
772rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 909rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
773{ 910{
774 wchar_t *ws = rxvt_mbstowcs (str, len); 911 wchar_t *ws = rxvt_mbstowcs (str, len);
775 char *s = rxvt_wcstoutf8 (ws); 912 char *s = rxvt_wcstoutf8 (ws);
776 913
777 XChangeProperty (dpy, parent[0], 914 XChangeProperty (dpy, parent,
778 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 915 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
779 (const unsigned char *)s, strlen (s)); 916 (const unsigned char *)s, strlen (s));
780 917
781 free (s); 918 free (s);
782 free (ws); 919 free (ws);
… …
805 942
806void 943void
807rxvt_term::set_window_color (int idx, const char *color) 944rxvt_term::set_window_color (int idx, const char *color)
808{ 945{
809#ifdef XTERM_COLOR_CHANGE 946#ifdef XTERM_COLOR_CHANGE
810 rxvt_color xcol;
811
812 if (color == NULL || *color == '\0') 947 if (color == NULL || *color == '\0')
813 return; 948 return;
814 949
815 color = strdup (color); 950 color = strdup (color);
816 allocated.push_back ((void *)color); 951 allocated.push_back ((void *)color);
… …
822 int i = atoi (color); 957 int i = atoi (color);
823 958
824 if (i >= 8 && i <= 15) 959 if (i >= 8 && i <= 15)
825 { 960 {
826 /* bright colors */ 961 /* bright colors */
827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 962 alias_color (idx, minBrightCOLOR + i - 8);
828 goto done; 963 goto done;
829 } 964 }
830 965
831 if (i >= 0 && i <= 7) 966 if (i >= 0 && i <= 7)
832 { 967 {
833 /* normal colors */ 968 /* normal colors */
834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 969 alias_color (idx, minCOLOR + i);
835 goto done; 970 goto done;
836 } 971 }
837 } 972 }
838 973
839 set_color (xcol, color); 974 pix_colors_focused[idx].free (this);
840 975 set_color (pix_colors_focused[idx], color);
841 /*
842 * FIXME: should free colors here, but no idea how to do it so instead,
843 * so just keep gobbling up the colormap
844 */
845
846 pix_colors_focused[idx] = xcol;
847 976
848done: 977done:
849 /*TODO: handle Color_BD, scrollbar background, etc. */ 978 /*TODO: handle Color_BD, scrollbar background, etc. */
850 979
851 update_fade_color (idx); 980 update_fade_color (idx);
852 recolour_cursor (); 981 recolor_cursor ();
853 scr_recolour (); 982 scr_recolor ();
854#endif /* XTERM_COLOR_CHANGE */ 983#endif /* XTERM_COLOR_CHANGE */
855} 984}
856 985
857void 986void
858rxvt_term::recolour_cursor () 987rxvt_term::recolor_cursor ()
859{ 988{
860 XColor fg, bg; 989 XColor fg, bg;
861 990
862 (ISSET_PIXCOLOR (Color_pointer_fg) 991 (ISSET_PIXCOLOR (Color_pointer_fg)
863 ? pix_colors_focused[Color_pointer_fg] 992 ? pix_colors_focused[Color_pointer_fg]
… …
872 1001
873/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
874/* 1003/*
875 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
876 */ 1005 */
877void 1006char *
878rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
879{ 1008{
880 unsigned int i; 1009 unsigned int i;
881 const char *xpmb = ""; 1010 const char *xpmb = "";
882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1011 char fstr[] = "default";
1012 char bstr[] = "default";
1013 char *env_colorfgbg;
883 1014
884 strcpy (fstr, "default");
885 strcpy (bstr, "default");
886 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
887 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
888 { 1017 {
889 sprintf (fstr, "%d", (i - Color_Black)); 1018 sprintf (fstr, "%d", i - Color_Black);
890 break; 1019 break;
891 } 1020 }
892 1021
893 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
894 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
895 { 1024 {
896 sprintf (bstr, "%d", (i - Color_Black)); 1025 sprintf (bstr, "%d", i - Color_Black);
897#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
898 xpmb = "default;"; 1027 xpmb = "default;";
899#endif 1028#endif
900 break; 1029 break;
901 } 1030 }
902 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
904} 1035}
905 1036
906/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
907 1038
908bool 1039bool
… …
916} 1047}
917 1048
918void 1049void
919rxvt_term::alias_color (int dst, int src) 1050rxvt_term::alias_color (int dst, int src)
920{ 1051{
1052 pix_colors[dst].free (this);
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1053 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
922} 1054}
923 1055
924/* -------------------------------------------------------------------- * 1056/* -------------------------------------------------------------------- *
925 * - WINDOW RESIZING - * 1057 * - WINDOW RESIZING - *
… …
937 1069
938 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1070 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
939 if (set_hint) 1071 if (set_hint)
940 { 1072 {
941 szHint.flags &= ~(PBaseSize | PResizeInc); 1073 szHint.flags &= ~(PBaseSize | PResizeInc);
942 XSetWMNormalHints (dpy, parent[0], &szHint); 1074 XSetWMNormalHints (dpy, parent, &szHint);
943 szHint.flags |= PBaseSize | PResizeInc; 1075 szHint.flags |= PBaseSize | PResizeInc;
944 } 1076 }
945 1077
946 if (!ignoreparent) 1078 if (!ignoreparent)
947 { 1079 {
… …
953 int x, y, x1, y1; 1085 int x, y, x1, y1;
954 int dx, dy; 1086 int dx, dy;
955 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1087 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
956 Window unused_cr; 1088 Window unused_cr;
957 1089
958 XTranslateCoordinates (dpy, parent[0], display->root, 1090 XTranslateCoordinates (dpy, parent, display->root,
959 0, 0, &x, &y, &unused_cr); 1091 0, 0, &x, &y, &unused_cr);
960 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1092 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
961 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1093 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
962 /* 1094 /*
963 * if display->root isn't the parent window, a WM will probably have offset 1095 * if display->root isn't the parent window, a WM will probably have offset
964 * our position for handles and decorations. Counter it 1096 * our position for handles and decorations. Counter it
965 */ 1097 */
… …
982 if (y < y1) /* top half */ 1114 if (y < y1) /* top half */
983 dy = 0; 1115 dy = 0;
984 else if (y == y1) /* exact center */ 1116 else if (y == y1) /* exact center */
985 dy /= 2; 1117 dy /= 2;
986 1118
987 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1119 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
988 szHint.width, szHint.height); 1120 szHint.width, szHint.height);
989#else 1121#else
990 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1122 XResizeWindow (dpy, parent, szHint.width, szHint.height);
991#endif 1123#endif
992 } 1124 }
993 1125
994 if (set_hint) 1126 if (set_hint)
995 XSetWMNormalHints (dpy, parent[0], &szHint); 1127 XSetWMNormalHints (dpy, parent, &szHint);
996 1128
997 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1129 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
998 1130
999 if (fix_screen || newwidth != old_width || newheight != old_height) 1131 if (fix_screen || newwidth != old_width || newheight != old_height)
1000 { 1132 {
1001 if (scrollBar.state) 1133 if (scrollBar.state)
1002 scrollBar.resize (); 1134 scrollBar.resize ();
1003 1135
1004 XMoveResizeWindow (dpy, vt, 1136 XMoveResizeWindow (dpy, vt,
1005 window_vt_x, window_vt_y, 1137 window_vt_x, window_vt_y,
1006 width, height); 1138 vt_width, vt_height);
1139
1140 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1007 1141
1008#ifdef HAVE_BG_PIXMAP 1142#ifdef HAVE_BG_PIXMAP
1009 if (bgPixmap.window_size_sensitive ()) 1143 if (bg_window_size_sensitive ())
1010 update_background (); 1144 update_background ();
1011#endif 1145#endif
1012 } 1146 }
1013 1147
1014 if (fix_screen || old_height == 0) 1148 if (fix_screen || old_height == 0)
1015 scr_reset (); 1149 scr_reset ();
1016 1150
1017#ifdef HAVE_BG_PIXMAP
1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1019// if (bgPixmap.pixmap)
1020// scr_touch (false);
1021#endif
1022
1023#ifdef USE_XIM 1151#if USE_XIM
1024 IMSetPosition (); 1152 im_set_position ();
1025#endif 1153#endif
1026} 1154}
1027 1155
1028/* 1156/*
1029 * Set the width/height of the vt window in characters. Units are pixels. 1157 * Set the width/height of the vt window in characters. Units are pixels.
… …
1042 newwidth = wattr.width - szHint.base_width; 1170 newwidth = wattr.width - szHint.base_width;
1043 if (newheight == 0) 1171 if (newheight == 0)
1044 newheight = wattr.height - szHint.base_height; 1172 newheight = wattr.height - szHint.base_height;
1045 } 1173 }
1046 1174
1047 if (newwidth != width || newheight != height) 1175 if (newwidth != vt_width || newheight != vt_height)
1048 { 1176 {
1049 newwidth += szHint.base_width; 1177 newwidth += szHint.base_width;
1050 newheight += szHint.base_height; 1178 newheight += szHint.base_height;
1051 resize_all_windows (newwidth, newheight, 0); 1179 resize_all_windows (newwidth, newheight, 0);
1052 } 1180 }
1053} 1181}
1054 1182
1055/* -------------------------------------------------------------------- * 1183/* -------------------------------------------------------------------- *
1056 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1057 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1058#ifdef USE_XIM 1186#if USE_XIM
1059 1187
1060void 1188void
1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1062{ 1190{
1063 fg = pix_colors [Color_fg]; 1191 fg = pix_colors [Color_fg];
… …
1090 status_rect.height = fheight; 1218 status_rect.height = fheight;
1091} 1219}
1092 1220
1093/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1094bool 1222bool
1095rxvt_term::IMisRunning () 1223rxvt_term::im_is_running ()
1096{ 1224{
1097 Atom atom; 1225 Atom atom;
1098 Window win; 1226 Window win;
1099 char server[IMBUFSIZ]; 1227 char server[IMBUFSIZ];
1100 1228
… …
1109 1237
1110 atom = XInternAtom (dpy, server, False); 1238 atom = XInternAtom (dpy, server, False);
1111 win = XGetSelectionOwner (dpy, atom); 1239 win = XGetSelectionOwner (dpy, atom);
1112 1240
1113 if (win != None) 1241 if (win != None)
1114 return True; 1242 return true;
1115 } 1243 }
1116 1244
1117 return False; 1245 return false;
1118} 1246}
1119 1247
1120void 1248void
1121rxvt_term::IMSendSpot () 1249rxvt_term::im_send_spot ()
1122{ 1250{
1123 XPoint nspot; 1251 XPoint nspot;
1124 XVaNestedList preedit_attr; 1252 XVaNestedList preedit_attr;
1125 1253
1126 if (!Input_Context 1254 if (!Input_Context
… …
1232/* 1360/*
1233 * Try to open a XIM with the current modifiers, then see if we can 1361 * Try to open a XIM with the current modifiers, then see if we can
1234 * open a suitable preedit type 1362 * open a suitable preedit type
1235 */ 1363 */
1236bool 1364bool
1237rxvt_term::IM_get_IC (const char *modifiers) 1365rxvt_term::im_get_ic (const char *modifiers)
1238{ 1366{
1239 int i, j, found; 1367 int i, j, found;
1240 XIM xim; 1368 XIM xim;
1241 XPoint spot; 1369 XPoint spot;
1242 XRectangle rect, status_rect, needed_rect; 1370 XRectangle rect, status_rect, needed_rect;
1243 unsigned long fg, bg; 1371 unsigned long fg, bg;
1244 const char *p; 1372 const char *p;
1245 char **s; 1373 char **s;
1246 XIMStyles *xim_styles; 1374 XIMStyles *xim_styles;
1247#ifdef ENABLE_XIM_ONTHESPOT
1248 XIMCallback xcb[4];
1249#endif
1250 1375
1251 set_environ (envv); 1376 set_environ (env);
1252 1377
1253 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1378 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1254 return false; 1379 return false;
1255 1380
1256 input_method = display->get_xim (locale, modifiers); 1381 input_method = display->get_xim (locale, modifiers);
1257 if (input_method == NULL) 1382 if (input_method == NULL)
1258 return false; 1383 return false;
… …
1275 p = pet[pi]; 1400 p = pet[pi];
1276 1401
1277 if (!p) 1402 if (!p)
1278 continue; 1403 continue;
1279 1404
1280 s = rxvt_splitcommastring (p); 1405 s = rxvt_strsplit (',', p);
1281 1406
1282 for (i = found = 0; !found && s[i]; i++) 1407 for (i = found = 0; !found && s[i]; i++)
1283 { 1408 {
1284 if (!strcmp (s[i], "OverTheSpot")) 1409 if (!strcmp (s[i], "OverTheSpot"))
1285 input_style = XIMPreeditPosition | XIMStatusNothing; 1410 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1297 input_style = XIMPreeditNothing | XIMStatusNothing; 1422 input_style = XIMPreeditNothing | XIMStatusNothing;
1298 1423
1299 for (j = 0; j < xim_styles->count_styles; j++) 1424 for (j = 0; j < xim_styles->count_styles; j++)
1300 if (input_style == xim_styles->supported_styles[j]) 1425 if (input_style == xim_styles->supported_styles[j])
1301 { 1426 {
1302 rxvt_freecommastring (s); 1427 rxvt_free_strsplit (s);
1303 1428
1304 found = 1; 1429 found = 1;
1305 goto foundpet; 1430 goto foundpet;
1306 } 1431 }
1307 1432
1308 } 1433 }
1309 1434
1310 rxvt_freecommastring (s); 1435 rxvt_free_strsplit (s);
1311 } 1436 }
1312 1437
1313foundpet: 1438foundpet:
1314 1439
1315 XFree (xim_styles); 1440 XFree (xim_styles);
… …
1394 NULL); 1519 NULL);
1395 } 1520 }
1396#if ENABLE_XIM_ONTHESPOT 1521#if ENABLE_XIM_ONTHESPOT
1397 else if (input_style & XIMPreeditCallbacks) 1522 else if (input_style & XIMPreeditCallbacks)
1398 { 1523 {
1524 XIMCallback xcb[4];
1525
1399 im_set_position (spot); 1526 im_set_position (spot);
1400 1527
1401 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1528 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1402 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1529 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1403 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1530 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1418#endif 1545#endif
1419 1546
1420 Input_Context = XCreateIC (xim, 1547 Input_Context = XCreateIC (xim,
1421 XNInputStyle, input_style, 1548 XNInputStyle, input_style,
1422 XNClientWindow, vt, 1549 XNClientWindow, vt,
1423 XNFocusWindow, parent[0], 1550 XNFocusWindow, parent,
1424 preedit_attr ? XNPreeditAttributes : NULL, 1551 preedit_attr ? XNPreeditAttributes : NULL,
1425 preedit_attr, 1552 preedit_attr,
1426 status_attr ? XNStatusAttributes : NULL, 1553 status_attr ? XNStatusAttributes : NULL,
1427 status_attr, NULL); 1554 status_attr, NULL);
1428 1555
… …
1441 // unfortunately, only the focus window is used by XIM, hard to fix 1568 // unfortunately, only the focus window is used by XIM, hard to fix
1442 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1569 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1443 vt_select_input (); 1570 vt_select_input ();
1444#endif 1571#endif
1445 1572
1446 IMSetPosition (); 1573 im_set_position ();
1447 1574
1448 return true; 1575 return true;
1449} 1576}
1450 1577
1451void 1578void
… …
1461 im_destroy (); 1588 im_destroy ();
1462 1589
1463 if (Input_Context) 1590 if (Input_Context)
1464 return; 1591 return;
1465 1592
1466#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1467 if (rs[Rs_imLocale]) 1593 if (rs[Rs_imLocale])
1468 SET_LOCALE (rs[Rs_imLocale]); 1594 SET_LOCALE (rs[Rs_imLocale]);
1469#endif
1470 1595
1471 p = rs[Rs_inputMethod]; 1596 p = rs[Rs_inputMethod];
1472 if (p && *p) 1597 if (p && *p)
1473 { 1598 {
1474 bool found = false; 1599 bool found = false;
1475 1600
1476 s = rxvt_splitcommastring (p); 1601 s = rxvt_strsplit (',', p);
1477 1602
1478 for (i = 0; s[i]; i++) 1603 for (i = 0; s[i]; i++)
1479 { 1604 {
1480 if (*s[i]) 1605 if (*s[i])
1481 { 1606 {
1482 strcpy (buf, "@im="); 1607 strcpy (buf, "@im=");
1483 strncat (buf, s[i], IMBUFSIZ - 5); 1608 strncat (buf, s[i], IMBUFSIZ - 5);
1484 if (IM_get_IC (buf)) 1609 if (im_get_ic (buf))
1485 { 1610 {
1486 found = true; 1611 found = true;
1487 break; 1612 break;
1488 } 1613 }
1489 } 1614 }
1490 } 1615 }
1491 1616
1492 rxvt_freecommastring (s); 1617 rxvt_free_strsplit (s);
1493 1618
1494 if (found) 1619 if (found)
1495 goto done; 1620 goto done;
1496 } 1621 }
1497 1622
1498 /* try with XMODIFIERS env. var. */ 1623 /* try with XMODIFIERS env. var. */
1499 if (IM_get_IC ("")) 1624 if (im_get_ic (""))
1500 goto done; 1625 goto done;
1501 1626
1502 /* try with no modifiers base IF the user didn't specify an IM */ 1627 /* try with no modifiers base IF the user didn't specify an IM */
1503 if (IM_get_IC ("@im=none")) 1628 if (im_get_ic ("@im=none"))
1504 goto done; 1629 goto done;
1505 1630
1506done: 1631done:
1507#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1508 if (rs[Rs_imLocale]) 1632 if (rs[Rs_imLocale])
1509 SET_LOCALE (locale); 1633 SET_LOCALE (locale);
1510#endif
1511} 1634}
1512 1635
1513void 1636void
1514rxvt_term::IMSetPosition () 1637rxvt_term::im_set_position ()
1515{ 1638{
1516 XRectangle preedit_rect, status_rect, *needed_rect; 1639 XRectangle preedit_rect, status_rect, *needed_rect;
1517 XVaNestedList preedit_attr, status_attr; 1640 XVaNestedList preedit_attr, status_attr;
1518 1641
1519 if (!Input_Context 1642 if (!Input_Context
1520 || !focus 1643 || !focus
1521 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1644 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1522 || !IMisRunning ()) 1645 || !im_is_running ())
1523 return; 1646 return;
1524 1647
1525 if (input_style & XIMPreeditPosition) 1648 if (input_style & XIMPreeditPosition)
1526 { 1649 {
1527 im_set_size (preedit_rect); 1650 im_set_size (preedit_rect);
… …
1557 1680
1558void 1681void
1559rxvt_term::get_window_origin (int &x, int &y) 1682rxvt_term::get_window_origin (int &x, int &y)
1560{ 1683{
1561 Window cr; 1684 Window cr;
1562 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1685 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1563/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1564}
1565
1566Pixmap
1567rxvt_term::get_pixmap_property (int prop_id)
1568{
1569 if (prop_id > 0 && prop_id < NUM_XA)
1570 if (xa[prop_id])
1571 {
1572 int aformat;
1573 unsigned long nitems, bytes_after;
1574 Atom atype;
1575 unsigned char *prop = NULL;
1576 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1577 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1578 &nitems, &bytes_after, &prop);
1579 if (result == Success && prop && atype == XA_PIXMAP)
1580 return *(Pixmap *)prop;
1581 }
1582
1583 return None;
1584} 1686}
1585 1687
1586#ifdef HAVE_BG_PIXMAP 1688#ifdef HAVE_BG_PIXMAP
1587# if TRACE_PIXMAPS
1588# undef update_background
1589void
1590rxvt_term::trace_update_background (const char *file, int line)
1591{
1592 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1593 update_background ();
1594}
1595# endif
1596 1689
1597void 1690void
1598rxvt_term::update_background () 1691rxvt_term::update_background ()
1599{ 1692{
1600 if (update_background_ev.is_active ()) 1693 if (update_background_ev.is_active ())
1601 return; 1694 return;
1602 1695
1603 bgPixmap.invalidate ();
1604
1605 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1696 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1606 1697
1607 if (to_wait <= 0.) 1698 if (to_wait <= 0.)
1608 bgPixmap.render (); 1699 bg_render ();
1609 else 1700 else
1610 update_background_ev.start (to_wait); 1701 update_background_ev.start (to_wait);
1611} 1702}
1612 1703
1613void 1704void
1614rxvt_term::update_background_cb (ev::timer &w, int revents) 1705rxvt_term::update_background_cb (ev::timer &w, int revents)
1615{ 1706{
1616 make_current (); 1707 make_current ();
1617 1708
1618 update_background_ev.stop (); 1709 update_background_ev.stop ();
1619 bgPixmap.render (); 1710 bg_render ();
1620 refresh_check (); 1711 refresh_check ();
1621} 1712}
1622 1713
1623#endif /* HAVE_BG_PIXMAP */ 1714#endif /* HAVE_BG_PIXMAP */
1624 1715

Diff Legend

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