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.303 by ayin, Sun Jan 27 22:48:33 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 230#endif
232 231
233 if (display) 232 if (display)
234 { 233 {
235 selection_clear (); 234 selection_clear ();
235 selection_clear (true);
236 236
237#ifdef USE_XIM 237#if USE_XIM
238 im_destroy (); 238 im_destroy ();
239#endif 239#endif
240#ifdef XTERM_SCROLLBAR 240 scrollBar.destroy ();
241 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 241
242 if (ShadowGC) XFreeGC (dpy, ShadowGC); 242 if (gc)
243#endif
244#ifdef PLAIN_SCROLLBAR
245 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
246#endif
247#ifdef NEXT_SCROLLBAR
248 if (blackGC) XFreeGC (dpy, blackGC);
249 if (whiteGC) XFreeGC (dpy, whiteGC);
250 if (grayGC) XFreeGC (dpy, grayGC);
251 if (darkGC) XFreeGC (dpy, darkGC);
252 if (stippleGC) XFreeGC (dpy, stippleGC);
253 if (dimple) XFreePixmap (dpy, dimple);
254 if (upArrow) XFreePixmap (dpy, upArrow);
255 if (downArrow) XFreePixmap (dpy, downArrow);
256 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
257 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
258#endif
259#ifdef RXVT_SCROLLBAR
260 if (topShadowGC) XFreeGC (dpy, topShadowGC);
261 if (botShadowGC) XFreeGC (dpy, botShadowGC);
262 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
263#endif
264 if (gc) XFreeGC (dpy, gc); 243 XFreeGC (dpy, gc);
265 244
266 delete drawable; 245 delete drawable;
246
267 // destroy all windows 247 // destroy all windows
268 if (parent[0]) 248 if (parent)
269 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
270 250
271 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
272 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
273 { 253 {
274 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
275#if OFF_FOCUS_FADING 255#if OFF_FOCUS_FADING
256 if (rs[Rs_fade])
276 pix_colors_unfocused [i].free (this); 257 pix_colors_unfocused [i].free (this);
277#endif 258#endif
278 } 259 }
279 260
280 clear (); 261 clear ();
281 262
… …
288 /* clear all resources */ 269 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 271 free (allocated [i]);
291 272
292 free (selection.text); 273 free (selection.text);
293 // TODO: manage env vars in child only(!) 274 free (selection.clip_text);
294 free (env_display);
295 free (env_term);
296 free (locale); 275 free (locale);
297 free (v_buffer); 276 free (v_buffer);
298 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;
299 284
300 delete envv; 285 delete envv;
301 delete argv; 286 delete argv;
302 287
303#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
304 delete keyboard; 289 delete keyboard;
305#endif 290#endif
306#ifndef NO_RESOURCES 291#ifndef NO_RESOURCES
307 XrmDestroyDatabase (option_db); 292 XrmDestroyDatabase (option_db);
308#endif 293#endif
294
295 SET_R ((rxvt_term *)0);
309} 296}
310 297
311// child has exited, usually destroys 298// child has exited, usually destroys
312void 299void
313rxvt_term::child_cb (ev::child &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
… …
336 { 323 {
337#if USE_XIM 324#if USE_XIM
338 im_ev.stop (display); 325 im_ev.stop (display);
339#endif 326#endif
340 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
341#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if ENABLE_PERL
342 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
343#endif 330#endif
344 incr_ev.stop ();
345 termwin_ev.stop (display); 331 termwin_ev.stop (display);
346 vt_ev.stop (display); 332 vt_ev.stop (display);
347 } 333 }
348 334
349 flush_ev.stop (); 335 flush_ev.stop ();
… …
373 make_current (); 359 make_current ();
374 360
375 delete this; 361 delete this;
376} 362}
377 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
378/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
379/* 377/*
380 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
381 * TODO: if debugging, this should free up any known resources if we can
382 */ 379 */
383static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
384 381
385static void 382static void
386rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
388 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++)
389 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
390} 387}
391 388
392#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
393static void 390static void ecb_cold
394print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
395{ 392{
396 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
397 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
398 char number[32]; 395 char number[32];
399 char *mtype = "XlibMessage"; 396
400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
402 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);
403 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
405 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 {
406 sprintf(number, "%d", event->request_code); 460 sprintf (number, "%d", event->request_code);
407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
408 rxvt_warn ("(which is %s)\n", buffer); 462 rxvt_warn ("+ (which is %s)\n", buffer);
409 if (event->request_code >= 128) {
410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
411 mesg, BUFSIZ);
412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
413 } 463 }
464
414 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
415 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
416 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
417 (event->error_code == BadFont) || 468 || event->error_code == BadFont
418 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
419 (event->error_code == BadColor) || 470 || event->error_code == BadColor
420 (event->error_code == BadGC) || 471 || event->error_code == BadGC
421 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
422 (event->error_code == BadValue) || 473 || event->error_code == BadValue
423 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
424 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
426 mesg, BUFSIZ);
427 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
429 mesg, BUFSIZ); 480 else
430 else
431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
432 mesg, BUFSIZ);
433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
434 }
435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
436 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
438}
439#endif
440 482
441int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
442rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
443{ 490{
444 if (GET_R->allowedxerror == -1) 491 if (GET_R && GET_R->allowedxerror == -1)
445 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
446 else 493 else
447 { 494 {
448 // 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,
449 // so just output the error and continue 496 // so just output the error and continue
… …
455 } 502 }
456 503
457 return 0; 504 return 0;
458} 505}
459 506
460int 507int ecb_cold
461rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
462{ 509{
463 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",
464 DisplayString (display)); 511 DisplayString (display));
465 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
488 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
489 w.stop (); 536 w.stop ();
490 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
491} 538}
492 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
493char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
494 608
495void 609void
496rxvt_init () 610rxvt_init ()
497{ 611{
498 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))));
499 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
500 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
501 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
502 623
503 rxvt_environ = environ; 624 rxvt_environ = environ;
504 625
505 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
506 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
507 628
508 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
509 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
510
511 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
512 /* signal (SIGURG, SIG_DFL); */
513 631
514 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
515 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
516 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
517 635
518 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
519} 641}
520 642
521/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
522/* 644/*
523 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
525 */ 647 */
526void 648void
527rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
528{ 650{
529 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
530 int x, y, sb_w, flags; 652 int x, y, flags;
531 unsigned int w, h; 653 unsigned int w, h;
532 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
533 655
534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
535 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
… …
545 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
546 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
547 669
548 if (flags & WidthValue) 670 if (flags & WidthValue)
549 { 671 {
672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
550 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
551 szHint.flags |= USSize; 676 szHint.flags |= USSize;
552 } 677 }
553 678
554 if (flags & HeightValue) 679 if (flags & HeightValue)
555 { 680 {
681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
556 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
557 szHint.flags |= USSize; 685 szHint.flags |= USSize;
558 } 686 }
559 687
560 if (flags & XValue) 688 if (flags & XValue)
561 { 689 {
… …
592 max_width = MAX_COLS * fwidth; 720 max_width = MAX_COLS * fwidth;
593 max_height = MAX_ROWS * fheight; 721 max_height = MAX_ROWS * fheight;
594 722
595 szHint.base_width = szHint.base_height = 2 * int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
596 724
597 sb_w = 0;
598 window_vt_x = window_vt_y = int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
599 726
600 if (scrollBar.state) 727 if (scrollBar.state)
601 { 728 {
602 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
603 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
604 731
605 if (!option (Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
606 window_vt_x += sb_w; 733 window_vt_x += sb_w;
607 } 734 }
… …
631 { 758 {
632 min_it (height, max_height); 759 min_it (height, max_height);
633 szHint.height = szHint.base_height + height; 760 szHint.height = szHint.base_height + height;
634 } 761 }
635 762
636 if (scrollBar.state && option (Opt_scrollBar_right))
637 window_sb_x = szHint.width - sb_w;
638
639 if (recalc_x) 763 if (recalc_x)
640 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
641 765
642 if (recalc_y) 766 if (recalc_y)
643 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
644 768
645 ncol = width / fwidth; 769 ncol = width / fwidth;
646 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;
647} 780}
648 781
649/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
650/* 783/*
651 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
659 792
660 struct winsize ws; 793 struct winsize ws;
661 794
662 ws.ws_col = ncol; 795 ws.ws_col = ncol;
663 ws.ws_row = nrow; 796 ws.ws_row = nrow;
664 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
665 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
666 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
667 800
668#if 0 801#if 0
669 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
670 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
671 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
672#endif 805#endif
673} 806}
674 807
675/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
676/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
677 *
678 * init = 1 - initialize
679 *
680 * fontname == FONT_UP - switch to bigger font
681 * fontname == FONT_DN - switch to smaller font
682 */
683bool 810bool
684rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
685{ 812{
686 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
687 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
701#endif 828#endif
702 829
703 delete fontset[0]; 830 delete fontset[0];
704 fontset[0] = fs; 831 fontset[0] = fs;
705 832
706 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
707 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
708 835
709 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
710 837
711 fwidth = prop.width; 838 fwidth = prop.width;
712 fheight = prop.height; 839 fheight = prop.height + lineSpace;
713 fbase = prop.ascent; 840 fbase = prop.ascent;
714 841
715 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
716 { 843 {
717#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
743#else 870#else
744 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
745#endif 872#endif
746 } 873 }
747 874
748 if (parent[0]) 875 if (parent)
749 { 876 {
750 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
751 scr_remap_chars (); 878 scr_remap_chars ();
752 scr_touch (true); 879 scr_touch (true);
753 } 880 }
… …
756} 883}
757 884
758void 885void
759rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
760{ 887{
761 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
762 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
763 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
764} 891}
765 892
766void 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
767rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
768{ 907{
769 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
770 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
771 910
772 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
773 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
774 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
775 914
776 free (s); 915 free (s);
777 free (ws); 916 free (ws);
… …
781/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
782/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
783void 922void
784rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
785{ 924{
786 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
787#if ENABLE_EWMH 926#if ENABLE_EWMH
788 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
789#endif 928#endif
790} 929}
791 930
792void 931void
793rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
794{ 933{
795 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
796#if ENABLE_EWMH 935#if ENABLE_EWMH
797 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
798#endif 937#endif
799} 938}
800 939
801void 940void
802rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
803{ 942{
804#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
805 rxvt_color xcol;
806 int i;
807
808 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
809 return; 945 return;
810 946
811 color = strdup (color); 947 color = strdup (color);
812 allocated.push_back ((void *)color); 948 allocated.push_back ((void *)color);
813 rs[Rs_color + idx] = color; 949 rs[Rs_color + idx] = color;
814 950
815 /* handle color aliases */ 951 /* handle color aliases */
816 if (isdigit (*color)) 952 if (isdigit (*color))
817 { 953 {
818 i = atoi (color); 954 int i = atoi (color);
819 955
820 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
821 { 957 {
822 /* bright colors */ 958 /* bright colors */
823 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 959 alias_color (idx, minBrightCOLOR + i - 8);
824 goto done; 960 goto done;
825 } 961 }
826 962
827 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
828 { 964 {
829 /* normal colors */ 965 /* normal colors */
830 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
831 goto done; 967 goto done;
832 } 968 }
833 } 969 }
834 970
835 set_color (xcol, color); 971 pix_colors_focused[idx].free (this);
836 972 set_color (pix_colors_focused[idx], color);
837 /*
838 * FIXME: should free colors here, but no idea how to do it so instead,
839 * so just keep gobbling up the colormap
840 */
841
842 pix_colors_focused[idx] = xcol;
843 973
844done: 974done:
845 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
846 976
847 update_fade_color (idx); 977 update_fade_color (idx);
848 recolour_cursor (); 978 recolor_cursor ();
849 scr_recolour (); 979 scr_recolor ();
850#endif /* XTERM_COLOR_CHANGE */ 980#endif /* XTERM_COLOR_CHANGE */
851} 981}
852 982
853void 983void
854rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
855{ 985{
856 XColor fg, bg; 986 XColor fg, bg;
857 987
858 (ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
859 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
… …
868 998
869/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
870/* 1000/*
871 * 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
872 */ 1002 */
873void 1003char *
874rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
875{ 1005{
876 unsigned int i; 1006 unsigned int i;
877 const char *xpmb = ""; 1007 const char *xpmb = "";
878 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
879 1011
880 strcpy (fstr, "default");
881 strcpy (bstr, "default");
882 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
883 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
884 { 1014 {
885 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
886 break; 1016 break;
887 } 1017 }
888 1018
889 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
890 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
891 { 1021 {
892 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
893#ifdef BG_IMAGE_FROM_FILE 1023#if HAVE_IMG
894 xpmb = "default;"; 1024 xpmb = "default;";
895#endif 1025#endif
896 break; 1026 break;
897 } 1027 }
898 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
899 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;
900} 1032}
901 1033
902/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
903 1035
904bool 1036bool
… …
912} 1044}
913 1045
914void 1046void
915rxvt_term::alias_color (int dst, int src) 1047rxvt_term::alias_color (int dst, int src)
916{ 1048{
1049 pix_colors[dst].free (this);
917 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]);
918} 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
919 1071
920/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
921 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
922 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
923void 1075void
… …
927 int old_width = szHint.width; 1079 int old_width = szHint.width;
928 int old_height = szHint.height; 1080 int old_height = szHint.height;
929 1081
930 window_calc (newwidth, newheight); 1082 window_calc (newwidth, newheight);
931 1083
932 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);
933 XSetWMNormalHints (dpy, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1091 szHint.flags |= PBaseSize | PResizeInc;
1092 }
934 1093
935 if (!ignoreparent) 1094 if (!ignoreparent)
936 { 1095 {
937#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
938 /* 1097 /*
… …
942 int x, y, x1, y1; 1101 int x, y, x1, y1;
943 int dx, dy; 1102 int dx, dy;
944 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
945 Window unused_cr; 1104 Window unused_cr;
946 1105
947 XTranslateCoordinates (dpy, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
948 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
949 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
950 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
951 /* 1110 /*
952 * 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
953 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
954 */ 1113 */
955 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
956 { 1115 {
957 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
958 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
959 } 1120 }
960 1121
961 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
962 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
963 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
… …
971 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
972 dy = 0; 1133 dy = 0;
973 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
974 dy /= 2; 1135 dy /= 2;
975 1136
976 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
977 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
978#else 1139#else
979 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
980#endif 1141#endif
981 } 1142 }
1143
1144 if (set_hint)
1145 XSetWMNormalHints (dpy, parent, &szHint);
982 1146
983 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
984 1148
985 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
986 { 1150 {
987 if (scrollBar.state) 1151 if (scrollBar.state)
988 { 1152 scrollBar.resize ();
989 XMoveResizeWindow (dpy, scrollBar.win,
990 window_sb_x, 0,
991 scrollbar_TotalWidth (), szHint.height);
992 resize_scrollbar ();
993 }
994 1153
995 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
996 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
997 width, height); 1156 vt_width, vt_height);
998 1157
999#ifdef HAVE_BG_PIXMAP 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1000 if (bgPixmap.window_size_sensitive ())
1001 update_background ();
1002#endif
1003
1004 scr_clear ();
1005 } 1159 }
1006 1160
1007 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
1008 scr_reset (); 1162 scr_reset ();
1009 1163
1010 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1011 //scr_touch (false);
1012
1013#ifdef HAVE_BG_PIXMAP
1014// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1015// if (bgPixmap.pixmap)
1016// scr_touch (false);
1017#endif
1018
1019#ifdef USE_XIM 1164#if USE_XIM
1020 IMSetPosition (); 1165 im_set_position ();
1021#endif 1166#endif
1022} 1167}
1023 1168
1024/* 1169/*
1025 * 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.
… …
1038 newwidth = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1039 if (newheight == 0) 1184 if (newheight == 0)
1040 newheight = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1041 } 1186 }
1042 1187
1043 if (newwidth != width || newheight != height) 1188 if (newwidth != vt_width || newheight != vt_height)
1044 { 1189 {
1045 newwidth += szHint.base_width; 1190 newwidth += szHint.base_width;
1046 newheight += szHint.base_height; 1191 newheight += szHint.base_height;
1047 resize_all_windows (newwidth, newheight, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1048 } 1193 }
1049} 1194}
1050 1195
1051/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1052 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1053 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1054#ifdef USE_XIM 1199#if USE_XIM
1055 1200
1056void 1201void
1057rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1058{ 1203{
1059 fg = pix_colors [Color_fg]; 1204 fg = pix_colors [Color_fg];
… …
1086 status_rect.height = fheight; 1231 status_rect.height = fheight;
1087} 1232}
1088 1233
1089/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1090bool 1235bool
1091rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1092{ 1237{
1093 char *p;
1094 Atom atom; 1238 Atom atom;
1095 Window win; 1239 Window win;
1096 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1097 1241
1098 /* get current locale modifier */ 1242 /* get current locale modifier */
1099 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1243 if (char *p = XSetLocaleModifiers (0))
1100 { 1244 {
1101 strcpy (server, "@server="); 1245 strcpy (server, "@server=");
1102 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1246 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1103 1247
1104 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1248 if (p = strchr (server + 1, '@')) /* first one only */
1105 *p = '\0'; 1249 *p = '\0';
1106 1250
1107 atom = XInternAtom (dpy, server, False); 1251 atom = XInternAtom (dpy, server, False);
1108 win = XGetSelectionOwner (dpy, atom); 1252 win = XGetSelectionOwner (dpy, atom);
1109 1253
1110 if (win != None) 1254 if (win != None)
1111 return True; 1255 return true;
1112 } 1256 }
1113 1257
1114 return False; 1258 return false;
1115} 1259}
1116 1260
1117void 1261void
1118rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1119{ 1263{
1120 XPoint nspot; 1264 XPoint nspot;
1121 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1122 1266
1123 if (!Input_Context 1267 if (!Input_Context
… …
1176 1320
1177 term->make_current (); 1321 term->make_current ();
1178 1322
1179 if (text) 1323 if (text)
1180 { 1324 {
1181 void *str; 1325 wchar_t *str;
1182 1326
1183 if (!text->encoding_is_wchar && text->string.multi_byte) 1327 if (!text->encoding_is_wchar && text->string.multi_byte)
1184 { 1328 {
1185 // of course, X makes it ugly again 1329 // of course, X makes it ugly again
1186 if (term->rs[Rs_imLocale]) 1330 if (term->rs[Rs_imLocale])
1187 SET_LOCALE (term->rs[Rs_imLocale]); 1331 SET_LOCALE (term->rs[Rs_imLocale]);
1188 1332
1189 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1333 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1190 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1334 mbstowcs (str, text->string.multi_byte, text->length + 1);
1191 1335
1192 if (term->rs[Rs_imLocale]) 1336 if (term->rs[Rs_imLocale])
1193 SET_LOCALE (term->locale); 1337 SET_LOCALE (term->locale);
1194 } 1338 }
1195 else 1339 else
1196 str = (void *)text->string.wide_char; 1340 str = text->string.wide_char;
1197 1341
1198 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1342 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1199 DT_INT, call_data->caret, 1343 DT_INT, call_data->caret,
1200 DT_INT, call_data->chg_first, 1344 DT_INT, call_data->chg_first,
1201 DT_INT, call_data->chg_length, 1345 DT_INT, call_data->chg_length,
… …
1229/* 1373/*
1230 * 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
1231 * open a suitable preedit type 1375 * open a suitable preedit type
1232 */ 1376 */
1233bool 1377bool
1234rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1235{ 1379{
1236 int i, j, found; 1380 int i, j, found;
1237 XIM xim; 1381 XIM xim;
1238 XPoint spot; 1382 XPoint spot;
1239 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1240 unsigned long fg, bg; 1384 unsigned long fg, bg;
1241 const char *p; 1385 const char *p;
1242 char **s; 1386 char **s;
1243 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1244#ifdef ENABLE_XIM_ONTHESPOT
1245 XIMCallback xcb[4];
1246#endif
1247 1388
1248 set_environ (envv); 1389 set_environ (env);
1249 1390
1250 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1251 return false; 1392 return false;
1252 1393
1253 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1254 if (input_method == NULL) 1395 if (input_method == NULL)
1255 return false; 1396 return false;
… …
1272 p = pet[pi]; 1413 p = pet[pi];
1273 1414
1274 if (!p) 1415 if (!p)
1275 continue; 1416 continue;
1276 1417
1277 s = rxvt_splitcommastring (p); 1418 s = rxvt_strsplit (',', p);
1278 1419
1279 for (i = found = 0; !found && s[i]; i++) 1420 for (i = found = 0; !found && s[i]; i++)
1280 { 1421 {
1281 if (!strcmp (s[i], "OverTheSpot")) 1422 if (!strcmp (s[i], "OverTheSpot"))
1282 input_style = XIMPreeditPosition | XIMStatusNothing; 1423 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1294 input_style = XIMPreeditNothing | XIMStatusNothing; 1435 input_style = XIMPreeditNothing | XIMStatusNothing;
1295 1436
1296 for (j = 0; j < xim_styles->count_styles; j++) 1437 for (j = 0; j < xim_styles->count_styles; j++)
1297 if (input_style == xim_styles->supported_styles[j]) 1438 if (input_style == xim_styles->supported_styles[j])
1298 { 1439 {
1299 rxvt_freecommastring (s); 1440 rxvt_free_strsplit (s);
1300 1441
1301 found = 1; 1442 found = 1;
1302 goto foundpet; 1443 goto foundpet;
1303 } 1444 }
1304 1445
1305 } 1446 }
1306 1447
1307 rxvt_freecommastring (s); 1448 rxvt_free_strsplit (s);
1308 } 1449 }
1309 1450
1310foundpet: 1451foundpet:
1311 1452
1312 XFree (xim_styles); 1453 XFree (xim_styles);
… …
1391 NULL); 1532 NULL);
1392 } 1533 }
1393#if ENABLE_XIM_ONTHESPOT 1534#if ENABLE_XIM_ONTHESPOT
1394 else if (input_style & XIMPreeditCallbacks) 1535 else if (input_style & XIMPreeditCallbacks)
1395 { 1536 {
1537 XIMCallback xcb[4];
1538
1396 im_set_position (spot); 1539 im_set_position (spot);
1397 1540
1398 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;
1399 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;
1400 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;
… …
1415#endif 1558#endif
1416 1559
1417 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1418 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1419 XNClientWindow, vt, 1562 XNClientWindow, vt,
1420 XNFocusWindow, parent[0], 1563 XNFocusWindow, parent,
1421 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1422 preedit_attr, 1565 preedit_attr,
1423 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1424 status_attr, NULL); 1567 status_attr, NULL);
1425 1568
… …
1438 // 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
1439 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1440 vt_select_input (); 1583 vt_select_input ();
1441#endif 1584#endif
1442 1585
1443 IMSetPosition (); 1586 im_set_position ();
1444 1587
1445 return true; 1588 return true;
1446} 1589}
1447 1590
1448void 1591void
… …
1458 im_destroy (); 1601 im_destroy ();
1459 1602
1460 if (Input_Context) 1603 if (Input_Context)
1461 return; 1604 return;
1462 1605
1463#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1464 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1465 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1466#endif
1467 1608
1468 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1469 if (p && *p) 1610 if (p && *p)
1470 { 1611 {
1471 bool found = false; 1612 bool found = false;
1472 1613
1473 s = rxvt_splitcommastring (p); 1614 s = rxvt_strsplit (',', p);
1474 1615
1475 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1476 { 1617 {
1477 if (*s[i]) 1618 if (*s[i])
1478 { 1619 {
1479 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1480 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1481 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1482 { 1623 {
1483 found = true; 1624 found = true;
1484 break; 1625 break;
1485 } 1626 }
1486 } 1627 }
1487 } 1628 }
1488 1629
1489 rxvt_freecommastring (s); 1630 rxvt_free_strsplit (s);
1490 1631
1491 if (found) 1632 if (found)
1492 goto done; 1633 goto done;
1493 } 1634 }
1494 1635
1495 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1496 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1497 goto done; 1638 goto done;
1498 1639
1499 /* 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 */
1500 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1501 goto done; 1642 goto done;
1502 1643
1503done: 1644done:
1504#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1505 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1506 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1507#endif
1508} 1647}
1509 1648
1510void 1649void
1511rxvt_term::IMSetPosition () 1650rxvt_term::im_set_position ()
1512{ 1651{
1513 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1514 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1515 1654
1516 if (!Input_Context 1655 if (!Input_Context
1517 || !focus 1656 || !focus
1518 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1519 || !IMisRunning ()) 1658 || !im_is_running ())
1520 return; 1659 return;
1521 1660
1522 if (input_style & XIMPreeditPosition) 1661 if (input_style & XIMPreeditPosition)
1523 { 1662 {
1524 im_set_size (preedit_rect); 1663 im_set_size (preedit_rect);
… …
1554 1693
1555void 1694void
1556rxvt_term::get_window_origin (int &x, int &y) 1695rxvt_term::get_window_origin (int &x, int &y)
1557{ 1696{
1558 Window cr; 1697 Window cr;
1559 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1560/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1561} 1699}
1562
1563Pixmap
1564rxvt_term::get_pixmap_property (int prop_id)
1565{
1566 if (prop_id > 0 && prop_id < NUM_XA)
1567 if (xa[prop_id])
1568 {
1569 int aformat;
1570 unsigned long nitems, bytes_after;
1571 Atom atype;
1572 unsigned char *prop = NULL;
1573 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1574 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1575 &nitems, &bytes_after, &prop);
1576 if (result == Success && prop && atype == XA_PIXMAP)
1577 return *(Pixmap *)prop;
1578 }
1579
1580 return None;
1581}
1582
1583#ifdef HAVE_BG_PIXMAP
1584# if TRACE_PIXMAPS
1585# undef update_background
1586void
1587rxvt_term::trace_update_background (const char *file, int line)
1588{
1589 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1590 update_background ();
1591}
1592# endif
1593
1594void
1595rxvt_term::update_background ()
1596{
1597 if (update_background_ev.is_active ())
1598 return;
1599
1600 bgPixmap.invalidate ();
1601
1602 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1603
1604 if (to_wait <= 0.)
1605 bgPixmap.render ();
1606 else
1607 update_background_ev.start (to_wait);
1608}
1609
1610void
1611rxvt_term::update_background_cb (ev::timer &w, int revents)
1612{
1613 make_current ();
1614
1615 update_background_ev.stop ();
1616 bgPixmap.render ();
1617 refresh_check ();
1618}
1619
1620#endif /* HAVE_BG_PIXMAP */
1621 1700
1622/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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