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.311 by root, Tue Nov 4 13:28:40 2008 UTC vs.
Revision 1.400 by sf-exg, Tue Jun 28 21:56:17 2016 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2014 Marc Lehmann <schmorp@schmorp.de>
17 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
17 * 18 *
18 * This program is free software; you can redistribute it and/or modify 19 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 20 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 21 * the Free Software Foundation; either version 3 of the License, or
21 * (at your option) any later version. 22 * (at your option) any later version.
22 * 23 *
23 * This program is distributed in the hope that it will be useful, 24 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 25 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 31 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 32 *---------------------------------------------------------------------*/
32 33
33#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h"
35#include "keyboard.h" 37#include "keyboard.h"
36#include "rxvtperl.h" 38#include "rxvtperl.h"
37 39
38#include <limits> 40#include <limits>
39 41
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.
… …
625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 768 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626 769
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}
1056
1057#ifdef SMART_RESIZE
1058static unsigned int
1059get_parent_bw (Display *dpy, Window w)
1060{
1061 int idummy;
1062 unsigned int udummy;
1063 Window wdummy, parent;
1064 Window *children;
1065 unsigned int nchildren, border_width;
1066
1067 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1068 XFree (children);
1069 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1070 &udummy, &udummy, &border_width, &udummy);
1071
1072 return border_width;
1073}
1074#endif
903 1075
904/* -------------------------------------------------------------------- * 1076/* -------------------------------------------------------------------- *
905 * - WINDOW RESIZING - * 1077 * - WINDOW RESIZING - *
906 * -------------------------------------------------------------------- */ 1078 * -------------------------------------------------------------------- */
907void 1079void
… …
911 int old_width = szHint.width; 1083 int old_width = szHint.width;
912 int old_height = szHint.height; 1084 int old_height = szHint.height;
913 1085
914 window_calc (newwidth, newheight); 1086 window_calc (newwidth, newheight);
915 1087
916 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1088 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1089
1090 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1091 if (set_hint)
1092 {
1093 szHint.flags &= ~(PBaseSize | PResizeInc);
917 XSetWMNormalHints (dpy, parent[0], &szHint); 1094 XSetWMNormalHints (dpy, parent, &szHint);
1095 szHint.flags |= PBaseSize | PResizeInc;
1096 }
918 1097
919 if (!ignoreparent) 1098 if (!ignoreparent)
920 { 1099 {
921#ifdef SMART_RESIZE 1100#ifdef SMART_RESIZE
922 /* 1101 /*
… …
926 int x, y, x1, y1; 1105 int x, y, x1, y1;
927 int dx, dy; 1106 int dx, dy;
928 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
929 Window unused_cr; 1108 Window unused_cr;
930 1109
931 XTranslateCoordinates (dpy, parent[0], display->root, 1110 XTranslateCoordinates (dpy, parent, display->root,
932 0, 0, &x, &y, &unused_cr); 1111 0, 0, &x, &y, &unused_cr);
933 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1112 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
934 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
935 /* 1114 /*
936 * if display->root isn't the parent window, a WM will probably have offset 1115 * if display->root isn't the parent window, a WM will probably have offset
937 * our position for handles and decorations. Counter it 1116 * our position for handles and decorations. Counter it
938 */ 1117 */
939 if (x1 != x || y1 != y) 1118 if (x1 != x || y1 != y)
940 { 1119 {
941 x -= x1; 1120 unsigned int border_width = get_parent_bw (dpy, parent);
942 y -= y1; 1121
1122 x -= x1 + border_width;
1123 y -= y1 + border_width;
943 } 1124 }
944 1125
945 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1126 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
946 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1127 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
947 dx = old_width - szHint.width; 1128 dx = old_width - szHint.width;
… …
955 if (y < y1) /* top half */ 1136 if (y < y1) /* top half */
956 dy = 0; 1137 dy = 0;
957 else if (y == y1) /* exact center */ 1138 else if (y == y1) /* exact center */
958 dy /= 2; 1139 dy /= 2;
959 1140
960 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1141 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
961 szHint.width, szHint.height); 1142 szHint.width, szHint.height);
962#else 1143#else
963 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1144 XResizeWindow (dpy, parent, szHint.width, szHint.height);
964#endif 1145#endif
965 } 1146 }
1147
1148 if (set_hint)
1149 XSetWMNormalHints (dpy, parent, &szHint);
966 1150
967 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1151 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
968 1152
969 if (fix_screen || newwidth != old_width || newheight != old_height) 1153 if (fix_screen || newwidth != old_width || newheight != old_height)
970 { 1154 {
971 if (scrollBar.state) 1155 if (scrollBar.state)
972 scrollBar.resize (); 1156 scrollBar.resize ();
973 1157
974 XMoveResizeWindow (dpy, vt, 1158 XMoveResizeWindow (dpy, vt,
975 window_vt_x, window_vt_y, 1159 window_vt_x, window_vt_y,
976 width, height); 1160 vt_width, vt_height);
1161
1162 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
977 1163
978#ifdef HAVE_BG_PIXMAP 1164#ifdef HAVE_BG_PIXMAP
979 if (bgPixmap.window_size_sensitive ()) 1165 if (bg_window_size_sensitive ())
980 update_background (); 1166 update_background ();
981#endif 1167#endif
982
983 scr_clear ();
984 } 1168 }
985 1169
986 if (fix_screen || old_height == 0) 1170 if (fix_screen || old_height == 0)
987 scr_reset (); 1171 scr_reset ();
988 1172
989 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
990 //scr_touch (false);
991
992#ifdef HAVE_BG_PIXMAP
993// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
994// if (bgPixmap.pixmap)
995// scr_touch (false);
996#endif
997
998#ifdef USE_XIM 1173#if USE_XIM
999 IMSetPosition (); 1174 im_set_position ();
1000#endif 1175#endif
1001} 1176}
1002 1177
1003/* 1178/*
1004 * Set the width/height of the vt window in characters. Units are pixels. 1179 * Set the width/height of the vt window in characters. Units are pixels.
… …
1017 newwidth = wattr.width - szHint.base_width; 1192 newwidth = wattr.width - szHint.base_width;
1018 if (newheight == 0) 1193 if (newheight == 0)
1019 newheight = wattr.height - szHint.base_height; 1194 newheight = wattr.height - szHint.base_height;
1020 } 1195 }
1021 1196
1022 if (newwidth != width || newheight != height) 1197 if (newwidth != vt_width || newheight != vt_height)
1023 { 1198 {
1024 newwidth += szHint.base_width; 1199 newwidth += szHint.base_width;
1025 newheight += szHint.base_height; 1200 newheight += szHint.base_height;
1026 resize_all_windows (newwidth, newheight, 0); 1201 resize_all_windows (newwidth, newheight, 0);
1027 } 1202 }
1028} 1203}
1029 1204
1030/* -------------------------------------------------------------------- * 1205/* -------------------------------------------------------------------- *
1031 * - X INPUT METHOD ROUTINES - * 1206 * - X INPUT METHOD ROUTINES - *
1032 * -------------------------------------------------------------------- */ 1207 * -------------------------------------------------------------------- */
1033#ifdef USE_XIM 1208#if USE_XIM
1034 1209
1035void 1210void
1036rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1211rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1037{ 1212{
1038 fg = pix_colors [Color_fg]; 1213 fg = pix_colors [Color_fg];
… …
1065 status_rect.height = fheight; 1240 status_rect.height = fheight;
1066} 1241}
1067 1242
1068/* Checking whether input method is running. */ 1243/* Checking whether input method is running. */
1069bool 1244bool
1070rxvt_term::IMisRunning () 1245rxvt_term::im_is_running ()
1071{ 1246{
1072 char *p;
1073 Atom atom; 1247 Atom atom;
1074 Window win; 1248 Window win;
1075 char server[IMBUFSIZ]; 1249 char server[IMBUFSIZ];
1076 1250
1077 /* get current locale modifier */ 1251 /* get current locale modifier */
1078 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1252 if (char *p = XSetLocaleModifiers (0))
1079 { 1253 {
1080 strcpy (server, "@server="); 1254 strcpy (server, "@server=");
1081 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1255 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1082 1256
1083 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1257 if (p = strchr (server + 1, '@')) /* first one only */
1084 *p = '\0'; 1258 *p = '\0';
1085 1259
1086 atom = XInternAtom (dpy, server, False); 1260 atom = XInternAtom (dpy, server, False);
1087 win = XGetSelectionOwner (dpy, atom); 1261 win = XGetSelectionOwner (dpy, atom);
1088 1262
1089 if (win != None) 1263 if (win != None)
1090 return True; 1264 return true;
1091 } 1265 }
1092 1266
1093 return False; 1267 return false;
1094} 1268}
1095 1269
1096void 1270void
1097rxvt_term::IMSendSpot () 1271rxvt_term::im_send_spot ()
1098{ 1272{
1099 XPoint nspot; 1273 XPoint nspot;
1100 XVaNestedList preedit_attr; 1274 XVaNestedList preedit_attr;
1101 1275
1102 if (!Input_Context 1276 if (!Input_Context
… …
1155 1329
1156 term->make_current (); 1330 term->make_current ();
1157 1331
1158 if (text) 1332 if (text)
1159 { 1333 {
1160 void *str; 1334 wchar_t *str;
1161 1335
1162 if (!text->encoding_is_wchar && text->string.multi_byte) 1336 if (!text->encoding_is_wchar && text->string.multi_byte)
1163 { 1337 {
1164 // of course, X makes it ugly again 1338 // of course, X makes it ugly again
1165 if (term->rs[Rs_imLocale]) 1339 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->rs[Rs_imLocale]); 1340 SET_LOCALE (term->rs[Rs_imLocale]);
1167 1341
1168 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1342 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1169 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1343 mbstowcs (str, text->string.multi_byte, text->length + 1);
1170 1344
1171 if (term->rs[Rs_imLocale]) 1345 if (term->rs[Rs_imLocale])
1172 SET_LOCALE (term->locale); 1346 SET_LOCALE (term->locale);
1173 } 1347 }
1174 else 1348 else
1175 str = (void *)text->string.wide_char; 1349 str = text->string.wide_char;
1176 1350
1177 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1178 DT_INT, call_data->caret, 1352 DT_INT, call_data->caret,
1179 DT_INT, call_data->chg_first, 1353 DT_INT, call_data->chg_first,
1180 DT_INT, call_data->chg_length, 1354 DT_INT, call_data->chg_length,
… …
1208/* 1382/*
1209 * Try to open a XIM with the current modifiers, then see if we can 1383 * Try to open a XIM with the current modifiers, then see if we can
1210 * open a suitable preedit type 1384 * open a suitable preedit type
1211 */ 1385 */
1212bool 1386bool
1213rxvt_term::IM_get_IC (const char *modifiers) 1387rxvt_term::im_get_ic (const char *modifiers)
1214{ 1388{
1215 int i, j, found; 1389 int i, j, found;
1216 XIM xim; 1390 XIM xim;
1217 XPoint spot; 1391 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect; 1392 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg; 1393 unsigned long fg, bg;
1220 const char *p; 1394 const char *p;
1221 char **s; 1395 char **s;
1222 XIMStyles *xim_styles; 1396 XIMStyles *xim_styles;
1223#ifdef ENABLE_XIM_ONTHESPOT
1224 XIMCallback xcb[4];
1225#endif
1226 1397
1227 set_environ (envv); 1398 set_environ (env);
1228 1399
1229 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1400 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1230 return false; 1401 return false;
1231 1402
1232 input_method = display->get_xim (locale, modifiers); 1403 input_method = display->get_xim (locale, modifiers);
1233 if (input_method == NULL) 1404 if (input_method == NULL)
1234 return false; 1405 return false;
… …
1251 p = pet[pi]; 1422 p = pet[pi];
1252 1423
1253 if (!p) 1424 if (!p)
1254 continue; 1425 continue;
1255 1426
1256 s = rxvt_splitcommastring (p); 1427 s = rxvt_strsplit (',', p);
1257 1428
1258 for (i = found = 0; !found && s[i]; i++) 1429 for (i = found = 0; !found && s[i]; i++)
1259 { 1430 {
1260 if (!strcmp (s[i], "OverTheSpot")) 1431 if (!strcmp (s[i], "OverTheSpot"))
1261 input_style = XIMPreeditPosition | XIMStatusNothing; 1432 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1273 input_style = XIMPreeditNothing | XIMStatusNothing; 1444 input_style = XIMPreeditNothing | XIMStatusNothing;
1274 1445
1275 for (j = 0; j < xim_styles->count_styles; j++) 1446 for (j = 0; j < xim_styles->count_styles; j++)
1276 if (input_style == xim_styles->supported_styles[j]) 1447 if (input_style == xim_styles->supported_styles[j])
1277 { 1448 {
1278 rxvt_freecommastring (s); 1449 rxvt_free_strsplit (s);
1279 1450
1280 found = 1; 1451 found = 1;
1281 goto foundpet; 1452 goto foundpet;
1282 } 1453 }
1283 1454
1284 } 1455 }
1285 1456
1286 rxvt_freecommastring (s); 1457 rxvt_free_strsplit (s);
1287 } 1458 }
1288 1459
1289foundpet: 1460foundpet:
1290 1461
1291 XFree (xim_styles); 1462 XFree (xim_styles);
… …
1370 NULL); 1541 NULL);
1371 } 1542 }
1372#if ENABLE_XIM_ONTHESPOT 1543#if ENABLE_XIM_ONTHESPOT
1373 else if (input_style & XIMPreeditCallbacks) 1544 else if (input_style & XIMPreeditCallbacks)
1374 { 1545 {
1546 XIMCallback xcb[4];
1547
1375 im_set_position (spot); 1548 im_set_position (spot);
1376 1549
1377 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1550 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1378 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1551 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1379 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1552 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1394#endif 1567#endif
1395 1568
1396 Input_Context = XCreateIC (xim, 1569 Input_Context = XCreateIC (xim,
1397 XNInputStyle, input_style, 1570 XNInputStyle, input_style,
1398 XNClientWindow, vt, 1571 XNClientWindow, vt,
1399 XNFocusWindow, parent[0], 1572 XNFocusWindow, parent,
1400 preedit_attr ? XNPreeditAttributes : NULL, 1573 preedit_attr ? XNPreeditAttributes : NULL,
1401 preedit_attr, 1574 preedit_attr,
1402 status_attr ? XNStatusAttributes : NULL, 1575 status_attr ? XNStatusAttributes : NULL,
1403 status_attr, NULL); 1576 status_attr, NULL);
1404 1577
… …
1417 // unfortunately, only the focus window is used by XIM, hard to fix 1590 // unfortunately, only the focus window is used by XIM, hard to fix
1418 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1591 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1419 vt_select_input (); 1592 vt_select_input ();
1420#endif 1593#endif
1421 1594
1422 IMSetPosition (); 1595 im_set_position ();
1423 1596
1424 return true; 1597 return true;
1425} 1598}
1426 1599
1427void 1600void
… …
1437 im_destroy (); 1610 im_destroy ();
1438 1611
1439 if (Input_Context) 1612 if (Input_Context)
1440 return; 1613 return;
1441 1614
1442#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1443 if (rs[Rs_imLocale]) 1615 if (rs[Rs_imLocale])
1444 SET_LOCALE (rs[Rs_imLocale]); 1616 SET_LOCALE (rs[Rs_imLocale]);
1445#endif
1446 1617
1447 p = rs[Rs_inputMethod]; 1618 p = rs[Rs_inputMethod];
1448 if (p && *p) 1619 if (p && *p)
1449 { 1620 {
1450 bool found = false; 1621 bool found = false;
1451 1622
1452 s = rxvt_splitcommastring (p); 1623 s = rxvt_strsplit (',', p);
1453 1624
1454 for (i = 0; s[i]; i++) 1625 for (i = 0; s[i]; i++)
1455 { 1626 {
1456 if (*s[i]) 1627 if (*s[i])
1457 { 1628 {
1458 strcpy (buf, "@im="); 1629 strcpy (buf, "@im=");
1459 strncat (buf, s[i], IMBUFSIZ - 5); 1630 strncat (buf, s[i], IMBUFSIZ - 5);
1460 if (IM_get_IC (buf)) 1631 if (im_get_ic (buf))
1461 { 1632 {
1462 found = true; 1633 found = true;
1463 break; 1634 break;
1464 } 1635 }
1465 } 1636 }
1466 } 1637 }
1467 1638
1468 rxvt_freecommastring (s); 1639 rxvt_free_strsplit (s);
1469 1640
1470 if (found) 1641 if (found)
1471 goto done; 1642 goto done;
1472 } 1643 }
1473 1644
1474 /* try with XMODIFIERS env. var. */ 1645 /* try with XMODIFIERS env. var. */
1475 if (IM_get_IC ("")) 1646 if (im_get_ic (""))
1476 goto done; 1647 goto done;
1477 1648
1478 /* try with no modifiers base IF the user didn't specify an IM */ 1649 /* try with no modifiers base IF the user didn't specify an IM */
1479 if (IM_get_IC ("@im=none")) 1650 if (im_get_ic ("@im=none"))
1480 goto done; 1651 goto done;
1481 1652
1482done: 1653done:
1483#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1484 if (rs[Rs_imLocale]) 1654 if (rs[Rs_imLocale])
1485 SET_LOCALE (locale); 1655 SET_LOCALE (locale);
1486#endif
1487} 1656}
1488 1657
1489void 1658void
1490rxvt_term::IMSetPosition () 1659rxvt_term::im_set_position ()
1491{ 1660{
1492 XRectangle preedit_rect, status_rect, *needed_rect; 1661 XRectangle preedit_rect, status_rect, *needed_rect;
1493 XVaNestedList preedit_attr, status_attr; 1662 XVaNestedList preedit_attr, status_attr;
1494 1663
1495 if (!Input_Context 1664 if (!Input_Context
1496 || !focus 1665 || !focus
1497 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1666 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1498 || !IMisRunning ()) 1667 || !im_is_running ())
1499 return; 1668 return;
1500 1669
1501 if (input_style & XIMPreeditPosition) 1670 if (input_style & XIMPreeditPosition)
1502 { 1671 {
1503 im_set_size (preedit_rect); 1672 im_set_size (preedit_rect);
… …
1533 1702
1534void 1703void
1535rxvt_term::get_window_origin (int &x, int &y) 1704rxvt_term::get_window_origin (int &x, int &y)
1536{ 1705{
1537 Window cr; 1706 Window cr;
1538 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1707 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1539/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1540}
1541
1542Pixmap
1543rxvt_term::get_pixmap_property (int prop_id)
1544{
1545 if (prop_id > 0 && prop_id < NUM_XA)
1546 if (xa[prop_id])
1547 {
1548 int aformat;
1549 unsigned long nitems, bytes_after;
1550 Atom atype;
1551 unsigned char *prop = NULL;
1552 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1553 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1554 &nitems, &bytes_after, &prop);
1555 if (result == Success && prop && atype == XA_PIXMAP)
1556 return *(Pixmap *)prop;
1557 }
1558
1559 return None;
1560} 1708}
1561 1709
1562#ifdef HAVE_BG_PIXMAP 1710#ifdef HAVE_BG_PIXMAP
1563# if TRACE_PIXMAPS
1564# undef update_background
1565void
1566rxvt_term::trace_update_background (const char *file, int line)
1567{
1568 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1569 update_background ();
1570}
1571# endif
1572 1711
1573void 1712void
1574rxvt_term::update_background () 1713rxvt_term::update_background ()
1575{ 1714{
1576 if (update_background_ev.is_active ()) 1715 if (update_background_ev.is_active ())
1577 return; 1716 return;
1578 1717
1579 bgPixmap.invalidate ();
1580
1581 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since); 1718 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1582 1719
1583 if (to_wait <= 0.) 1720 if (to_wait <= 0.)
1584 bgPixmap.render (); 1721 bg_render ();
1585 else 1722 else
1586 update_background_ev.start (to_wait); 1723 update_background_ev.start (to_wait);
1587} 1724}
1588 1725
1589void 1726void
1590rxvt_term::update_background_cb (ev::timer &w, int revents) 1727rxvt_term::update_background_cb (ev::timer &w, int revents)
1591{ 1728{
1592 make_current (); 1729 make_current ();
1593 1730
1594 update_background_ev.stop (); 1731 update_background_ev.stop ();
1595 bgPixmap.render (); 1732 bg_render ();
1596 refresh_check (); 1733 refresh_check ();
1597} 1734}
1598 1735
1599#endif /* HAVE_BG_PIXMAP */ 1736#endif /* HAVE_BG_PIXMAP */
1600 1737

Diff Legend

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