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.269 by root, Tue Dec 4 14:50:42 2007 UTC vs.
Revision 1.388 by root, Sun Feb 17 00:11:28 2013 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-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif 52#endif
54#endif
55 53
54struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
57 56
58// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
60 59
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 95{
97 compose_char *cc; 96 compose_char *cc;
98 97
99 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 100 cc = (*this)[c1];
102 while (cc) 101 while (cc)
103 { 102 {
104 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
106 } 105 }
107 106
108 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
113 }
114 111
115 // allocate a new combination 112 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 114 {
118 static int seen; 115 static int seen;
119 116
120 if (!seen++) 117 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 119
123 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
124 } 121 }
125 122
126 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
152 149
153} 150}
154#endif 151#endif
155 152
156rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
157 : 154{
158#if HAVE_BG_PIXMAP 155#if HAVE_BG_PIXMAP
159 update_background_ev(this, &rxvt_term::update_background_cb), 156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
160#endif 157#endif
161#ifdef CURSOR_BLINK 158#ifdef CURSOR_BLINK
162 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
163#endif 160#endif
164#ifdef TEXT_BLINK 161#ifdef TEXT_BLINK
165 text_blink_ev (this, &rxvt_term::text_blink_cb), 162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
166#endif 163#endif
167#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
168 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
169#endif 166#endif
170#ifdef SELECTION_SCROLLING 167#ifdef SELECTION_SCROLLING
171 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
172#endif 169#endif
173#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
174 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
173#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
175#endif
176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
177#if USE_XIM
178 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
175#endif 179#endif
176#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
177 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
178#endif 182#endif
179#ifndef NO_BELL 183#ifndef NO_BELL
180 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
181#endif 185#endif
182 child_ev (this, &rxvt_term::child_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
183 prepare_ev (this, &rxvt_term::prepare_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
184 flush_ev (this, &rxvt_term::flush_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
185 destroy_ev (this, &rxvt_term::destroy_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
186 pty_ev (this, &rxvt_term::pty_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
187 incr_ev (this, &rxvt_term::incr_cb) 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
188{
189#if ENABLE_TRANSPARENCY || ENABLE_PERL
190 callback_set (rootwin_ev , this, rxvt_term, rootwin_cb);
191#endif
192#ifdef HAVE_SCROLLBARS
193 callback_set (scrollbar_ev, this, rxvt_term, x_cb);
194#endif
195#ifdef USE_XIM
196 callback_set (im_ev , this, rxvt_term, im_cb);
197#endif
198 callback_set (termwin_ev , this, rxvt_term, x_cb);
199 callback_set (vt_ev , this, rxvt_term, x_cb);
200 192
201 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
202 194
203 termlist.push_back (this); 195 termlist.push_back (this);
204 196
… …
230 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
231 delete fontset[i]; 223 delete fontset[i];
232#endif 224#endif
233 delete fontset[0]; 225 delete fontset[0];
234 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
231#if HAVE_IMG
232 delete bg_img;
233#endif
234
235 if (display) 235 if (display)
236 { 236 {
237 selection_clear (); 237 selection_clear ();
238 selection_clear (true);
238 239
239#ifdef USE_XIM 240#if USE_XIM
240 im_destroy (); 241 im_destroy ();
241#endif 242#endif
242#ifdef XTERM_SCROLLBAR 243 scrollBar.destroy ();
243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC); 244
244 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
245#endif
246#ifdef PLAIN_SCROLLBAR
247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
248#endif
249#ifdef NEXT_SCROLLBAR
250 if (blackGC) XFreeGC (dpy, blackGC);
251 if (whiteGC) XFreeGC (dpy, whiteGC);
252 if (grayGC) XFreeGC (dpy, grayGC);
253 if (darkGC) XFreeGC (dpy, darkGC);
254 if (stippleGC) XFreeGC (dpy, stippleGC);
255 if (dimple) XFreePixmap (dpy, dimple);
256 if (upArrow) XFreePixmap (dpy, upArrow);
257 if (downArrow) XFreePixmap (dpy, downArrow);
258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
260#endif
261#ifdef RXVT_SCROLLBAR
262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
265#endif
266 if (gc) XFreeGC (dpy, gc); 246 XFreeGC (dpy, gc);
267 247
268 delete drawable; 248 delete drawable;
249
269 // destroy all windows 250 // destroy all windows
270 if (parent[0]) 251 if (parent)
271 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
272 253
273 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
275 { 256 {
276 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
278 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
279#endif 260#endif
280 } 261 }
281 262
282 clear (); 263 clear ();
283 }
284 264
285 delete [] pix_colors_focused; 265 display->flush (); /* ideally .put should do this */
286#if OFF_FOCUS_FADING
287 delete [] pix_colors_unfocused;
288#endif
289
290#ifdef HAVE_BG_PIXMAP
291 bgPixmap.destroy ();
292#endif
293 displays.put (display); 266 displays.put (display);
267 }
294 268
295 scr_release (); 269 scr_release ();
296 270
297 /* clear all resources */ 271 /* clear all resources */
298 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
299 free (allocated [i]); 273 free (allocated [i]);
300 274
301 free (selection.text); 275 free (selection.text);
302 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
303 free (env_display);
304 free (env_term);
305 free (locale); 277 free (locale);
306 free (v_buffer); 278 free (v_buffer);
307 free (incr_buf); 279
280 delete selection_req;
308 281
309 delete envv; 282 delete envv;
310 delete argv; 283 delete argv;
311 284
312#ifdef KEYSYM_RESOURCE 285#ifdef KEYSYM_RESOURCE
… …
330} 303}
331 304
332void 305void
333rxvt_term::destroy () 306rxvt_term::destroy ()
334{ 307{
335 if (destroy_ev.active) 308 if (destroy_ev.is_active ())
336 return; 309 return;
337 310
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 311 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 312
340#if ENABLE_OVERLAY 313#if ENABLE_OVERLAY
… …
344 if (display) 317 if (display)
345 { 318 {
346#if USE_XIM 319#if USE_XIM
347 im_ev.stop (display); 320 im_ev.stop (display);
348#endif 321#endif
349#if HAVE_SCROLLBARS
350 scrollbar_ev.stop (display); 322 scrollbar_ev.stop (display);
351#endif 323#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
352#if ENABLE_TRANSPARENCY || ENABLE_PERL
353 rootwin_ev.stop (display); 324 rootwin_ev.stop (display);
354#endif 325#endif
355 incr_ev.stop ();
356 termwin_ev.stop (display); 326 termwin_ev.stop (display);
357 vt_ev.stop (display); 327 vt_ev.stop (display);
358 } 328 }
359 329
360 prepare_ev.stop (); 330 flush_ev.stop ();
361 pty_ev.stop (); 331 pty_ev.stop ();
362#ifdef CURSOR_BLINK 332#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 333 cursor_blink_ev.stop ();
364#endif 334#endif
365#ifdef TEXT_BLINK 335#ifdef TEXT_BLINK
… …
384 make_current (); 354 make_current ();
385 355
386 delete this; 356 delete this;
387} 357}
388 358
359void
360rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
361{
362 if (!opt)
363 return;
364
365 uint8_t mask = 1 << (opt & 7);
366 uint8_t &val = options [opt >> 3];
367
368 val = val & ~mask | (set ? mask : 0);
369}
370
389/*----------------------------------------------------------------------*/ 371/*----------------------------------------------------------------------*/
390/* 372/*
391 * Exit gracefully, clearing the utmp entry and restoring tty attributes 373 * Exit gracefully, clearing the utmp entry and restoring tty attributes
392 * TODO: if debugging, this should free up any known resources if we can
393 */ 374 */
394static XErrorHandler old_xerror_handler; 375static XErrorHandler old_xerror_handler;
395 376
396static void 377static void
397rxvt_emergency_cleanup () 378rxvt_emergency_cleanup ()
… …
399 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 380 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
400 (*t)->emergency_cleanup (); 381 (*t)->emergency_cleanup ();
401} 382}
402 383
403#if !ENABLE_MINIMAL 384#if !ENABLE_MINIMAL
404static void 385static void ecb_cold
405print_x_error (Display *dpy, XErrorEvent *event) 386print_x_error (Display *dpy, XErrorEvent *event)
406{ 387{
407 char buffer[BUFSIZ]; 388 char buffer[BUFSIZ];
408 char mesg[BUFSIZ]; 389 char mesg[BUFSIZ];
409 char number[32]; 390 char number[32];
410 char *mtype = "XlibMessage"; 391
411 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
412 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 392 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
393
394 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
395 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
396
397 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
398 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
414 rxvt_warn ("%s: %s\n", mesg, buffer); 399 rxvt_warn ("+ %s: %s\n", mesg, buffer);
400
415 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 401 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 402 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
417 sprintf(number, "%d", event->request_code); 403
418 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
419 rxvt_warn ("(which is %s)\n", buffer);
420 if (event->request_code >= 128) { 404 if (event->request_code >= 128)
421 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 405 {
422 mesg, BUFSIZ); 406#if 0
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 407 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
408 int nexts;
409 char **exts = XListExtensions (dpy, &nexts);
410
411 while (nexts)
412 {
413 char *extname = exts [nexts - 1];
414 int major, first_event, first_error;
415
416 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
417 {
418 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
419 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
420
421 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
422 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
423 rxvt_warn ("+ (which is %s)\n", buffer);
424
425 break;
426 }
427
428 printf ("nextss %d %s\n", nexts, extname);//D
429 --nexts;
430 ++exts;
431 }
432#else
433 int nexts = 0;
434 char **exts = 0;
435#endif
436
437 if (!nexts)
438 {
439 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
440
441 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
442 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
443
444#if 0
445 sprintf (number, "RENDER.%d", event->minor_code);
446 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
447 rxvt_warn ("+ (which is %s)\n", buffer);
448#endif
449 }
450
451 XFreeExtensionList (exts);
424 } 452 }
453 else
454 {
455 sprintf (number, "%d", event->request_code);
456 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
457 rxvt_warn ("+ (which is %s)\n", buffer);
458 }
459
425 if ((event->error_code == BadWindow) || 460 if (event->error_code == BadWindow
426 (event->error_code == BadPixmap) || 461 || event->error_code == BadPixmap
427 (event->error_code == BadCursor) || 462 || event->error_code == BadCursor
428 (event->error_code == BadFont) || 463 || event->error_code == BadFont
429 (event->error_code == BadDrawable) || 464 || event->error_code == BadDrawable
430 (event->error_code == BadColor) || 465 || event->error_code == BadColor
431 (event->error_code == BadGC) || 466 || event->error_code == BadGC
432 (event->error_code == BadIDChoice) || 467 || event->error_code == BadIDChoice
433 (event->error_code == BadValue) || 468 || event->error_code == BadValue
434 (event->error_code == BadAtom)) { 469 || event->error_code == BadAtom)
470 {
435 if (event->error_code == BadValue) 471 if (event->error_code == BadValue)
436 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 472 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
437 mesg, BUFSIZ);
438 else if (event->error_code == BadAtom) 473 else if (event->error_code == BadAtom)
439 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 474 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
440 mesg, BUFSIZ); 475 else
441 else
442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 476 XGetErrorDatabaseText (dpy, "XlibMessage", "ResourceID", "ResourceID 0x%x", mesg, BUFSIZ);
443 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
445 }
446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
447 mesg, BUFSIZ);
448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
449}
450#endif
451 477
452int 478 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
479 }
480}
481#endif
482
483int ecb_cold
453rxvt_xerror_handler (Display *display, XErrorEvent *event) 484rxvt_xerror_handler (Display *display, XErrorEvent *event)
454{ 485{
455 if (GET_R->allowedxerror == -1) 486 if (GET_R->allowedxerror == -1)
456 GET_R->allowedxerror = event->error_code; 487 GET_R->allowedxerror = event->error_code;
457 else 488 else
… …
466 } 497 }
467 498
468 return 0; 499 return 0;
469} 500}
470 501
471int 502int ecb_cold
472rxvt_xioerror_handler (Display *display) 503rxvt_xioerror_handler (Display *display)
473{ 504{
474 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 505 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
475 DisplayString (display)); 506 DisplayString (display));
476 rxvt_emergency_cleanup (); 507 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 508 _exit (EXIT_FAILURE);
478} 509}
479 510
480/*----------------------------------------------------------------------*/
481bool
482rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
483{
484 this->envv = envv;
485
486 SET_R (this);
487 set_locale ("");
488 set_environ (envv); // few things in X do not call setlocale :(
489
490 if (!init_vars ())
491 return false;
492
493 init_secondary ();
494
495 const char **cmd_argv = init_resources (argc, argv);
496
497#ifdef KEYSYM_RESOURCE
498 keyboard->register_done ();
499#endif
500
501#ifdef HAVE_SCROLLBARS
502 if (option (Opt_scrollBar))
503 scrollBar.setIdle (); /* set existence for size calculations */
504#endif
505
506 pty = ptytty::create ();
507
508 create_windows (argc, argv);
509
510 init_xlocale ();
511
512 scr_reset (); // initialize screen
513
514#if 0
515 XSynchronize (dpy, True);
516#endif
517
518#ifdef HAVE_SCROLLBARS
519 if (option (Opt_scrollBar))
520 resize_scrollbar (); /* create and map scrollbar */
521#endif
522#ifdef HAVE_BG_PIXMAP
523 {
524 bgPixmap.set_target (this);
525
526#ifdef ENABLE_TRANSPARENCY
527 if (option (Opt_transparent))
528 {
529 bgPixmap.set_transparent ();
530#ifdef HAVE_AFTERIMAGE
531 if (rs [Rs_blurradius])
532 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
533#endif
534 if (ISSET_PIXCOLOR (Color_tint))
535 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
536 if (rs [Rs_shade])
537 bgPixmap.set_shade (rs [Rs_shade]);
538
539 bgPixmap.set_root_pixmap ();
540 XSelectInput (dpy, display->root, PropertyChangeMask);
541 rootwin_ev.start (display, display->root);
542 }
543#endif
544
545#ifdef BG_IMAGE_FROM_FILE
546 if (rs[Rs_backgroundPixmap] != NULL)
547 {
548 const char *p = rs[Rs_backgroundPixmap];
549
550 if ((p = strchr (p, ';')) != NULL)
551 {
552 p++;
553 bgPixmap.set_geometry (p);
554 }
555 else
556 bgPixmap.set_defaultGeometry ();
557
558 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
559 if (!bgPixmap.window_position_sensitive ())
560 update_background ();
561 }
562#endif
563 }
564#endif
565
566#if ENABLE_PERL
567 rootwin_ev.start (display, display->root);
568#endif
569
570 set_colorfgbg ();
571
572 init_command (cmd_argv);
573
574 free (cmd_argv);
575
576 if (pty->pty >= 0)
577 pty_ev.start (pty->pty, ev::READ);
578
579 prepare_ev.start ();
580
581 HOOK_INVOKE ((this, HOOK_START, DT_END));
582
583#if ENABLE_XEMBED
584 if (rs[Rs_embed])
585 {
586 long info[2] = { 0, XEMBED_MAPPED };
587
588 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
589 32, PropModeReplace, (unsigned char *)&info, 2);
590 }
591#endif
592
593 XMapWindow (dpy, vt);
594 XMapWindow (dpy, parent[0]);
595
596 return true;
597}
598
599static struct sig_handlers 511static struct sig_handlers
600{ 512{
601 ev::sig sw_term, sw_int; 513 ev::sig sw_term, sw_int;
602 514
603 /* 515 /*
604 * Catch a fatal signal and tidy up before quitting 516 * Catch a fatal signal and tidy up before quitting
605 */ 517 */
606 void
607 sig_term (ev::sig &w, int revents) 518 void sig_term (ev::sig &w, int revents);
519
520 sig_handlers ()
608 { 521 {
609 rxvt_emergency_cleanup (); 522 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
610 w.stop ();
611 kill (getpid (), w.signum);
612 }
613
614 sig_handlers ()
615 : sw_term (this, &sig_handlers::sig_term),
616 sw_int (this, &sig_handlers::sig_term) 523 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 524 }
619} sig_handlers; 525} sig_handlers;
620 526
527void
528sig_handlers::sig_term (ev::sig &w, int revents)
529{
530 rxvt_emergency_cleanup ();
531 w.stop ();
532 kill (getpid (), w.signum);
533}
534
535static void
536rxvt_get_ttymode (struct termios *tio)
537{
538 if (tcgetattr (STDIN_FILENO, tio) < 0)
539 memset (tio, 0, sizeof (struct termios));
540
541 for (int i = 0; i < NCCS; i++)
542 tio->c_cc[i] = VDISABLE;
543
544 tio->c_cc[VINTR] = CINTR;
545 tio->c_cc[VQUIT] = CQUIT;
546 tio->c_cc[VERASE] = CERASE;
547#ifdef VERASE2
548 tio->c_cc[VERASE2] = CERASE2;
549#endif
550 tio->c_cc[VKILL] = CKILL;
551 tio->c_cc[VEOF] = CEOF;
552 tio->c_cc[VSTART] = CSTART;
553 tio->c_cc[VSTOP] = CSTOP;
554 tio->c_cc[VSUSP] = CSUSP;
555# ifdef VDSUSP
556 tio->c_cc[VDSUSP] = CDSUSP;
557# endif
558# ifdef VREPRINT
559 tio->c_cc[VREPRINT] = CRPRNT;
560# endif
561# ifdef VDISCRD
562 tio->c_cc[VDISCRD] = CFLUSH;
563# endif
564# ifdef VWERSE
565 tio->c_cc[VWERSE] = CWERASE;
566# endif
567# ifdef VLNEXT
568 tio->c_cc[VLNEXT] = CLNEXT;
569# endif
570# ifdef VSTATUS
571 tio->c_cc[VSTATUS] = CSTATUS;
572# endif
573
574# if VMIN != VEOF
575 tio->c_cc[VMIN] = 1;
576# endif
577# if VTIME != VEOL
578 tio->c_cc[VTIME] = 0;
579# endif
580
581 /* input modes */
582 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
583# ifdef IMAXBEL
584 | IMAXBEL
585# endif
586 | IXON);
587
588 /* output modes */
589 tio->c_oflag = (OPOST | ONLCR);
590
591 /* control modes */
592 tio->c_cflag = (CS8 | CREAD);
593
594 /* local modes */
595 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
596# if defined (ECHOCTL) && defined (ECHOKE)
597 | ECHOCTL | ECHOKE
598# endif
599 | ECHOE | ECHOK);
600}
601
621char **rxvt_environ; // startup environment 602char **rxvt_environ; // startup environment
622 603
623void 604void
624rxvt_init () 605rxvt_init ()
625{ 606{
626 ptytty::init (); 607 assert (("fontMask must not overlap other RS masks",
608 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
627 609
610 rxvt_get_ttymode (&rxvt_term::def_tio);
611
612 // get rid of stdin/stdout as we don't need them, to free resources
613 dup2 (STDERR_FILENO, STDIN_FILENO);
614 dup2 (STDERR_FILENO, STDOUT_FILENO);
615
628 if (!ev_default_loop (0)) 616 if (!ev_default_loop ())
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 617 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630 618
631 rxvt_environ = environ; 619 rxvt_environ = environ;
632 620
633 signal (SIGHUP, SIG_IGN); 621 signal (SIGHUP, SIG_IGN);
634 signal (SIGPIPE, SIG_IGN); 622 signal (SIGPIPE, SIG_IGN);
635 623
636 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 624 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
637 sig_handlers.sw_int.start (SIGINT); ev_unref (); 625 sig_handlers.sw_int.start (SIGINT); ev_unref ();
638
639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
640 /* signal (SIGURG, SIG_DFL); */
641 626
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 628 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 629 XSetIOErrorHandler (rxvt_xioerror_handler);
645 630
646 XrmInitialize (); 631 XrmInitialize ();
647}
648 632
649/* ------------------------------------------------------------------------- * 633#if HAVE_PIXBUF
650 * MEMORY ALLOCATION WRAPPERS * 634 g_type_init ();
651 * ------------------------------------------------------------------------- */ 635#endif
652void *
653rxvt_malloc (size_t size)
654{
655 void *p = malloc (size);
656
657 if (!p)
658 rxvt_fatal ("memory allocation failure. aborting.\n");
659
660 return p;
661}
662
663void *
664rxvt_calloc (size_t number, size_t size)
665{
666 void *p = calloc (number, size);
667
668 if (!p)
669 rxvt_fatal ("memory allocation failure. aborting.\n");
670
671 return p;
672}
673
674void *
675rxvt_realloc (void *ptr, size_t size)
676{
677 void *p = realloc (ptr, size);
678
679 if (!p)
680 rxvt_fatal ("memory allocation failure. aborting.\n");
681
682 return p;
683} 636}
684 637
685/*----------------------------------------------------------------------*/ 638/*----------------------------------------------------------------------*/
686/* 639/*
687 * window size/position calculations for XSizeHint and other storage. 640 * window size/position calculations for XSizeHint and other storage.
… …
689 */ 642 */
690void 643void
691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 644rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692{ 645{
693 short recalc_x, recalc_y; 646 short recalc_x, recalc_y;
694 int x, y, sb_w, flags; 647 int x, y, flags;
695 unsigned int w, h; 648 unsigned int w, h;
696 unsigned int max_width, max_height; 649 unsigned int max_width, max_height;
697 650
698 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 651 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
699 szHint.win_gravity = NorthWestGravity; 652 szHint.win_gravity = NorthWestGravity;
… …
709 if (rs[Rs_geometry]) 662 if (rs[Rs_geometry])
710 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 663 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711 664
712 if (flags & WidthValue) 665 if (flags & WidthValue)
713 { 666 {
667 if (!w)
668 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
669
714 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 670 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 671 szHint.flags |= USSize;
716 } 672 }
717 673
718 if (flags & HeightValue) 674 if (flags & HeightValue)
719 { 675 {
676 if (!h)
677 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
678
720 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 679 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 680 szHint.flags |= USSize;
722 } 681 }
723 682
724 if (flags & XValue) 683 if (flags & XValue)
725 { 684 {
… …
756 max_width = MAX_COLS * fwidth; 715 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * fheight; 716 max_height = MAX_ROWS * fheight;
758 717
759 szHint.base_width = szHint.base_height = 2 * int_bwidth; 718 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 719
761 sb_w = 0;
762 window_vt_x = window_vt_y = int_bwidth; 720 window_vt_x = window_vt_y = int_bwidth;
763 721
764 if (scrollBar.state) 722 if (scrollBar.state)
765 { 723 {
766 sb_w = scrollbar_TotalWidth (); 724 int sb_w = scrollBar.total_width ();
767 szHint.base_width += sb_w; 725 szHint.base_width += sb_w;
768 726
769 if (!option (Opt_scrollBar_right)) 727 if (!option (Opt_scrollBar_right))
770 window_vt_x += sb_w; 728 window_vt_x += sb_w;
771 } 729 }
… …
795 { 753 {
796 min_it (height, max_height); 754 min_it (height, max_height);
797 szHint.height = szHint.base_height + height; 755 szHint.height = szHint.base_height + height;
798 } 756 }
799 757
800 if (scrollBar.state && option (Opt_scrollBar_right))
801 window_sb_x = szHint.width - sb_w;
802
803 if (recalc_x) 758 if (recalc_x)
804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 759 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805 760
806 if (recalc_y) 761 if (recalc_y)
807 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 762 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808 763
809 ncol = width / fwidth; 764 ncol = width / fwidth;
810 nrow = height / fheight; 765 nrow = height / fheight;
766
767 // When the size of the vt window is not a multiple of the cell
768 // size, i.e., when the wm does not honour our size hints, there are
769 // extra areas not covered by the terminal screen. Such gaps, when a
770 // bg pixmap is set, would have to be cleared manually to properly
771 // refresh the background. We take the simpler route and shrink the
772 // vt window so as to avoid creating gaps.
773 vt_width = ncol * fwidth;
774 vt_height = nrow * fheight;
811} 775}
812 776
813/*----------------------------------------------------------------------*/ 777/*----------------------------------------------------------------------*/
814/* 778/*
815 * Tell the teletype handler what size the window is. 779 * Tell the teletype handler what size the window is.
… …
823 787
824 struct winsize ws; 788 struct winsize ws;
825 789
826 ws.ws_col = ncol; 790 ws.ws_col = ncol;
827 ws.ws_row = nrow; 791 ws.ws_row = nrow;
828 ws.ws_xpixel = width; 792 ws.ws_xpixel = vt_width;
829 ws.ws_ypixel = height; 793 ws.ws_ypixel = vt_height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 794 ioctl (pty->pty, TIOCSWINSZ, &ws);
831 795
832#if 0 796#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 797 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 798 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 799 kill (-cmd_pid, SIGWINCH);
836#endif 800#endif
837} 801}
838 802
839/*----------------------------------------------------------------------*/ 803/*----------------------------------------------------------------------*/
840/* set_fonts () - load and set the various fonts 804/* load and set the various fonts */
841 *
842 * init = 1 - initialize
843 *
844 * fontname == FONT_UP - switch to bigger font
845 * fontname == FONT_DN - switch to smaller font
846 */
847bool 805bool
848rxvt_term::set_fonts () 806rxvt_term::set_fonts ()
849{ 807{
850 rxvt_fontset *fs = new rxvt_fontset (this); 808 rxvt_fontset *fs = new rxvt_fontset (this);
851 rxvt_fontprop prop; 809 rxvt_fontprop prop;
… …
865#endif 823#endif
866 824
867 delete fontset[0]; 825 delete fontset[0];
868 fontset[0] = fs; 826 fontset[0] = fs;
869 827
870 prop = (*fs)[1]->properties (); 828 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
871 prop.height += lineSpace; 829 prop.width = max (prop.width + letterSpace, 1);
872 830
873 fs->set_prop (prop, false); 831 fs->set_prop (prop, false);
874 832
875 fwidth = prop.width; 833 fwidth = prop.width;
876 fheight = prop.height; 834 fheight = prop.height + lineSpace;
877 fbase = prop.ascent; 835 fbase = prop.ascent;
878 836
879 for (int style = 1; style < 4; style++) 837 for (int style = 1; style < 4; style++)
880 { 838 {
881#if ENABLE_STYLES 839#if ENABLE_STYLES
… …
907#else 865#else
908 fontset[style] = fontset[0]; 866 fontset[style] = fontset[0];
909#endif 867#endif
910 } 868 }
911 869
912 if (parent[0]) 870 if (parent)
913 { 871 {
914 resize_all_windows (0, 0, 0); 872 resize_all_windows (0, 0, 0);
915 scr_remap_chars (); 873 scr_remap_chars ();
916 scr_touch (true); 874 scr_touch (true);
917 } 875 }
… …
920} 878}
921 879
922void 880void
923rxvt_term::set_string_property (Atom prop, const char *str, int len) 881rxvt_term::set_string_property (Atom prop, const char *str, int len)
924{ 882{
925 XChangeProperty (dpy, parent[0], 883 XChangeProperty (dpy, parent,
926 prop, XA_STRING, 8, PropModeReplace, 884 prop, XA_STRING, 8, PropModeReplace,
927 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 885 (const unsigned char *)str, len >= 0 ? len : strlen (str));
928} 886}
929 887
930void 888void
889rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
890{
891 XTextProperty ct;
892
893 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
894 {
895 XSetTextProperty (dpy, parent, &ct, prop);
896 XFree (ct.value);
897 }
898}
899
900void
931rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 901rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
932{ 902{
933 wchar_t *ws = rxvt_mbstowcs (str, len); 903 wchar_t *ws = rxvt_mbstowcs (str, len);
934 char *s = rxvt_wcstoutf8 (ws); 904 char *s = rxvt_wcstoutf8 (ws);
935 905
936 XChangeProperty (dpy, parent[0], 906 XChangeProperty (dpy, parent,
937 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 907 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
938 (const unsigned char *)s, strlen (s)); 908 (const unsigned char *)s, strlen (s));
939 909
940 free (s); 910 free (s);
941 free (ws); 911 free (ws);
… …
945/*----------------------------------------------------------------------*/ 915/*----------------------------------------------------------------------*/
946/* xterm sequences - title, iconName, color (exptl) */ 916/* xterm sequences - title, iconName, color (exptl) */
947void 917void
948rxvt_term::set_title (const char *str) 918rxvt_term::set_title (const char *str)
949{ 919{
950 set_string_property (XA_WM_NAME, str); 920 set_mbstring_property (XA_WM_NAME, str);
951#if ENABLE_EWMH 921#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_NAME], str); 922 set_utf8_property (xa[XA_NET_WM_NAME], str);
953#endif 923#endif
954} 924}
955 925
956void 926void
957rxvt_term::set_icon_name (const char *str) 927rxvt_term::set_icon_name (const char *str)
958{ 928{
959 set_string_property (XA_WM_ICON_NAME, str); 929 set_mbstring_property (XA_WM_ICON_NAME, str);
960#if ENABLE_EWMH 930#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 931 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
962#endif 932#endif
963} 933}
964 934
965void 935void
966rxvt_term::set_window_color (int idx, const char *color) 936rxvt_term::set_window_color (int idx, const char *color)
967{ 937{
968#ifdef XTERM_COLOR_CHANGE 938#ifdef XTERM_COLOR_CHANGE
969 rxvt_color xcol; 939 rxvt_color xcol;
970 int i;
971 940
972 if (color == NULL || *color == '\0') 941 if (color == NULL || *color == '\0')
973 return; 942 return;
974 943
975 color = strdup (color); 944 color = strdup (color);
… …
977 rs[Rs_color + idx] = color; 946 rs[Rs_color + idx] = color;
978 947
979 /* handle color aliases */ 948 /* handle color aliases */
980 if (isdigit (*color)) 949 if (isdigit (*color))
981 { 950 {
982 i = atoi (color); 951 int i = atoi (color);
983 952
984 if (i >= 8 && i <= 15) 953 if (i >= 8 && i <= 15)
985 { 954 {
986 /* bright colors */ 955 /* bright colors */
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 956 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1032 1001
1033/*----------------------------------------------------------------------*/ 1002/*----------------------------------------------------------------------*/
1034/* 1003/*
1035 * find if fg/bg matches any of the normal (low-intensity) colors 1004 * find if fg/bg matches any of the normal (low-intensity) colors
1036 */ 1005 */
1037void 1006char *
1038rxvt_term::set_colorfgbg () 1007rxvt_term::get_colorfgbg ()
1039{ 1008{
1040 unsigned int i; 1009 unsigned int i;
1041 const char *xpmb = ""; 1010 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1011 char fstr[] = "default";
1012 char bstr[] = "default";
1013 char *env_colorfgbg;
1043 1014
1044 strcpy (fstr, "default");
1045 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 1015 for (i = Color_Black; i <= Color_White; i++)
1047 if (pix_colors[Color_fg] == pix_colors[i]) 1016 if (pix_colors[Color_fg] == pix_colors[i])
1048 { 1017 {
1049 sprintf (fstr, "%d", (i - Color_Black)); 1018 sprintf (fstr, "%d", i - Color_Black);
1050 break; 1019 break;
1051 } 1020 }
1052 1021
1053 for (i = Color_Black; i <= Color_White; i++) 1022 for (i = Color_Black; i <= Color_White; i++)
1054 if (pix_colors[Color_bg] == pix_colors[i]) 1023 if (pix_colors[Color_bg] == pix_colors[i])
1055 { 1024 {
1056 sprintf (bstr, "%d", (i - Color_Black)); 1025 sprintf (bstr, "%d", i - Color_Black);
1057#ifdef BG_IMAGE_FROM_FILE 1026#if BG_IMAGE_FROM_FILE
1058 xpmb = "default;"; 1027 xpmb = "default;";
1059#endif 1028#endif
1060 break; 1029 break;
1061 } 1030 }
1062 1031
1032 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1033 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1034 return env_colorfgbg;
1064} 1035}
1065 1036
1066/*----------------------------------------------------------------------*/ 1037/*----------------------------------------------------------------------*/
1067 1038
1068bool 1039bool
… …
1091 int old_width = szHint.width; 1062 int old_width = szHint.width;
1092 int old_height = szHint.height; 1063 int old_height = szHint.height;
1093 1064
1094 window_calc (newwidth, newheight); 1065 window_calc (newwidth, newheight);
1095 1066
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1067 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1068
1069 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1070 if (set_hint)
1071 {
1072 szHint.flags &= ~(PBaseSize | PResizeInc);
1097 XSetWMNormalHints (dpy, parent[0], &szHint); 1073 XSetWMNormalHints (dpy, parent, &szHint);
1074 szHint.flags |= PBaseSize | PResizeInc;
1075 }
1098 1076
1099 if (!ignoreparent) 1077 if (!ignoreparent)
1100 { 1078 {
1101#ifdef SMART_RESIZE 1079#ifdef SMART_RESIZE
1102 /* 1080 /*
… …
1106 int x, y, x1, y1; 1084 int x, y, x1, y1;
1107 int dx, dy; 1085 int dx, dy;
1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1086 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1109 Window unused_cr; 1087 Window unused_cr;
1110 1088
1111 XTranslateCoordinates (dpy, parent[0], display->root, 1089 XTranslateCoordinates (dpy, parent, display->root,
1112 0, 0, &x, &y, &unused_cr); 1090 0, 0, &x, &y, &unused_cr);
1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1091 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1092 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1115 /* 1093 /*
1116 * if display->root isn't the parent window, a WM will probably have offset 1094 * if display->root isn't the parent window, a WM will probably have offset
1117 * our position for handles and decorations. Counter it 1095 * our position for handles and decorations. Counter it
1118 */ 1096 */
… …
1135 if (y < y1) /* top half */ 1113 if (y < y1) /* top half */
1136 dy = 0; 1114 dy = 0;
1137 else if (y == y1) /* exact center */ 1115 else if (y == y1) /* exact center */
1138 dy /= 2; 1116 dy /= 2;
1139 1117
1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1118 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1141 szHint.width, szHint.height); 1119 szHint.width, szHint.height);
1142#else 1120#else
1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1121 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1144#endif 1122#endif
1145 } 1123 }
1124
1125 if (set_hint)
1126 XSetWMNormalHints (dpy, parent, &szHint);
1146 1127
1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1128 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1148 1129
1149 if (fix_screen || newwidth != old_width || newheight != old_height) 1130 if (fix_screen || newwidth != old_width || newheight != old_height)
1150 { 1131 {
1151 if (scrollBar.state) 1132 if (scrollBar.state)
1152 { 1133 scrollBar.resize ();
1153 XMoveResizeWindow (dpy, scrollBar.win,
1154 window_sb_x, 0,
1155 scrollbar_TotalWidth (), szHint.height);
1156 resize_scrollbar ();
1157 }
1158 1134
1159 XMoveResizeWindow (dpy, vt, 1135 XMoveResizeWindow (dpy, vt,
1160 window_vt_x, window_vt_y, 1136 window_vt_x, window_vt_y,
1161 width, height); 1137 vt_width, vt_height);
1138
1139 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1162 1140
1163#ifdef HAVE_BG_PIXMAP 1141#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ()) 1142 if (bg_window_size_sensitive ())
1165 update_background (); 1143 update_background ();
1166#endif 1144#endif
1167
1168 scr_clear ();
1169 } 1145 }
1170 1146
1171 if (fix_screen || old_height == 0) 1147 if (fix_screen || old_height == 0)
1172 scr_reset (); 1148 scr_reset ();
1173 1149
1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1175 //scr_touch (false);
1176
1177#ifdef HAVE_BG_PIXMAP
1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1179// if (bgPixmap.pixmap)
1180// scr_touch (false);
1181#endif
1182
1183#ifdef USE_XIM 1150#if USE_XIM
1184 IMSetPosition (); 1151 im_set_position ();
1185#endif 1152#endif
1186} 1153}
1187 1154
1188/* 1155/*
1189 * Set the width/height of the vt window in characters. Units are pixels. 1156 * Set the width/height of the vt window in characters. Units are pixels.
… …
1202 newwidth = wattr.width - szHint.base_width; 1169 newwidth = wattr.width - szHint.base_width;
1203 if (newheight == 0) 1170 if (newheight == 0)
1204 newheight = wattr.height - szHint.base_height; 1171 newheight = wattr.height - szHint.base_height;
1205 } 1172 }
1206 1173
1207 if (newwidth != width || newheight != height) 1174 if (newwidth != vt_width || newheight != vt_height)
1208 { 1175 {
1209 newwidth += szHint.base_width; 1176 newwidth += szHint.base_width;
1210 newheight += szHint.base_height; 1177 newheight += szHint.base_height;
1211 resize_all_windows (newwidth, newheight, 0); 1178 resize_all_windows (newwidth, newheight, 0);
1212 } 1179 }
1213} 1180}
1214 1181
1215/* -------------------------------------------------------------------- * 1182/* -------------------------------------------------------------------- *
1216 * - X INPUT METHOD ROUTINES - * 1183 * - X INPUT METHOD ROUTINES - *
1217 * -------------------------------------------------------------------- */ 1184 * -------------------------------------------------------------------- */
1218#ifdef USE_XIM 1185#if USE_XIM
1219 1186
1220void 1187void
1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1188rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1222{ 1189{
1223 fg = pix_colors [Color_fg]; 1190 fg = pix_colors [Color_fg];
… …
1250 status_rect.height = fheight; 1217 status_rect.height = fheight;
1251} 1218}
1252 1219
1253/* Checking whether input method is running. */ 1220/* Checking whether input method is running. */
1254bool 1221bool
1255rxvt_term::IMisRunning () 1222rxvt_term::im_is_running ()
1256{ 1223{
1257 char *p;
1258 Atom atom; 1224 Atom atom;
1259 Window win; 1225 Window win;
1260 char server[IMBUFSIZ]; 1226 char server[IMBUFSIZ];
1261 1227
1262 /* get current locale modifier */ 1228 /* get current locale modifier */
1263 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1229 if (char *p = XSetLocaleModifiers (0))
1264 { 1230 {
1265 strcpy (server, "@server="); 1231 strcpy (server, "@server=");
1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1232 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267 1233
1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1234 if (p = strchr (server + 1, '@')) /* first one only */
1269 *p = '\0'; 1235 *p = '\0';
1270 1236
1271 atom = XInternAtom (dpy, server, False); 1237 atom = XInternAtom (dpy, server, False);
1272 win = XGetSelectionOwner (dpy, atom); 1238 win = XGetSelectionOwner (dpy, atom);
1273 1239
1274 if (win != None) 1240 if (win != None)
1275 return True; 1241 return true;
1276 } 1242 }
1277 1243
1278 return False; 1244 return false;
1279} 1245}
1280 1246
1281void 1247void
1282rxvt_term::IMSendSpot () 1248rxvt_term::im_send_spot ()
1283{ 1249{
1284 XPoint nspot; 1250 XPoint nspot;
1285 XVaNestedList preedit_attr; 1251 XVaNestedList preedit_attr;
1286 1252
1287 if (!Input_Context 1253 if (!Input_Context
… …
1340 1306
1341 term->make_current (); 1307 term->make_current ();
1342 1308
1343 if (text) 1309 if (text)
1344 { 1310 {
1345 void *str; 1311 wchar_t *str;
1346 1312
1347 if (!text->encoding_is_wchar && text->string.multi_byte) 1313 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 { 1314 {
1349 // of course, X makes it ugly again 1315 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale]) 1316 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]); 1317 SET_LOCALE (term->rs[Rs_imLocale]);
1352 1318
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1319 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1320 mbstowcs (str, text->string.multi_byte, text->length + 1);
1355 1321
1356 if (term->rs[Rs_imLocale]) 1322 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale); 1323 SET_LOCALE (term->locale);
1358 } 1324 }
1359 else 1325 else
1360 str = (void *)text->string.wide_char; 1326 str = text->string.wide_char;
1361 1327
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1328 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret, 1329 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first, 1330 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length, 1331 DT_INT, call_data->chg_length,
… …
1393/* 1359/*
1394 * Try to open a XIM with the current modifiers, then see if we can 1360 * Try to open a XIM with the current modifiers, then see if we can
1395 * open a suitable preedit type 1361 * open a suitable preedit type
1396 */ 1362 */
1397bool 1363bool
1398rxvt_term::IM_get_IC (const char *modifiers) 1364rxvt_term::im_get_ic (const char *modifiers)
1399{ 1365{
1400 int i, j, found; 1366 int i, j, found;
1401 XIM xim; 1367 XIM xim;
1402 XPoint spot; 1368 XPoint spot;
1403 XRectangle rect, status_rect, needed_rect; 1369 XRectangle rect, status_rect, needed_rect;
1404 unsigned long fg, bg; 1370 unsigned long fg, bg;
1405 const char *p; 1371 const char *p;
1406 char **s; 1372 char **s;
1407 XIMStyles *xim_styles; 1373 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1411 1374
1412 set_environ (envv); 1375 set_environ (envv);
1413 1376
1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1377 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1415 return false; 1378 return false;
… …
1436 p = pet[pi]; 1399 p = pet[pi];
1437 1400
1438 if (!p) 1401 if (!p)
1439 continue; 1402 continue;
1440 1403
1441 s = rxvt_splitcommastring (p); 1404 s = rxvt_strsplit (',', p);
1442 1405
1443 for (i = found = 0; !found && s[i]; i++) 1406 for (i = found = 0; !found && s[i]; i++)
1444 { 1407 {
1445 if (!strcmp (s[i], "OverTheSpot")) 1408 if (!strcmp (s[i], "OverTheSpot"))
1446 input_style = XIMPreeditPosition | XIMStatusNothing; 1409 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1458 input_style = XIMPreeditNothing | XIMStatusNothing; 1421 input_style = XIMPreeditNothing | XIMStatusNothing;
1459 1422
1460 for (j = 0; j < xim_styles->count_styles; j++) 1423 for (j = 0; j < xim_styles->count_styles; j++)
1461 if (input_style == xim_styles->supported_styles[j]) 1424 if (input_style == xim_styles->supported_styles[j])
1462 { 1425 {
1463 rxvt_freecommastring (s); 1426 rxvt_free_strsplit (s);
1464 1427
1465 found = 1; 1428 found = 1;
1466 goto foundpet; 1429 goto foundpet;
1467 } 1430 }
1468 1431
1469 } 1432 }
1470 1433
1471 rxvt_freecommastring (s); 1434 rxvt_free_strsplit (s);
1472 } 1435 }
1473 1436
1474foundpet: 1437foundpet:
1475 1438
1476 XFree (xim_styles); 1439 XFree (xim_styles);
… …
1555 NULL); 1518 NULL);
1556 } 1519 }
1557#if ENABLE_XIM_ONTHESPOT 1520#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks) 1521 else if (input_style & XIMPreeditCallbacks)
1559 { 1522 {
1523 XIMCallback xcb[4];
1524
1560 im_set_position (spot); 1525 im_set_position (spot);
1561 1526
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1527 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1528 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1529 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1579#endif 1544#endif
1580 1545
1581 Input_Context = XCreateIC (xim, 1546 Input_Context = XCreateIC (xim,
1582 XNInputStyle, input_style, 1547 XNInputStyle, input_style,
1583 XNClientWindow, vt, 1548 XNClientWindow, vt,
1584 XNFocusWindow, parent[0], 1549 XNFocusWindow, parent,
1585 preedit_attr ? XNPreeditAttributes : NULL, 1550 preedit_attr ? XNPreeditAttributes : NULL,
1586 preedit_attr, 1551 preedit_attr,
1587 status_attr ? XNStatusAttributes : NULL, 1552 status_attr ? XNStatusAttributes : NULL,
1588 status_attr, NULL); 1553 status_attr, NULL);
1589 1554
… …
1602 // unfortunately, only the focus window is used by XIM, hard to fix 1567 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1568 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input (); 1569 vt_select_input ();
1605#endif 1570#endif
1606 1571
1607 IMSetPosition (); 1572 im_set_position ();
1608 1573
1609 return true; 1574 return true;
1610} 1575}
1611 1576
1612void 1577void
… …
1622 im_destroy (); 1587 im_destroy ();
1623 1588
1624 if (Input_Context) 1589 if (Input_Context)
1625 return; 1590 return;
1626 1591
1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1628 if (rs[Rs_imLocale]) 1592 if (rs[Rs_imLocale])
1629 SET_LOCALE (rs[Rs_imLocale]); 1593 SET_LOCALE (rs[Rs_imLocale]);
1630#endif
1631 1594
1632 p = rs[Rs_inputMethod]; 1595 p = rs[Rs_inputMethod];
1633 if (p && *p) 1596 if (p && *p)
1634 { 1597 {
1635 bool found = false; 1598 bool found = false;
1636 1599
1637 s = rxvt_splitcommastring (p); 1600 s = rxvt_strsplit (',', p);
1638 1601
1639 for (i = 0; s[i]; i++) 1602 for (i = 0; s[i]; i++)
1640 { 1603 {
1641 if (*s[i]) 1604 if (*s[i])
1642 { 1605 {
1643 strcpy (buf, "@im="); 1606 strcpy (buf, "@im=");
1644 strncat (buf, s[i], IMBUFSIZ - 5); 1607 strncat (buf, s[i], IMBUFSIZ - 5);
1645 if (IM_get_IC (buf)) 1608 if (im_get_ic (buf))
1646 { 1609 {
1647 found = true; 1610 found = true;
1648 break; 1611 break;
1649 } 1612 }
1650 } 1613 }
1651 } 1614 }
1652 1615
1653 rxvt_freecommastring (s); 1616 rxvt_free_strsplit (s);
1654 1617
1655 if (found) 1618 if (found)
1656 goto done; 1619 goto done;
1657 } 1620 }
1658 1621
1659 /* try with XMODIFIERS env. var. */ 1622 /* try with XMODIFIERS env. var. */
1660 if (IM_get_IC ("")) 1623 if (im_get_ic (""))
1661 goto done; 1624 goto done;
1662 1625
1663 /* try with no modifiers base IF the user didn't specify an IM */ 1626 /* try with no modifiers base IF the user didn't specify an IM */
1664 if (IM_get_IC ("@im=none")) 1627 if (im_get_ic ("@im=none"))
1665 goto done; 1628 goto done;
1666 1629
1667done: 1630done:
1668#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1669 if (rs[Rs_imLocale]) 1631 if (rs[Rs_imLocale])
1670 SET_LOCALE (locale); 1632 SET_LOCALE (locale);
1671#endif
1672} 1633}
1673 1634
1674void 1635void
1675rxvt_term::IMSetPosition () 1636rxvt_term::im_set_position ()
1676{ 1637{
1677 XRectangle preedit_rect, status_rect, *needed_rect; 1638 XRectangle preedit_rect, status_rect, *needed_rect;
1678 XVaNestedList preedit_attr, status_attr; 1639 XVaNestedList preedit_attr, status_attr;
1679 1640
1680 if (!Input_Context 1641 if (!Input_Context
1681 || !focus 1642 || !focus
1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1643 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1683 || !IMisRunning ()) 1644 || !im_is_running ())
1684 return; 1645 return;
1685 1646
1686 if (input_style & XIMPreeditPosition) 1647 if (input_style & XIMPreeditPosition)
1687 { 1648 {
1688 im_set_size (preedit_rect); 1649 im_set_size (preedit_rect);
… …
1718 1679
1719void 1680void
1720rxvt_term::get_window_origin (int &x, int &y) 1681rxvt_term::get_window_origin (int &x, int &y)
1721{ 1682{
1722 Window cr; 1683 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1684 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746} 1685}
1747 1686
1748#ifdef HAVE_BG_PIXMAP 1687#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char *file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757 1688
1758int 1689void
1759rxvt_term::update_background () 1690rxvt_term::update_background ()
1760{ 1691{
1761 bgPixmap.invalidate (); 1692 if (update_background_ev.is_active ())
1693 return;
1762 1694
1763 /* no chance of real time refresh if we are blurring! */ 1695 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1696
1697 if (to_wait <= 0.)
1765 bgPixmap.render (); 1698 bg_render ();
1766 else 1699 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1700 update_background_ev.start (to_wait);
1772 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1773 update_background_ev.start (.20); /* very slow !!! */
1774 else
1775 update_background_ev.start (.07);
1776 }
1777
1778 return 0;
1779} 1701}
1780 1702
1781void 1703void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1704rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1705{
1706 make_current ();
1707
1708 update_background_ev.stop ();
1784 bgPixmap.render (); 1709 bg_render ();
1710 refresh_check ();
1785} 1711}
1786 1712
1787#endif /* HAVE_BG_PIXMAP */ 1713#endif /* HAVE_BG_PIXMAP */
1788 1714
1789/*----------------------- end-of-file (C source) -----------------------*/ 1715/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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