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.312 by root, Tue Nov 4 16:41:12 2008 UTC vs.
Revision 1.399 by sf-exg, Tue Oct 13 08:10:43 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 * 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
42#include <assert.h>
40#include <csignal> 43#include <signal.h>
41#include <cstring> 44#include <string.h>
42 45
43#include <termios.h> 46#include <termios.h>
44 47
45#ifdef HAVE_XSETLOCALE 48#ifdef HAVE_XSETLOCALE
46# define X_LOCALE 49# define X_LOCALE
47# include <X11/Xlocale.h> 50# include <X11/Xlocale.h>
48#else 51#else
49# ifdef HAVE_SETLOCALE
50# include <clocale> 52# include <locale.h>
51# endif 53#endif
52#endif
53 54
55struct termios rxvt_term::def_tio;
54vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
55 57
56// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
57rxvt_t rxvt_current_term; 59rxvt_t rxvt_current_term;
58 60
… …
93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
94{ 96{
95 compose_char *cc; 97 compose_char *cc;
96 98
97 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
98 // composing characters for some reason near the end of a line. 100 // composing characters for some reason, near the end of a line.
99 cc = (*this)[c1]; 101 cc = (*this)[c1];
100 while (cc) 102 while (cc)
101 { 103 {
102 if (cc->c2 == c2) return c1; 104 if (cc->c2 == c2) return c1;
103 cc = (*this)[cc->c1]; 105 cc = (*this)[cc->c1];
104 } 106 }
105 107
106 // check to see wether this combination already exists otherwise 108 // check to see whether this combination already exists otherwise
107 for (cc = v.end (); cc-- > v.begin (); ) 109 for (cc = v.begin (); cc < v.end (); cc++)
108 {
109 if (cc->c1 == c1 && cc->c2 == c2) 110 if (cc->c1 == c1 && cc->c2 == c2)
110 return COMPOSE_LO + (cc - v.begin ()); 111 return COMPOSE_LO + (cc - v.begin ());
111 }
112 112
113 // allocate a new combination 113 // allocate a new combination
114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 114 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
115 { 115 {
116 static int seen; 116 static int seen;
117 117
118 if (!seen++) 118 if (!seen++)
119 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 119 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
120 120
121 return REPLACEMENT_CHAR; 121 return REPLACEMENT_CHAR;
122 } 122 }
123 123
124 v.push_back (compose_char (c1, c2)); 124 v.push_back (compose_char (c1, c2));
… …
169 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);
170#endif 170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 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);
173#endif 173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL 174#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this), 175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
176#endif 176#endif
177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this), 177 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
178#ifdef USE_XIM 178#if USE_XIM
179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this), 179 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
180#endif 180#endif
181#ifdef POINTER_BLANK 181#ifdef POINTER_BLANK
182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this); 182 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
183#endif 183#endif
… …
186#endif 186#endif
187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this); 187 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this); 188 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this); 189 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this); 190 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
191 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 191 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this); 192 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
194 193
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 194 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 195
… …
225 delete fontset[i]; 224 delete fontset[i];
226#endif 225#endif
227 delete fontset[0]; 226 delete fontset[0];
228 227
229#ifdef HAVE_BG_PIXMAP 228#ifdef HAVE_BG_PIXMAP
230 bgPixmap.destroy (); 229 bg_destroy ();
231#endif 230#endif
232#ifdef HAVE_AFTERIMAGE 231
233 if (asv) 232#if HAVE_IMG
234 destroy_asvisual (asv, 0); 233 delete bg_img;
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 234#endif
238 235
239 if (display) 236 if (display)
240 { 237 {
241 selection_clear (); 238 selection_clear ();
239 selection_clear (true);
242 240
243#ifdef USE_XIM 241#if USE_XIM
244 im_destroy (); 242 im_destroy ();
245#endif 243#endif
246 scrollBar.destroy (); 244 scrollBar.destroy ();
245
246 if (gc)
247 if (gc) XFreeGC (dpy, gc); 247 XFreeGC (dpy, gc);
248 248
249 delete drawable; 249 delete drawable;
250
250 // destroy all windows 251 // destroy all windows
251 if (parent[0]) 252 if (parent)
252 XDestroyWindow (dpy, parent[0]); 253 XDestroyWindow (dpy, parent);
253 254
254 for (int i = 0; i < TOTAL_COLORS; i++) 255 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 256 if (ISSET_PIXCOLOR (i))
256 { 257 {
257 pix_colors_focused [i].free (this); 258 pix_colors_focused [i].free (this);
258#if OFF_FOCUS_FADING 259#if OFF_FOCUS_FADING
260 if (rs[Rs_fade])
259 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
260#endif 262#endif
261 } 263 }
262 264
263 clear (); 265 clear ();
264 266
… …
271 /* clear all resources */ 273 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 275 free (allocated [i]);
274 276
275 free (selection.text); 277 free (selection.text);
276 // TODO: manage env vars in child only(!) 278 free (selection.clip_text);
277 free (env_display);
278 free (env_term);
279 free (locale); 279 free (locale);
280 free (v_buffer); 280 free (v_buffer);
281 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;
282 288
283 delete envv; 289 delete envv;
284 delete argv; 290 delete argv;
285 291
286#ifdef KEYSYM_RESOURCE 292#ifdef KEYSYM_RESOURCE
287 delete keyboard; 293 delete keyboard;
288#endif 294#endif
289#ifndef NO_RESOURCES 295#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db); 296 XrmDestroyDatabase (option_db);
291#endif 297#endif
298
299 SET_R ((rxvt_term *)0);
292} 300}
293 301
294// child has exited, usually destroys 302// child has exited, usually destroys
295void 303void
296rxvt_term::child_cb (ev::child &w, int status) 304rxvt_term::child_cb (ev::child &w, int status)
… …
319 { 327 {
320#if USE_XIM 328#if USE_XIM
321 im_ev.stop (display); 329 im_ev.stop (display);
322#endif 330#endif
323 scrollbar_ev.stop (display); 331 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 332#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
325 rootwin_ev.stop (display); 333 rootwin_ev.stop (display);
326#endif 334#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 335 termwin_ev.stop (display);
329 vt_ev.stop (display); 336 vt_ev.stop (display);
330 } 337 }
331 338
332 flush_ev.stop (); 339 flush_ev.stop ();
… …
356 make_current (); 363 make_current ();
357 364
358 delete this; 365 delete this;
359} 366}
360 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
361/*----------------------------------------------------------------------*/ 380/*----------------------------------------------------------------------*/
362/* 381/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 382 * Exit gracefully, clearing the utmp entry and restoring tty attributes
364 * TODO: if debugging, this should free up any known resources if we can
365 */ 383 */
366static XErrorHandler old_xerror_handler; 384static XErrorHandler old_xerror_handler;
367 385
368static void 386static void
369rxvt_emergency_cleanup () 387rxvt_emergency_cleanup ()
… …
371 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++)
372 (*t)->emergency_cleanup (); 390 (*t)->emergency_cleanup ();
373} 391}
374 392
375#if !ENABLE_MINIMAL 393#if !ENABLE_MINIMAL
376static void 394static void ecb_cold
377print_x_error (Display *dpy, XErrorEvent *event) 395print_x_error (Display *dpy, XErrorEvent *event)
378{ 396{
379 char buffer[BUFSIZ]; 397 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 398 char mesg[BUFSIZ];
381 char number[32]; 399 char number[32];
382 char *mtype = "XlibMessage"; 400
383 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
384 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
385 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 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);
386 rxvt_warn ("%s: %s\n", mesg, buffer); 408 rxvt_warn ("+ %s: %s\n", mesg, buffer);
409
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 410 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 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 {
389 sprintf(number, "%d", event->request_code); 464 sprintf (number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 465 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 466 rxvt_warn ("+ (which is %s)\n", buffer);
392 if (event->request_code >= 128) {
393 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
394 mesg, BUFSIZ);
395 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
396 } 467 }
468
397 if ((event->error_code == BadWindow) || 469 if (event->error_code == BadWindow
398 (event->error_code == BadPixmap) || 470 || event->error_code == BadPixmap
399 (event->error_code == BadCursor) || 471 || event->error_code == BadCursor
400 (event->error_code == BadFont) || 472 || event->error_code == BadFont
401 (event->error_code == BadDrawable) || 473 || event->error_code == BadDrawable
402 (event->error_code == BadColor) || 474 || event->error_code == BadColor
403 (event->error_code == BadGC) || 475 || event->error_code == BadGC
404 (event->error_code == BadIDChoice) || 476 || event->error_code == BadIDChoice
405 (event->error_code == BadValue) || 477 || event->error_code == BadValue
406 (event->error_code == BadAtom)) { 478 || event->error_code == BadAtom)
479 {
407 if (event->error_code == BadValue) 480 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 482 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 483 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ); 484 else
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 485 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
415 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
417 }
418 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
419 mesg, BUFSIZ);
420 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
421}
422#endif
423 486
424int 487 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
488 }
489}
490#endif
491
492int ecb_cold
425rxvt_xerror_handler (Display *display, XErrorEvent *event) 493rxvt_xerror_handler (Display *display, XErrorEvent *event)
426{ 494{
427 if (GET_R->allowedxerror == -1) 495 if (GET_R && GET_R->allowedxerror == -1)
428 GET_R->allowedxerror = event->error_code; 496 GET_R->allowedxerror = event->error_code;
429 else 497 else
430 { 498 {
431 // 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,
432 // so just output the error and continue 500 // so just output the error and continue
… …
438 } 506 }
439 507
440 return 0; 508 return 0;
441} 509}
442 510
443int 511int ecb_cold
444rxvt_xioerror_handler (Display *display) 512rxvt_xioerror_handler (Display *display)
445{ 513{
446 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",
447 DisplayString (display)); 515 DisplayString (display));
448 rxvt_emergency_cleanup (); 516 rxvt_emergency_cleanup ();
… …
471 rxvt_emergency_cleanup (); 539 rxvt_emergency_cleanup ();
472 w.stop (); 540 w.stop ();
473 kill (getpid (), w.signum); 541 kill (getpid (), w.signum);
474} 542}
475 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
476char **rxvt_environ; // startup environment 611char **rxvt_environ; // startup environment
477 612
478void 613void
479rxvt_init () 614rxvt_init ()
480{ 615{
481 ptytty::init (); 616 assert (("fontMask must not overlap other RS masks",
617 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 618
619 rxvt_get_ttymode (&rxvt_term::def_tio);
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
483 if (!ev_default_loop (0)) 625 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 626 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 627
486 rxvt_environ = environ; 628 rxvt_environ = environ;
487 629
488 signal (SIGHUP, SIG_IGN); 630 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 631 signal (SIGPIPE, SIG_IGN);
490 632
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 633 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 634 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 635
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 637 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 638 XSetIOErrorHandler (rxvt_xioerror_handler);
500 639
501 XrmInitialize (); 640 XrmInitialize ();
641
642#if HAVE_PIXBUF
643 g_type_init ();
644#endif
502} 645}
503 646
504/*----------------------------------------------------------------------*/ 647/*----------------------------------------------------------------------*/
505/* 648/*
506 * window size/position calculations for XSizeHint and other storage. 649 * window size/position calculations for XSizeHint and other storage.
… …
627 if (recalc_y) 770 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 771 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 772
630 ncol = width / fwidth; 773 ncol = width / fwidth;
631 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;
632} 784}
633 785
634/*----------------------------------------------------------------------*/ 786/*----------------------------------------------------------------------*/
635/* 787/*
636 * Tell the teletype handler what size the window is. 788 * Tell the teletype handler what size the window is.
… …
644 796
645 struct winsize ws; 797 struct winsize ws;
646 798
647 ws.ws_col = ncol; 799 ws.ws_col = ncol;
648 ws.ws_row = nrow; 800 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 801 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 802 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 803 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 804
653#if 0 805#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 806 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 807 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 808 kill (-cmd_pid, SIGWINCH);
657#endif 809#endif
658} 810}
659 811
660/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 813/* load and set the various fonts */
662 *
663 * init = 1 - initialize
664 *
665 * fontname == FONT_UP - switch to bigger font
666 * fontname == FONT_DN - switch to smaller font
667 */
668bool 814bool
669rxvt_term::set_fonts () 815rxvt_term::set_fonts ()
670{ 816{
671 rxvt_fontset *fs = new rxvt_fontset (this); 817 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 818 rxvt_fontprop prop;
… …
686#endif 832#endif
687 833
688 delete fontset[0]; 834 delete fontset[0];
689 fontset[0] = fs; 835 fontset[0] = fs;
690 836
691 prop = (*fs)[1]->properties (); 837 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 838 prop.width = max (prop.width + letterSpace, 1);
693 839
694 fs->set_prop (prop, false); 840 fs->set_prop (prop, false);
695 841
696 fwidth = prop.width; 842 fwidth = prop.width;
697 fheight = prop.height; 843 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 844 fbase = prop.ascent;
699 845
700 for (int style = 1; style < 4; style++) 846 for (int style = 1; style < 4; style++)
701 { 847 {
702#if ENABLE_STYLES 848#if ENABLE_STYLES
… …
728#else 874#else
729 fontset[style] = fontset[0]; 875 fontset[style] = fontset[0];
730#endif 876#endif
731 } 877 }
732 878
733 if (parent[0]) 879 if (parent)
734 { 880 {
735 resize_all_windows (0, 0, 0); 881 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 882 scr_remap_chars ();
737 scr_touch (true); 883 scr_touch (true);
738 } 884 }
… …
741} 887}
742 888
743void 889void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 890rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 891{
746 XChangeProperty (dpy, parent[0], 892 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 893 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 894 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 895}
750 896
751void 897void
898rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
899{
900 XTextProperty ct;
901
902 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
903 {
904 XSetTextProperty (dpy, parent, &ct, prop);
905 XFree (ct.value);
906 }
907}
908
909void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 910rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 911{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 912 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 913 char *s = rxvt_wcstoutf8 (ws);
756 914
757 XChangeProperty (dpy, parent[0], 915 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 916 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 917 (const unsigned char *)s, strlen (s));
760 918
761 free (s); 919 free (s);
762 free (ws); 920 free (ws);
… …
766/*----------------------------------------------------------------------*/ 924/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 925/* xterm sequences - title, iconName, color (exptl) */
768void 926void
769rxvt_term::set_title (const char *str) 927rxvt_term::set_title (const char *str)
770{ 928{
771 set_string_property (XA_WM_NAME, str); 929 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 930#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 932#endif
775} 933}
776 934
777void 935void
778rxvt_term::set_icon_name (const char *str) 936rxvt_term::set_icon_name (const char *str)
779{ 937{
780 set_string_property (XA_WM_ICON_NAME, str); 938 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 939#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 940 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 941#endif
784} 942}
785 943
786void 944void
787rxvt_term::set_window_color (int idx, const char *color) 945rxvt_term::set_window_color (int idx, const char *color)
788{ 946{
789#ifdef XTERM_COLOR_CHANGE 947#ifdef XTERM_COLOR_CHANGE
790 rxvt_color xcol;
791
792 if (color == NULL || *color == '\0') 948 if (color == NULL || *color == '\0')
793 return; 949 return;
794 950
795 color = strdup (color); 951 color = strdup (color);
796 allocated.push_back ((void *)color); 952 allocated.push_back ((void *)color);
… …
802 int i = atoi (color); 958 int i = atoi (color);
803 959
804 if (i >= 8 && i <= 15) 960 if (i >= 8 && i <= 15)
805 { 961 {
806 /* bright colors */ 962 /* bright colors */
807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 963 alias_color (idx, minBrightCOLOR + i - 8);
808 goto done; 964 goto done;
809 } 965 }
810 966
811 if (i >= 0 && i <= 7) 967 if (i >= 0 && i <= 7)
812 { 968 {
813 /* normal colors */ 969 /* normal colors */
814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 970 alias_color (idx, minCOLOR + i);
815 goto done; 971 goto done;
816 } 972 }
817 } 973 }
818 974
819 set_color (xcol, color); 975 pix_colors_focused[idx].free (this);
820 976 set_color (pix_colors_focused[idx], color);
821 /*
822 * FIXME: should free colors here, but no idea how to do it so instead,
823 * so just keep gobbling up the colormap
824 */
825
826 pix_colors_focused[idx] = xcol;
827 977
828done: 978done:
829 /*TODO: handle Color_BD, scrollbar background, etc. */ 979 /*TODO: handle Color_BD, scrollbar background, etc. */
830 980
831 update_fade_color (idx); 981 update_fade_color (idx);
832 recolour_cursor (); 982 recolor_cursor ();
833 scr_recolour (); 983 scr_recolor ();
834#endif /* XTERM_COLOR_CHANGE */ 984#endif /* XTERM_COLOR_CHANGE */
835} 985}
836 986
837void 987void
838rxvt_term::recolour_cursor () 988rxvt_term::recolor_cursor ()
839{ 989{
840 XColor fg, bg; 990 XColor fg, bg;
841 991
842 (ISSET_PIXCOLOR (Color_pointer_fg) 992 (ISSET_PIXCOLOR (Color_pointer_fg)
843 ? pix_colors_focused[Color_pointer_fg] 993 ? pix_colors_focused[Color_pointer_fg]
… …
852 1002
853/*----------------------------------------------------------------------*/ 1003/*----------------------------------------------------------------------*/
854/* 1004/*
855 * 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
856 */ 1006 */
857void 1007char *
858rxvt_term::set_colorfgbg () 1008rxvt_term::get_colorfgbg ()
859{ 1009{
860 unsigned int i; 1010 unsigned int i;
861 const char *xpmb = ""; 1011 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1012 char fstr[] = "default";
1013 char bstr[] = "default";
1014 char *env_colorfgbg;
863 1015
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 1016 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 1017 if (pix_colors[Color_fg] == pix_colors[i])
868 { 1018 {
869 sprintf (fstr, "%d", (i - Color_Black)); 1019 sprintf (fstr, "%d", i - Color_Black);
870 break; 1020 break;
871 } 1021 }
872 1022
873 for (i = Color_Black; i <= Color_White; i++) 1023 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 1024 if (pix_colors[Color_bg] == pix_colors[i])
875 { 1025 {
876 sprintf (bstr, "%d", (i - Color_Black)); 1026 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 1027#if BG_IMAGE_FROM_FILE
878 xpmb = "default;"; 1028 xpmb = "default;";
879#endif 1029#endif
880 break; 1030 break;
881 } 1031 }
882 1032
1033 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 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;
884} 1036}
885 1037
886/*----------------------------------------------------------------------*/ 1038/*----------------------------------------------------------------------*/
887 1039
888bool 1040bool
… …
896} 1048}
897 1049
898void 1050void
899rxvt_term::alias_color (int dst, int src) 1051rxvt_term::alias_color (int dst, int src)
900{ 1052{
1053 pix_colors[dst].free (this);
901 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]);
902} 1055}
903 1056
904/* -------------------------------------------------------------------- * 1057/* -------------------------------------------------------------------- *
905 * - WINDOW RESIZING - * 1058 * - WINDOW RESIZING - *
… …
913 1066
914 window_calc (newwidth, newheight); 1067 window_calc (newwidth, newheight);
915 1068
916 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)); 1069 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
917 1070
1071 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
918 if (set_hint) 1072 if (set_hint)
919 { 1073 {
920 szHint.flags &= ~(PBaseSize | PResizeInc); 1074 szHint.flags &= ~(PBaseSize | PResizeInc);
921 XSetWMNormalHints (dpy, parent[0], &szHint); 1075 XSetWMNormalHints (dpy, parent, &szHint);
922 szHint.flags |= PBaseSize | PResizeInc; 1076 szHint.flags |= PBaseSize | PResizeInc;
923 } 1077 }
924 1078
925 if (!ignoreparent) 1079 if (!ignoreparent)
926 { 1080 {
… …
932 int x, y, x1, y1; 1086 int x, y, x1, y1;
933 int dx, dy; 1087 int dx, dy;
934 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1088 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
935 Window unused_cr; 1089 Window unused_cr;
936 1090
937 XTranslateCoordinates (dpy, parent[0], display->root, 1091 XTranslateCoordinates (dpy, parent, display->root,
938 0, 0, &x, &y, &unused_cr); 1092 0, 0, &x, &y, &unused_cr);
939 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1093 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
940 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1094 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
941 /* 1095 /*
942 * if display->root isn't the parent window, a WM will probably have offset 1096 * if display->root isn't the parent window, a WM will probably have offset
943 * our position for handles and decorations. Counter it 1097 * our position for handles and decorations. Counter it
944 */ 1098 */
… …
961 if (y < y1) /* top half */ 1115 if (y < y1) /* top half */
962 dy = 0; 1116 dy = 0;
963 else if (y == y1) /* exact center */ 1117 else if (y == y1) /* exact center */
964 dy /= 2; 1118 dy /= 2;
965 1119
966 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1120 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
967 szHint.width, szHint.height); 1121 szHint.width, szHint.height);
968#else 1122#else
969 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1123 XResizeWindow (dpy, parent, szHint.width, szHint.height);
970#endif 1124#endif
971 } 1125 }
1126
1127 if (set_hint)
1128 XSetWMNormalHints (dpy, parent, &szHint);
972 1129
973 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1130 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
974 1131
975 if (fix_screen || newwidth != old_width || newheight != old_height) 1132 if (fix_screen || newwidth != old_width || newheight != old_height)
976 { 1133 {
977 if (scrollBar.state) 1134 if (scrollBar.state)
978 scrollBar.resize (); 1135 scrollBar.resize ();
979 1136
980 XMoveResizeWindow (dpy, vt, 1137 XMoveResizeWindow (dpy, vt,
981 window_vt_x, window_vt_y, 1138 window_vt_x, window_vt_y,
982 width, height); 1139 vt_width, vt_height);
1140
1141 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
983 1142
984#ifdef HAVE_BG_PIXMAP 1143#ifdef HAVE_BG_PIXMAP
985 if (bgPixmap.window_size_sensitive ()) 1144 if (bg_window_size_sensitive ())
986 update_background (); 1145 update_background ();
987#endif 1146#endif
988
989 scr_clear ();
990 } 1147 }
991
992 if (set_hint)
993 XSetWMNormalHints (dpy, parent[0], &szHint);
994 1148
995 if (fix_screen || old_height == 0) 1149 if (fix_screen || old_height == 0)
996 scr_reset (); 1150 scr_reset ();
997 1151
998 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
999 //scr_touch (false);
1000
1001#ifdef HAVE_BG_PIXMAP
1002// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1003// if (bgPixmap.pixmap)
1004// scr_touch (false);
1005#endif
1006
1007#ifdef USE_XIM 1152#if USE_XIM
1008 IMSetPosition (); 1153 im_set_position ();
1009#endif 1154#endif
1010} 1155}
1011 1156
1012/* 1157/*
1013 * Set the width/height of the vt window in characters. Units are pixels. 1158 * Set the width/height of the vt window in characters. Units are pixels.
… …
1026 newwidth = wattr.width - szHint.base_width; 1171 newwidth = wattr.width - szHint.base_width;
1027 if (newheight == 0) 1172 if (newheight == 0)
1028 newheight = wattr.height - szHint.base_height; 1173 newheight = wattr.height - szHint.base_height;
1029 } 1174 }
1030 1175
1031 if (newwidth != width || newheight != height) 1176 if (newwidth != vt_width || newheight != vt_height)
1032 { 1177 {
1033 newwidth += szHint.base_width; 1178 newwidth += szHint.base_width;
1034 newheight += szHint.base_height; 1179 newheight += szHint.base_height;
1035 resize_all_windows (newwidth, newheight, 0); 1180 resize_all_windows (newwidth, newheight, 0);
1036 } 1181 }
1037} 1182}
1038 1183
1039/* -------------------------------------------------------------------- * 1184/* -------------------------------------------------------------------- *
1040 * - X INPUT METHOD ROUTINES - * 1185 * - X INPUT METHOD ROUTINES - *
1041 * -------------------------------------------------------------------- */ 1186 * -------------------------------------------------------------------- */
1042#ifdef USE_XIM 1187#if USE_XIM
1043 1188
1044void 1189void
1045rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1190rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1046{ 1191{
1047 fg = pix_colors [Color_fg]; 1192 fg = pix_colors [Color_fg];
… …
1074 status_rect.height = fheight; 1219 status_rect.height = fheight;
1075} 1220}
1076 1221
1077/* Checking whether input method is running. */ 1222/* Checking whether input method is running. */
1078bool 1223bool
1079rxvt_term::IMisRunning () 1224rxvt_term::im_is_running ()
1080{ 1225{
1081 char *p;
1082 Atom atom; 1226 Atom atom;
1083 Window win; 1227 Window win;
1084 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1085 1229
1086 /* get current locale modifier */ 1230 /* get current locale modifier */
1087 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if (char *p = XSetLocaleModifiers (0))
1088 { 1232 {
1089 strcpy (server, "@server="); 1233 strcpy (server, "@server=");
1090 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1091 1235
1092 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1236 if (p = strchr (server + 1, '@')) /* first one only */
1093 *p = '\0'; 1237 *p = '\0';
1094 1238
1095 atom = XInternAtom (dpy, server, False); 1239 atom = XInternAtom (dpy, server, False);
1096 win = XGetSelectionOwner (dpy, atom); 1240 win = XGetSelectionOwner (dpy, atom);
1097 1241
1098 if (win != None) 1242 if (win != None)
1099 return True; 1243 return true;
1100 } 1244 }
1101 1245
1102 return False; 1246 return false;
1103} 1247}
1104 1248
1105void 1249void
1106rxvt_term::IMSendSpot () 1250rxvt_term::im_send_spot ()
1107{ 1251{
1108 XPoint nspot; 1252 XPoint nspot;
1109 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1110 1254
1111 if (!Input_Context 1255 if (!Input_Context
… …
1164 1308
1165 term->make_current (); 1309 term->make_current ();
1166 1310
1167 if (text) 1311 if (text)
1168 { 1312 {
1169 void *str; 1313 wchar_t *str;
1170 1314
1171 if (!text->encoding_is_wchar && text->string.multi_byte) 1315 if (!text->encoding_is_wchar && text->string.multi_byte)
1172 { 1316 {
1173 // of course, X makes it ugly again 1317 // of course, X makes it ugly again
1174 if (term->rs[Rs_imLocale]) 1318 if (term->rs[Rs_imLocale])
1175 SET_LOCALE (term->rs[Rs_imLocale]); 1319 SET_LOCALE (term->rs[Rs_imLocale]);
1176 1320
1177 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1321 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1178 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1322 mbstowcs (str, text->string.multi_byte, text->length + 1);
1179 1323
1180 if (term->rs[Rs_imLocale]) 1324 if (term->rs[Rs_imLocale])
1181 SET_LOCALE (term->locale); 1325 SET_LOCALE (term->locale);
1182 } 1326 }
1183 else 1327 else
1184 str = (void *)text->string.wide_char; 1328 str = text->string.wide_char;
1185 1329
1186 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1330 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1187 DT_INT, call_data->caret, 1331 DT_INT, call_data->caret,
1188 DT_INT, call_data->chg_first, 1332 DT_INT, call_data->chg_first,
1189 DT_INT, call_data->chg_length, 1333 DT_INT, call_data->chg_length,
… …
1217/* 1361/*
1218 * Try to open a XIM with the current modifiers, then see if we can 1362 * Try to open a XIM with the current modifiers, then see if we can
1219 * open a suitable preedit type 1363 * open a suitable preedit type
1220 */ 1364 */
1221bool 1365bool
1222rxvt_term::IM_get_IC (const char *modifiers) 1366rxvt_term::im_get_ic (const char *modifiers)
1223{ 1367{
1224 int i, j, found; 1368 int i, j, found;
1225 XIM xim; 1369 XIM xim;
1226 XPoint spot; 1370 XPoint spot;
1227 XRectangle rect, status_rect, needed_rect; 1371 XRectangle rect, status_rect, needed_rect;
1228 unsigned long fg, bg; 1372 unsigned long fg, bg;
1229 const char *p; 1373 const char *p;
1230 char **s; 1374 char **s;
1231 XIMStyles *xim_styles; 1375 XIMStyles *xim_styles;
1232#ifdef ENABLE_XIM_ONTHESPOT
1233 XIMCallback xcb[4];
1234#endif
1235 1376
1236 set_environ (envv); 1377 set_environ (env);
1237 1378
1238 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1379 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1239 return false; 1380 return false;
1240 1381
1241 input_method = display->get_xim (locale, modifiers); 1382 input_method = display->get_xim (locale, modifiers);
1242 if (input_method == NULL) 1383 if (input_method == NULL)
1243 return false; 1384 return false;
… …
1260 p = pet[pi]; 1401 p = pet[pi];
1261 1402
1262 if (!p) 1403 if (!p)
1263 continue; 1404 continue;
1264 1405
1265 s = rxvt_splitcommastring (p); 1406 s = rxvt_strsplit (',', p);
1266 1407
1267 for (i = found = 0; !found && s[i]; i++) 1408 for (i = found = 0; !found && s[i]; i++)
1268 { 1409 {
1269 if (!strcmp (s[i], "OverTheSpot")) 1410 if (!strcmp (s[i], "OverTheSpot"))
1270 input_style = XIMPreeditPosition | XIMStatusNothing; 1411 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1282 input_style = XIMPreeditNothing | XIMStatusNothing; 1423 input_style = XIMPreeditNothing | XIMStatusNothing;
1283 1424
1284 for (j = 0; j < xim_styles->count_styles; j++) 1425 for (j = 0; j < xim_styles->count_styles; j++)
1285 if (input_style == xim_styles->supported_styles[j]) 1426 if (input_style == xim_styles->supported_styles[j])
1286 { 1427 {
1287 rxvt_freecommastring (s); 1428 rxvt_free_strsplit (s);
1288 1429
1289 found = 1; 1430 found = 1;
1290 goto foundpet; 1431 goto foundpet;
1291 } 1432 }
1292 1433
1293 } 1434 }
1294 1435
1295 rxvt_freecommastring (s); 1436 rxvt_free_strsplit (s);
1296 } 1437 }
1297 1438
1298foundpet: 1439foundpet:
1299 1440
1300 XFree (xim_styles); 1441 XFree (xim_styles);
… …
1379 NULL); 1520 NULL);
1380 } 1521 }
1381#if ENABLE_XIM_ONTHESPOT 1522#if ENABLE_XIM_ONTHESPOT
1382 else if (input_style & XIMPreeditCallbacks) 1523 else if (input_style & XIMPreeditCallbacks)
1383 { 1524 {
1525 XIMCallback xcb[4];
1526
1384 im_set_position (spot); 1527 im_set_position (spot);
1385 1528
1386 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1529 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1387 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1530 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1388 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1531 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1403#endif 1546#endif
1404 1547
1405 Input_Context = XCreateIC (xim, 1548 Input_Context = XCreateIC (xim,
1406 XNInputStyle, input_style, 1549 XNInputStyle, input_style,
1407 XNClientWindow, vt, 1550 XNClientWindow, vt,
1408 XNFocusWindow, parent[0], 1551 XNFocusWindow, parent,
1409 preedit_attr ? XNPreeditAttributes : NULL, 1552 preedit_attr ? XNPreeditAttributes : NULL,
1410 preedit_attr, 1553 preedit_attr,
1411 status_attr ? XNStatusAttributes : NULL, 1554 status_attr ? XNStatusAttributes : NULL,
1412 status_attr, NULL); 1555 status_attr, NULL);
1413 1556
… …
1426 // unfortunately, only the focus window is used by XIM, hard to fix 1569 // unfortunately, only the focus window is used by XIM, hard to fix
1427 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1570 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1428 vt_select_input (); 1571 vt_select_input ();
1429#endif 1572#endif
1430 1573
1431 IMSetPosition (); 1574 im_set_position ();
1432 1575
1433 return true; 1576 return true;
1434} 1577}
1435 1578
1436void 1579void
… …
1446 im_destroy (); 1589 im_destroy ();
1447 1590
1448 if (Input_Context) 1591 if (Input_Context)
1449 return; 1592 return;
1450 1593
1451#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1452 if (rs[Rs_imLocale]) 1594 if (rs[Rs_imLocale])
1453 SET_LOCALE (rs[Rs_imLocale]); 1595 SET_LOCALE (rs[Rs_imLocale]);
1454#endif
1455 1596
1456 p = rs[Rs_inputMethod]; 1597 p = rs[Rs_inputMethod];
1457 if (p && *p) 1598 if (p && *p)
1458 { 1599 {
1459 bool found = false; 1600 bool found = false;
1460 1601
1461 s = rxvt_splitcommastring (p); 1602 s = rxvt_strsplit (',', p);
1462 1603
1463 for (i = 0; s[i]; i++) 1604 for (i = 0; s[i]; i++)
1464 { 1605 {
1465 if (*s[i]) 1606 if (*s[i])
1466 { 1607 {
1467 strcpy (buf, "@im="); 1608 strcpy (buf, "@im=");
1468 strncat (buf, s[i], IMBUFSIZ - 5); 1609 strncat (buf, s[i], IMBUFSIZ - 5);
1469 if (IM_get_IC (buf)) 1610 if (im_get_ic (buf))
1470 { 1611 {
1471 found = true; 1612 found = true;
1472 break; 1613 break;
1473 } 1614 }
1474 } 1615 }
1475 } 1616 }
1476 1617
1477 rxvt_freecommastring (s); 1618 rxvt_free_strsplit (s);
1478 1619
1479 if (found) 1620 if (found)
1480 goto done; 1621 goto done;
1481 } 1622 }
1482 1623
1483 /* try with XMODIFIERS env. var. */ 1624 /* try with XMODIFIERS env. var. */
1484 if (IM_get_IC ("")) 1625 if (im_get_ic (""))
1485 goto done; 1626 goto done;
1486 1627
1487 /* try with no modifiers base IF the user didn't specify an IM */ 1628 /* try with no modifiers base IF the user didn't specify an IM */
1488 if (IM_get_IC ("@im=none")) 1629 if (im_get_ic ("@im=none"))
1489 goto done; 1630 goto done;
1490 1631
1491done: 1632done:
1492#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1493 if (rs[Rs_imLocale]) 1633 if (rs[Rs_imLocale])
1494 SET_LOCALE (locale); 1634 SET_LOCALE (locale);
1495#endif
1496} 1635}
1497 1636
1498void 1637void
1499rxvt_term::IMSetPosition () 1638rxvt_term::im_set_position ()
1500{ 1639{
1501 XRectangle preedit_rect, status_rect, *needed_rect; 1640 XRectangle preedit_rect, status_rect, *needed_rect;
1502 XVaNestedList preedit_attr, status_attr; 1641 XVaNestedList preedit_attr, status_attr;
1503 1642
1504 if (!Input_Context 1643 if (!Input_Context
1505 || !focus 1644 || !focus
1506 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1645 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1507 || !IMisRunning ()) 1646 || !im_is_running ())
1508 return; 1647 return;
1509 1648
1510 if (input_style & XIMPreeditPosition) 1649 if (input_style & XIMPreeditPosition)
1511 { 1650 {
1512 im_set_size (preedit_rect); 1651 im_set_size (preedit_rect);
… …
1542 1681
1543void 1682void
1544rxvt_term::get_window_origin (int &x, int &y) 1683rxvt_term::get_window_origin (int &x, int &y)
1545{ 1684{
1546 Window cr; 1685 Window cr;
1547 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1686 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1548/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1549}
1550
1551Pixmap
1552rxvt_term::get_pixmap_property (int prop_id)
1553{
1554 if (prop_id > 0 && prop_id < NUM_XA)
1555 if (xa[prop_id])
1556 {
1557 int aformat;
1558 unsigned long nitems, bytes_after;
1559 Atom atype;
1560 unsigned char *prop = NULL;
1561 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1562 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1563 &nitems, &bytes_after, &prop);
1564 if (result == Success && prop && atype == XA_PIXMAP)
1565 return *(Pixmap *)prop;
1566 }
1567
1568 return None;
1569} 1687}
1570 1688
1571#ifdef HAVE_BG_PIXMAP 1689#ifdef HAVE_BG_PIXMAP
1572# if TRACE_PIXMAPS
1573# undef update_background
1574void
1575rxvt_term::trace_update_background (const char *file, int line)
1576{
1577 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1578 update_background ();
1579}
1580# endif
1581 1690
1582void 1691void
1583rxvt_term::update_background () 1692rxvt_term::update_background ()
1584{ 1693{
1585 if (update_background_ev.is_active ()) 1694 if (update_background_ev.is_active ())
1586 return; 1695 return;
1587 1696
1588 bgPixmap.invalidate ();
1589
1590 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1697 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1591 1698
1592 if (to_wait <= 0.) 1699 if (to_wait <= 0.)
1593 bgPixmap.render (); 1700 bg_render ();
1594 else 1701 else
1595 update_background_ev.start (to_wait); 1702 update_background_ev.start (to_wait);
1596} 1703}
1597 1704
1598void 1705void
1599rxvt_term::update_background_cb (ev::timer &w, int revents) 1706rxvt_term::update_background_cb (ev::timer &w, int revents)
1600{ 1707{
1601 make_current (); 1708 make_current ();
1602 1709
1603 update_background_ev.stop (); 1710 update_background_ev.stop ();
1604 bgPixmap.render (); 1711 bg_render ();
1605 refresh_check (); 1712 refresh_check ();
1606} 1713}
1607 1714
1608#endif /* HAVE_BG_PIXMAP */ 1715#endif /* HAVE_BG_PIXMAP */
1609 1716

Diff Legend

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