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.276 by root, Tue Dec 11 18:00:07 2007 UTC vs.
Revision 1.389 by root, Sun Feb 17 00:52:04 2013 UTC

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

Diff Legend

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