ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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