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.268 by root, Tue Nov 27 17:52:51 2007 UTC vs.
Revision 1.392 by sf-exg, Mon Nov 3 09:40:26 2014 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 3 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
22 * 22 *
23 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
24 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
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); 244
243 if (ShadowGC) XFreeGC (dpy, ShadowGC); 245 if (gc)
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); 246 XFreeGC (dpy, gc);
266 247
267 delete drawable; 248 delete drawable;
249
268 // destroy all windows 250 // destroy all windows
269 if (parent[0]) 251 if (parent)
270 XDestroyWindow (dpy, parent[0]); 252 XDestroyWindow (dpy, parent);
271 253
272 for (int i = 0; i < TOTAL_COLORS; i++) 254 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 255 if (ISSET_PIXCOLOR (i))
274 { 256 {
275 pix_colors_focused [i].free (this); 257 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 259 pix_colors_unfocused [i].free (this);
278#endif 260#endif
279 } 261 }
280 262
281 clear (); 263 clear ();
282 }
283 264
284 delete [] pix_colors_focused; 265 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); 266 displays.put (display);
267 }
293 268
294 scr_release (); 269 scr_release ();
295 270
296 /* clear all resources */ 271 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 272 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 273 free (allocated [i]);
299 274
300 free (selection.text); 275 free (selection.text);
301 // TODO: manage env vars in child only(!) 276 free (selection.clip_text);
302 free (env_display);
303 free (env_term);
304 free (locale); 277 free (locale);
305 free (v_buffer); 278 free (v_buffer);
306 free (incr_buf); 279
280 delete selection_req;
281
282 if (env && memcmp (env, envv->begin (), envv->size () * sizeof (char *)))
283 rxvt_warn ("env has been modified, probably as a result of a lib calling setenv.\n");
284
285 delete env;
307 286
308 delete envv; 287 delete envv;
309 delete argv; 288 delete argv;
310 289
311#ifdef KEYSYM_RESOURCE 290#ifdef KEYSYM_RESOURCE
… …
329} 308}
330 309
331void 310void
332rxvt_term::destroy () 311rxvt_term::destroy ()
333{ 312{
334 if (destroy_ev.active) 313 if (destroy_ev.is_active ())
335 return; 314 return;
336 315
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 316 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 317
339#if ENABLE_OVERLAY 318#if ENABLE_OVERLAY
… …
343 if (display) 322 if (display)
344 { 323 {
345#if USE_XIM 324#if USE_XIM
346 im_ev.stop (display); 325 im_ev.stop (display);
347#endif 326#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 327 scrollbar_ev.stop (display);
350#endif 328#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
351#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 329 rootwin_ev.stop (display);
353#endif 330#endif
354 incr_ev.stop ();
355 termwin_ev.stop (display); 331 termwin_ev.stop (display);
356 vt_ev.stop (display); 332 vt_ev.stop (display);
357 } 333 }
358 334
359 prepare_ev.stop (); 335 flush_ev.stop ();
360 pty_ev.stop (); 336 pty_ev.stop ();
361#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
363#endif 339#endif
364#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
383 make_current (); 359 make_current ();
384 360
385 delete this; 361 delete this;
386} 362}
387 363
364void
365rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
374}
375
388/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
389/* 377/*
390 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * 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 */ 379 */
393static XErrorHandler old_xerror_handler; 380static XErrorHandler old_xerror_handler;
394 381
395static void 382static void
396rxvt_emergency_cleanup () 383rxvt_emergency_cleanup ()
… …
398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 385 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
399 (*t)->emergency_cleanup (); 386 (*t)->emergency_cleanup ();
400} 387}
401 388
402#if !ENABLE_MINIMAL 389#if !ENABLE_MINIMAL
403static void 390static void ecb_cold
404print_x_error (Display *dpy, XErrorEvent *event) 391print_x_error (Display *dpy, XErrorEvent *event)
405{ 392{
406 char buffer[BUFSIZ]; 393 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 394 char mesg[BUFSIZ];
408 char number[32]; 395 char number[32];
409 char *mtype = "XlibMessage"; 396
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"); 397 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
398
399 XGetErrorDatabaseText (dpy, "XlibMessage", "ErrorSerial", "Error Serial #%d", mesg, BUFSIZ);
400 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->serial);
401
402 XGetErrorText (dpy, event->error_code, buffer, BUFSIZ);
403 XGetErrorDatabaseText (dpy, "XlibMessage", "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("%s: %s\n", mesg, buffer); 404 rxvt_warn ("+ %s: %s\n", mesg, buffer);
405
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 406 XGetErrorDatabaseText (dpy, "XlibMessage", "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 407 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->request_code);
416 sprintf(number, "%d", event->request_code); 408
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 409 if (event->request_code >= 128)
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 {
421 mesg, BUFSIZ); 411#if 0
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 /* XListExtensions and probably query extensions hangs when there are multiple queues errors */
413 int nexts;
414 char **exts = XListExtensions (dpy, &nexts);
415
416 while (nexts)
417 {
418 char *extname = exts [nexts - 1];
419 int major, first_event, first_error;
420
421 if (XQueryExtension (dpy, extname, &major, &first_event, &first_error) && major == event->request_code)
422 {
423 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
424 rxvt_warn ("+ (which is extension %s minor code %d)\n", extname, event->minor_code);
425
426 snprintf (buffer, BUFSIZ, "%s.%d", extname, event->minor_code);
427 XGetErrorDatabaseText (dpy, "XRequest", buffer, "an unregistered minor code", buffer, BUFSIZ);
428 rxvt_warn ("+ (which is %s)\n", buffer);
429
430 break;
431 }
432
433 printf ("nextss %d %s\n", nexts, extname);//D
434 --nexts;
435 ++exts;
436 }
437#else
438 int nexts = 0;
439 char **exts = 0;
440#endif
441
442 if (!nexts)
443 {
444 rxvt_warn ("+ (which is an unknown extension)\n", buffer);
445
446 XGetErrorDatabaseText (dpy, "XlibMessage", "MinorCode", "Request Minor code %d", mesg, BUFSIZ);
447 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->minor_code);
448
449#if 0
450 sprintf (number, "RENDER.%d", event->minor_code);
451 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
452 rxvt_warn ("+ (which is %s)\n", buffer);
453#endif
454 }
455
456 XFreeExtensionList (exts);
423 } 457 }
458 else
459 {
460 sprintf (number, "%d", event->request_code);
461 XGetErrorDatabaseText (dpy, "XRequest", number, "", buffer, BUFSIZ);
462 rxvt_warn ("+ (which is %s)\n", buffer);
463 }
464
424 if ((event->error_code == BadWindow) || 465 if (event->error_code == BadWindow
425 (event->error_code == BadPixmap) || 466 || event->error_code == BadPixmap
426 (event->error_code == BadCursor) || 467 || event->error_code == BadCursor
427 (event->error_code == BadFont) || 468 || event->error_code == BadFont
428 (event->error_code == BadDrawable) || 469 || event->error_code == BadDrawable
429 (event->error_code == BadColor) || 470 || event->error_code == BadColor
430 (event->error_code == BadGC) || 471 || event->error_code == BadGC
431 (event->error_code == BadIDChoice) || 472 || event->error_code == BadIDChoice
432 (event->error_code == BadValue) || 473 || event->error_code == BadValue
433 (event->error_code == BadAtom)) { 474 || event->error_code == BadAtom)
475 {
434 if (event->error_code == BadValue) 476 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 477 XGetErrorDatabaseText (dpy, "XlibMessage", "Value", "Value 0x%x", mesg, BUFSIZ);
436 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 478 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 479 XGetErrorDatabaseText (dpy, "XlibMessage", "AtomID", "AtomID 0x%x", mesg, BUFSIZ);
439 mesg, BUFSIZ); 480 else
440 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 481 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 482
451int 483 snprintf (buffer, BUFSIZ, "+ %s\n", mesg); rxvt_warn (buffer, event->resourceid);
484 }
485}
486#endif
487
488int ecb_cold
452rxvt_xerror_handler (Display *display, XErrorEvent *event) 489rxvt_xerror_handler (Display *display, XErrorEvent *event)
453{ 490{
454 if (GET_R->allowedxerror == -1) 491 if (GET_R->allowedxerror == -1)
455 GET_R->allowedxerror = event->error_code; 492 GET_R->allowedxerror = event->error_code;
456 else 493 else
… …
465 } 502 }
466 503
467 return 0; 504 return 0;
468} 505}
469 506
470int 507int ecb_cold
471rxvt_xioerror_handler (Display *display) 508rxvt_xioerror_handler (Display *display)
472{ 509{
473 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 510 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
474 DisplayString (display)); 511 DisplayString (display));
475 rxvt_emergency_cleanup (); 512 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 513 _exit (EXIT_FAILURE);
477} 514}
478 515
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 516static struct sig_handlers
599{ 517{
600 ev::sig sw_term, sw_int; 518 ev::sig sw_term, sw_int;
601 519
602 /* 520 /*
603 * Catch a fatal signal and tidy up before quitting 521 * Catch a fatal signal and tidy up before quitting
604 */ 522 */
605 void
606 sig_term (ev::sig &w, int revents) 523 void sig_term (ev::sig &w, int revents);
524
525 sig_handlers ()
607 { 526 {
608 rxvt_emergency_cleanup (); 527 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) 528 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 529 }
618} sig_handlers; 530} sig_handlers;
619 531
532void
533sig_handlers::sig_term (ev::sig &w, int revents)
534{
535 rxvt_emergency_cleanup ();
536 w.stop ();
537 kill (getpid (), w.signum);
538}
539
540static void
541rxvt_get_ttymode (struct termios *tio)
542{
543 if (tcgetattr (STDIN_FILENO, tio) < 0)
544 memset (tio, 0, sizeof (struct termios));
545
546 for (int i = 0; i < NCCS; i++)
547 tio->c_cc[i] = VDISABLE;
548
549 tio->c_cc[VINTR] = CINTR;
550 tio->c_cc[VQUIT] = CQUIT;
551 tio->c_cc[VERASE] = CERASE;
552#ifdef VERASE2
553 tio->c_cc[VERASE2] = CERASE2;
554#endif
555 tio->c_cc[VKILL] = CKILL;
556 tio->c_cc[VEOF] = CEOF;
557 tio->c_cc[VSTART] = CSTART;
558 tio->c_cc[VSTOP] = CSTOP;
559 tio->c_cc[VSUSP] = CSUSP;
560# ifdef VDSUSP
561 tio->c_cc[VDSUSP] = CDSUSP;
562# endif
563# ifdef VREPRINT
564 tio->c_cc[VREPRINT] = CRPRNT;
565# endif
566# ifdef VDISCRD
567 tio->c_cc[VDISCRD] = CFLUSH;
568# endif
569# ifdef VWERSE
570 tio->c_cc[VWERSE] = CWERASE;
571# endif
572# ifdef VLNEXT
573 tio->c_cc[VLNEXT] = CLNEXT;
574# endif
575# ifdef VSTATUS
576 tio->c_cc[VSTATUS] = CSTATUS;
577# endif
578
579# if VMIN != VEOF
580 tio->c_cc[VMIN] = 1;
581# endif
582# if VTIME != VEOL
583 tio->c_cc[VTIME] = 0;
584# endif
585
586 /* input modes */
587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
588# ifdef IMAXBEL
589 | IMAXBEL
590# endif
591 | IXON);
592
593 /* output modes */
594 tio->c_oflag = (OPOST | ONLCR);
595
596 /* control modes */
597 tio->c_cflag = (CS8 | CREAD);
598
599 /* local modes */
600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
601# if defined (ECHOCTL) && defined (ECHOKE)
602 | ECHOCTL | ECHOKE
603# endif
604 | ECHOE | ECHOK);
605}
606
620char **rxvt_environ; // startup environment 607char **rxvt_environ; // startup environment
621 608
622void 609void
623rxvt_init () 610rxvt_init ()
624{ 611{
625 ptytty::init (); 612 assert (("fontMask must not overlap other RS masks",
613 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
626 614
615 rxvt_get_ttymode (&rxvt_term::def_tio);
616
617 // get rid of stdin/stdout as we don't need them, to free resources
618 dup2 (STDERR_FILENO, STDIN_FILENO);
619 dup2 (STDERR_FILENO, STDOUT_FILENO);
620
627 if (!ev_default_loop (0)) 621 if (!ev_default_loop ())
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 622 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 623
630 rxvt_environ = environ; 624 rxvt_environ = environ;
631 625
632 signal (SIGHUP, SIG_IGN); 626 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 627 signal (SIGPIPE, SIG_IGN);
634 628
635 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 629 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev_unref (); 630 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */
640 631
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 633 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 634 XSetIOErrorHandler (rxvt_xioerror_handler);
644 635
645 XrmInitialize (); 636 XrmInitialize ();
646}
647 637
648/* ------------------------------------------------------------------------- * 638#if HAVE_PIXBUF
649 * MEMORY ALLOCATION WRAPPERS * 639 g_type_init ();
650 * ------------------------------------------------------------------------- */ 640#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} 641}
683 642
684/*----------------------------------------------------------------------*/ 643/*----------------------------------------------------------------------*/
685/* 644/*
686 * window size/position calculations for XSizeHint and other storage. 645 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 647 */
689void 648void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 649rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 650{
692 short recalc_x, recalc_y; 651 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 652 int x, y, flags;
694 unsigned int w, h; 653 unsigned int w, h;
695 unsigned int max_width, max_height; 654 unsigned int max_width, max_height;
696 655
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 656 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 657 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 667 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 668 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 669
711 if (flags & WidthValue) 670 if (flags & WidthValue)
712 { 671 {
672 if (!w)
673 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
674
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 675 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 676 szHint.flags |= USSize;
715 } 677 }
716 678
717 if (flags & HeightValue) 679 if (flags & HeightValue)
718 { 680 {
681 if (!h)
682 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
683
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 684 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 685 szHint.flags |= USSize;
721 } 686 }
722 687
723 if (flags & XValue) 688 if (flags & XValue)
724 { 689 {
… …
755 max_width = MAX_COLS * fwidth; 720 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 721 max_height = MAX_ROWS * fheight;
757 722
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 723 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 724
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 725 window_vt_x = window_vt_y = int_bwidth;
762 726
763 if (scrollBar.state) 727 if (scrollBar.state)
764 { 728 {
765 sb_w = scrollbar_TotalWidth (); 729 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 730 szHint.base_width += sb_w;
767 731
768 if (!option (Opt_scrollBar_right)) 732 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 733 window_vt_x += sb_w;
770 } 734 }
… …
794 { 758 {
795 min_it (height, max_height); 759 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 760 szHint.height = szHint.base_height + height;
797 } 761 }
798 762
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 763 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 764 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 765
805 if (recalc_y) 766 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 767 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 768
808 ncol = width / fwidth; 769 ncol = width / fwidth;
809 nrow = height / fheight; 770 nrow = height / fheight;
771
772 // When the size of the vt window is not a multiple of the cell
773 // size, i.e., when the wm does not honour our size hints, there are
774 // extra areas not covered by the terminal screen. Such gaps, when a
775 // bg pixmap is set, would have to be cleared manually to properly
776 // refresh the background. We take the simpler route and shrink the
777 // vt window so as to avoid creating gaps.
778 vt_width = ncol * fwidth;
779 vt_height = nrow * fheight;
810} 780}
811 781
812/*----------------------------------------------------------------------*/ 782/*----------------------------------------------------------------------*/
813/* 783/*
814 * Tell the teletype handler what size the window is. 784 * Tell the teletype handler what size the window is.
… …
822 792
823 struct winsize ws; 793 struct winsize ws;
824 794
825 ws.ws_col = ncol; 795 ws.ws_col = ncol;
826 ws.ws_row = nrow; 796 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 797 ws.ws_xpixel = vt_width;
828 ws.ws_ypixel = height; 798 ws.ws_ypixel = vt_height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 799 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 800
831#if 0 801#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 802 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 803 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 804 kill (-cmd_pid, SIGWINCH);
835#endif 805#endif
836} 806}
837 807
838/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
839/* set_fonts () - load and set the various fonts 809/* 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 810bool
847rxvt_term::set_fonts () 811rxvt_term::set_fonts ()
848{ 812{
849 rxvt_fontset *fs = new rxvt_fontset (this); 813 rxvt_fontset *fs = new rxvt_fontset (this);
850 rxvt_fontprop prop; 814 rxvt_fontprop prop;
… …
864#endif 828#endif
865 829
866 delete fontset[0]; 830 delete fontset[0];
867 fontset[0] = fs; 831 fontset[0] = fs;
868 832
869 prop = (*fs)[1]->properties (); 833 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 834 prop.width = max (prop.width + letterSpace, 1);
871 835
872 fs->set_prop (prop, false); 836 fs->set_prop (prop, false);
873 837
874 fwidth = prop.width; 838 fwidth = prop.width;
875 fheight = prop.height; 839 fheight = prop.height + lineSpace;
876 fbase = prop.ascent; 840 fbase = prop.ascent;
877 841
878 for (int style = 1; style < 4; style++) 842 for (int style = 1; style < 4; style++)
879 { 843 {
880#if ENABLE_STYLES 844#if ENABLE_STYLES
… …
906#else 870#else
907 fontset[style] = fontset[0]; 871 fontset[style] = fontset[0];
908#endif 872#endif
909 } 873 }
910 874
911 if (parent[0]) 875 if (parent)
912 { 876 {
913 resize_all_windows (0, 0, 0); 877 resize_all_windows (0, 0, 0);
914 scr_remap_chars (); 878 scr_remap_chars ();
915 scr_touch (true); 879 scr_touch (true);
916 } 880 }
… …
919} 883}
920 884
921void 885void
922rxvt_term::set_string_property (Atom prop, const char *str, int len) 886rxvt_term::set_string_property (Atom prop, const char *str, int len)
923{ 887{
924 XChangeProperty (dpy, parent[0], 888 XChangeProperty (dpy, parent,
925 prop, XA_STRING, 8, PropModeReplace, 889 prop, XA_STRING, 8, PropModeReplace,
926 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 890 (const unsigned char *)str, len >= 0 ? len : strlen (str));
927} 891}
928 892
929void 893void
894rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
895{
896 XTextProperty ct;
897
898 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
899 {
900 XSetTextProperty (dpy, parent, &ct, prop);
901 XFree (ct.value);
902 }
903}
904
905void
930rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 906rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931{ 907{
932 wchar_t *ws = rxvt_mbstowcs (str, len); 908 wchar_t *ws = rxvt_mbstowcs (str, len);
933 char *s = rxvt_wcstoutf8 (ws); 909 char *s = rxvt_wcstoutf8 (ws);
934 910
935 XChangeProperty (dpy, parent[0], 911 XChangeProperty (dpy, parent,
936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 912 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
937 (const unsigned char *)s, strlen (s)); 913 (const unsigned char *)s, strlen (s));
938 914
939 free (s); 915 free (s);
940 free (ws); 916 free (ws);
… …
944/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
945/* xterm sequences - title, iconName, color (exptl) */ 921/* xterm sequences - title, iconName, color (exptl) */
946void 922void
947rxvt_term::set_title (const char *str) 923rxvt_term::set_title (const char *str)
948{ 924{
949 set_string_property (XA_WM_NAME, str); 925 set_mbstring_property (XA_WM_NAME, str);
950#if ENABLE_EWMH 926#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_NAME], str); 927 set_utf8_property (xa[XA_NET_WM_NAME], str);
952#endif 928#endif
953} 929}
954 930
955void 931void
956rxvt_term::set_icon_name (const char *str) 932rxvt_term::set_icon_name (const char *str)
957{ 933{
958 set_string_property (XA_WM_ICON_NAME, str); 934 set_mbstring_property (XA_WM_ICON_NAME, str);
959#if ENABLE_EWMH 935#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 936 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961#endif 937#endif
962} 938}
963 939
964void 940void
965rxvt_term::set_window_color (int idx, const char *color) 941rxvt_term::set_window_color (int idx, const char *color)
966{ 942{
967#ifdef XTERM_COLOR_CHANGE 943#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 944 rxvt_color xcol;
969 int i;
970 945
971 if (color == NULL || *color == '\0') 946 if (color == NULL || *color == '\0')
972 return; 947 return;
973 948
974 color = strdup (color); 949 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 951 rs[Rs_color + idx] = color;
977 952
978 /* handle color aliases */ 953 /* handle color aliases */
979 if (isdigit (*color)) 954 if (isdigit (*color))
980 { 955 {
981 i = atoi (color); 956 int i = atoi (color);
982 957
983 if (i >= 8 && i <= 15) 958 if (i >= 8 && i <= 15)
984 { 959 {
985 /* bright colors */ 960 /* bright colors */
986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 961 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1031 1006
1032/*----------------------------------------------------------------------*/ 1007/*----------------------------------------------------------------------*/
1033/* 1008/*
1034 * find if fg/bg matches any of the normal (low-intensity) colors 1009 * find if fg/bg matches any of the normal (low-intensity) colors
1035 */ 1010 */
1036void 1011char *
1037rxvt_term::set_colorfgbg () 1012rxvt_term::get_colorfgbg ()
1038{ 1013{
1039 unsigned int i; 1014 unsigned int i;
1040 const char *xpmb = ""; 1015 const char *xpmb = "";
1041 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1016 char fstr[] = "default";
1017 char bstr[] = "default";
1018 char *env_colorfgbg;
1042 1019
1043 strcpy (fstr, "default");
1044 strcpy (bstr, "default");
1045 for (i = Color_Black; i <= Color_White; i++) 1020 for (i = Color_Black; i <= Color_White; i++)
1046 if (pix_colors[Color_fg] == pix_colors[i]) 1021 if (pix_colors[Color_fg] == pix_colors[i])
1047 { 1022 {
1048 sprintf (fstr, "%d", (i - Color_Black)); 1023 sprintf (fstr, "%d", i - Color_Black);
1049 break; 1024 break;
1050 } 1025 }
1051 1026
1052 for (i = Color_Black; i <= Color_White; i++) 1027 for (i = Color_Black; i <= Color_White; i++)
1053 if (pix_colors[Color_bg] == pix_colors[i]) 1028 if (pix_colors[Color_bg] == pix_colors[i])
1054 { 1029 {
1055 sprintf (bstr, "%d", (i - Color_Black)); 1030 sprintf (bstr, "%d", i - Color_Black);
1056#ifdef BG_IMAGE_FROM_FILE 1031#if BG_IMAGE_FROM_FILE
1057 xpmb = "default;"; 1032 xpmb = "default;";
1058#endif 1033#endif
1059 break; 1034 break;
1060 } 1035 }
1061 1036
1037 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1062 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1038 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1039 return env_colorfgbg;
1063} 1040}
1064 1041
1065/*----------------------------------------------------------------------*/ 1042/*----------------------------------------------------------------------*/
1066 1043
1067bool 1044bool
… …
1090 int old_width = szHint.width; 1067 int old_width = szHint.width;
1091 int old_height = szHint.height; 1068 int old_height = szHint.height;
1092 1069
1093 window_calc (newwidth, newheight); 1070 window_calc (newwidth, newheight);
1094 1071
1095 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1072 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1073
1074 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1075 if (set_hint)
1076 {
1077 szHint.flags &= ~(PBaseSize | PResizeInc);
1096 XSetWMNormalHints (dpy, parent[0], &szHint); 1078 XSetWMNormalHints (dpy, parent, &szHint);
1079 szHint.flags |= PBaseSize | PResizeInc;
1080 }
1097 1081
1098 if (!ignoreparent) 1082 if (!ignoreparent)
1099 { 1083 {
1100#ifdef SMART_RESIZE 1084#ifdef SMART_RESIZE
1101 /* 1085 /*
… …
1105 int x, y, x1, y1; 1089 int x, y, x1, y1;
1106 int dx, dy; 1090 int dx, dy;
1107 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1091 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1108 Window unused_cr; 1092 Window unused_cr;
1109 1093
1110 XTranslateCoordinates (dpy, parent[0], display->root, 1094 XTranslateCoordinates (dpy, parent, display->root,
1111 0, 0, &x, &y, &unused_cr); 1095 0, 0, &x, &y, &unused_cr);
1112 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1096 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1113 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1097 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1114 /* 1098 /*
1115 * if display->root isn't the parent window, a WM will probably have offset 1099 * if display->root isn't the parent window, a WM will probably have offset
1116 * our position for handles and decorations. Counter it 1100 * our position for handles and decorations. Counter it
1117 */ 1101 */
… …
1134 if (y < y1) /* top half */ 1118 if (y < y1) /* top half */
1135 dy = 0; 1119 dy = 0;
1136 else if (y == y1) /* exact center */ 1120 else if (y == y1) /* exact center */
1137 dy /= 2; 1121 dy /= 2;
1138 1122
1139 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1123 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1140 szHint.width, szHint.height); 1124 szHint.width, szHint.height);
1141#else 1125#else
1142 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1126 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1143#endif 1127#endif
1144 } 1128 }
1129
1130 if (set_hint)
1131 XSetWMNormalHints (dpy, parent, &szHint);
1145 1132
1146 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1147 1134
1148 if (fix_screen || newwidth != old_width || newheight != old_height) 1135 if (fix_screen || newwidth != old_width || newheight != old_height)
1149 { 1136 {
1150 if (scrollBar.state) 1137 if (scrollBar.state)
1151 { 1138 scrollBar.resize ();
1152 XMoveResizeWindow (dpy, scrollBar.win,
1153 window_sb_x, 0,
1154 scrollbar_TotalWidth (), szHint.height);
1155 resize_scrollbar ();
1156 }
1157 1139
1158 XMoveResizeWindow (dpy, vt, 1140 XMoveResizeWindow (dpy, vt,
1159 window_vt_x, window_vt_y, 1141 window_vt_x, window_vt_y,
1160 width, height); 1142 vt_width, vt_height);
1143
1144 HOOK_INVOKE ((this, HOOK_SIZE_CHANGE, DT_INT, newwidth, DT_INT, newheight, DT_END));
1161 1145
1162#ifdef HAVE_BG_PIXMAP 1146#ifdef HAVE_BG_PIXMAP
1163 if (bgPixmap.window_size_sensitive ()) 1147 if (bg_window_size_sensitive ())
1164 update_background (); 1148 update_background ();
1165#endif 1149#endif
1166
1167 scr_clear ();
1168 } 1150 }
1169 1151
1170 if (fix_screen || old_height == 0) 1152 if (fix_screen || old_height == 0)
1171 scr_reset (); 1153 scr_reset ();
1172 1154
1173 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1174 //scr_touch (false);
1175
1176#ifdef HAVE_BG_PIXMAP
1177// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1178// if (bgPixmap.pixmap)
1179// scr_touch (false);
1180#endif
1181
1182#ifdef USE_XIM 1155#if USE_XIM
1183 IMSetPosition (); 1156 im_set_position ();
1184#endif 1157#endif
1185} 1158}
1186 1159
1187/* 1160/*
1188 * Set the width/height of the vt window in characters. Units are pixels. 1161 * Set the width/height of the vt window in characters. Units are pixels.
… …
1201 newwidth = wattr.width - szHint.base_width; 1174 newwidth = wattr.width - szHint.base_width;
1202 if (newheight == 0) 1175 if (newheight == 0)
1203 newheight = wattr.height - szHint.base_height; 1176 newheight = wattr.height - szHint.base_height;
1204 } 1177 }
1205 1178
1206 if (newwidth != width || newheight != height) 1179 if (newwidth != vt_width || newheight != vt_height)
1207 { 1180 {
1208 newwidth += szHint.base_width; 1181 newwidth += szHint.base_width;
1209 newheight += szHint.base_height; 1182 newheight += szHint.base_height;
1210 resize_all_windows (newwidth, newheight, 0); 1183 resize_all_windows (newwidth, newheight, 0);
1211 } 1184 }
1212} 1185}
1213 1186
1214/* -------------------------------------------------------------------- * 1187/* -------------------------------------------------------------------- *
1215 * - X INPUT METHOD ROUTINES - * 1188 * - X INPUT METHOD ROUTINES - *
1216 * -------------------------------------------------------------------- */ 1189 * -------------------------------------------------------------------- */
1217#ifdef USE_XIM 1190#if USE_XIM
1218 1191
1219void 1192void
1220rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1193rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1221{ 1194{
1222 fg = pix_colors [Color_fg]; 1195 fg = pix_colors [Color_fg];
… …
1249 status_rect.height = fheight; 1222 status_rect.height = fheight;
1250} 1223}
1251 1224
1252/* Checking whether input method is running. */ 1225/* Checking whether input method is running. */
1253bool 1226bool
1254rxvt_term::IMisRunning () 1227rxvt_term::im_is_running ()
1255{ 1228{
1256 char *p;
1257 Atom atom; 1229 Atom atom;
1258 Window win; 1230 Window win;
1259 char server[IMBUFSIZ]; 1231 char server[IMBUFSIZ];
1260 1232
1261 /* get current locale modifier */ 1233 /* get current locale modifier */
1262 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1234 if (char *p = XSetLocaleModifiers (0))
1263 { 1235 {
1264 strcpy (server, "@server="); 1236 strcpy (server, "@server=");
1265 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1237 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1266 1238
1267 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1239 if (p = strchr (server + 1, '@')) /* first one only */
1268 *p = '\0'; 1240 *p = '\0';
1269 1241
1270 atom = XInternAtom (dpy, server, False); 1242 atom = XInternAtom (dpy, server, False);
1271 win = XGetSelectionOwner (dpy, atom); 1243 win = XGetSelectionOwner (dpy, atom);
1272 1244
1273 if (win != None) 1245 if (win != None)
1274 return True; 1246 return true;
1275 } 1247 }
1276 1248
1277 return False; 1249 return false;
1278} 1250}
1279 1251
1280void 1252void
1281rxvt_term::IMSendSpot () 1253rxvt_term::im_send_spot ()
1282{ 1254{
1283 XPoint nspot; 1255 XPoint nspot;
1284 XVaNestedList preedit_attr; 1256 XVaNestedList preedit_attr;
1285 1257
1286 if (!Input_Context 1258 if (!Input_Context
… …
1339 1311
1340 term->make_current (); 1312 term->make_current ();
1341 1313
1342 if (text) 1314 if (text)
1343 { 1315 {
1344 void *str; 1316 wchar_t *str;
1345 1317
1346 if (!text->encoding_is_wchar && text->string.multi_byte) 1318 if (!text->encoding_is_wchar && text->string.multi_byte)
1347 { 1319 {
1348 // of course, X makes it ugly again 1320 // of course, X makes it ugly again
1349 if (term->rs[Rs_imLocale]) 1321 if (term->rs[Rs_imLocale])
1350 SET_LOCALE (term->rs[Rs_imLocale]); 1322 SET_LOCALE (term->rs[Rs_imLocale]);
1351 1323
1352 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1324 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1353 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1325 mbstowcs (str, text->string.multi_byte, text->length + 1);
1354 1326
1355 if (term->rs[Rs_imLocale]) 1327 if (term->rs[Rs_imLocale])
1356 SET_LOCALE (term->locale); 1328 SET_LOCALE (term->locale);
1357 } 1329 }
1358 else 1330 else
1359 str = (void *)text->string.wide_char; 1331 str = text->string.wide_char;
1360 1332
1361 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1333 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1362 DT_INT, call_data->caret, 1334 DT_INT, call_data->caret,
1363 DT_INT, call_data->chg_first, 1335 DT_INT, call_data->chg_first,
1364 DT_INT, call_data->chg_length, 1336 DT_INT, call_data->chg_length,
… …
1392/* 1364/*
1393 * Try to open a XIM with the current modifiers, then see if we can 1365 * Try to open a XIM with the current modifiers, then see if we can
1394 * open a suitable preedit type 1366 * open a suitable preedit type
1395 */ 1367 */
1396bool 1368bool
1397rxvt_term::IM_get_IC (const char *modifiers) 1369rxvt_term::im_get_ic (const char *modifiers)
1398{ 1370{
1399 int i, j, found; 1371 int i, j, found;
1400 XIM xim; 1372 XIM xim;
1401 XPoint spot; 1373 XPoint spot;
1402 XRectangle rect, status_rect, needed_rect; 1374 XRectangle rect, status_rect, needed_rect;
1403 unsigned long fg, bg; 1375 unsigned long fg, bg;
1404 const char *p; 1376 const char *p;
1405 char **s; 1377 char **s;
1406 XIMStyles *xim_styles; 1378 XIMStyles *xim_styles;
1407#ifdef ENABLE_XIM_ONTHESPOT
1408 XIMCallback xcb[4];
1409#endif
1410 1379
1411 set_environ (envv); 1380 set_environ (env);
1412 1381
1413 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1382 if (!((p = XSetLocaleModifiers (modifiers)) && *p))
1414 return false; 1383 return false;
1415 1384
1416 input_method = display->get_xim (locale, modifiers); 1385 input_method = display->get_xim (locale, modifiers);
1417 if (input_method == NULL) 1386 if (input_method == NULL)
1418 return false; 1387 return false;
… …
1435 p = pet[pi]; 1404 p = pet[pi];
1436 1405
1437 if (!p) 1406 if (!p)
1438 continue; 1407 continue;
1439 1408
1440 s = rxvt_splitcommastring (p); 1409 s = rxvt_strsplit (',', p);
1441 1410
1442 for (i = found = 0; !found && s[i]; i++) 1411 for (i = found = 0; !found && s[i]; i++)
1443 { 1412 {
1444 if (!strcmp (s[i], "OverTheSpot")) 1413 if (!strcmp (s[i], "OverTheSpot"))
1445 input_style = XIMPreeditPosition | XIMStatusNothing; 1414 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1457 input_style = XIMPreeditNothing | XIMStatusNothing; 1426 input_style = XIMPreeditNothing | XIMStatusNothing;
1458 1427
1459 for (j = 0; j < xim_styles->count_styles; j++) 1428 for (j = 0; j < xim_styles->count_styles; j++)
1460 if (input_style == xim_styles->supported_styles[j]) 1429 if (input_style == xim_styles->supported_styles[j])
1461 { 1430 {
1462 rxvt_freecommastring (s); 1431 rxvt_free_strsplit (s);
1463 1432
1464 found = 1; 1433 found = 1;
1465 goto foundpet; 1434 goto foundpet;
1466 } 1435 }
1467 1436
1468 } 1437 }
1469 1438
1470 rxvt_freecommastring (s); 1439 rxvt_free_strsplit (s);
1471 } 1440 }
1472 1441
1473foundpet: 1442foundpet:
1474 1443
1475 XFree (xim_styles); 1444 XFree (xim_styles);
… …
1554 NULL); 1523 NULL);
1555 } 1524 }
1556#if ENABLE_XIM_ONTHESPOT 1525#if ENABLE_XIM_ONTHESPOT
1557 else if (input_style & XIMPreeditCallbacks) 1526 else if (input_style & XIMPreeditCallbacks)
1558 { 1527 {
1528 XIMCallback xcb[4];
1529
1559 im_set_position (spot); 1530 im_set_position (spot);
1560 1531
1561 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1532 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1562 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1533 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1563 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1534 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1578#endif 1549#endif
1579 1550
1580 Input_Context = XCreateIC (xim, 1551 Input_Context = XCreateIC (xim,
1581 XNInputStyle, input_style, 1552 XNInputStyle, input_style,
1582 XNClientWindow, vt, 1553 XNClientWindow, vt,
1583 XNFocusWindow, parent[0], 1554 XNFocusWindow, parent,
1584 preedit_attr ? XNPreeditAttributes : NULL, 1555 preedit_attr ? XNPreeditAttributes : NULL,
1585 preedit_attr, 1556 preedit_attr,
1586 status_attr ? XNStatusAttributes : NULL, 1557 status_attr ? XNStatusAttributes : NULL,
1587 status_attr, NULL); 1558 status_attr, NULL);
1588 1559
… …
1601 // unfortunately, only the focus window is used by XIM, hard to fix 1572 // unfortunately, only the focus window is used by XIM, hard to fix
1602 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1573 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1603 vt_select_input (); 1574 vt_select_input ();
1604#endif 1575#endif
1605 1576
1606 IMSetPosition (); 1577 im_set_position ();
1607 1578
1608 return true; 1579 return true;
1609} 1580}
1610 1581
1611void 1582void
… …
1621 im_destroy (); 1592 im_destroy ();
1622 1593
1623 if (Input_Context) 1594 if (Input_Context)
1624 return; 1595 return;
1625 1596
1626#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1627 if (rs[Rs_imLocale]) 1597 if (rs[Rs_imLocale])
1628 SET_LOCALE (rs[Rs_imLocale]); 1598 SET_LOCALE (rs[Rs_imLocale]);
1629#endif
1630 1599
1631 p = rs[Rs_inputMethod]; 1600 p = rs[Rs_inputMethod];
1632 if (p && *p) 1601 if (p && *p)
1633 { 1602 {
1634 bool found = false; 1603 bool found = false;
1635 1604
1636 s = rxvt_splitcommastring (p); 1605 s = rxvt_strsplit (',', p);
1637 1606
1638 for (i = 0; s[i]; i++) 1607 for (i = 0; s[i]; i++)
1639 { 1608 {
1640 if (*s[i]) 1609 if (*s[i])
1641 { 1610 {
1642 strcpy (buf, "@im="); 1611 strcpy (buf, "@im=");
1643 strncat (buf, s[i], IMBUFSIZ - 5); 1612 strncat (buf, s[i], IMBUFSIZ - 5);
1644 if (IM_get_IC (buf)) 1613 if (im_get_ic (buf))
1645 { 1614 {
1646 found = true; 1615 found = true;
1647 break; 1616 break;
1648 } 1617 }
1649 } 1618 }
1650 } 1619 }
1651 1620
1652 rxvt_freecommastring (s); 1621 rxvt_free_strsplit (s);
1653 1622
1654 if (found) 1623 if (found)
1655 goto done; 1624 goto done;
1656 } 1625 }
1657 1626
1658 /* try with XMODIFIERS env. var. */ 1627 /* try with XMODIFIERS env. var. */
1659 if (IM_get_IC ("")) 1628 if (im_get_ic (""))
1660 goto done; 1629 goto done;
1661 1630
1662 /* try with no modifiers base IF the user didn't specify an IM */ 1631 /* try with no modifiers base IF the user didn't specify an IM */
1663 if (IM_get_IC ("@im=none")) 1632 if (im_get_ic ("@im=none"))
1664 goto done; 1633 goto done;
1665 1634
1666done: 1635done:
1667#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1668 if (rs[Rs_imLocale]) 1636 if (rs[Rs_imLocale])
1669 SET_LOCALE (locale); 1637 SET_LOCALE (locale);
1670#endif
1671} 1638}
1672 1639
1673void 1640void
1674rxvt_term::IMSetPosition () 1641rxvt_term::im_set_position ()
1675{ 1642{
1676 XRectangle preedit_rect, status_rect, *needed_rect; 1643 XRectangle preedit_rect, status_rect, *needed_rect;
1677 XVaNestedList preedit_attr, status_attr; 1644 XVaNestedList preedit_attr, status_attr;
1678 1645
1679 if (!Input_Context 1646 if (!Input_Context
1680 || !focus 1647 || !focus
1681 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1648 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1682 || !IMisRunning ()) 1649 || !im_is_running ())
1683 return; 1650 return;
1684 1651
1685 if (input_style & XIMPreeditPosition) 1652 if (input_style & XIMPreeditPosition)
1686 { 1653 {
1687 im_set_size (preedit_rect); 1654 im_set_size (preedit_rect);
… …
1717 1684
1718void 1685void
1719rxvt_term::get_window_origin (int &x, int &y) 1686rxvt_term::get_window_origin (int &x, int &y)
1720{ 1687{
1721 Window cr; 1688 Window cr;
1722 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1689 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1723/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1724}
1725
1726Pixmap
1727rxvt_term::get_pixmap_property (int prop_id)
1728{
1729 if (prop_id > 0 && prop_id < NUM_XA)
1730 if (xa[prop_id])
1731 {
1732 int aformat;
1733 unsigned long nitems, bytes_after;
1734 Atom atype;
1735 unsigned char *prop = NULL;
1736 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1737 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1738 &nitems, &bytes_after, &prop);
1739 if (result == Success && prop && atype == XA_PIXMAP)
1740 {
1741 return *(Pixmap *)prop;
1742 }
1743 }
1744 return None;
1745} 1690}
1746 1691
1747#ifdef HAVE_BG_PIXMAP 1692#ifdef HAVE_BG_PIXMAP
1748# if TRACE_PIXMAPS
1749# undef update_background
1750int rxvt_term::trace_update_background (const char *file, int line)
1751{
1752 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1753 update_background ();
1754}
1755# endif
1756 1693
1757int 1694void
1758rxvt_term::update_background () 1695rxvt_term::update_background ()
1759{ 1696{
1760 bgPixmap.invalidate (); 1697 if (update_background_ev.is_active ())
1698 return;
1761 1699
1762 /* no chance of real time refresh if we are blurring! */ 1700 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1701
1702 if (to_wait <= 0.)
1764 bgPixmap.render (); 1703 bg_render ();
1765 else 1704 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1705 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} 1706}
1779 1707
1780void 1708void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1709rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1710{
1711 make_current ();
1712
1713 update_background_ev.stop ();
1783 bgPixmap.render (); 1714 bg_render ();
1715 refresh_check ();
1784} 1716}
1785 1717
1786#endif /* HAVE_BG_PIXMAP */ 1718#endif /* HAVE_BG_PIXMAP */
1787 1719
1788/*----------------------- end-of-file (C source) -----------------------*/ 1720/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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