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.310 by root, Wed Feb 27 01:05:55 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 scrollBar.destroy (); 240 scrollBar.destroy ();
241
242 if (gc)
241 if (gc) XFreeGC (dpy, gc); 243 XFreeGC (dpy, gc);
242 244
243 delete drawable; 245 delete drawable;
246
244 // destroy all windows 247 // destroy all windows
245 if (parent[0]) 248 if (parent)
246 XDestroyWindow (dpy, parent[0]); 249 XDestroyWindow (dpy, parent);
247 250
248 for (int i = 0; i < TOTAL_COLORS; i++) 251 for (int i = 0; i < TOTAL_COLORS; i++)
249 if (ISSET_PIXCOLOR (i)) 252 if (ISSET_PIXCOLOR (i))
250 { 253 {
251 pix_colors_focused [i].free (this); 254 pix_colors_focused [i].free (this);
252#if OFF_FOCUS_FADING 255#if OFF_FOCUS_FADING
256 if (rs[Rs_fade])
253 pix_colors_unfocused [i].free (this); 257 pix_colors_unfocused [i].free (this);
254#endif 258#endif
255 } 259 }
256 260
257 clear (); 261 clear ();
258 262
… …
265 /* clear all resources */ 269 /* clear all resources */
266 for (int i = 0; i < allocated.size (); i++) 270 for (int i = 0; i < allocated.size (); i++)
267 free (allocated [i]); 271 free (allocated [i]);
268 272
269 free (selection.text); 273 free (selection.text);
270 // TODO: manage env vars in child only(!) 274 free (selection.clip_text);
271 free (env_display);
272 free (env_term);
273 free (locale); 275 free (locale);
274 free (v_buffer); 276 free (v_buffer);
275 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;
276 284
277 delete envv; 285 delete envv;
278 delete argv; 286 delete argv;
279 287
280#ifdef KEYSYM_RESOURCE 288#ifdef KEYSYM_RESOURCE
281 delete keyboard; 289 delete keyboard;
282#endif 290#endif
283#ifndef NO_RESOURCES 291#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db); 292 XrmDestroyDatabase (option_db);
285#endif 293#endif
294
295 SET_R ((rxvt_term *)0);
286} 296}
287 297
288// child has exited, usually destroys 298// child has exited, usually destroys
289void 299void
290rxvt_term::child_cb (ev::child &w, int status) 300rxvt_term::child_cb (ev::child &w, int status)
… …
313 { 323 {
314#if USE_XIM 324#if USE_XIM
315 im_ev.stop (display); 325 im_ev.stop (display);
316#endif 326#endif
317 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
318#if ENABLE_TRANSPARENCY || ENABLE_PERL 328#if ENABLE_PERL
319 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
320#endif 330#endif
321 incr_ev.stop ();
322 termwin_ev.stop (display); 331 termwin_ev.stop (display);
323 vt_ev.stop (display); 332 vt_ev.stop (display);
324 } 333 }
325 334
326 flush_ev.stop (); 335 flush_ev.stop ();
… …
350 make_current (); 359 make_current ();
351 360
352 delete this; 361 delete this;
353} 362}
354 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
355/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
356/* 377/*
357 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
358 * TODO: if debugging, this should free up any known resources if we can
359 */ 379 */
360static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
361 381
362static void 382static void
363rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
365 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++)
366 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
367} 387}
368 388
369#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
370static void 390static void ecb_cold
371print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
372{ 392{
373 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
374 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
375 char number[32]; 395 char number[32];
376 char *mtype = "XlibMessage"; 396
377 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
378 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
379 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);
380 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
381 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
382 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 {
383 sprintf(number, "%d", event->request_code); 460 sprintf (number, "%d", event->request_code);
384 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
385 rxvt_warn ("(which is %s)\n", buffer); 462 rxvt_warn ("+ (which is %s)\n", buffer);
386 if (event->request_code >= 128) {
387 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
388 mesg, BUFSIZ);
389 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
390 } 463 }
464
391 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
392 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
393 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
394 (event->error_code == BadFont) || 468 || event->error_code == BadFont
395 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
396 (event->error_code == BadColor) || 470 || event->error_code == BadColor
397 (event->error_code == BadGC) || 471 || event->error_code == BadGC
398 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
399 (event->error_code == BadValue) || 473 || event->error_code == BadValue
400 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
401 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
402 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
403 mesg, BUFSIZ);
404 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
405 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
406 mesg, BUFSIZ); 480 else
407 else
408 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
409 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
411 }
412 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
413 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
415}
416#endif
417 482
418int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
419rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
420{ 490{
421 if (GET_R->allowedxerror == -1) 491 if (GET_R && GET_R->allowedxerror == -1)
422 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
423 else 493 else
424 { 494 {
425 // 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,
426 // so just output the error and continue 496 // so just output the error and continue
… …
432 } 502 }
433 503
434 return 0; 504 return 0;
435} 505}
436 506
437int 507int ecb_cold
438rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
439{ 509{
440 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",
441 DisplayString (display)); 511 DisplayString (display));
442 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
… …
465 rxvt_emergency_cleanup (); 535 rxvt_emergency_cleanup ();
466 w.stop (); 536 w.stop ();
467 kill (getpid (), w.signum); 537 kill (getpid (), w.signum);
468} 538}
469 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
470char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
471 608
472void 609void
473rxvt_init () 610rxvt_init ()
474{ 611{
475 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))));
476 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
477 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
478 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
479 623
480 rxvt_environ = environ; 624 rxvt_environ = environ;
481 625
482 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
483 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
484 628
485 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
486 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
487
488 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
489 /* signal (SIGURG, SIG_DFL); */
490 631
491 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
492 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
493 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
494 635
495 XrmInitialize (); 636 XrmInitialize ();
637
638#if HAVE_PIXBUF
639 g_type_init ();
640#endif
496} 641}
497 642
498/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
499/* 644/*
500 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
619 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
620 765
621 if (recalc_y) 766 if (recalc_y)
622 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
623 768
624 ncol = width / fwidth; 769 ncol = width / fwidth;
625 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;
626} 780}
627 781
628/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
629/* 783/*
630 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
638 792
639 struct winsize ws; 793 struct winsize ws;
640 794
641 ws.ws_col = ncol; 795 ws.ws_col = ncol;
642 ws.ws_row = nrow; 796 ws.ws_row = nrow;
643 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
644 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
645 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
646 800
647#if 0 801#if 0
648 // TIOCSWINSZ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
649 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
650 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
651#endif 805#endif
652} 806}
653 807
654/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
655/* set_fonts () - load and set the various fonts 809/* load and set the various fonts */
656 *
657 * init = 1 - initialize
658 *
659 * fontname == FONT_UP - switch to bigger font
660 * fontname == FONT_DN - switch to smaller font
661 */
662bool 810bool
663rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
664{ 812{
665 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
666 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
680#endif 828#endif
681 829
682 delete fontset[0]; 830 delete fontset[0];
683 fontset[0] = fs; 831 fontset[0] = fs;
684 832
685 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
686 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
687 835
688 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
689 837
690 fwidth = prop.width; 838 fwidth = prop.width;
691 fheight = prop.height; 839 fheight = prop.height + lineSpace;
692 fbase = prop.ascent; 840 fbase = prop.ascent;
693 841
694 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
695 { 843 {
696#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
722#else 870#else
723 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
724#endif 872#endif
725 } 873 }
726 874
727 if (parent[0]) 875 if (parent)
728 { 876 {
729 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
730 scr_remap_chars (); 878 scr_remap_chars ();
731 scr_touch (true); 879 scr_touch (true);
732 } 880 }
… …
735} 883}
736 884
737void 885void
738rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
739{ 887{
740 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
741 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
742 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
743} 891}
744 892
745void 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
746rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
747{ 907{
748 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
749 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
750 910
751 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
752 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
753 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
754 914
755 free (s); 915 free (s);
756 free (ws); 916 free (ws);
… …
760/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
761/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
762void 922void
763rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
764{ 924{
765 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
766#if ENABLE_EWMH 926#if ENABLE_EWMH
767 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
768#endif 928#endif
769} 929}
770 930
771void 931void
772rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
773{ 933{
774 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
775#if ENABLE_EWMH 935#if ENABLE_EWMH
776 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
777#endif 937#endif
778} 938}
779 939
780void 940void
781rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
782{ 942{
783#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
784 rxvt_color xcol;
785
786 if (color == NULL || *color == '\0') 944 if (color == NULL || *color == '\0')
787 return; 945 return;
788 946
789 color = strdup (color); 947 color = strdup (color);
790 allocated.push_back ((void *)color); 948 allocated.push_back ((void *)color);
… …
796 int i = atoi (color); 954 int i = atoi (color);
797 955
798 if (i >= 8 && i <= 15) 956 if (i >= 8 && i <= 15)
799 { 957 {
800 /* bright colors */ 958 /* bright colors */
801 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 959 alias_color (idx, minBrightCOLOR + i - 8);
802 goto done; 960 goto done;
803 } 961 }
804 962
805 if (i >= 0 && i <= 7) 963 if (i >= 0 && i <= 7)
806 { 964 {
807 /* normal colors */ 965 /* normal colors */
808 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 966 alias_color (idx, minCOLOR + i);
809 goto done; 967 goto done;
810 } 968 }
811 } 969 }
812 970
813 set_color (xcol, color); 971 pix_colors_focused[idx].free (this);
814 972 set_color (pix_colors_focused[idx], color);
815 /*
816 * FIXME: should free colors here, but no idea how to do it so instead,
817 * so just keep gobbling up the colormap
818 */
819
820 pix_colors_focused[idx] = xcol;
821 973
822done: 974done:
823 /*TODO: handle Color_BD, scrollbar background, etc. */ 975 /*TODO: handle Color_BD, scrollbar background, etc. */
824 976
825 update_fade_color (idx); 977 update_fade_color (idx);
826 recolour_cursor (); 978 recolor_cursor ();
827 scr_recolour (); 979 scr_recolor ();
828#endif /* XTERM_COLOR_CHANGE */ 980#endif /* XTERM_COLOR_CHANGE */
829} 981}
830 982
831void 983void
832rxvt_term::recolour_cursor () 984rxvt_term::recolor_cursor ()
833{ 985{
834 XColor fg, bg; 986 XColor fg, bg;
835 987
836 (ISSET_PIXCOLOR (Color_pointer_fg) 988 (ISSET_PIXCOLOR (Color_pointer_fg)
837 ? pix_colors_focused[Color_pointer_fg] 989 ? pix_colors_focused[Color_pointer_fg]
… …
846 998
847/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
848/* 1000/*
849 * 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
850 */ 1002 */
851void 1003char *
852rxvt_term::set_colorfgbg () 1004rxvt_term::get_colorfgbg ()
853{ 1005{
854 unsigned int i; 1006 unsigned int i;
855 const char *xpmb = ""; 1007 const char *xpmb = "";
856 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1008 char fstr[] = "default";
1009 char bstr[] = "default";
1010 char *env_colorfgbg;
857 1011
858 strcpy (fstr, "default");
859 strcpy (bstr, "default");
860 for (i = Color_Black; i <= Color_White; i++) 1012 for (i = Color_Black; i <= Color_White; i++)
861 if (pix_colors[Color_fg] == pix_colors[i]) 1013 if (pix_colors[Color_fg] == pix_colors[i])
862 { 1014 {
863 sprintf (fstr, "%d", (i - Color_Black)); 1015 sprintf (fstr, "%d", i - Color_Black);
864 break; 1016 break;
865 } 1017 }
866 1018
867 for (i = Color_Black; i <= Color_White; i++) 1019 for (i = Color_Black; i <= Color_White; i++)
868 if (pix_colors[Color_bg] == pix_colors[i]) 1020 if (pix_colors[Color_bg] == pix_colors[i])
869 { 1021 {
870 sprintf (bstr, "%d", (i - Color_Black)); 1022 sprintf (bstr, "%d", i - Color_Black);
871#ifdef BG_IMAGE_FROM_FILE 1023#if HAVE_IMG
872 xpmb = "default;"; 1024 xpmb = "default;";
873#endif 1025#endif
874 break; 1026 break;
875 } 1027 }
876 1028
1029 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
877 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;
878} 1032}
879 1033
880/*----------------------------------------------------------------------*/ 1034/*----------------------------------------------------------------------*/
881 1035
882bool 1036bool
… …
890} 1044}
891 1045
892void 1046void
893rxvt_term::alias_color (int dst, int src) 1047rxvt_term::alias_color (int dst, int src)
894{ 1048{
1049 pix_colors[dst].free (this);
895 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]);
896} 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
897 1071
898/* -------------------------------------------------------------------- * 1072/* -------------------------------------------------------------------- *
899 * - WINDOW RESIZING - * 1073 * - WINDOW RESIZING - *
900 * -------------------------------------------------------------------- */ 1074 * -------------------------------------------------------------------- */
901void 1075void
… …
905 int old_width = szHint.width; 1079 int old_width = szHint.width;
906 int old_height = szHint.height; 1080 int old_height = szHint.height;
907 1081
908 window_calc (newwidth, newheight); 1082 window_calc (newwidth, newheight);
909 1083
910 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);
911 XSetWMNormalHints (dpy, parent[0], &szHint); 1090 XSetWMNormalHints (dpy, parent, &szHint);
1091 szHint.flags |= PBaseSize | PResizeInc;
1092 }
912 1093
913 if (!ignoreparent) 1094 if (!ignoreparent)
914 { 1095 {
915#ifdef SMART_RESIZE 1096#ifdef SMART_RESIZE
916 /* 1097 /*
… …
920 int x, y, x1, y1; 1101 int x, y, x1, y1;
921 int dx, dy; 1102 int dx, dy;
922 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
923 Window unused_cr; 1104 Window unused_cr;
924 1105
925 XTranslateCoordinates (dpy, parent[0], display->root, 1106 XTranslateCoordinates (dpy, parent, display->root,
926 0, 0, &x, &y, &unused_cr); 1107 0, 0, &x, &y, &unused_cr);
927 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1108 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
928 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
929 /* 1110 /*
930 * 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
931 * our position for handles and decorations. Counter it 1112 * our position for handles and decorations. Counter it
932 */ 1113 */
933 if (x1 != x || y1 != y) 1114 if (x1 != x || y1 != y)
934 { 1115 {
935 x -= x1; 1116 unsigned int border_width = get_parent_bw (dpy, parent);
936 y -= y1; 1117
1118 x -= x1 + border_width;
1119 y -= y1 + border_width;
937 } 1120 }
938 1121
939 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2; 1122 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
940 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2; 1123 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
941 dx = old_width - szHint.width; 1124 dx = old_width - szHint.width;
… …
949 if (y < y1) /* top half */ 1132 if (y < y1) /* top half */
950 dy = 0; 1133 dy = 0;
951 else if (y == y1) /* exact center */ 1134 else if (y == y1) /* exact center */
952 dy /= 2; 1135 dy /= 2;
953 1136
954 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1137 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
955 szHint.width, szHint.height); 1138 szHint.width, szHint.height);
956#else 1139#else
957 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1140 XResizeWindow (dpy, parent, szHint.width, szHint.height);
958#endif 1141#endif
959 } 1142 }
1143
1144 if (set_hint)
1145 XSetWMNormalHints (dpy, parent, &szHint);
960 1146
961 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
962 1148
963 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
964 { 1150 {
965 if (scrollBar.state) 1151 if (scrollBar.state)
966 scrollBar.resize (); 1152 scrollBar.resize ();
967 1153
968 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
969 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
970 width, height); 1156 vt_width, vt_height);
971 1157
972#ifdef HAVE_BG_PIXMAP 1158 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
973 if (bgPixmap.window_size_sensitive ())
974 update_background ();
975#endif
976
977 scr_clear ();
978 } 1159 }
979 1160
980 if (fix_screen || old_height == 0) 1161 if (fix_screen || old_height == 0)
981 scr_reset (); 1162 scr_reset ();
982 1163
983 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
984 //scr_touch (false);
985
986#ifdef HAVE_BG_PIXMAP
987// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
988// if (bgPixmap.pixmap)
989// scr_touch (false);
990#endif
991
992#ifdef USE_XIM 1164#if USE_XIM
993 IMSetPosition (); 1165 im_set_position ();
994#endif 1166#endif
995} 1167}
996 1168
997/* 1169/*
998 * 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.
… …
1011 newwidth = wattr.width - szHint.base_width; 1183 newwidth = wattr.width - szHint.base_width;
1012 if (newheight == 0) 1184 if (newheight == 0)
1013 newheight = wattr.height - szHint.base_height; 1185 newheight = wattr.height - szHint.base_height;
1014 } 1186 }
1015 1187
1016 if (newwidth != width || newheight != height) 1188 if (newwidth != vt_width || newheight != vt_height)
1017 { 1189 {
1018 newwidth += szHint.base_width; 1190 newwidth += szHint.base_width;
1019 newheight += szHint.base_height; 1191 newheight += szHint.base_height;
1020 resize_all_windows (newwidth, newheight, 0); 1192 resize_all_windows (newwidth, newheight, 0);
1021 } 1193 }
1022} 1194}
1023 1195
1024/* -------------------------------------------------------------------- * 1196/* -------------------------------------------------------------------- *
1025 * - X INPUT METHOD ROUTINES - * 1197 * - X INPUT METHOD ROUTINES - *
1026 * -------------------------------------------------------------------- */ 1198 * -------------------------------------------------------------------- */
1027#ifdef USE_XIM 1199#if USE_XIM
1028 1200
1029void 1201void
1030rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1202rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1031{ 1203{
1032 fg = pix_colors [Color_fg]; 1204 fg = pix_colors [Color_fg];
… …
1059 status_rect.height = fheight; 1231 status_rect.height = fheight;
1060} 1232}
1061 1233
1062/* Checking whether input method is running. */ 1234/* Checking whether input method is running. */
1063bool 1235bool
1064rxvt_term::IMisRunning () 1236rxvt_term::im_is_running ()
1065{ 1237{
1066 char *p;
1067 Atom atom; 1238 Atom atom;
1068 Window win; 1239 Window win;
1069 char server[IMBUFSIZ]; 1240 char server[IMBUFSIZ];
1070 1241
1071 /* get current locale modifier */ 1242 /* get current locale modifier */
1072 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1243 if (char *p = XSetLocaleModifiers (0))
1073 { 1244 {
1074 strcpy (server, "@server="); 1245 strcpy (server, "@server=");
1075 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1246 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1076 1247
1077 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1248 if (p = strchr (server + 1, '@')) /* first one only */
1078 *p = '\0'; 1249 *p = '\0';
1079 1250
1080 atom = XInternAtom (dpy, server, False); 1251 atom = XInternAtom (dpy, server, False);
1081 win = XGetSelectionOwner (dpy, atom); 1252 win = XGetSelectionOwner (dpy, atom);
1082 1253
1083 if (win != None) 1254 if (win != None)
1084 return True; 1255 return true;
1085 } 1256 }
1086 1257
1087 return False; 1258 return false;
1088} 1259}
1089 1260
1090void 1261void
1091rxvt_term::IMSendSpot () 1262rxvt_term::im_send_spot ()
1092{ 1263{
1093 XPoint nspot; 1264 XPoint nspot;
1094 XVaNestedList preedit_attr; 1265 XVaNestedList preedit_attr;
1095 1266
1096 if (!Input_Context 1267 if (!Input_Context
… …
1149 1320
1150 term->make_current (); 1321 term->make_current ();
1151 1322
1152 if (text) 1323 if (text)
1153 { 1324 {
1154 void *str; 1325 wchar_t *str;
1155 1326
1156 if (!text->encoding_is_wchar && text->string.multi_byte) 1327 if (!text->encoding_is_wchar && text->string.multi_byte)
1157 { 1328 {
1158 // of course, X makes it ugly again 1329 // of course, X makes it ugly again
1159 if (term->rs[Rs_imLocale]) 1330 if (term->rs[Rs_imLocale])
1160 SET_LOCALE (term->rs[Rs_imLocale]); 1331 SET_LOCALE (term->rs[Rs_imLocale]);
1161 1332
1162 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1333 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1163 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1334 mbstowcs (str, text->string.multi_byte, text->length + 1);
1164 1335
1165 if (term->rs[Rs_imLocale]) 1336 if (term->rs[Rs_imLocale])
1166 SET_LOCALE (term->locale); 1337 SET_LOCALE (term->locale);
1167 } 1338 }
1168 else 1339 else
1169 str = (void *)text->string.wide_char; 1340 str = text->string.wide_char;
1170 1341
1171 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1342 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1172 DT_INT, call_data->caret, 1343 DT_INT, call_data->caret,
1173 DT_INT, call_data->chg_first, 1344 DT_INT, call_data->chg_first,
1174 DT_INT, call_data->chg_length, 1345 DT_INT, call_data->chg_length,
… …
1202/* 1373/*
1203 * 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
1204 * open a suitable preedit type 1375 * open a suitable preedit type
1205 */ 1376 */
1206bool 1377bool
1207rxvt_term::IM_get_IC (const char *modifiers) 1378rxvt_term::im_get_ic (const char *modifiers)
1208{ 1379{
1209 int i, j, found; 1380 int i, j, found;
1210 XIM xim; 1381 XIM xim;
1211 XPoint spot; 1382 XPoint spot;
1212 XRectangle rect, status_rect, needed_rect; 1383 XRectangle rect, status_rect, needed_rect;
1213 unsigned long fg, bg; 1384 unsigned long fg, bg;
1214 const char *p; 1385 const char *p;
1215 char **s; 1386 char **s;
1216 XIMStyles *xim_styles; 1387 XIMStyles *xim_styles;
1217#ifdef ENABLE_XIM_ONTHESPOT
1218 XIMCallback xcb[4];
1219#endif
1220 1388
1221 set_environ (envv); 1389 set_environ (env);
1222 1390
1223 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1391 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1224 return false; 1392 return false;
1225 1393
1226 input_method = display->get_xim (locale, modifiers); 1394 input_method = display->get_xim (locale, modifiers);
1227 if (input_method == NULL) 1395 if (input_method == NULL)
1228 return false; 1396 return false;
… …
1245 p = pet[pi]; 1413 p = pet[pi];
1246 1414
1247 if (!p) 1415 if (!p)
1248 continue; 1416 continue;
1249 1417
1250 s = rxvt_splitcommastring (p); 1418 s = rxvt_strsplit (',', p);
1251 1419
1252 for (i = found = 0; !found && s[i]; i++) 1420 for (i = found = 0; !found && s[i]; i++)
1253 { 1421 {
1254 if (!strcmp (s[i], "OverTheSpot")) 1422 if (!strcmp (s[i], "OverTheSpot"))
1255 input_style = XIMPreeditPosition | XIMStatusNothing; 1423 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1267 input_style = XIMPreeditNothing | XIMStatusNothing; 1435 input_style = XIMPreeditNothing | XIMStatusNothing;
1268 1436
1269 for (j = 0; j < xim_styles->count_styles; j++) 1437 for (j = 0; j < xim_styles->count_styles; j++)
1270 if (input_style == xim_styles->supported_styles[j]) 1438 if (input_style == xim_styles->supported_styles[j])
1271 { 1439 {
1272 rxvt_freecommastring (s); 1440 rxvt_free_strsplit (s);
1273 1441
1274 found = 1; 1442 found = 1;
1275 goto foundpet; 1443 goto foundpet;
1276 } 1444 }
1277 1445
1278 } 1446 }
1279 1447
1280 rxvt_freecommastring (s); 1448 rxvt_free_strsplit (s);
1281 } 1449 }
1282 1450
1283foundpet: 1451foundpet:
1284 1452
1285 XFree (xim_styles); 1453 XFree (xim_styles);
… …
1364 NULL); 1532 NULL);
1365 } 1533 }
1366#if ENABLE_XIM_ONTHESPOT 1534#if ENABLE_XIM_ONTHESPOT
1367 else if (input_style & XIMPreeditCallbacks) 1535 else if (input_style & XIMPreeditCallbacks)
1368 { 1536 {
1537 XIMCallback xcb[4];
1538
1369 im_set_position (spot); 1539 im_set_position (spot);
1370 1540
1371 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;
1372 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;
1373 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;
… …
1388#endif 1558#endif
1389 1559
1390 Input_Context = XCreateIC (xim, 1560 Input_Context = XCreateIC (xim,
1391 XNInputStyle, input_style, 1561 XNInputStyle, input_style,
1392 XNClientWindow, vt, 1562 XNClientWindow, vt,
1393 XNFocusWindow, parent[0], 1563 XNFocusWindow, parent,
1394 preedit_attr ? XNPreeditAttributes : NULL, 1564 preedit_attr ? XNPreeditAttributes : NULL,
1395 preedit_attr, 1565 preedit_attr,
1396 status_attr ? XNStatusAttributes : NULL, 1566 status_attr ? XNStatusAttributes : NULL,
1397 status_attr, NULL); 1567 status_attr, NULL);
1398 1568
… …
1411 // 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
1412 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1582 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1413 vt_select_input (); 1583 vt_select_input ();
1414#endif 1584#endif
1415 1585
1416 IMSetPosition (); 1586 im_set_position ();
1417 1587
1418 return true; 1588 return true;
1419} 1589}
1420 1590
1421void 1591void
… …
1431 im_destroy (); 1601 im_destroy ();
1432 1602
1433 if (Input_Context) 1603 if (Input_Context)
1434 return; 1604 return;
1435 1605
1436#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1437 if (rs[Rs_imLocale]) 1606 if (rs[Rs_imLocale])
1438 SET_LOCALE (rs[Rs_imLocale]); 1607 SET_LOCALE (rs[Rs_imLocale]);
1439#endif
1440 1608
1441 p = rs[Rs_inputMethod]; 1609 p = rs[Rs_inputMethod];
1442 if (p && *p) 1610 if (p && *p)
1443 { 1611 {
1444 bool found = false; 1612 bool found = false;
1445 1613
1446 s = rxvt_splitcommastring (p); 1614 s = rxvt_strsplit (',', p);
1447 1615
1448 for (i = 0; s[i]; i++) 1616 for (i = 0; s[i]; i++)
1449 { 1617 {
1450 if (*s[i]) 1618 if (*s[i])
1451 { 1619 {
1452 strcpy (buf, "@im="); 1620 strcpy (buf, "@im=");
1453 strncat (buf, s[i], IMBUFSIZ - 5); 1621 strncat (buf, s[i], IMBUFSIZ - 5);
1454 if (IM_get_IC (buf)) 1622 if (im_get_ic (buf))
1455 { 1623 {
1456 found = true; 1624 found = true;
1457 break; 1625 break;
1458 } 1626 }
1459 } 1627 }
1460 } 1628 }
1461 1629
1462 rxvt_freecommastring (s); 1630 rxvt_free_strsplit (s);
1463 1631
1464 if (found) 1632 if (found)
1465 goto done; 1633 goto done;
1466 } 1634 }
1467 1635
1468 /* try with XMODIFIERS env. var. */ 1636 /* try with XMODIFIERS env. var. */
1469 if (IM_get_IC ("")) 1637 if (im_get_ic (""))
1470 goto done; 1638 goto done;
1471 1639
1472 /* 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 */
1473 if (IM_get_IC ("@im=none")) 1641 if (im_get_ic ("@im=none"))
1474 goto done; 1642 goto done;
1475 1643
1476done: 1644done:
1477#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1478 if (rs[Rs_imLocale]) 1645 if (rs[Rs_imLocale])
1479 SET_LOCALE (locale); 1646 SET_LOCALE (locale);
1480#endif
1481} 1647}
1482 1648
1483void 1649void
1484rxvt_term::IMSetPosition () 1650rxvt_term::im_set_position ()
1485{ 1651{
1486 XRectangle preedit_rect, status_rect, *needed_rect; 1652 XRectangle preedit_rect, status_rect, *needed_rect;
1487 XVaNestedList preedit_attr, status_attr; 1653 XVaNestedList preedit_attr, status_attr;
1488 1654
1489 if (!Input_Context 1655 if (!Input_Context
1490 || !focus 1656 || !focus
1491 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1657 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1492 || !IMisRunning ()) 1658 || !im_is_running ())
1493 return; 1659 return;
1494 1660
1495 if (input_style & XIMPreeditPosition) 1661 if (input_style & XIMPreeditPosition)
1496 { 1662 {
1497 im_set_size (preedit_rect); 1663 im_set_size (preedit_rect);
… …
1527 1693
1528void 1694void
1529rxvt_term::get_window_origin (int &x, int &y) 1695rxvt_term::get_window_origin (int &x, int &y)
1530{ 1696{
1531 Window cr; 1697 Window cr;
1532 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1698 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1533/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1534} 1699}
1535
1536Pixmap
1537rxvt_term::get_pixmap_property (int prop_id)
1538{
1539 if (prop_id > 0 && prop_id < NUM_XA)
1540 if (xa[prop_id])
1541 {
1542 int aformat;
1543 unsigned long nitems, bytes_after;
1544 Atom atype;
1545 unsigned char *prop = NULL;
1546 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1547 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1548 &nitems, &bytes_after, &prop);
1549 if (result == Success && prop && atype == XA_PIXMAP)
1550 return *(Pixmap *)prop;
1551 }
1552
1553 return None;
1554}
1555
1556#ifdef HAVE_BG_PIXMAP
1557# if TRACE_PIXMAPS
1558# undef update_background
1559void
1560rxvt_term::trace_update_background (const char *file, int line)
1561{
1562 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1563 update_background ();
1564}
1565# endif
1566
1567void
1568rxvt_term::update_background ()
1569{
1570 if (update_background_ev.is_active ())
1571 return;
1572
1573 bgPixmap.invalidate ();
1574
1575 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1576
1577 if (to_wait <= 0.)
1578 bgPixmap.render ();
1579 else
1580 update_background_ev.start (to_wait);
1581}
1582
1583void
1584rxvt_term::update_background_cb (ev::timer &w, int revents)
1585{
1586 make_current ();
1587
1588 update_background_ev.stop ();
1589 bgPixmap.render ();
1590 refresh_check ();
1591}
1592
1593#endif /* HAVE_BG_PIXMAP */
1594 1700
1595/*----------------------- end-of-file (C source) -----------------------*/ 1701/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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