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.316 by root, Sun Apr 26 01:51:20 2009 UTC vs.
Revision 1.404 by root, Thu Jun 17 14:31:39 2021 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
59static char curlocale[128], savelocale[128]; 61static char curlocale[128], savelocale[128];
60 62
61bool 63bool
62rxvt_set_locale (const char *locale) NOTHROW 64rxvt_set_locale (const char *locale) noexcept
63{ 65{
64 int size = strlen (locale) + 1; 66 int size = strlen (locale) + 1;
65 67
66 if (size > sizeof (curlocale)) 68 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n"); 69 rxvt_fatal ("locale string too long, aborting.\n");
… …
73 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
74 return true; 76 return true;
75} 77}
76 78
77void 79void
78rxvt_push_locale (const char *locale) NOTHROW 80rxvt_push_locale (const char *locale) noexcept
79{ 81{
80 strcpy (savelocale, curlocale); 82 strcpy (savelocale, curlocale);
81 rxvt_set_locale (locale); 83 rxvt_set_locale (locale);
82} 84}
83 85
84void 86void
85rxvt_pop_locale () NOTHROW 87rxvt_pop_locale () noexcept
86{ 88{
87 rxvt_set_locale (savelocale); 89 rxvt_set_locale (savelocale);
88} 90}
89 91
90#if ENABLE_COMBINING 92#if ENABLE_COMBINING
… …
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));
125 125
126 return v.size () - 1 + COMPOSE_LO; 126 return v.size () - 1 + COMPOSE_LO;
127} 127}
128 128
129template<typename T>
129int rxvt_composite_vec::expand (unicode_t c, wchar_t *r) 130int rxvt_composite_vec::expand (unicode_t c, T *r)
130{ 131{
131 compose_char *cc = (*this)[c]; 132 compose_char *cc = (*this)[c];
132 133
133 if (!cc) 134 if (!cc)
134 { 135 {
… …
145 len++; 146 len++;
146 if (r) *r++ = cc->c2; 147 if (r) *r++ = cc->c2;
147 } 148 }
148 149
149 return len; 150 return len;
150
151} 151}
152
153template int rxvt_composite_vec::expand<text_t> (unicode_t c, text_t *);
154template int rxvt_composite_vec::expand<wchar_t> (unicode_t c, wchar_t *);
152#endif 155#endif
153 156
154rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
155{ 158{
156#if HAVE_BG_PIXMAP
157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK 159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL); 160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif 161#endif
162#ifdef TEXT_BLINK 162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL); 163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
… …
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 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
… …
224 if (fontset[i] != fontset[0]) 223 if (fontset[i] != fontset[0])
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#if HAVE_IMG
230 bgPixmap.destroy (); 229 delete bg_img;
231#endif
232#ifdef HAVE_AFTERIMAGE
233 if (asv)
234 destroy_asvisual (asv, 0);
235 if (asimman)
236 destroy_image_manager (asimman, 0);
237#endif 230#endif
238 231
239 if (display) 232 if (display)
240 { 233 {
241 selection_clear (); 234 selection_clear ();
235 selection_clear (true);
242 236
243#ifdef USE_XIM 237#if USE_XIM
244 im_destroy (); 238 im_destroy ();
245#endif 239#endif
246 scrollBar.destroy (); 240 scrollBar.destroy ();
241
242 if (gc)
247 if (gc) XFreeGC (dpy, gc); 243 XFreeGC (dpy, gc);
248 244
249 delete drawable; 245 delete drawable;
246
250 // destroy all windows 247 // destroy all windows
251 if (parent[0]) 248 if (parent)
252 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
253 250
254 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
255 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
256 { 253 {
257 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
258#if OFF_FOCUS_FADING 255#if OFF_FOCUS_FADING
256 if (rs[Rs_fade])
259 pix_colors_unfocused [i].free (this); 257 pix_colors_unfocused [i].free (this);
260#endif 258#endif
261 } 259 }
262 260
263 clear (); 261 clear ();
264 262
… …
271 /* clear all resources */ 269 /* clear all resources */
272 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
273 free (allocated [i]); 271 free (allocated [i]);
274 272
275 free (selection.text); 273 free (selection.text);
276 // TODO: manage env vars in child only(!) 274 free (selection.clip_text);
277 free (env_display);
278 free (env_term);
279 free (locale); 275 free (locale);
280 free (v_buffer); 276 free (v_buffer);
281 free (incr_buf); 277
278 delete selection_req;
279
280 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
281 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
282
283 delete [] env;
282 284
283 delete envv; 285 delete envv;
284 delete argv; 286 delete argv;
285 287
286#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
287 delete keyboard; 289 delete keyboard;
288#endif 290#endif
289#ifndef NO_RESOURCES 291#ifndef NO_RESOURCES
290 XrmDestroyDatabase (option_db); 292 XrmDestroyDatabase (option_db);
291#endif 293#endif
294
295 SET_R ((rxvt_term *)0);
292} 296}
293 297
294// child has exited, usually destroys 298// child has exited, usually destroys
295void 299void
296rxvt_term::child_cb (ev::child &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
… …
319 { 323 {
320#if USE_XIM 324#if USE_XIM
321 im_ev.stop (display); 325 im_ev.stop (display);
322#endif 326#endif
323 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
324#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if ENABLE_PERL
325 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
326#endif 330#endif
327 incr_ev.stop ();
328 termwin_ev.stop (display); 331 termwin_ev.stop (display);
329 vt_ev.stop (display); 332 vt_ev.stop (display);
330 } 333 }
331 334
332 flush_ev.stop (); 335 flush_ev.stop ();
… …
356 make_current (); 359 make_current ();
357 360
358 delete this; 361 delete this;
359} 362}
360 363
364void
365rxvt_term::set_option (uint8_t opt, bool set) noexcept
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
361/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
362/* 377/*
363 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * 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 */ 379 */
366static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
367 381
368static void 382static void
369rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
371 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
372 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
373} 387}
374 388
375#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
376static void 390static void ecb_cold
377print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
378{ 392{
379 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
380 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
381 char number[32]; 395 char number[32];
382 char *mtype = "XlibMessage"; 396
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"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
386 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
387 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
388 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
408
409 if (event->request_code >= 128)
410 {
411#if 0
412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
457 }
458 else
459 {
389 sprintf(number, "%d", event->request_code); 460 sprintf (number, "%d", event->request_code);
390 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
391 rxvt_warn ("(which is %s)\n", buffer); 462 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 } 463 }
464
397 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
398 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
399 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
400 (event->error_code == BadFont) || 468 || event->error_code == BadFont
401 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
402 (event->error_code == BadColor) || 470 || event->error_code == BadColor
403 (event->error_code == BadGC) || 471 || event->error_code == BadGC
404 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
405 (event->error_code == BadValue) || 473 || event->error_code == BadValue
406 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
407 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
408 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
411 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
412 mesg, BUFSIZ); 480 else
413 else
414 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 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 482
424int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
425rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
426{ 490{
427 if (GET_R->allowedxerror == -1) 491 if (GET_R && GET_R->allowedxerror == -1)
428 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
429 else 493 else
430 { 494 {
431 // GET_R is most likely not the terminal which caused the error, 495 // GET_R is most likely not the terminal which caused the error,
432 // so just output the error and continue 496 // so just output the error and continue
… …
438 } 502 }
439 503
440 return 0; 504 return 0;
441} 505}
442 506
443int 507int ecb_cold
444rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
445{ 509{
446 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
447 DisplayString (display)); 511 DisplayString (display));
448 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
471 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
472 w.stop (); 536 w.stop ();
473 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
474} 538}
475 539
540static void
541rxvt_get_ttymode (struct termios *tio)
542{
543 if (tcgetattr (STDIN_FILENO, tio) < 0)
544 memset (tio, 0, sizeof (struct termios));
545
546 for (int i = 0; i < NCCS; i++)
547 tio->c_cc[i] = VDISABLE;
548
549 tio->c_cc[VINTR] = CINTR;
550 tio->c_cc[VQUIT] = CQUIT;
551 tio->c_cc[VERASE] = CERASE;
552#ifdef VERASE2
553 tio->c_cc[VERASE2] = CERASE2;
554#endif
555 tio->c_cc[VKILL] = CKILL;
556 tio->c_cc[VEOF] = CEOF;
557 tio->c_cc[VSTART] = CSTART;
558 tio->c_cc[VSTOP] = CSTOP;
559 tio->c_cc[VSUSP] = CSUSP;
560# ifdef VDSUSP
561 tio->c_cc[VDSUSP] = CDSUSP;
562# endif
563# ifdef VREPRINT
564 tio->c_cc[VREPRINT] = CRPRNT;
565# endif
566# ifdef VDISCRD
567 tio->c_cc[VDISCRD] = CFLUSH;
568# endif
569# ifdef VWERSE
570 tio->c_cc[VWERSE] = CWERASE;
571# endif
572# ifdef VLNEXT
573 tio->c_cc[VLNEXT] = CLNEXT;
574# endif
575# ifdef VSTATUS
576 tio->c_cc[VSTATUS] = CSTATUS;
577# endif
578
579# if VMIN != VEOF
580 tio->c_cc[VMIN] = 1;
581# endif
582# if VTIME != VEOL
583 tio->c_cc[VTIME] = 0;
584# endif
585
586 /* input modes */
587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
588# ifdef IMAXBEL
589 | IMAXBEL
590# endif
591 | IXON);
592
593 /* output modes */
594 tio->c_oflag = (OPOST | ONLCR);
595
596 /* control modes */
597 tio->c_cflag = (CS8 | CREAD);
598
599 /* local modes */
600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
601# if defined (ECHOCTL) && defined (ECHOKE)
602 | ECHOCTL | ECHOKE
603# endif
604 | ECHOE | ECHOK);
605}
606
476char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
477 608
478void 609void
479rxvt_init () 610rxvt_init ()
480{ 611{
481 ptytty::init (); 612 assert (("fontMask must not overlap other RS masks",
613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
482 614
615 rxvt_get_ttymode (&rxvt_term::def_tio);
616
617 // get rid of stdin/stdout as we don't need them, to free resources
618 dup2 (STDERR_FILENO, STDIN_FILENO);
619 dup2 (STDERR_FILENO, STDOUT_FILENO);
620
483 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
484 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
485 623
486 rxvt_environ = environ; 624 rxvt_environ = environ;
487 625
488 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
489 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
490 628
491 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
492 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
493
494 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
495 /* signal (SIGURG, SIG_DFL); */
496 631
497 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
498 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
499 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
500 635
501 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 #if !GLIB_CHECK_VERSION(2,36,0)
640 g_type_init ();
641 #endif
642#endif
502} 643}
503 644
504/*----------------------------------------------------------------------*/ 645/*----------------------------------------------------------------------*/
505/* 646/*
506 * window size/position calculations for XSizeHint and other storage. 647 * window size/position calculations for XSizeHint and other storage.
… …
627 if (recalc_y) 768 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 769 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 770
630 ncol = width / fwidth; 771 ncol = width / fwidth;
631 nrow = height / fheight; 772 nrow = height / fheight;
773
774 // When the size of the vt window is not a multiple of the cell
775 // size, i.e., when the wm does not honour our size hints, there are
776 // extra areas not covered by the terminal screen. Such gaps, when a
777 // bg pixmap is set, would have to be cleared manually to properly
778 // refresh the background. We take the simpler route and shrink the
779 // vt window so as to avoid creating gaps.
780 vt_width = ncol * fwidth;
781 vt_height = nrow * fheight;
632} 782}
633 783
634/*----------------------------------------------------------------------*/ 784/*----------------------------------------------------------------------*/
635/* 785/*
636 * Tell the teletype handler what size the window is. 786 * Tell the teletype handler what size the window is.
… …
644 794
645 struct winsize ws; 795 struct winsize ws;
646 796
647 ws.ws_col = ncol; 797 ws.ws_col = ncol;
648 ws.ws_row = nrow; 798 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 799 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 800 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 801 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 802
653#if 0 803#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 804 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 805 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 806 kill (-cmd_pid, SIGWINCH);
657#endif 807#endif
658} 808}
659 809
660/*----------------------------------------------------------------------*/ 810/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 811/* 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 812bool
669rxvt_term::set_fonts () 813rxvt_term::set_fonts ()
670{ 814{
671 rxvt_fontset *fs = new rxvt_fontset (this); 815 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 816 rxvt_fontprop prop;
… …
686#endif 830#endif
687 831
688 delete fontset[0]; 832 delete fontset[0];
689 fontset[0] = fs; 833 fontset[0] = fs;
690 834
691 prop = (*fs)[1]->properties (); 835 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 836 prop.width = max (prop.width + letterSpace, 1);
693 837
694 fs->set_prop (prop, false); 838 fs->set_prop (prop, false);
695 839
696 fwidth = prop.width; 840 fwidth = prop.width;
697 fheight = prop.height; 841 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 842 fbase = prop.ascent;
699 843
700 for (int style = 1; style < 4; style++) 844 for (int style = 1; style < 4; style++)
701 { 845 {
702#if ENABLE_STYLES 846#if ENABLE_STYLES
… …
728#else 872#else
729 fontset[style] = fontset[0]; 873 fontset[style] = fontset[0];
730#endif 874#endif
731 } 875 }
732 876
733 if (parent[0]) 877 if (parent)
734 { 878 {
735 resize_all_windows (0, 0, 0); 879 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 880 scr_remap_chars ();
737 scr_touch (true); 881 scr_touch (true);
738 } 882 }
… …
741} 885}
742 886
743void 887void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 888rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 889{
746 XChangeProperty (dpy, parent[0], 890 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 891 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 892 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 893}
750 894
751void 895void
896rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
897{
898 XTextProperty ct;
899
900 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
901 {
902 XSetTextProperty (dpy, parent, &ct, prop);
903 XFree (ct.value);
904 }
905}
906
907void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 908rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 909{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 910 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 911 char *s = rxvt_wcstoutf8 (ws);
756 912
757 XChangeProperty (dpy, parent[0], 913 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 914 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 915 (const unsigned char *)s, strlen (s));
760 916
761 free (s); 917 free (s);
762 free (ws); 918 free (ws);
… …
766/*----------------------------------------------------------------------*/ 922/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 923/* xterm sequences - title, iconName, color (exptl) */
768void 924void
769rxvt_term::set_title (const char *str) 925rxvt_term::set_title (const char *str)
770{ 926{
771 set_string_property (XA_WM_NAME, str); 927 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 928#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 929 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 930#endif
775} 931}
776 932
777void 933void
778rxvt_term::set_icon_name (const char *str) 934rxvt_term::set_icon_name (const char *str)
779{ 935{
780 set_string_property (XA_WM_ICON_NAME, str); 936 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 937#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 938 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 939#endif
784} 940}
785 941
786void 942void
787rxvt_term::set_window_color (int idx, const char *color) 943rxvt_term::set_window_color (int idx, const char *color)
788{ 944{
789#ifdef XTERM_COLOR_CHANGE 945#ifdef XTERM_COLOR_CHANGE
790 rxvt_color xcol;
791
792 if (color == NULL || *color == '\0') 946 if (color == NULL || *color == '\0')
793 return; 947 return;
794 948
795 color = strdup (color); 949 color = strdup (color);
796 allocated.push_back ((void *)color); 950 allocated.push_back ((void *)color);
… …
802 int i = atoi (color); 956 int i = atoi (color);
803 957
804 if (i >= 8 && i <= 15) 958 if (i >= 8 && i <= 15)
805 { 959 {
806 /* bright colors */ 960 /* bright colors */
807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 961 alias_color (idx, minBrightCOLOR + i - 8);
808 goto done; 962 goto done;
809 } 963 }
810 964
811 if (i >= 0 && i <= 7) 965 if (i >= 0 && i <= 7)
812 { 966 {
813 /* normal colors */ 967 /* normal colors */
814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 968 alias_color (idx, minCOLOR + i);
815 goto done; 969 goto done;
816 } 970 }
817 } 971 }
818 972
819 set_color (xcol, color); 973 pix_colors_focused[idx].free (this);
820 974 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 975
828done: 976done:
829 /*TODO: handle Color_BD, scrollbar background, etc. */ 977 /*TODO: handle Color_BD, scrollbar background, etc. */
830 978
831 update_fade_color (idx); 979 update_fade_color (idx);
832 recolour_cursor (); 980 recolor_cursor ();
833 scr_recolour (); 981 scr_recolor ();
834#endif /* XTERM_COLOR_CHANGE */ 982#endif /* XTERM_COLOR_CHANGE */
835} 983}
836 984
837void 985void
838rxvt_term::recolour_cursor () 986rxvt_term::recolor_cursor ()
839{ 987{
840 XColor fg, bg; 988 XColor fg, bg;
841 989
842 (ISSET_PIXCOLOR (Color_pointer_fg) 990 (ISSET_PIXCOLOR (Color_pointer_fg)
843 ? pix_colors_focused[Color_pointer_fg] 991 ? pix_colors_focused[Color_pointer_fg]
… …
852 1000
853/*----------------------------------------------------------------------*/ 1001/*----------------------------------------------------------------------*/
854/* 1002/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 1003 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 1004 */
857void 1005char *
858rxvt_term::set_colorfgbg () 1006rxvt_term::get_colorfgbg ()
859{ 1007{
860 unsigned int i; 1008 unsigned int i;
861 const char *xpmb = ""; 1009 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1010 char fstr[] = "default";
1011 char bstr[] = "default";
1012 char *env_colorfgbg;
863 1013
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 1014 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 1015 if (pix_colors[Color_fg] == pix_colors[i])
868 { 1016 {
869 sprintf (fstr, "%d", (i - Color_Black)); 1017 sprintf (fstr, "%d", i - Color_Black);
870 break; 1018 break;
871 } 1019 }
872 1020
873 for (i = Color_Black; i <= Color_White; i++) 1021 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 1022 if (pix_colors[Color_bg] == pix_colors[i])
875 { 1023 {
876 sprintf (bstr, "%d", (i - Color_Black)); 1024 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 1025#if HAVE_IMG
878 xpmb = "default;"; 1026 xpmb = "default;";
879#endif 1027#endif
880 break; 1028 break;
881 } 1029 }
882 1030
1031 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1032 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1033 return env_colorfgbg;
884} 1034}
885 1035
886/*----------------------------------------------------------------------*/ 1036/*----------------------------------------------------------------------*/
887 1037
888bool 1038bool
… …
896} 1046}
897 1047
898void 1048void
899rxvt_term::alias_color (int dst, int src) 1049rxvt_term::alias_color (int dst, int src)
900{ 1050{
1051 pix_colors[dst].free (this);
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1052 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
902} 1053}
1054
1055#ifdef SMART_RESIZE
1056static unsigned int
1057get_parent_bw (Display *dpy, Window w)
1058{
1059 int idummy;
1060 unsigned int udummy;
1061 Window wdummy, parent;
1062 Window *children;
1063 unsigned int nchildren, border_width;
1064
1065 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1066 XFree (children);
1067 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1068 &udummy, &udummy, &border_width, &udummy);
1069
1070 return border_width;
1071}
1072#endif
903 1073
904/* -------------------------------------------------------------------- * 1074/* -------------------------------------------------------------------- *
905 * - WINDOW RESIZING - * 1075 * - WINDOW RESIZING - *
906 * -------------------------------------------------------------------- */ 1076 * -------------------------------------------------------------------- */
907void 1077void
… …
917 1087
918 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow 1088 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
919 if (set_hint) 1089 if (set_hint)
920 { 1090 {
921 szHint.flags &= ~(PBaseSize | PResizeInc); 1091 szHint.flags &= ~(PBaseSize | PResizeInc);
922 XSetWMNormalHints (dpy, parent[0], &szHint); 1092 XSetWMNormalHints (dpy, parent, &szHint);
923 szHint.flags |= PBaseSize | PResizeInc; 1093 szHint.flags |= PBaseSize | PResizeInc;
924 } 1094 }
925 1095
926 if (!ignoreparent) 1096 if (!ignoreparent)
927 { 1097 {
… …
933 int x, y, x1, y1; 1103 int x, y, x1, y1;
934 int dx, dy; 1104 int dx, dy;
935 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1105 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
936 Window unused_cr; 1106 Window unused_cr;
937 1107
938 XTranslateCoordinates (dpy, parent[0], display->root, 1108 XTranslateCoordinates (dpy, parent, display->root,
939 0, 0, &x, &y, &unused_cr); 1109 0, 0, &x, &y, &unused_cr);
940 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1110 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
941 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1111 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
942 /* 1112 /*
943 * if display->root isn't the parent window, a WM will probably have offset 1113 * if display->root isn't the parent window, a WM will probably have offset
944 * our position for handles and decorations. Counter it 1114 * our position for handles and decorations. Counter it
945 */ 1115 */
946 if (x1 != x || y1 != y) 1116 if (x1 != x || y1 != y)
947 { 1117 {
948 x -= x1; 1118 unsigned int border_width = get_parent_bw (dpy, parent);
949 y -= y1; 1119
1120 x -= x1 + border_width;
1121 y -= y1 + border_width;
950 } 1122 }
951 1123
952 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1124 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
953 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1125 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
954 dx = old_width - szHint.width; 1126 dx = old_width - szHint.width;
… …
962 if (y < y1) /* top half */ 1134 if (y < y1) /* top half */
963 dy = 0; 1135 dy = 0;
964 else if (y == y1) /* exact center */ 1136 else if (y == y1) /* exact center */
965 dy /= 2; 1137 dy /= 2;
966 1138
967 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1139 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
968 szHint.width, szHint.height); 1140 szHint.width, szHint.height);
969#else 1141#else
970 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1142 XResizeWindow (dpy, parent, szHint.width, szHint.height);
971#endif 1143#endif
972 } 1144 }
973 1145
974 if (set_hint) 1146 if (set_hint)
975 XSetWMNormalHints (dpy, parent[0], &szHint); 1147 XSetWMNormalHints (dpy, parent, &szHint);
976 1148
977 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1149 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
978 1150
979 if (fix_screen || newwidth != old_width || newheight != old_height) 1151 if (fix_screen || newwidth != old_width || newheight != old_height)
980 { 1152 {
981 if (scrollBar.state) 1153 if (scrollBar.state)
982 scrollBar.resize (); 1154 scrollBar.resize ();
983 1155
984 XMoveResizeWindow (dpy, vt, 1156 XMoveResizeWindow (dpy, vt,
985 window_vt_x, window_vt_y, 1157 window_vt_x, window_vt_y,
986 width, height); 1158 vt_width, vt_height);
987 1159
988#ifdef HAVE_BG_PIXMAP 1160 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
989 if (bgPixmap.window_size_sensitive ())
990 update_background ();
991#endif
992 } 1161 }
993 1162
994 if (fix_screen || old_height == 0) 1163 if (fix_screen || old_height == 0)
995 scr_reset (); 1164 scr_reset ();
996 1165
997 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
998 //scr_touch (false);
999
1000#ifdef HAVE_BG_PIXMAP
1001// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1002// if (bgPixmap.pixmap)
1003// scr_touch (false);
1004#endif
1005
1006#ifdef USE_XIM 1166#if USE_XIM
1007 IMSetPosition (); 1167 im_set_position ();
1008#endif 1168#endif
1009} 1169}
1010 1170
1011/* 1171/*
1012 * Set the width/height of the vt window in characters. Units are pixels. 1172 * Set the width/height of the vt window in characters. Units are pixels.
… …
1025 newwidth = wattr.width - szHint.base_width; 1185 newwidth = wattr.width - szHint.base_width;
1026 if (newheight == 0) 1186 if (newheight == 0)
1027 newheight = wattr.height - szHint.base_height; 1187 newheight = wattr.height - szHint.base_height;
1028 } 1188 }
1029 1189
1030 if (newwidth != width || newheight != height) 1190 if (newwidth != vt_width || newheight != vt_height)
1031 { 1191 {
1032 newwidth += szHint.base_width; 1192 newwidth += szHint.base_width;
1033 newheight += szHint.base_height; 1193 newheight += szHint.base_height;
1034 resize_all_windows (newwidth, newheight, 0); 1194 resize_all_windows (newwidth, newheight, 0);
1035 } 1195 }
1036} 1196}
1037 1197
1038/* -------------------------------------------------------------------- * 1198/* -------------------------------------------------------------------- *
1039 * - X INPUT METHOD ROUTINES - * 1199 * - X INPUT METHOD ROUTINES - *
1040 * -------------------------------------------------------------------- */ 1200 * -------------------------------------------------------------------- */
1041#ifdef USE_XIM 1201#if USE_XIM
1042 1202
1043void 1203void
1044rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1204rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1045{ 1205{
1046 fg = pix_colors [Color_fg]; 1206 fg = pix_colors [Color_fg];
… …
1073 status_rect.height = fheight; 1233 status_rect.height = fheight;
1074} 1234}
1075 1235
1076/* Checking whether input method is running. */ 1236/* Checking whether input method is running. */
1077bool 1237bool
1078rxvt_term::IMisRunning () 1238rxvt_term::im_is_running ()
1079{ 1239{
1080 Atom atom; 1240 Atom atom;
1081 Window win; 1241 Window win;
1082 char server[IMBUFSIZ]; 1242 char server[IMBUFSIZ];
1083 1243
… …
1092 1252
1093 atom = XInternAtom (dpy, server, False); 1253 atom = XInternAtom (dpy, server, False);
1094 win = XGetSelectionOwner (dpy, atom); 1254 win = XGetSelectionOwner (dpy, atom);
1095 1255
1096 if (win != None) 1256 if (win != None)
1097 return True; 1257 return true;
1098 } 1258 }
1099 1259
1100 return False; 1260 return false;
1101} 1261}
1102 1262
1103void 1263void
1104rxvt_term::IMSendSpot () 1264rxvt_term::im_send_spot ()
1105{ 1265{
1106 XPoint nspot; 1266 XPoint nspot;
1107 XVaNestedList preedit_attr; 1267 XVaNestedList preedit_attr;
1108 1268
1109 if (!Input_Context 1269 if (!Input_Context
… …
1162 1322
1163 term->make_current (); 1323 term->make_current ();
1164 1324
1165 if (text) 1325 if (text)
1166 { 1326 {
1167 void *str; 1327 wchar_t *str;
1168 1328
1169 if (!text->encoding_is_wchar && text->string.multi_byte) 1329 if (!text->encoding_is_wchar && text->string.multi_byte)
1170 { 1330 {
1171 // of course, X makes it ugly again 1331 // of course, X makes it ugly again
1172 if (term->rs[Rs_imLocale]) 1332 if (term->rs[Rs_imLocale])
1173 SET_LOCALE (term->rs[Rs_imLocale]); 1333 SET_LOCALE (term->rs[Rs_imLocale]);
1174 1334
1175 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1335 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1176 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1336 mbstowcs (str, text->string.multi_byte, text->length + 1);
1177 1337
1178 if (term->rs[Rs_imLocale]) 1338 if (term->rs[Rs_imLocale])
1179 SET_LOCALE (term->locale); 1339 SET_LOCALE (term->locale);
1180 } 1340 }
1181 else 1341 else
1182 str = (void *)text->string.wide_char; 1342 str = text->string.wide_char;
1183 1343
1184 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1344 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1185 DT_INT, call_data->caret, 1345 DT_INT, call_data->caret,
1186 DT_INT, call_data->chg_first, 1346 DT_INT, call_data->chg_first,
1187 DT_INT, call_data->chg_length, 1347 DT_INT, call_data->chg_length,
… …
1215/* 1375/*
1216 * Try to open a XIM with the current modifiers, then see if we can 1376 * Try to open a XIM with the current modifiers, then see if we can
1217 * open a suitable preedit type 1377 * open a suitable preedit type
1218 */ 1378 */
1219bool 1379bool
1220rxvt_term::IM_get_IC (const char *modifiers) 1380rxvt_term::im_get_ic (const char *modifiers)
1221{ 1381{
1222 int i, j, found; 1382 int i, j, found;
1223 XIM xim; 1383 XIM xim;
1224 XPoint spot; 1384 XPoint spot;
1225 XRectangle rect, status_rect, needed_rect; 1385 XRectangle rect, status_rect, needed_rect;
1226 unsigned long fg, bg; 1386 unsigned long fg, bg;
1227 const char *p; 1387 const char *p;
1228 char **s; 1388 char **s;
1229 XIMStyles *xim_styles; 1389 XIMStyles *xim_styles;
1230#ifdef ENABLE_XIM_ONTHESPOT
1231 XIMCallback xcb[4];
1232#endif
1233 1390
1234 set_environ (envv); 1391 set_environ (env);
1235 1392
1236 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1393 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1237 return false; 1394 return false;
1238 1395
1239 input_method = display->get_xim (locale, modifiers); 1396 input_method = display->get_xim (locale, modifiers);
1240 if (input_method == NULL) 1397 if (input_method == NULL)
1241 return false; 1398 return false;
… …
1258 p = pet[pi]; 1415 p = pet[pi];
1259 1416
1260 if (!p) 1417 if (!p)
1261 continue; 1418 continue;
1262 1419
1263 s = rxvt_splitcommastring (p); 1420 s = rxvt_strsplit (',', p);
1264 1421
1265 for (i = found = 0; !found && s[i]; i++) 1422 for (i = found = 0; !found && s[i]; i++)
1266 { 1423 {
1267 if (!strcmp (s[i], "OverTheSpot")) 1424 if (!strcmp (s[i], "OverTheSpot"))
1268 input_style = XIMPreeditPosition | XIMStatusNothing; 1425 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1280 input_style = XIMPreeditNothing | XIMStatusNothing; 1437 input_style = XIMPreeditNothing | XIMStatusNothing;
1281 1438
1282 for (j = 0; j < xim_styles->count_styles; j++) 1439 for (j = 0; j < xim_styles->count_styles; j++)
1283 if (input_style == xim_styles->supported_styles[j]) 1440 if (input_style == xim_styles->supported_styles[j])
1284 { 1441 {
1285 rxvt_freecommastring (s); 1442 rxvt_free_strsplit (s);
1286 1443
1287 found = 1; 1444 found = 1;
1288 goto foundpet; 1445 goto foundpet;
1289 } 1446 }
1290 1447
1291 } 1448 }
1292 1449
1293 rxvt_freecommastring (s); 1450 rxvt_free_strsplit (s);
1294 } 1451 }
1295 1452
1296foundpet: 1453foundpet:
1297 1454
1298 XFree (xim_styles); 1455 XFree (xim_styles);
… …
1377 NULL); 1534 NULL);
1378 } 1535 }
1379#if ENABLE_XIM_ONTHESPOT 1536#if ENABLE_XIM_ONTHESPOT
1380 else if (input_style & XIMPreeditCallbacks) 1537 else if (input_style & XIMPreeditCallbacks)
1381 { 1538 {
1539 XIMCallback xcb[4];
1540
1382 im_set_position (spot); 1541 im_set_position (spot);
1383 1542
1384 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1543 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1385 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1544 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1386 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1545 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1401#endif 1560#endif
1402 1561
1403 Input_Context = XCreateIC (xim, 1562 Input_Context = XCreateIC (xim,
1404 XNInputStyle, input_style, 1563 XNInputStyle, input_style,
1405 XNClientWindow, vt, 1564 XNClientWindow, vt,
1406 XNFocusWindow, parent[0], 1565 XNFocusWindow, parent,
1407 preedit_attr ? XNPreeditAttributes : NULL, 1566 preedit_attr ? XNPreeditAttributes : NULL,
1408 preedit_attr, 1567 preedit_attr,
1409 status_attr ? XNStatusAttributes : NULL, 1568 status_attr ? XNStatusAttributes : NULL,
1410 status_attr, NULL); 1569 status_attr, NULL);
1411 1570
… …
1424 // unfortunately, only the focus window is used by XIM, hard to fix 1583 // unfortunately, only the focus window is used by XIM, hard to fix
1425 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1584 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1426 vt_select_input (); 1585 vt_select_input ();
1427#endif 1586#endif
1428 1587
1429 IMSetPosition (); 1588 im_set_position ();
1430 1589
1431 return true; 1590 return true;
1432} 1591}
1433 1592
1434void 1593void
… …
1444 im_destroy (); 1603 im_destroy ();
1445 1604
1446 if (Input_Context) 1605 if (Input_Context)
1447 return; 1606 return;
1448 1607
1449#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1450 if (rs[Rs_imLocale]) 1608 if (rs[Rs_imLocale])
1451 SET_LOCALE (rs[Rs_imLocale]); 1609 SET_LOCALE (rs[Rs_imLocale]);
1452#endif
1453 1610
1454 p = rs[Rs_inputMethod]; 1611 p = rs[Rs_inputMethod];
1455 if (p && *p) 1612 if (p && *p)
1456 { 1613 {
1457 bool found = false; 1614 bool found = false;
1458 1615
1459 s = rxvt_splitcommastring (p); 1616 s = rxvt_strsplit (',', p);
1460 1617
1461 for (i = 0; s[i]; i++) 1618 for (i = 0; s[i]; i++)
1462 { 1619 {
1463 if (*s[i]) 1620 if (*s[i])
1464 { 1621 {
1465 strcpy (buf, "@im="); 1622 strcpy (buf, "@im=");
1466 strncat (buf, s[i], IMBUFSIZ - 5); 1623 strncat (buf, s[i], IMBUFSIZ - 5);
1467 if (IM_get_IC (buf)) 1624 if (im_get_ic (buf))
1468 { 1625 {
1469 found = true; 1626 found = true;
1470 break; 1627 break;
1471 } 1628 }
1472 } 1629 }
1473 } 1630 }
1474 1631
1475 rxvt_freecommastring (s); 1632 rxvt_free_strsplit (s);
1476 1633
1477 if (found) 1634 if (found)
1478 goto done; 1635 goto done;
1479 } 1636 }
1480 1637
1481 /* try with XMODIFIERS env. var. */ 1638 /* try with XMODIFIERS env. var. */
1482 if (IM_get_IC ("")) 1639 if (im_get_ic (""))
1483 goto done; 1640 goto done;
1484 1641
1485 /* try with no modifiers base IF the user didn't specify an IM */ 1642 /* try with no modifiers base IF the user didn't specify an IM */
1486 if (IM_get_IC ("@im=none")) 1643 if (im_get_ic ("@im=none"))
1487 goto done; 1644 goto done;
1488 1645
1489done: 1646done:
1490#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1491 if (rs[Rs_imLocale]) 1647 if (rs[Rs_imLocale])
1492 SET_LOCALE (locale); 1648 SET_LOCALE (locale);
1493#endif
1494} 1649}
1495 1650
1496void 1651void
1497rxvt_term::IMSetPosition () 1652rxvt_term::im_set_position ()
1498{ 1653{
1499 XRectangle preedit_rect, status_rect, *needed_rect; 1654 XRectangle preedit_rect, status_rect, *needed_rect;
1500 XVaNestedList preedit_attr, status_attr; 1655 XVaNestedList preedit_attr, status_attr;
1501 1656
1502 if (!Input_Context 1657 if (!Input_Context
1503 || !focus 1658 || !focus
1504 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1659 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1505 || !IMisRunning ()) 1660 || !im_is_running ())
1506 return; 1661 return;
1507 1662
1508 if (input_style & XIMPreeditPosition) 1663 if (input_style & XIMPreeditPosition)
1509 { 1664 {
1510 im_set_size (preedit_rect); 1665 im_set_size (preedit_rect);
… …
1540 1695
1541void 1696void
1542rxvt_term::get_window_origin (int &x, int &y) 1697rxvt_term::get_window_origin (int &x, int &y)
1543{ 1698{
1544 Window cr; 1699 Window cr;
1545 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1700 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1546/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1547} 1701}
1548
1549Pixmap
1550rxvt_term::get_pixmap_property (int prop_id)
1551{
1552 if (prop_id > 0 && prop_id < NUM_XA)
1553 if (xa[prop_id])
1554 {
1555 int aformat;
1556 unsigned long nitems, bytes_after;
1557 Atom atype;
1558 unsigned char *prop = NULL;
1559 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1560 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1561 &nitems, &bytes_after, &prop);
1562 if (result == Success && prop && atype == XA_PIXMAP)
1563 return *(Pixmap *)prop;
1564 }
1565
1566 return None;
1567}
1568
1569#ifdef HAVE_BG_PIXMAP
1570# if TRACE_PIXMAPS
1571# undef update_background
1572void
1573rxvt_term::trace_update_background (const char *file, int line)
1574{
1575 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1576 update_background ();
1577}
1578# endif
1579
1580void
1581rxvt_term::update_background ()
1582{
1583 if (update_background_ev.is_active ())
1584 return;
1585
1586 bgPixmap.invalidate ();
1587
1588 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1589
1590 if (to_wait <= 0.)
1591 bgPixmap.render ();
1592 else
1593 update_background_ev.start (to_wait);
1594}
1595
1596void
1597rxvt_term::update_background_cb (ev::timer &w, int revents)
1598{
1599 make_current ();
1600
1601 update_background_ev.stop ();
1602 bgPixmap.render ();
1603 refresh_check ();
1604}
1605
1606#endif /* HAVE_BG_PIXMAP */
1607 1702
1608/*----------------------- end-of-file (C source) -----------------------*/ 1703/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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