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

Diff Legend

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