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.403 by root, Thu Jun 17 00:49:20 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 g_type_init ();
640#endif
502} 641}
503 642
504/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
505/* 644/*
506 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
625 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
626 765
627 if (recalc_y) 766 if (recalc_y)
628 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
629 768
630 ncol = width / fwidth; 769 ncol = width / fwidth;
631 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
632} 780}
633 781
634/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
635/* 783/*
636 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
644 792
645 struct winsize ws; 793 struct winsize ws;
646 794
647 ws.ws_col = ncol; 795 ws.ws_col = ncol;
648 ws.ws_row = nrow; 796 ws.ws_row = nrow;
649 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
650 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
651 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
652 800
653#if 0 801#if 0
654 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
655 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
656 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
657#endif 805#endif
658} 806}
659 807
660/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
661/* set_fonts () - load and set the various fonts 809/* 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 810bool
669rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
670{ 812{
671 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
672 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
686#endif 828#endif
687 829
688 delete fontset[0]; 830 delete fontset[0];
689 fontset[0] = fs; 831 fontset[0] = fs;
690 832
691 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
692 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
693 835
694 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
695 837
696 fwidth = prop.width; 838 fwidth = prop.width;
697 fheight = prop.height; 839 fheight = prop.height + lineSpace;
698 fbase = prop.ascent; 840 fbase = prop.ascent;
699 841
700 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
701 { 843 {
702#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
728#else 870#else
729 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
730#endif 872#endif
731 } 873 }
732 874
733 if (parent[0]) 875 if (parent)
734 { 876 {
735 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
736 scr_remap_chars (); 878 scr_remap_chars ();
737 scr_touch (true); 879 scr_touch (true);
738 } 880 }
… …
741} 883}
742 884
743void 885void
744rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
745{ 887{
746 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
747 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
748 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
749} 891}
750 892
751void 893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
752rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
753{ 907{
754 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
755 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
756 910
757 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
758 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
759 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
760 914
761 free (s); 915 free (s);
762 free (ws); 916 free (ws);
… …
766/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
767/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
768void 922void
769rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
770{ 924{
771 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
772#if ENABLE_EWMH 926#if ENABLE_EWMH
773 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
774#endif 928#endif
775} 929}
776 930
777void 931void
778rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
779{ 933{
780 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
781#if ENABLE_EWMH 935#if ENABLE_EWMH
782 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
783#endif 937#endif
784} 938}
785 939
786void 940void
787rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
788{ 942{
789#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
790 rxvt_color xcol;
791
792 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
793 return; 945 return;
794 946
795 color = strdup (color); 947 color = strdup (color);
796 allocated.push_back ((void *)color); 948 allocated.push_back ((void *)color);
… …
802 int i = atoi (color); 954 int i = atoi (color);
803 955
804 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
805 { 957 {
806 /* bright colors */ 958 /* bright colors */
807 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 959 alias_color (idx, minBrightCOLOR + i - 8);
808 goto done; 960 goto done;
809 } 961 }
810 962
811 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
812 { 964 {
813 /* normal colors */ 965 /* normal colors */
814 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
815 goto done; 967 goto done;
816 } 968 }
817 } 969 }
818 970
819 set_color (xcol, color); 971 pix_colors_focused[idx].free (this);
820 972 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 973
828done: 974done:
829 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
830 976
831 update_fade_color (idx); 977 update_fade_color (idx);
832 recolour_cursor (); 978 recolor_cursor ();
833 scr_recolour (); 979 scr_recolor ();
834#endif /* XTERM_COLOR_CHANGE */ 980#endif /* XTERM_COLOR_CHANGE */
835} 981}
836 982
837void 983void
838rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
839{ 985{
840 XColor fg, bg; 986 XColor fg, bg;
841 987
842 (ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
843 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
… …
852 998
853/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
854/* 1000/*
855 * find if fg/bg matches any of the normal (low-intensity) colors 1001 * find if fg/bg matches any of the normal (low-intensity) colors
856 */ 1002 */
857void 1003char *
858rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
859{ 1005{
860 unsigned int i; 1006 unsigned int i;
861 const char *xpmb = ""; 1007 const char *xpmb = "";
862 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
863 1011
864 strcpy (fstr, "default");
865 strcpy (bstr, "default");
866 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
867 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
868 { 1014 {
869 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
870 break; 1016 break;
871 } 1017 }
872 1018
873 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
874 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
875 { 1021 {
876 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
877#ifdef BG_IMAGE_FROM_FILE 1023#if HAVE_IMG
878 xpmb = "default;"; 1024 xpmb = "default;";
879#endif 1025#endif
880 break; 1026 break;
881 } 1027 }
882 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
883 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1030 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1031 return env_colorfgbg;
884} 1032}
885 1033
886/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
887 1035
888bool 1036bool
… …
896} 1044}
897 1045
898void 1046void
899rxvt_term::alias_color (int dst, int src) 1047rxvt_term::alias_color (int dst, int src)
900{ 1048{
1049 pix_colors[dst].free (this);
901 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]); 1050 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
902} 1051}
1052
1053#ifdef SMART_RESIZE
1054static unsigned int
1055get_parent_bw (Display *dpy, Window w)
1056{
1057 int idummy;
1058 unsigned int udummy;
1059 Window wdummy, parent;
1060 Window *children;
1061 unsigned int nchildren, border_width;
1062
1063 XQueryTree (dpy, w, &wdummy, &parent, &children, &nchildren);
1064 XFree (children);
1065 XGetGeometry (dpy, parent, &wdummy, &idummy, &idummy,
1066 &udummy, &udummy, &border_width, &udummy);
1067
1068 return border_width;
1069}
1070#endif
903 1071
904/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
905 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
906 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
907void 1075void
… …
911 int old_width = szHint.width; 1079 int old_width = szHint.width;
912 int old_height = szHint.height; 1080 int old_height = szHint.height;
913 1081
914 window_calc (newwidth, newheight); 1082 window_calc (newwidth, newheight);
915 1083
916 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1084 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1085
1086 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1087 if (set_hint)
1088 {
1089 szHint.flags &= ~(PBaseSize | PResizeInc);
917 XSetWMNormalHints (dpy, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1091 szHint.flags |= PBaseSize | PResizeInc;
1092 }
918 1093
919 if (!ignoreparent) 1094 if (!ignoreparent)
920 { 1095 {
921#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
922 /* 1097 /*
… …
926 int x, y, x1, y1; 1101 int x, y, x1, y1;
927 int dx, dy; 1102 int dx, dy;
928 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
929 Window unused_cr; 1104 Window unused_cr;
930 1105
931 XTranslateCoordinates (dpy, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
932 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
933 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
934 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
935 /* 1110 /*
936 * if display->root isn't the parent window, a WM will probably have offset 1111 * if display->root isn't the parent window, a WM will probably have offset
937 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
938 */ 1113 */
939 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
940 { 1115 {
941 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
942 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
943 } 1120 }
944 1121
945 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
946 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
947 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
… …
955 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
956 dy = 0; 1133 dy = 0;
957 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
958 dy /= 2; 1135 dy /= 2;
959 1136
960 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
961 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
962#else 1139#else
963 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
964#endif 1141#endif
965 } 1142 }
1143
1144 if (set_hint)
1145 XSetWMNormalHints (dpy, parent, &szHint);
966 1146
967 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
968 1148
969 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
970 { 1150 {
971 if (scrollBar.state) 1151 if (scrollBar.state)
972 scrollBar.resize (); 1152 scrollBar.resize ();
973 1153
974 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
975 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
976 width, height); 1156 vt_width, vt_height);
977 1157
978#ifdef HAVE_BG_PIXMAP 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
979 if (bgPixmap.window_size_sensitive ())
980 update_background ();
981#endif
982
983 scr_clear ();
984 } 1159 }
985 1160
986 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
987 scr_reset (); 1162 scr_reset ();
988 1163
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 1164#if USE_XIM
999 IMSetPosition (); 1165 im_set_position ();
1000#endif 1166#endif
1001} 1167}
1002 1168
1003/* 1169/*
1004 * Set the width/height of the vt window in characters. Units are pixels. 1170 * Set the width/height of the vt window in characters. Units are pixels.
… …
1017 newwidth = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1018 if (newheight == 0) 1184 if (newheight == 0)
1019 newheight = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1020 } 1186 }
1021 1187
1022 if (newwidth != width || newheight != height) 1188 if (newwidth != vt_width || newheight != vt_height)
1023 { 1189 {
1024 newwidth += szHint.base_width; 1190 newwidth += szHint.base_width;
1025 newheight += szHint.base_height; 1191 newheight += szHint.base_height;
1026 resize_all_windows (newwidth, newheight, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1027 } 1193 }
1028} 1194}
1029 1195
1030/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1031 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1032 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1033#ifdef USE_XIM 1199#if USE_XIM
1034 1200
1035void 1201void
1036rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1037{ 1203{
1038 fg = pix_colors [Color_fg]; 1204 fg = pix_colors [Color_fg];
… …
1065 status_rect.height = fheight; 1231 status_rect.height = fheight;
1066} 1232}
1067 1233
1068/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1069bool 1235bool
1070rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1071{ 1237{
1072 char *p;
1073 Atom atom; 1238 Atom atom;
1074 Window win; 1239 Window win;
1075 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1076 1241
1077 /* get current locale modifier */ 1242 /* get current locale modifier */
1078 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1243 if (char *p = XSetLocaleModifiers (0))
1079 { 1244 {
1080 strcpy (server, "@server="); 1245 strcpy (server, "@server=");
1081 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1246 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1082 1247
1083 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1248 if (p = strchr (server + 1, '@')) /* first one only */
1084 *p = '\0'; 1249 *p = '\0';
1085 1250
1086 atom = XInternAtom (dpy, server, False); 1251 atom = XInternAtom (dpy, server, False);
1087 win = XGetSelectionOwner (dpy, atom); 1252 win = XGetSelectionOwner (dpy, atom);
1088 1253
1089 if (win != None) 1254 if (win != None)
1090 return True; 1255 return true;
1091 } 1256 }
1092 1257
1093 return False; 1258 return false;
1094} 1259}
1095 1260
1096void 1261void
1097rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1098{ 1263{
1099 XPoint nspot; 1264 XPoint nspot;
1100 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1101 1266
1102 if (!Input_Context 1267 if (!Input_Context
… …
1155 1320
1156 term->make_current (); 1321 term->make_current ();
1157 1322
1158 if (text) 1323 if (text)
1159 { 1324 {
1160 void *str; 1325 wchar_t *str;
1161 1326
1162 if (!text->encoding_is_wchar && text->string.multi_byte) 1327 if (!text->encoding_is_wchar && text->string.multi_byte)
1163 { 1328 {
1164 // of course, X makes it ugly again 1329 // of course, X makes it ugly again
1165 if (term->rs[Rs_imLocale]) 1330 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->rs[Rs_imLocale]); 1331 SET_LOCALE (term->rs[Rs_imLocale]);
1167 1332
1168 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1333 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1169 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1334 mbstowcs (str, text->string.multi_byte, text->length + 1);
1170 1335
1171 if (term->rs[Rs_imLocale]) 1336 if (term->rs[Rs_imLocale])
1172 SET_LOCALE (term->locale); 1337 SET_LOCALE (term->locale);
1173 } 1338 }
1174 else 1339 else
1175 str = (void *)text->string.wide_char; 1340 str = text->string.wide_char;
1176 1341
1177 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1342 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1178 DT_INT, call_data->caret, 1343 DT_INT, call_data->caret,
1179 DT_INT, call_data->chg_first, 1344 DT_INT, call_data->chg_first,
1180 DT_INT, call_data->chg_length, 1345 DT_INT, call_data->chg_length,
… …
1208/* 1373/*
1209 * Try to open a XIM with the current modifiers, then see if we can 1374 * Try to open a XIM with the current modifiers, then see if we can
1210 * open a suitable preedit type 1375 * open a suitable preedit type
1211 */ 1376 */
1212bool 1377bool
1213rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1214{ 1379{
1215 int i, j, found; 1380 int i, j, found;
1216 XIM xim; 1381 XIM xim;
1217 XPoint spot; 1382 XPoint spot;
1218 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1219 unsigned long fg, bg; 1384 unsigned long fg, bg;
1220 const char *p; 1385 const char *p;
1221 char **s; 1386 char **s;
1222 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1223#ifdef ENABLE_XIM_ONTHESPOT
1224 XIMCallback xcb[4];
1225#endif
1226 1388
1227 set_environ (envv); 1389 set_environ (env);
1228 1390
1229 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1230 return false; 1392 return false;
1231 1393
1232 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1233 if (input_method == NULL) 1395 if (input_method == NULL)
1234 return false; 1396 return false;
… …
1251 p = pet[pi]; 1413 p = pet[pi];
1252 1414
1253 if (!p) 1415 if (!p)
1254 continue; 1416 continue;
1255 1417
1256 s = rxvt_splitcommastring (p); 1418 s = rxvt_strsplit (',', p);
1257 1419
1258 for (i = found = 0; !found && s[i]; i++) 1420 for (i = found = 0; !found && s[i]; i++)
1259 { 1421 {
1260 if (!strcmp (s[i], "OverTheSpot")) 1422 if (!strcmp (s[i], "OverTheSpot"))
1261 input_style = XIMPreeditPosition | XIMStatusNothing; 1423 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1273 input_style = XIMPreeditNothing | XIMStatusNothing; 1435 input_style = XIMPreeditNothing | XIMStatusNothing;
1274 1436
1275 for (j = 0; j < xim_styles->count_styles; j++) 1437 for (j = 0; j < xim_styles->count_styles; j++)
1276 if (input_style == xim_styles->supported_styles[j]) 1438 if (input_style == xim_styles->supported_styles[j])
1277 { 1439 {
1278 rxvt_freecommastring (s); 1440 rxvt_free_strsplit (s);
1279 1441
1280 found = 1; 1442 found = 1;
1281 goto foundpet; 1443 goto foundpet;
1282 } 1444 }
1283 1445
1284 } 1446 }
1285 1447
1286 rxvt_freecommastring (s); 1448 rxvt_free_strsplit (s);
1287 } 1449 }
1288 1450
1289foundpet: 1451foundpet:
1290 1452
1291 XFree (xim_styles); 1453 XFree (xim_styles);
… …
1370 NULL); 1532 NULL);
1371 } 1533 }
1372#if ENABLE_XIM_ONTHESPOT 1534#if ENABLE_XIM_ONTHESPOT
1373 else if (input_style & XIMPreeditCallbacks) 1535 else if (input_style & XIMPreeditCallbacks)
1374 { 1536 {
1537 XIMCallback xcb[4];
1538
1375 im_set_position (spot); 1539 im_set_position (spot);
1376 1540
1377 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1541 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; 1542 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; 1543 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1394#endif 1558#endif
1395 1559
1396 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1397 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1398 XNClientWindow, vt, 1562 XNClientWindow, vt,
1399 XNFocusWindow, parent[0], 1563 XNFocusWindow, parent,
1400 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1401 preedit_attr, 1565 preedit_attr,
1402 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1403 status_attr, NULL); 1567 status_attr, NULL);
1404 1568
… …
1417 // unfortunately, only the focus window is used by XIM, hard to fix 1581 // unfortunately, only the focus window is used by XIM, hard to fix
1418 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1419 vt_select_input (); 1583 vt_select_input ();
1420#endif 1584#endif
1421 1585
1422 IMSetPosition (); 1586 im_set_position ();
1423 1587
1424 return true; 1588 return true;
1425} 1589}
1426 1590
1427void 1591void
… …
1437 im_destroy (); 1601 im_destroy ();
1438 1602
1439 if (Input_Context) 1603 if (Input_Context)
1440 return; 1604 return;
1441 1605
1442#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1443 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1444 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1445#endif
1446 1608
1447 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1448 if (p && *p) 1610 if (p && *p)
1449 { 1611 {
1450 bool found = false; 1612 bool found = false;
1451 1613
1452 s = rxvt_splitcommastring (p); 1614 s = rxvt_strsplit (',', p);
1453 1615
1454 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1455 { 1617 {
1456 if (*s[i]) 1618 if (*s[i])
1457 { 1619 {
1458 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1459 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1460 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1461 { 1623 {
1462 found = true; 1624 found = true;
1463 break; 1625 break;
1464 } 1626 }
1465 } 1627 }
1466 } 1628 }
1467 1629
1468 rxvt_freecommastring (s); 1630 rxvt_free_strsplit (s);
1469 1631
1470 if (found) 1632 if (found)
1471 goto done; 1633 goto done;
1472 } 1634 }
1473 1635
1474 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1475 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1476 goto done; 1638 goto done;
1477 1639
1478 /* try with no modifiers base IF the user didn't specify an IM */ 1640 /* try with no modifiers base IF the user didn't specify an IM */
1479 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1480 goto done; 1642 goto done;
1481 1643
1482done: 1644done:
1483#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1484 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1485 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1486#endif
1487} 1647}
1488 1648
1489void 1649void
1490rxvt_term::IMSetPosition () 1650rxvt_term::im_set_position ()
1491{ 1651{
1492 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1493 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1494 1654
1495 if (!Input_Context 1655 if (!Input_Context
1496 || !focus 1656 || !focus
1497 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1498 || !IMisRunning ()) 1658 || !im_is_running ())
1499 return; 1659 return;
1500 1660
1501 if (input_style & XIMPreeditPosition) 1661 if (input_style & XIMPreeditPosition)
1502 { 1662 {
1503 im_set_size (preedit_rect); 1663 im_set_size (preedit_rect);
… …
1533 1693
1534void 1694void
1535rxvt_term::get_window_origin (int &x, int &y) 1695rxvt_term::get_window_origin (int &x, int &y)
1536{ 1696{
1537 Window cr; 1697 Window cr;
1538 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1539/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1540} 1699}
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}
1561
1562#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
1573void
1574rxvt_term::update_background ()
1575{
1576 if (update_background_ev.is_active ())
1577 return;
1578
1579 bgPixmap.invalidate ();
1580
1581 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1582
1583 if (to_wait <= 0.)
1584 bgPixmap.render ();
1585 else
1586 update_background_ev.start (to_wait);
1587}
1588
1589void
1590rxvt_term::update_background_cb (ev::timer &w, int revents)
1591{
1592 make_current ();
1593
1594 update_background_ev.stop ();
1595 bgPixmap.render ();
1596 refresh_check ();
1597}
1598
1599#endif /* HAVE_BG_PIXMAP */
1600 1700
1601/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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