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

Diff Legend

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