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.357 by sf-exg, Sat Jul 9 13:14:47 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.end (); cc-- > v.begin (); )
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
… …
230 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
231 delete fontset[i]; 225 delete fontset[i];
232#endif 226#endif
233 delete fontset[0]; 227 delete fontset[0];
234 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
235 if (display) 233 if (display)
236 { 234 {
237 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
238 237
239#ifdef USE_XIM 238#ifdef USE_XIM
240 im_destroy (); 239 im_destroy ();
241#endif 240#endif
242#ifdef XTERM_SCROLLBAR 241 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); 242 if (gc) XFreeGC (dpy, gc);
267 243
268 delete drawable; 244 delete drawable;
269 // destroy all windows 245 // destroy all windows
270 if (parent[0]) 246 if (parent)
271 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
272 248
273 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
274 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
275 { 251 {
276 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
278 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
279#endif 255#endif
280 } 256 }
281 257
282 clear (); 258 clear ();
283 }
284 259
285 delete [] pix_colors_focused; 260 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); 261 displays.put (display);
262 }
294 263
295 scr_release (); 264 scr_release ();
296 265
297 /* clear all resources */ 266 /* clear all resources */
298 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
299 free (allocated [i]); 268 free (allocated [i]);
300 269
301 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
302 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
303 free (env_display); 273 free (env_display);
304 free (env_term); 274 free (env_term);
305 free (locale); 275 free (locale);
306 free (v_buffer); 276 free (v_buffer);
307 free (incr_buf); 277
278 delete selection_req;
308 279
309 delete envv; 280 delete envv;
310 delete argv; 281 delete argv;
311 282
312#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
330} 301}
331 302
332void 303void
333rxvt_term::destroy () 304rxvt_term::destroy ()
334{ 305{
335 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
336 return; 307 return;
337 308
338 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
339 310
340#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
344 if (display) 315 if (display)
345 { 316 {
346#if USE_XIM 317#if USE_XIM
347 im_ev.stop (display); 318 im_ev.stop (display);
348#endif 319#endif
349#if HAVE_SCROLLBARS
350 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
351#endif
352#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
353 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
354#endif 323#endif
355 incr_ev.stop ();
356 termwin_ev.stop (display); 324 termwin_ev.stop (display);
357 vt_ev.stop (display); 325 vt_ev.stop (display);
358 } 326 }
359 327
360 prepare_ev.stop (); 328 flush_ev.stop ();
361 pty_ev.stop (); 329 pty_ev.stop ();
362#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
363 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
364#endif 332#endif
365#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
382rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
383{ 351{
384 make_current (); 352 make_current ();
385 353
386 delete this; 354 delete this;
355}
356
357void
358rxvt_term::set_option (uint8_t opt, bool set)
359{
360 if (!opt)
361 return;
362
363 uint8_t mask = 1 << (opt & 7);
364 uint8_t &val = options [opt >> 3];
365
366 val = val & ~mask | (set ? mask : 0);
387} 367}
388 368
389/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
390/* 370/*
391 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
405print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
406{ 386{
407 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
408 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
409 char number[32]; 389 char number[32];
410 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
411 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
412 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
413 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 393 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
414 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
415 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
417 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
418 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
419 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
420 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
421 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
422 mesg, BUFSIZ); 402 mesg, BUFSIZ);
423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
424 } 404 }
425 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
426 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
427 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
428 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
429 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
430 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
431 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
432 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
433 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
434 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
435 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
436 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
437 mesg, BUFSIZ); 417 mesg, BUFSIZ);
438 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
439 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
440 mesg, BUFSIZ); 420 mesg, BUFSIZ);
441 else 421 else
442 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
443 mesg, BUFSIZ); 423 mesg, BUFSIZ);
444 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
445 } 425 }
446 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
447 mesg, BUFSIZ); 427 mesg, BUFSIZ);
448 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
449} 429}
450#endif 430#endif
451 431
452int 432int
… …
475 DisplayString (display)); 455 DisplayString (display));
476 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
477 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
478} 458}
479 459
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 460static struct sig_handlers
600{ 461{
601 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
602 463
603 /* 464 /*
604 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
605 */ 466 */
606 void
607 sig_term (ev::sig &w, int revents) 467 void sig_term (ev::sig &w, int revents);
468
469 sig_handlers ()
608 { 470 {
609 rxvt_emergency_cleanup (); 471 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) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
617 {
618 } 473 }
619} sig_handlers; 474} sig_handlers;
620 475
476void
477sig_handlers::sig_term (ev::sig &w, int revents)
478{
479 rxvt_emergency_cleanup ();
480 w.stop ();
481 kill (getpid (), w.signum);
482}
483
484static void
485rxvt_get_ttymode (struct termios *tio)
486{
487 if (tcgetattr (STDIN_FILENO, tio) < 0)
488 memset (tio, 0, sizeof (struct termios));
489
490 for (int i = 0; i < NCCS; i++)
491 tio->c_cc[i] = VDISABLE;
492
493 tio->c_cc[VINTR] = CINTR;
494 tio->c_cc[VQUIT] = CQUIT;
495 tio->c_cc[VERASE] = CERASE;
496#ifdef VERASE2
497 tio->c_cc[VERASE2] = CERASE2;
498#endif
499 tio->c_cc[VKILL] = CKILL;
500 tio->c_cc[VEOF] = CEOF;
501 tio->c_cc[VSTART] = CSTART;
502 tio->c_cc[VSTOP] = CSTOP;
503 tio->c_cc[VSUSP] = CSUSP;
504# ifdef VDSUSP
505 tio->c_cc[VDSUSP] = CDSUSP;
506# endif
507# ifdef VREPRINT
508 tio->c_cc[VREPRINT] = CRPRNT;
509# endif
510# ifdef VDISCRD
511 tio->c_cc[VDISCRD] = CFLUSH;
512# endif
513# ifdef VWERSE
514 tio->c_cc[VWERSE] = CWERASE;
515# endif
516# ifdef VLNEXT
517 tio->c_cc[VLNEXT] = CLNEXT;
518# endif
519# ifdef VSTATUS
520 tio->c_cc[VSTATUS] = CSTATUS;
521# endif
522
523# if VMIN != VEOF
524 tio->c_cc[VMIN] = 1;
525# endif
526# if VTIME != VEOL
527 tio->c_cc[VTIME] = 0;
528# endif
529
530 /* input modes */
531 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
532# ifdef IMAXBEL
533 | IMAXBEL
534# endif
535 | IXON);
536
537 /* output modes */
538 tio->c_oflag = (OPOST | ONLCR);
539
540 /* control modes */
541 tio->c_cflag = (CS8 | CREAD);
542
543 /* local modes */
544 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
545# if defined (ECHOCTL) && defined (ECHOKE)
546 | ECHOCTL | ECHOKE
547# endif
548 | ECHOE | ECHOK);
549}
550
621char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
622 552
623void 553void
624rxvt_init () 554rxvt_init ()
625{ 555{
626 ptytty::init (); 556 assert (("fontMask must not overlap other RS masks",
557 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
627 558
559 rxvt_get_ttymode (&rxvt_term::def_tio);
560
561 // get rid of stdin/stdout as we don't need them, to free resources
562 dup2 (STDERR_FILENO, STDIN_FILENO);
563 dup2 (STDERR_FILENO, STDOUT_FILENO);
564
628 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
629 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
630 567
631 rxvt_environ = environ; 568 rxvt_environ = environ;
632 569
633 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
634 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
635 572
636 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
637 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
638
639 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
640 /* signal (SIGURG, SIG_DFL); */
641 575
642 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
643 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
644 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
645 579
646 XrmInitialize (); 580 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} 581}
684 582
685/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
686/* 584/*
687 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
689 */ 587 */
690void 588void
691rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
692{ 590{
693 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
694 int x, y, sb_w, flags; 592 int x, y, flags;
695 unsigned int w, h; 593 unsigned int w, h;
696 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
697 595
698 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
699 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
709 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
710 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
711 609
712 if (flags & WidthValue) 610 if (flags & WidthValue)
713 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
714 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 616 szHint.flags |= USSize;
716 } 617 }
717 618
718 if (flags & HeightValue) 619 if (flags & HeightValue)
719 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
720 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
721 szHint.flags |= USSize; 625 szHint.flags |= USSize;
722 } 626 }
723 627
724 if (flags & XValue) 628 if (flags & XValue)
725 { 629 {
… …
756 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
757 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
758 662
759 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
760 664
761 sb_w = 0;
762 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
763 666
764 if (scrollBar.state) 667 if (scrollBar.state)
765 { 668 {
766 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
767 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
768 671
769 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
770 window_vt_x += sb_w; 673 window_vt_x += sb_w;
771 } 674 }
… …
795 { 698 {
796 min_it (height, max_height); 699 min_it (height, max_height);
797 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
798 } 701 }
799 702
800 if (scrollBar.state && option (Opt_scrollBar_right))
801 window_sb_x = szHint.width - sb_w;
802
803 if (recalc_x) 703 if (recalc_x)
804 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
805 705
806 if (recalc_y) 706 if (recalc_y)
807 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
808 708
809 ncol = width / fwidth; 709 ncol = width / fwidth;
810 nrow = height / fheight; 710 nrow = height / fheight;
811} 711}
812 712
813/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
814/* 714/*
… …
825 725
826 ws.ws_col = ncol; 726 ws.ws_col = ncol;
827 ws.ws_row = nrow; 727 ws.ws_row = nrow;
828 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
829 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
830 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
831 731
832#if 0 732#if 0
833 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
834 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
835 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
836#endif 736#endif
837} 737}
838 738
839/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
840/* set_fonts () - load and set the various fonts 740/* 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 741bool
848rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
849{ 743{
850 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
851 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
865#endif 759#endif
866 760
867 delete fontset[0]; 761 delete fontset[0];
868 fontset[0] = fs; 762 fontset[0] = fs;
869 763
870 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
871 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
872 767
873 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
874 769
875 fwidth = prop.width; 770 fwidth = prop.width;
876 fheight = prop.height; 771 fheight = prop.height;
… …
907#else 802#else
908 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
909#endif 804#endif
910 } 805 }
911 806
912 if (parent[0]) 807 if (parent)
913 { 808 {
914 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
915 scr_remap_chars (); 810 scr_remap_chars ();
916 scr_touch (true); 811 scr_touch (true);
917 } 812 }
… …
920} 815}
921 816
922void 817void
923rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
924{ 819{
925 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
926 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
927 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
928} 823}
929 824
930void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
931rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
932{ 839{
933 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
934 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
935 842
936 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
937 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
938 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
939 846
940 free (s); 847 free (s);
941 free (ws); 848 free (ws);
… …
945/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
946/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
947void 854void
948rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
949{ 856{
950 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
951#if ENABLE_EWMH 858#if ENABLE_EWMH
952 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
953#endif 860#endif
954} 861}
955 862
956void 863void
957rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
958{ 865{
959 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
960#if ENABLE_EWMH 867#if ENABLE_EWMH
961 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
962#endif 869#endif
963} 870}
964 871
965void 872void
966rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
967{ 874{
968#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
969 rxvt_color xcol; 876 rxvt_color xcol;
970 int i;
971 877
972 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
973 return; 879 return;
974 880
975 color = strdup (color); 881 color = strdup (color);
… …
977 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
978 884
979 /* handle color aliases */ 885 /* handle color aliases */
980 if (isdigit (*color)) 886 if (isdigit (*color))
981 { 887 {
982 i = atoi (color); 888 int i = atoi (color);
983 889
984 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
985 { 891 {
986 /* bright colors */ 892 /* bright colors */
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
… …
1037void 943void
1038rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1039{ 945{
1040 unsigned int i; 946 unsigned int i;
1041 const char *xpmb = ""; 947 const char *xpmb = "";
1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
1043 950
1044 strcpy (fstr, "default");
1045 strcpy (bstr, "default");
1046 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
1047 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
1048 { 953 {
1049 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
1050 break; 955 break;
1051 } 956 }
1052 957
1053 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1054 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
1055 { 960 {
1056 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
1057#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
1058 xpmb = "default;"; 963 xpmb = "default;";
1059#endif 964#endif
1060 break; 965 break;
1061 } 966 }
… …
1091 int old_width = szHint.width; 996 int old_width = szHint.width;
1092 int old_height = szHint.height; 997 int old_height = szHint.height;
1093 998
1094 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1095 1000
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1001 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002
1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1004 if (set_hint)
1005 {
1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1097 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1098 1010
1099 if (!ignoreparent) 1011 if (!ignoreparent)
1100 { 1012 {
1101#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1102 /* 1014 /*
… …
1106 int x, y, x1, y1; 1018 int x, y, x1, y1;
1107 int dx, dy; 1019 int dx, dy;
1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1109 Window unused_cr; 1021 Window unused_cr;
1110 1022
1111 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1112 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1115 /* 1027 /*
1116 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1117 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1118 */ 1030 */
… …
1135 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1136 dy = 0; 1048 dy = 0;
1137 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1138 dy /= 2; 1050 dy /= 2;
1139 1051
1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1141 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1142#else 1054#else
1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1144#endif 1056#endif
1145 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1146 1061
1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1148 1063
1149 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1150 { 1065 {
1151 if (scrollBar.state) 1066 if (scrollBar.state)
1152 { 1067 scrollBar.resize ();
1153 XMoveResizeWindow (dpy, scrollBar.win,
1154 window_sb_x, 0,
1155 scrollbar_TotalWidth (), szHint.height);
1156 resize_scrollbar ();
1157 }
1158 1068
1159 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1160 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1161 width, height); 1071 width, height);
1162 1072
1163#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1165 update_background (); 1075 update_background ();
1166#endif 1076#endif
1167
1168 scr_clear ();
1169 } 1077 }
1170 1078
1171 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1172 scr_reset (); 1080 scr_reset ();
1173
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 1081
1183#ifdef USE_XIM 1082#ifdef USE_XIM
1184 IMSetPosition (); 1083 IMSetPosition ();
1185#endif 1084#endif
1186} 1085}
… …
1252 1151
1253/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1254bool 1153bool
1255rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1256{ 1155{
1257 char *p;
1258 Atom atom; 1156 Atom atom;
1259 Window win; 1157 Window win;
1260 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1261 1159
1262 /* get current locale modifier */ 1160 /* get current locale modifier */
1263 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1264 { 1162 {
1265 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1267 1165
1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1269 *p = '\0'; 1167 *p = '\0';
1270 1168
1271 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1272 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1273 1171
1274 if (win != None) 1172 if (win != None)
1275 return True; 1173 return true;
1276 } 1174 }
1277 1175
1278 return False; 1176 return false;
1279} 1177}
1280 1178
1281void 1179void
1282rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1283{ 1181{
… …
1340 1238
1341 term->make_current (); 1239 term->make_current ();
1342 1240
1343 if (text) 1241 if (text)
1344 { 1242 {
1345 void *str; 1243 wchar_t *str;
1346 1244
1347 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 { 1246 {
1349 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1352 1250
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1355 1253
1356 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1358 } 1256 }
1359 else 1257 else
1360 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1361 1259
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
… …
1403 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1404 unsigned long fg, bg; 1302 unsigned long fg, bg;
1405 const char *p; 1303 const char *p;
1406 char **s; 1304 char **s;
1407 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1411 1306
1412 set_environ (envv); 1307 set_environ (envv);
1413 1308
1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1415 return false; 1310 return false;
… …
1436 p = pet[pi]; 1331 p = pet[pi];
1437 1332
1438 if (!p) 1333 if (!p)
1439 continue; 1334 continue;
1440 1335
1441 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1442 1337
1443 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1444 { 1339 {
1445 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1446 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1458 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1459 1354
1460 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1461 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1462 { 1357 {
1463 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1464 1359
1465 found = 1; 1360 found = 1;
1466 goto foundpet; 1361 goto foundpet;
1467 } 1362 }
1468 1363
1469 } 1364 }
1470 1365
1471 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1472 } 1367 }
1473 1368
1474foundpet: 1369foundpet:
1475 1370
1476 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1555 NULL); 1450 NULL);
1556 } 1451 }
1557#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1559 { 1454 {
1455 XIMCallback xcb[4];
1456
1560 im_set_position (spot); 1457 im_set_position (spot);
1561 1458
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 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; 1460 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; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1579#endif 1476#endif
1580 1477
1581 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1582 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1583 XNClientWindow, vt, 1480 XNClientWindow, vt,
1584 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1585 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1586 preedit_attr, 1483 preedit_attr,
1587 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1588 status_attr, NULL); 1485 status_attr, NULL);
1589 1486
… …
1632 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1633 if (p && *p) 1530 if (p && *p)
1634 { 1531 {
1635 bool found = false; 1532 bool found = false;
1636 1533
1637 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1638 1535
1639 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1640 { 1537 {
1641 if (*s[i]) 1538 if (*s[i])
1642 { 1539 {
… …
1648 break; 1545 break;
1649 } 1546 }
1650 } 1547 }
1651 } 1548 }
1652 1549
1653 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1654 1551
1655 if (found) 1552 if (found)
1656 goto done; 1553 goto done;
1657 } 1554 }
1658 1555
… …
1718 1615
1719void 1616void
1720rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1721{ 1618{
1722 Window cr; 1619 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725} 1621}
1726 1622
1727Pixmap 1623Pixmap
1728rxvt_term::get_pixmap_property (int prop_id) 1624rxvt_term::get_pixmap_property (Atom property)
1729{ 1625{
1730 if (prop_id > 0 && prop_id < NUM_XA) 1626 Pixmap pixmap = None;
1731 if (xa[prop_id]) 1627
1732 {
1733 int aformat; 1628 int aformat;
1734 unsigned long nitems, bytes_after; 1629 unsigned long nitems, bytes_after;
1735 Atom atype; 1630 Atom atype;
1736 unsigned char *prop = NULL; 1631 unsigned char *prop;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1632 int result = XGetWindowProperty (dpy, display->root, property,
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop); 1634 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP) 1635 if (result == Success)
1741 { 1636 {
1742 return *(Pixmap *)prop; 1637 if (atype == XA_PIXMAP)
1743 } 1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1744 } 1640 }
1745 return None; 1641
1642 return pixmap;
1746} 1643}
1747 1644
1748#ifdef HAVE_BG_PIXMAP 1645#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 1646
1758int 1647void
1759rxvt_term::update_background () 1648rxvt_term::update_background ()
1760{ 1649{
1650 if (update_background_ev.is_active ())
1651 return;
1652
1761 bgPixmap.invalidate (); 1653 bg_invalidate ();
1762 1654
1763 /* no chance of real time refresh if we are blurring! */ 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1764 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1656
1657 if (to_wait <= 0.)
1765 bgPixmap.render (); 1658 bg_render ();
1766 else 1659 else
1767 {
1768 update_background_ev.stop ();
1769
1770 if (!bgPixmap.need_client_side_rendering())
1771 update_background_ev.start (.05); 1660 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} 1661}
1780 1662
1781void 1663void
1782rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1783{ 1665{
1666 make_current ();
1667
1668 update_background_ev.stop ();
1784 bgPixmap.render (); 1669 bg_render ();
1670 refresh_check ();
1785} 1671}
1786 1672
1787#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1788 1674
1789/*----------------------- end-of-file (C source) -----------------------*/ 1675/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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