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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.265 by ayin, Mon Nov 26 10:08:36 2007 UTC vs.
Revision 1.358 by sf-exg, Sat Jul 9 13:40:13 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{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif
163#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 177#endif
161#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
163#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194
198 incr_ev (this, &rxvt_term::incr_cb)
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 196
202 termlist.push_back (this); 197 termlist.push_back (this);
203 198
204#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
230 delete fontset[i]; 225 delete fontset[i];
231#endif 226#endif
232 delete fontset[0]; 227 delete fontset[0];
233 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
234 if (display) 233 if (display)
235 { 234 {
236 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
237 237
238#ifdef USE_XIM 238#ifdef USE_XIM
239 im_destroy (); 239 im_destroy ();
240#endif 240#endif
241#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
266 243
267 delete drawable; 244 delete drawable;
268 // destroy all windows 245 // destroy all windows
269 if (parent[0]) 246 if (parent)
270 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
271 248
272 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
274 { 251 {
275 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
278#endif 255#endif
279 } 256 }
280 257
281 clear (); 258 clear ();
282 }
283 259
284 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
292 displays.put (display); 261 displays.put (display);
262 }
293 263
294 scr_release (); 264 scr_release ();
295 265
296 /* clear all resources */ 266 /* clear all resources */
297 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
298 free (allocated [i]); 268 free (allocated [i]);
299 269
300 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
301 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
302 free (env_display); 273 free (env_display);
303 free (env_term); 274 free (env_term);
304 free (locale); 275 free (locale);
305 free (v_buffer); 276 free (v_buffer);
306 free (incr_buf); 277
278 delete selection_req;
307 279
308 delete envv; 280 delete envv;
309 delete argv; 281 delete argv;
310 282
311#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
… …
329} 301}
330 302
331void 303void
332rxvt_term::destroy () 304rxvt_term::destroy ()
333{ 305{
334 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
335 return; 307 return;
336 308
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338 310
339#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
343 if (display) 315 if (display)
344 { 316 {
345#if USE_XIM 317#if USE_XIM
346 im_ev.stop (display); 318 im_ev.stop (display);
347#endif 319#endif
348#if HAVE_SCROLLBARS
349 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
350#endif
351#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
352 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
353#endif 323#endif
354 incr_ev.stop ();
355 termwin_ev.stop (display); 324 termwin_ev.stop (display);
356 vt_ev.stop (display); 325 vt_ev.stop (display);
357 } 326 }
358 327
359 prepare_ev.stop (); 328 flush_ev.stop ();
360 pty_ev.stop (); 329 pty_ev.stop ();
361#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
362 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
363#endif 332#endif
364#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
381rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
382{ 351{
383 make_current (); 352 make_current ();
384 353
385 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);
386} 367}
387 368
388/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
389/* 370/*
390 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
404print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
405{ 386{
406 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
407 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
408 char number[32]; 389 char number[32];
409 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
410 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
411 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
412 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");
413 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
414 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
415 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
416 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
417 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
418 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
419 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
420 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
421 mesg, BUFSIZ); 402 mesg, BUFSIZ);
422 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
423 } 404 }
424 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
425 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
426 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
427 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
428 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
429 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
430 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
431 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
432 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
433 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
434 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
435 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
436 mesg, BUFSIZ); 417 mesg, BUFSIZ);
437 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
438 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
439 mesg, BUFSIZ); 420 mesg, BUFSIZ);
440 else 421 else
441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
442 mesg, BUFSIZ); 423 mesg, BUFSIZ);
443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
444 } 425 }
445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
446 mesg, BUFSIZ); 427 mesg, BUFSIZ);
447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
448} 429}
449#endif 430#endif
450 431
451int 432int
… …
474 DisplayString (display)); 455 DisplayString (display));
475 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
476 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
477} 458}
478 459
479/*----------------------------------------------------------------------*/
480bool
481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
482{
483 this->envv = envv;
484
485 SET_R (this);
486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
488
489 if (!init_vars ())
490 return false;
491
492 init_secondary ();
493
494 const char **cmd_argv = init_resources (argc, argv);
495
496#ifdef KEYSYM_RESOURCE
497 keyboard->register_done ();
498#endif
499
500#ifdef HAVE_SCROLLBARS
501 if (option (Opt_scrollBar))
502 scrollBar.setIdle (); /* set existence for size calculations */
503#endif
504
505 pty = ptytty::create ();
506
507 create_windows (argc, argv);
508
509 init_xlocale ();
510
511 scr_reset (); // initialize screen
512
513#if 0
514 XSynchronize (dpy, True);
515#endif
516
517#ifdef HAVE_SCROLLBARS
518 if (option (Opt_scrollBar))
519 resize_scrollbar (); /* create and map scrollbar */
520#endif
521#ifdef HAVE_BG_PIXMAP
522 {
523 bgPixmap.set_target (this);
524
525#ifdef ENABLE_TRANSPARENCY
526 if (option (Opt_transparent))
527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
539 XSelectInput (dpy, display->root, PropertyChangeMask);
540 rootwin_ev.start (display, display->root);
541 }
542#endif
543
544#ifdef BG_IMAGE_FROM_FILE
545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
568
569 set_colorfgbg ();
570
571 init_command (cmd_argv);
572
573 free (cmd_argv);
574
575 if (pty->pty >= 0)
576 pty_ev.start (pty->pty, ev::READ);
577
578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
594
595 return true;
596}
597
598static struct sig_handlers 460static struct sig_handlers
599{ 461{
600 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
601 463
602 /* 464 /*
603 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
604 */ 466 */
605 void
606 sig_term (ev::sig &w, int revents) 467 void sig_term (ev::sig &w, int revents);
468
469 sig_handlers ()
607 { 470 {
608 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
609 w.stop ();
610 kill (getpid (), w.signum);
611 }
612
613 sig_handlers ()
614 : sw_term (this, &sig_handlers::sig_term),
615 sw_int (this, &sig_handlers::sig_term) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
616 {
617 } 473 }
618} sig_handlers; 474} sig_handlers;
619 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
620char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
621 552
622void 553void
623rxvt_init () 554rxvt_init ()
624{ 555{
625 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))));
626 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
627 if (!ev_default_loop (0)) 565 if (!ev_default_loop ())
628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
629 567
630 rxvt_environ = environ; 568 rxvt_environ = environ;
631 569
632 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
633 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
634 572
635 sig_handlers.sw_term.start (SIGTERM); ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
636 sig_handlers.sw_int.start (SIGINT); ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
637
638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
639 /* signal (SIGURG, SIG_DFL); */
640 575
641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
642 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
643 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
644 579
645 XrmInitialize (); 580 XrmInitialize ();
646}
647
648/* ------------------------------------------------------------------------- *
649 * MEMORY ALLOCATION WRAPPERS *
650 * ------------------------------------------------------------------------- */
651void *
652rxvt_malloc (size_t size)
653{
654 void *p = malloc (size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_calloc (size_t number, size_t size)
664{
665 void *p = calloc (number, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671}
672
673void *
674rxvt_realloc (void *ptr, size_t size)
675{
676 void *p = realloc (ptr, size);
677
678 if (!p)
679 rxvt_fatal ("memory allocation failure. aborting.\n");
680
681 return p;
682} 581}
683 582
684/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
685/* 584/*
686 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
688 */ 587 */
689void 588void
690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
691{ 590{
692 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
693 int x, y, sb_w, flags; 592 int x, y, flags;
694 unsigned int w, h; 593 unsigned int w, h;
695 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
696 595
697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
698 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
708 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
710 609
711 if (flags & WidthValue) 610 if (flags & WidthValue)
712 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
714 szHint.flags |= USSize; 616 szHint.flags |= USSize;
715 } 617 }
716 618
717 if (flags & HeightValue) 619 if (flags & HeightValue)
718 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
720 szHint.flags |= USSize; 625 szHint.flags |= USSize;
721 } 626 }
722 627
723 if (flags & XValue) 628 if (flags & XValue)
724 { 629 {
… …
755 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
756 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
757 662
758 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
759 664
760 sb_w = 0;
761 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
762 666
763 if (scrollBar.state) 667 if (scrollBar.state)
764 { 668 {
765 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
766 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
767 671
768 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
769 window_vt_x += sb_w; 673 window_vt_x += sb_w;
770 } 674 }
… …
794 { 698 {
795 min_it (height, max_height); 699 min_it (height, max_height);
796 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
797 } 701 }
798 702
799 if (scrollBar.state && option (Opt_scrollBar_right))
800 window_sb_x = szHint.width - sb_w;
801
802 if (recalc_x) 703 if (recalc_x)
803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804 705
805 if (recalc_y) 706 if (recalc_y)
806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
807 708
808 ncol = width / fwidth; 709 ncol = width / fwidth;
809 nrow = height / fheight; 710 nrow = height / fheight;
810} 711}
811 712
812/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
813/* 714/*
… …
824 725
825 ws.ws_col = ncol; 726 ws.ws_col = ncol;
826 ws.ws_row = nrow; 727 ws.ws_row = nrow;
827 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
828 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
830 731
831#if 0 732#if 0
832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
833 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
834 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
835#endif 736#endif
836} 737}
837 738
838/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
839/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
840 *
841 * init = 1 - initialize
842 *
843 * fontname == FONT_UP - switch to bigger font
844 * fontname == FONT_DN - switch to smaller font
845 */
846bool 741bool
847rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
848{ 743{
849 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
850 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
864#endif 759#endif
865 760
866 delete fontset[0]; 761 delete fontset[0];
867 fontset[0] = fs; 762 fontset[0] = fs;
868 763
869 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
870 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
871 767
872 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
873 769
874 fwidth = prop.width; 770 fwidth = prop.width;
875 fheight = prop.height; 771 fheight = prop.height;
… …
906#else 802#else
907 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
908#endif 804#endif
909 } 805 }
910 806
911 if (parent[0]) 807 if (parent)
912 { 808 {
913 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
914 scr_remap_chars (); 810 scr_remap_chars ();
915 scr_touch (true); 811 scr_touch (true);
916 } 812 }
… …
919} 815}
920 816
921void 817void
922rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
923{ 819{
924 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
925 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
926 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
927} 823}
928 824
929void 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
930rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
931{ 839{
932 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
933 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
934 842
935 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
937 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
938 846
939 free (s); 847 free (s);
940 free (ws); 848 free (ws);
… …
944/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
945/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
946void 854void
947rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
948{ 856{
949 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
950#if ENABLE_EWMH 858#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
952#endif 860#endif
953} 861}
954 862
955void 863void
956rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
957{ 865{
958 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
959#if ENABLE_EWMH 867#if ENABLE_EWMH
960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
961#endif 869#endif
962} 870}
963 871
964void 872void
965rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
966{ 874{
967#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
968 rxvt_color xcol; 876 rxvt_color xcol;
969 int i;
970 877
971 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
972 return; 879 return;
973 880
974 color = strdup (color); 881 color = strdup (color);
… …
976 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
977 884
978 /* handle color aliases */ 885 /* handle color aliases */
979 if (isdigit (*color)) 886 if (isdigit (*color))
980 { 887 {
981 i = atoi (color); 888 int i = atoi (color);
982 889
983 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
984 { 891 {
985 /* bright colors */ 892 /* bright colors */
986 i -= 8;
987 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
988 goto done; 894 goto done;
989 } 895 }
990 896
991 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
992 { 898 {
… …
1036 */ 942 */
1037void 943void
1038rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1039{ 945{
1040 unsigned int i; 946 unsigned int i;
1041 const char *xpmb = "\0"; 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 1081
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 1082#ifdef USE_XIM
1184 IMSetPosition (); 1083 im_set_position ();
1185#endif 1084#endif
1186} 1085}
1187 1086
1188/* 1087/*
1189 * Set the width/height of the vt window in characters. Units are pixels. 1088 * Set the width/height of the vt window in characters. Units are pixels.
… …
1250 status_rect.height = fheight; 1149 status_rect.height = fheight;
1251} 1150}
1252 1151
1253/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1254bool 1153bool
1255rxvt_term::IMisRunning () 1154rxvt_term::im_is_running ()
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::im_send_spot ()
1283{ 1181{
1284 XPoint nspot; 1182 XPoint nspot;
1285 XVaNestedList preedit_attr; 1183 XVaNestedList preedit_attr;
1286 1184
1287 if (!Input_Context 1185 if (!Input_Context
… …
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,
… …
1393/* 1291/*
1394 * Try to open a XIM with the current modifiers, then see if we can 1292 * Try to open a XIM with the current modifiers, then see if we can
1395 * open a suitable preedit type 1293 * open a suitable preedit type
1396 */ 1294 */
1397bool 1295bool
1398rxvt_term::IM_get_IC (const char *modifiers) 1296rxvt_term::im_get_ic (const char *modifiers)
1399{ 1297{
1400 int i, j, found; 1298 int i, j, found;
1401 XIM xim; 1299 XIM xim;
1402 XPoint spot; 1300 XPoint spot;
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
… …
1602 // unfortunately, only the focus window is used by XIM, hard to fix 1499 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1500 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input (); 1501 vt_select_input ();
1605#endif 1502#endif
1606 1503
1607 IMSetPosition (); 1504 im_set_position ();
1608 1505
1609 return true; 1506 return true;
1610} 1507}
1611 1508
1612void 1509void
… …
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 {
1643 strcpy (buf, "@im="); 1540 strcpy (buf, "@im=");
1644 strncat (buf, s[i], IMBUFSIZ - 5); 1541 strncat (buf, s[i], IMBUFSIZ - 5);
1645 if (IM_get_IC (buf)) 1542 if (im_get_ic (buf))
1646 { 1543 {
1647 found = true; 1544 found = true;
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
1659 /* try with XMODIFIERS env. var. */ 1556 /* try with XMODIFIERS env. var. */
1660 if (IM_get_IC ("")) 1557 if (im_get_ic (""))
1661 goto done; 1558 goto done;
1662 1559
1663 /* try with no modifiers base IF the user didn't specify an IM */ 1560 /* try with no modifiers base IF the user didn't specify an IM */
1664 if (IM_get_IC ("@im=none")) 1561 if (im_get_ic ("@im=none"))
1665 goto done; 1562 goto done;
1666 1563
1667done: 1564done:
1668#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1565#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1669 if (rs[Rs_imLocale]) 1566 if (rs[Rs_imLocale])
1670 SET_LOCALE (locale); 1567 SET_LOCALE (locale);
1671#endif 1568#endif
1672} 1569}
1673 1570
1674void 1571void
1675rxvt_term::IMSetPosition () 1572rxvt_term::im_set_position ()
1676{ 1573{
1677 XRectangle preedit_rect, status_rect, *needed_rect; 1574 XRectangle preedit_rect, status_rect, *needed_rect;
1678 XVaNestedList preedit_attr, status_attr; 1575 XVaNestedList preedit_attr, status_attr;
1679 1576
1680 if (!Input_Context 1577 if (!Input_Context
1681 || !focus 1578 || !focus
1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1579 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1683 || !IMisRunning ()) 1580 || !im_is_running ())
1684 return; 1581 return;
1685 1582
1686 if (input_style & XIMPreeditPosition) 1583 if (input_style & XIMPreeditPosition)
1687 { 1584 {
1688 im_set_size (preedit_rect); 1585 im_set_size (preedit_rect);
… …
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 1646
1750# undef update_background 1647void
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background () 1648rxvt_term::update_background ()
1759{ 1649{
1650 if (update_background_ev.is_active ())
1651 return;
1652
1760 bgPixmap.invalidate (); 1653 bg_invalidate ();
1761 1654
1762 /* no chance of real time refresh if we are blurring! */ 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1656
1657 if (to_wait <= 0.)
1764 bgPixmap.render (); 1658 bg_render ();
1765 else 1659 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05); 1660 update_background_ev.start (to_wait);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778} 1661}
1779 1662
1780void 1663void
1781rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{ 1665{
1666 make_current ();
1667
1668 update_background_ev.stop ();
1783 bgPixmap.render (); 1669 bg_render ();
1670 refresh_check ();
1784} 1671}
1785 1672
1786#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1787 1674
1788/*----------------------- end-of-file (C source) -----------------------*/ 1675/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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