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.255 by ayin, Wed Oct 31 09:55:23 2007 UTC vs.
Revision 1.348 by sf-exg, Thu Jan 20 16:41:23 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 <pcg@goof.com>
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 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
198 incr_ev (this, &rxvt_term::incr_cb) 195
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 196 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 197
202 termlist.push_back (this); 198 termlist.push_back (this);
203 199
204#ifdef KEYSYM_RESOURCE 200#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 225 if (fontset[i] != fontset[0])
230 delete fontset[i]; 226 delete fontset[i];
231#endif 227#endif
232 delete fontset[0]; 228 delete fontset[0];
233 229
230#ifdef HAVE_BG_PIXMAP
231 bgPixmap.destroy ();
232#endif
233#ifdef HAVE_AFTERIMAGE
234 if (asv)
235 destroy_asvisual (asv, 0);
236 if (asimman)
237 destroy_image_manager (asimman, 0);
238#endif
239
234 if (display) 240 if (display)
235 { 241 {
236 selection_clear (); 242 selection_clear ();
243 selection_clear (true);
237 244
238#ifdef USE_XIM 245#ifdef USE_XIM
239 im_destroy (); 246 im_destroy ();
240#endif 247#endif
241#ifdef XTERM_SCROLLBAR 248 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); 249 if (gc) XFreeGC (dpy, gc);
266 250
267 delete drawable; 251 delete drawable;
268 // destroy all windows 252 // destroy all windows
269 if (parent[0]) 253 if (parent[0])
… …
277 pix_colors_unfocused [i].free (this); 261 pix_colors_unfocused [i].free (this);
278#endif 262#endif
279 } 263 }
280 264
281 clear (); 265 clear ();
282 }
283 266
284 delete [] pix_colors_focused; 267 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 displays.put (display); 268 displays.put (display);
269 }
290 270
291 scr_release (); 271 scr_release ();
292 272
293 /* clear all resources */ 273 /* clear all resources */
294 for (int i = 0; i < allocated.size (); i++) 274 for (int i = 0; i < allocated.size (); i++)
295 free (allocated [i]); 275 free (allocated [i]);
296 276
297 free (selection.text); 277 free (selection.text);
278 free (selection.clip_text);
298 // TODO: manage env vars in child only(!) 279 // TODO: manage env vars in child only(!)
299 free (env_display); 280 free (env_display);
300 free (env_term); 281 free (env_term);
301 free (locale); 282 free (locale);
302 free (v_buffer); 283 free (v_buffer);
… …
306 delete argv; 287 delete argv;
307 288
308#ifdef KEYSYM_RESOURCE 289#ifdef KEYSYM_RESOURCE
309 delete keyboard; 290 delete keyboard;
310#endif 291#endif
292#ifndef NO_RESOURCES
293 XrmDestroyDatabase (option_db);
294#endif
311} 295}
312 296
313// child has exited, usually destroys 297// child has exited, usually destroys
314void 298void
315rxvt_term::child_cb (child_watcher &w, int status) 299rxvt_term::child_cb (ev::child &w, int status)
316{ 300{
317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 301 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
318 302
319 cmd_pid = 0; 303 cmd_pid = 0;
320 304
… …
323} 307}
324 308
325void 309void
326rxvt_term::destroy () 310rxvt_term::destroy ()
327{ 311{
328 if (destroy_ev.active) 312 if (destroy_ev.is_active ())
329 return; 313 return;
330 314
331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 315 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
332 316
333#if ENABLE_OVERLAY 317#if ENABLE_OVERLAY
… …
337 if (display) 321 if (display)
338 { 322 {
339#if USE_XIM 323#if USE_XIM
340 im_ev.stop (display); 324 im_ev.stop (display);
341#endif 325#endif
342#if HAVE_SCROLLBARS
343 scrollbar_ev.stop (display); 326 scrollbar_ev.stop (display);
344#endif
345#if ENABLE_TRANSPARENCY || ENABLE_PERL 327#if ENABLE_TRANSPARENCY || ENABLE_PERL
346 rootwin_ev.stop (display); 328 rootwin_ev.stop (display);
347#endif 329#endif
348 incr_ev.stop (); 330 incr_ev.stop ();
349 termwin_ev.stop (display); 331 termwin_ev.stop (display);
350 vt_ev.stop (display); 332 vt_ev.stop (display);
351 } 333 }
352 334
353 check_ev.stop (); 335 flush_ev.stop ();
354 pty_ev.stop (); 336 pty_ev.stop ();
355#ifdef CURSOR_BLINK 337#ifdef CURSOR_BLINK
356 cursor_blink_ev.stop (); 338 cursor_blink_ev.stop ();
357#endif 339#endif
358#ifdef TEXT_BLINK 340#ifdef TEXT_BLINK
… …
366#endif 348#endif
367#ifdef POINTER_BLANK 349#ifdef POINTER_BLANK
368 pointer_ev.stop (); 350 pointer_ev.stop ();
369#endif 351#endif
370 352
371 destroy_ev.start (0); 353 destroy_ev.start ();
372} 354}
373 355
374void 356void
375rxvt_term::destroy_cb (time_watcher &w) 357rxvt_term::destroy_cb (ev::idle &w, int revents)
376{ 358{
377 make_current (); 359 make_current ();
378 360
379 delete this; 361 delete this;
362}
363
364void
365rxvt_term::set_option (uint8_t opt, bool set)
366{
367 if (!opt)
368 return;
369
370 uint8_t mask = 1 << (opt & 7);
371 uint8_t &val = options [opt >> 3];
372
373 val = val & ~mask | (set ? mask : 0);
380} 374}
381 375
382/*----------------------------------------------------------------------*/ 376/*----------------------------------------------------------------------*/
383/* 377/*
384 * Exit gracefully, clearing the utmp entry and restoring tty attributes 378 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
398print_x_error (Display *dpy, XErrorEvent *event) 392print_x_error (Display *dpy, XErrorEvent *event)
399{ 393{
400 char buffer[BUFSIZ]; 394 char buffer[BUFSIZ];
401 char mesg[BUFSIZ]; 395 char mesg[BUFSIZ];
402 char number[32]; 396 char number[32];
403 char *mtype = "XlibMessage"; 397 const char mtype[] = "XlibMessage";
404 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
405 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
406 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 400 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
407 rxvt_warn ("%s: %s\n", mesg, buffer); 401 rxvt_warn ("%s: %s\n", mesg, buffer);
408 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
409 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
410 sprintf(number, "%d", event->request_code); 404 sprintf(number, "%d", event->request_code);
411 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
412 rxvt_warn ("(which is %s)\n", buffer); 406 rxvt_warn ("(which is %s)\n", buffer);
413 if (event->request_code >= 128) { 407 if (event->request_code >= 128) {
414 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
415 mesg, BUFSIZ); 409 mesg, BUFSIZ);
416 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
417 } 411 }
418 if ((event->error_code == BadWindow) || 412 if ((event->error_code == BadWindow) ||
419 (event->error_code == BadPixmap) || 413 (event->error_code == BadPixmap) ||
420 (event->error_code == BadCursor) || 414 (event->error_code == BadCursor) ||
421 (event->error_code == BadFont) || 415 (event->error_code == BadFont) ||
422 (event->error_code == BadDrawable) || 416 (event->error_code == BadDrawable) ||
423 (event->error_code == BadColor) || 417 (event->error_code == BadColor) ||
424 (event->error_code == BadGC) || 418 (event->error_code == BadGC) ||
425 (event->error_code == BadIDChoice) || 419 (event->error_code == BadIDChoice) ||
426 (event->error_code == BadValue) || 420 (event->error_code == BadValue) ||
427 (event->error_code == BadAtom)) { 421 (event->error_code == BadAtom)) {
428 if (event->error_code == BadValue) 422 if (event->error_code == BadValue)
429 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
430 mesg, BUFSIZ); 424 mesg, BUFSIZ);
431 else if (event->error_code == BadAtom) 425 else if (event->error_code == BadAtom)
432 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
433 mesg, BUFSIZ); 427 mesg, BUFSIZ);
434 else 428 else
435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
436 mesg, BUFSIZ); 430 mesg, BUFSIZ);
437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
438 } 432 }
439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
440 mesg, BUFSIZ); 434 mesg, BUFSIZ);
441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
442} 436}
443#endif 437#endif
444 438
445int 439int
… …
468 DisplayString (display)); 462 DisplayString (display));
469 rxvt_emergency_cleanup (); 463 rxvt_emergency_cleanup ();
470 _exit (EXIT_FAILURE); 464 _exit (EXIT_FAILURE);
471} 465}
472 466
473/*----------------------------------------------------------------------*/
474bool
475rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
476{
477 this->envv = envv;
478
479 SET_R (this);
480 set_locale ("");
481 set_environ (envv); // few things in X do not call setlocale :(
482
483 if (!init_vars ())
484 return false;
485
486 init_secondary ();
487
488 const char **cmd_argv = init_resources (argc, argv);
489
490#ifdef KEYSYM_RESOURCE
491 keyboard->register_done ();
492#endif
493
494#ifdef HAVE_SCROLLBARS
495 if (option (Opt_scrollBar))
496 scrollBar.setIdle (); /* set existence for size calculations */
497#endif
498
499 pty = ptytty::create ();
500
501 create_windows (argc, argv);
502
503 init_xlocale ();
504
505 scr_reset (); // initialize screen
506
507#if 0
508 XSynchronize (dpy, True);
509#endif
510
511#ifdef HAVE_SCROLLBARS
512 if (option (Opt_scrollBar))
513 resize_scrollbar (); /* create and map scrollbar */
514#endif
515#ifdef HAVE_BG_PIXMAP
516 {
517 bgPixmap.set_target (this);
518
519#ifdef ENABLE_TRANSPARENCY
520 if (option (Opt_transparent))
521 {
522 bgPixmap.set_transparent ();
523#ifdef HAVE_AFTERIMAGE
524 if (rs [Rs_blurradius])
525 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
526#endif
527 if (ISSET_PIXCOLOR (Color_tint))
528 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
529 if (rs [Rs_shade])
530 bgPixmap.set_shade (rs [Rs_shade]);
531
532 bgPixmap.set_root_pixmap ();
533 XSelectInput (dpy, display->root, PropertyChangeMask);
534 rootwin_ev.start (display, display->root);
535 }
536#endif
537
538#ifdef BG_IMAGE_FROM_FILE
539 if (rs[Rs_backgroundPixmap] != NULL)
540 {
541 const char *p = rs[Rs_backgroundPixmap];
542
543 if ((p = strchr (p, ';')) != NULL)
544 {
545 p++;
546 bgPixmap.set_geometry (p);
547 }
548 else
549 bgPixmap.set_defaultGeometry ();
550
551 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
552 if (!bgPixmap.window_position_sensitive ())
553 update_background ();
554 }
555#endif
556 }
557#endif
558
559#if ENABLE_PERL
560 rootwin_ev.start (display, display->root);
561#endif
562
563 set_colorfgbg ();
564
565 init_command (cmd_argv);
566
567 free (cmd_argv);
568
569 if (pty->pty >= 0)
570 pty_ev.start (pty->pty, EVENT_READ);
571
572 check_ev.start ();
573
574 HOOK_INVOKE ((this, HOOK_START, DT_END));
575
576#if ENABLE_XEMBED
577 if (rs[Rs_embed])
578 {
579 long info[2] = { 0, XEMBED_MAPPED };
580
581 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
582 32, PropModeReplace, (unsigned char *)&info, 2);
583 }
584#endif
585
586 XMapWindow (dpy, vt);
587 XMapWindow (dpy, parent[0]);
588
589 return true;
590}
591
592static struct sig_handlers 467static struct sig_handlers
593{ 468{
594 sig_watcher sw_term, sw_int; 469 ev::sig sw_term, sw_int;
595 470
596 /* 471 /*
597 * Catch a fatal signal and tidy up before quitting 472 * Catch a fatal signal and tidy up before quitting
598 */ 473 */
599 void 474 void sig_term (ev::sig &w, int revents);
600 sig_term (sig_watcher &w) 475
476 sig_handlers ()
601 { 477 {
602 rxvt_emergency_cleanup (); 478 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
603 signal (w.signum, SIG_DFL);
604 kill (getpid (), w.signum);
605 }
606
607 sig_handlers ()
608 : sw_term (this, &sig_handlers::sig_term),
609 sw_int (this, &sig_handlers::sig_term) 479 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
610 {
611 } 480 }
612} sig_handlers; 481} sig_handlers;
613 482
483void
484sig_handlers::sig_term (ev::sig &w, int revents)
485{
486 rxvt_emergency_cleanup ();
487 w.stop ();
488 kill (getpid (), w.signum);
489}
490
491static void
492rxvt_get_ttymode (struct termios *tio)
493{
494 if (tcgetattr (STDIN_FILENO, tio) < 0)
495 memset (tio, 0, sizeof (struct termios));
496
497 for (int i = 0; i < NCCS; i++)
498 tio->c_cc[i] = VDISABLE;
499
500 tio->c_cc[VINTR] = CINTR;
501 tio->c_cc[VQUIT] = CQUIT;
502 tio->c_cc[VERASE] = CERASE;
503#ifdef VERASE2
504 tio->c_cc[VERASE2] = CERASE2;
505#endif
506 tio->c_cc[VKILL] = CKILL;
507 tio->c_cc[VEOF] = CEOF;
508 tio->c_cc[VSTART] = CSTART;
509 tio->c_cc[VSTOP] = CSTOP;
510 tio->c_cc[VSUSP] = CSUSP;
511# ifdef VDSUSP
512 tio->c_cc[VDSUSP] = CDSUSP;
513# endif
514# ifdef VREPRINT
515 tio->c_cc[VREPRINT] = CRPRNT;
516# endif
517# ifdef VDISCRD
518 tio->c_cc[VDISCRD] = CFLUSH;
519# endif
520# ifdef VWERSE
521 tio->c_cc[VWERSE] = CWERASE;
522# endif
523# ifdef VLNEXT
524 tio->c_cc[VLNEXT] = CLNEXT;
525# endif
526# ifdef VSTATUS
527 tio->c_cc[VSTATUS] = CSTATUS;
528# endif
529
530# if VMIN != VEOF
531 tio->c_cc[VMIN] = 1;
532# endif
533# if VTIME != VEOL
534 tio->c_cc[VTIME] = 0;
535# endif
536
537 /* input modes */
538 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
539# ifdef IMAXBEL
540 | IMAXBEL
541# endif
542 | IXON);
543
544 /* output modes */
545 tio->c_oflag = (OPOST | ONLCR);
546
547 /* control modes */
548 tio->c_cflag = (CS8 | CREAD);
549
550 /* local modes */
551 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
552# if defined (ECHOCTL) && defined (ECHOKE)
553 | ECHOCTL | ECHOKE
554# endif
555 | ECHOE | ECHOK);
556}
557
614char **rxvt_environ; // startup environment 558char **rxvt_environ; // startup environment
615 559
616void 560void
617rxvt_init () 561rxvt_init ()
618{ 562{
619 ptytty::init (); 563 assert (("fontMask must not overlap other RS masks",
564 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
565
566 rxvt_get_ttymode (&rxvt_term::def_tio);
567
568 // get rid of stdin/stdout as we don't need them, to free resources
569 dup2 (STDERR_FILENO, STDIN_FILENO);
570 dup2 (STDERR_FILENO, STDOUT_FILENO);
571
572 if (!ev_default_loop ())
573 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
620 574
621 rxvt_environ = environ; 575 rxvt_environ = environ;
622 576
623 signal (SIGHUP, SIG_IGN); 577 signal (SIGHUP, SIG_IGN);
624 signal (SIGPIPE, SIG_IGN); 578 signal (SIGPIPE, SIG_IGN);
625 579
626 sig_handlers.sw_term.start (SIGTERM); 580 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
627 sig_handlers.sw_int.start (SIGINT); 581 sig_handlers.sw_int.start (SIGINT); ev_unref ();
628
629 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
630 /* signal (SIGURG, SIG_DFL); */
631 582
632 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 583 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
633 // TODO: handle this with exceptions and tolerate the memory loss 584 // TODO: handle this with exceptions and tolerate the memory loss
634 XSetIOErrorHandler (rxvt_xioerror_handler); 585 XSetIOErrorHandler (rxvt_xioerror_handler);
635 586
636 XrmInitialize (); 587 XrmInitialize ();
637}
638
639/* ------------------------------------------------------------------------- *
640 * MEMORY ALLOCATION WRAPPERS *
641 * ------------------------------------------------------------------------- */
642void *
643rxvt_malloc (size_t size)
644{
645 void *p = malloc (size);
646
647 if (!p)
648 rxvt_fatal ("memory allocation failure. aborting.\n");
649
650 return p;
651}
652
653void *
654rxvt_calloc (size_t number, size_t size)
655{
656 void *p = calloc (number, size);
657
658 if (!p)
659 rxvt_fatal ("memory allocation failure. aborting.\n");
660
661 return p;
662}
663
664void *
665rxvt_realloc (void *ptr, size_t size)
666{
667 void *p = realloc (ptr, size);
668
669 if (!p)
670 rxvt_fatal ("memory allocation failure. aborting.\n");
671
672 return p;
673} 588}
674 589
675/*----------------------------------------------------------------------*/ 590/*----------------------------------------------------------------------*/
676/* 591/*
677 * window size/position calculations for XSizeHint and other storage. 592 * window size/position calculations for XSizeHint and other storage.
… …
679 */ 594 */
680void 595void
681rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 596rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
682{ 597{
683 short recalc_x, recalc_y; 598 short recalc_x, recalc_y;
684 int x, y, sb_w, flags; 599 int x, y, flags;
685 unsigned int w, h; 600 unsigned int w, h;
686 unsigned int max_width, max_height; 601 unsigned int max_width, max_height;
687 602
688 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 603 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
689 szHint.win_gravity = NorthWestGravity; 604 szHint.win_gravity = NorthWestGravity;
… …
699 if (rs[Rs_geometry]) 614 if (rs[Rs_geometry])
700 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 615 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
701 616
702 if (flags & WidthValue) 617 if (flags & WidthValue)
703 { 618 {
619 if (!w)
620 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
621
704 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 622 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 623 szHint.flags |= USSize;
706 } 624 }
707 625
708 if (flags & HeightValue) 626 if (flags & HeightValue)
709 { 627 {
628 if (!h)
629 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
630
710 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 631 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
711 szHint.flags |= USSize; 632 szHint.flags |= USSize;
712 } 633 }
713 634
714 if (flags & XValue) 635 if (flags & XValue)
715 { 636 {
… …
746 max_width = MAX_COLS * fwidth; 667 max_width = MAX_COLS * fwidth;
747 max_height = MAX_ROWS * fheight; 668 max_height = MAX_ROWS * fheight;
748 669
749 szHint.base_width = szHint.base_height = 2 * int_bwidth; 670 szHint.base_width = szHint.base_height = 2 * int_bwidth;
750 671
751 sb_w = 0;
752 window_vt_x = window_vt_y = int_bwidth; 672 window_vt_x = window_vt_y = int_bwidth;
753 673
754 if (scrollBar.state) 674 if (scrollBar.state)
755 { 675 {
756 sb_w = scrollbar_TotalWidth (); 676 int sb_w = scrollBar.total_width ();
757 szHint.base_width += sb_w; 677 szHint.base_width += sb_w;
758 678
759 if (!option (Opt_scrollBar_right)) 679 if (!option (Opt_scrollBar_right))
760 window_vt_x += sb_w; 680 window_vt_x += sb_w;
761 } 681 }
… …
785 { 705 {
786 min_it (height, max_height); 706 min_it (height, max_height);
787 szHint.height = szHint.base_height + height; 707 szHint.height = szHint.base_height + height;
788 } 708 }
789 709
790 if (scrollBar.state && option (Opt_scrollBar_right))
791 window_sb_x = szHint.width - sb_w;
792
793 if (recalc_x) 710 if (recalc_x)
794 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 711 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
795 712
796 if (recalc_y) 713 if (recalc_y)
797 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 714 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
798 715
799 ncol = width / fwidth; 716 ncol = width / fwidth;
800 nrow = height / fheight; 717 nrow = height / fheight;
801} 718}
802 719
803/*----------------------------------------------------------------------*/ 720/*----------------------------------------------------------------------*/
804/* 721/*
… …
815 732
816 ws.ws_col = ncol; 733 ws.ws_col = ncol;
817 ws.ws_row = nrow; 734 ws.ws_row = nrow;
818 ws.ws_xpixel = width; 735 ws.ws_xpixel = width;
819 ws.ws_ypixel = height; 736 ws.ws_ypixel = height;
820 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 737 ioctl (pty->pty, TIOCSWINSZ, &ws);
821 738
822#if 0 739#if 0
823 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 740 // TIOCSWINSZ is supposed to do this automatically and correctly
824 if (cmd_pid) /* force through to the command */ 741 if (cmd_pid) /* force through to the command */
825 kill (-cmd_pid, SIGWINCH); 742 kill (-cmd_pid, SIGWINCH);
826#endif 743#endif
827} 744}
828 745
… …
855#endif 772#endif
856 773
857 delete fontset[0]; 774 delete fontset[0];
858 fontset[0] = fs; 775 fontset[0] = fs;
859 776
860 prop = (*fs)[1]->properties (); 777 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
861 prop.height += lineSpace; 778 prop.height += lineSpace;
779 prop.width += letterSpace;
862 780
863 fs->set_prop (prop, false); 781 fs->set_prop (prop, false);
864 782
865 fwidth = prop.width; 783 fwidth = prop.width;
866 fheight = prop.height; 784 fheight = prop.height;
… …
916 prop, XA_STRING, 8, PropModeReplace, 834 prop, XA_STRING, 8, PropModeReplace,
917 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 835 (const unsigned char *)str, len >= 0 ? len : strlen (str));
918} 836}
919 837
920void 838void
839rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
840{
841 XTextProperty ct;
842
843 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
844 {
845 XSetTextProperty (dpy, parent[0], &ct, prop);
846 XFree (ct.value);
847 }
848}
849
850void
921rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 851rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
922{ 852{
923 wchar_t *ws = rxvt_mbstowcs (str, len); 853 wchar_t *ws = rxvt_mbstowcs (str, len);
924 char *s = rxvt_wcstoutf8 (ws); 854 char *s = rxvt_wcstoutf8 (ws);
925 855
… …
935/*----------------------------------------------------------------------*/ 865/*----------------------------------------------------------------------*/
936/* xterm sequences - title, iconName, color (exptl) */ 866/* xterm sequences - title, iconName, color (exptl) */
937void 867void
938rxvt_term::set_title (const char *str) 868rxvt_term::set_title (const char *str)
939{ 869{
940 set_string_property (XA_WM_NAME, str); 870 set_mbstring_property (XA_WM_NAME, str);
941#if ENABLE_EWMH 871#if ENABLE_EWMH
942 set_utf8_property (xa[XA_NET_WM_NAME], str); 872 set_utf8_property (xa[XA_NET_WM_NAME], str);
943#endif 873#endif
944} 874}
945 875
946void 876void
947rxvt_term::set_icon_name (const char *str) 877rxvt_term::set_icon_name (const char *str)
948{ 878{
949 set_string_property (XA_WM_ICON_NAME, str); 879 set_mbstring_property (XA_WM_ICON_NAME, str);
950#if ENABLE_EWMH 880#if ENABLE_EWMH
951 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 881 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
952#endif 882#endif
953} 883}
954 884
955void 885void
956rxvt_term::set_window_color (int idx, const char *color) 886rxvt_term::set_window_color (int idx, const char *color)
957{ 887{
958#ifdef XTERM_COLOR_CHANGE 888#ifdef XTERM_COLOR_CHANGE
959 rxvt_color xcol; 889 rxvt_color xcol;
960 int i;
961 890
962 if (color == NULL || *color == '\0') 891 if (color == NULL || *color == '\0')
963 return; 892 return;
964 893
965 color = strdup (color); 894 color = strdup (color);
… …
967 rs[Rs_color + idx] = color; 896 rs[Rs_color + idx] = color;
968 897
969 /* handle color aliases */ 898 /* handle color aliases */
970 if (isdigit (*color)) 899 if (isdigit (*color))
971 { 900 {
972 i = atoi (color); 901 int i = atoi (color);
973 902
974 if (i >= 8 && i <= 15) 903 if (i >= 8 && i <= 15)
904 {
975 { /* bright colors */ 905 /* bright colors */
976 i -= 8;
977 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
978 goto done; 907 goto done;
979 } 908 }
980 909
981 if (i >= 0 && i <= 7) 910 if (i >= 0 && i <= 7)
911 {
982 { /* normal colors */ 912 /* normal colors */
983 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
984 goto done; 914 goto done;
985 } 915 }
986 } 916 }
987 917
… …
992 * so just keep gobbling up the colormap 922 * so just keep gobbling up the colormap
993 */ 923 */
994 924
995 pix_colors_focused[idx] = xcol; 925 pix_colors_focused[idx] = xcol;
996 926
997 /* XSetWindowAttributes attr; */
998 /* Cursor cursor; */
999done: 927done:
1000 /*TODO: handle Color_BD, scrollbar background, etc. */ 928 /*TODO: handle Color_BD, scrollbar background, etc. */
1001 929
1002 update_fade_color (idx); 930 update_fade_color (idx);
1003 recolour_cursor (); 931 recolour_cursor ();
1004 scr_recolour (); 932 scr_recolour ();
1005#endif /* XTERM_COLOR_CHANGE */ 933#endif /* XTERM_COLOR_CHANGE */
1006} 934}
1007 935
1008void 936void
1009rxvt_term::recolour_cursor () 937rxvt_term::recolour_cursor ()
1010{ 938{
… …
1027 */ 955 */
1028void 956void
1029rxvt_term::set_colorfgbg () 957rxvt_term::set_colorfgbg ()
1030{ 958{
1031 unsigned int i; 959 unsigned int i;
1032 const char *xpmb = "\0"; 960 const char *xpmb = "";
1033 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 961 char fstr[] = "default";
962 char bstr[] = "default";
1034 963
1035 strcpy (fstr, "default");
1036 strcpy (bstr, "default");
1037 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1038 if (pix_colors[Color_fg] == pix_colors[i]) 965 if (pix_colors[Color_fg] == pix_colors[i])
1039 { 966 {
1040 sprintf (fstr, "%d", (i - Color_Black)); 967 sprintf (fstr, "%d", i - Color_Black);
1041 break; 968 break;
1042 } 969 }
1043 970
1044 for (i = Color_Black; i <= Color_White; i++) 971 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 972 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 973 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 974 sprintf (bstr, "%d", i - Color_Black);
1048#ifdef BG_IMAGE_FROM_FILE 975#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 976 xpmb = "default;";
1050#endif 977#endif
1051 break; 978 break;
1052 } 979 }
… …
1082 int old_width = szHint.width; 1009 int old_width = szHint.width;
1083 int old_height = szHint.height; 1010 int old_height = szHint.height;
1084 1011
1085 window_calc (newwidth, newheight); 1012 window_calc (newwidth, newheight);
1086 1013
1087 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1014 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1015
1016 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1017 if (set_hint)
1018 {
1019 szHint.flags &= ~(PBaseSize | PResizeInc);
1088 XSetWMNormalHints (dpy, parent[0], &szHint); 1020 XSetWMNormalHints (dpy, parent[0], &szHint);
1021 szHint.flags |= PBaseSize | PResizeInc;
1022 }
1089 1023
1090 if (!ignoreparent) 1024 if (!ignoreparent)
1091 { 1025 {
1092#ifdef SMART_RESIZE 1026#ifdef SMART_RESIZE
1093 /* 1027 /*
… …
1133#else 1067#else
1134 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1068 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1135#endif 1069#endif
1136 } 1070 }
1137 1071
1072 if (set_hint)
1073 XSetWMNormalHints (dpy, parent[0], &szHint);
1074
1138 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1075 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1139 1076
1140 if (fix_screen || newwidth != old_width || newheight != old_height) 1077 if (fix_screen || newwidth != old_width || newheight != old_height)
1141 { 1078 {
1142 if (scrollBar.state) 1079 if (scrollBar.state)
1143 { 1080 scrollBar.resize ();
1144 XMoveResizeWindow (dpy, scrollBar.win,
1145 window_sb_x, 0,
1146 scrollbar_TotalWidth (), szHint.height);
1147 resize_scrollbar ();
1148 }
1149 1081
1150 XMoveResizeWindow (dpy, vt, 1082 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1083 window_vt_x, window_vt_y,
1152 width, height); 1084 width, height);
1153 1085
1154#ifdef HAVE_BG_PIXMAP 1086#ifdef HAVE_BG_PIXMAP
1155 if (bgPixmap.window_size_sensitive ()) 1087 if (bgPixmap.window_size_sensitive ())
1156 update_background (); 1088 update_background ();
1157#endif 1089#endif
1158
1159 scr_clear ();
1160 } 1090 }
1161 1091
1162 if (fix_screen || old_height == 0) 1092 if (fix_screen || old_height == 0)
1163 scr_reset (); 1093 scr_reset ();
1164
1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 //scr_touch (false);
1167
1168#ifdef HAVE_BG_PIXMAP
1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1171// scr_touch (false);
1172#endif
1173 1094
1174#ifdef USE_XIM 1095#ifdef USE_XIM
1175 IMSetPosition (); 1096 IMSetPosition ();
1176#endif 1097#endif
1177} 1098}
… …
1243 1164
1244/* Checking whether input method is running. */ 1165/* Checking whether input method is running. */
1245bool 1166bool
1246rxvt_term::IMisRunning () 1167rxvt_term::IMisRunning ()
1247{ 1168{
1248 char *p;
1249 Atom atom; 1169 Atom atom;
1250 Window win; 1170 Window win;
1251 char server[IMBUFSIZ]; 1171 char server[IMBUFSIZ];
1252 1172
1253 /* get current locale modifier */ 1173 /* get current locale modifier */
1254 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1174 if (char *p = XSetLocaleModifiers (0))
1255 { 1175 {
1256 strcpy (server, "@server="); 1176 strcpy (server, "@server=");
1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1177 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1258 1178
1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1179 if (p = strchr (server + 1, '@')) /* first one only */
1260 *p = '\0'; 1180 *p = '\0';
1261 1181
1262 atom = XInternAtom (dpy, server, False); 1182 atom = XInternAtom (dpy, server, False);
1263 win = XGetSelectionOwner (dpy, atom); 1183 win = XGetSelectionOwner (dpy, atom);
1264 1184
… …
1331 1251
1332 term->make_current (); 1252 term->make_current ();
1333 1253
1334 if (text) 1254 if (text)
1335 { 1255 {
1336 void *str; 1256 wchar_t *str;
1337 1257
1338 if (!text->encoding_is_wchar && text->string.multi_byte) 1258 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 { 1259 {
1340 // of course, X makes it ugly again 1260 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale]) 1261 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]); 1262 SET_LOCALE (term->rs[Rs_imLocale]);
1343 1263
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1264 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1265 mbstowcs (str, text->string.multi_byte, text->length + 1);
1346 1266
1347 if (term->rs[Rs_imLocale]) 1267 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1268 SET_LOCALE (term->locale);
1349 } 1269 }
1350 else 1270 else
1351 str = (void *)text->string.wide_char; 1271 str = text->string.wide_char;
1352 1272
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1273 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1274 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1275 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1276 DT_INT, call_data->chg_length,
… …
1427 p = pet[pi]; 1347 p = pet[pi];
1428 1348
1429 if (!p) 1349 if (!p)
1430 continue; 1350 continue;
1431 1351
1432 s = rxvt_splitcommastring (p); 1352 s = rxvt_strsplit (',', p);
1433 1353
1434 for (i = found = 0; !found && s[i]; i++) 1354 for (i = found = 0; !found && s[i]; i++)
1435 { 1355 {
1436 if (!strcmp (s[i], "OverTheSpot")) 1356 if (!strcmp (s[i], "OverTheSpot"))
1437 input_style = XIMPreeditPosition | XIMStatusNothing; 1357 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1449 input_style = XIMPreeditNothing | XIMStatusNothing; 1369 input_style = XIMPreeditNothing | XIMStatusNothing;
1450 1370
1451 for (j = 0; j < xim_styles->count_styles; j++) 1371 for (j = 0; j < xim_styles->count_styles; j++)
1452 if (input_style == xim_styles->supported_styles[j]) 1372 if (input_style == xim_styles->supported_styles[j])
1453 { 1373 {
1454 rxvt_freecommastring (s); 1374 rxvt_free_strsplit (s);
1455 1375
1456 found = 1; 1376 found = 1;
1457 goto foundpet; 1377 goto foundpet;
1458 } 1378 }
1459 1379
1460 } 1380 }
1461 1381
1462 rxvt_freecommastring (s); 1382 rxvt_free_strsplit (s);
1463 } 1383 }
1464 1384
1465foundpet: 1385foundpet:
1466 1386
1467 XFree (xim_styles); 1387 XFree (xim_styles);
… …
1623 p = rs[Rs_inputMethod]; 1543 p = rs[Rs_inputMethod];
1624 if (p && *p) 1544 if (p && *p)
1625 { 1545 {
1626 bool found = false; 1546 bool found = false;
1627 1547
1628 s = rxvt_splitcommastring (p); 1548 s = rxvt_strsplit (',', p);
1629 1549
1630 for (i = 0; s[i]; i++) 1550 for (i = 0; s[i]; i++)
1631 { 1551 {
1632 if (*s[i]) 1552 if (*s[i])
1633 { 1553 {
… …
1639 break; 1559 break;
1640 } 1560 }
1641 } 1561 }
1642 } 1562 }
1643 1563
1644 rxvt_freecommastring (s); 1564 rxvt_free_strsplit (s);
1645 1565
1646 if (found) 1566 if (found)
1647 goto done; 1567 goto done;
1648 } 1568 }
1649 1569
… …
1703 XFree (status_attr); 1623 XFree (status_attr);
1704 } 1624 }
1705 1625
1706 XFree (preedit_attr); 1626 XFree (preedit_attr);
1707} 1627}
1708#endif /* USE_XIM */ 1628#endif /* USE_XIM */
1709 1629
1710void 1630void
1711rxvt_term::get_window_origin (int &x, int &y) 1631rxvt_term::get_window_origin (int &x, int &y)
1712{ 1632{
1713 Window cr; 1633 Window cr;
1714 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1634 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1715/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1716} 1635}
1717 1636
1718Pixmap 1637Pixmap
1719rxvt_term::get_pixmap_property (int prop_id) 1638rxvt_term::get_pixmap_property (Atom property)
1720{ 1639{
1721 if (prop_id > 0 && prop_id < NUM_XA) 1640 Pixmap pixmap = None;
1722 if (xa[prop_id]) 1641
1723 {
1724 int aformat; 1642 int aformat;
1725 unsigned long nitems, bytes_after; 1643 unsigned long nitems, bytes_after;
1726 Atom atype; 1644 Atom atype;
1727 unsigned char *prop = NULL; 1645 unsigned char *prop;
1728 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1646 int result = XGetWindowProperty (dpy, display->root, property,
1729 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1647 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1730 &nitems, &bytes_after, &prop); 1648 &nitems, &bytes_after, &prop);
1731 if (result == Success && prop && atype == XA_PIXMAP) 1649 if (result == Success)
1732 { 1650 {
1733 return *(Pixmap *)prop; 1651 if (atype == XA_PIXMAP)
1734 } 1652 pixmap = *(Pixmap *)prop;
1653 XFree (prop);
1735 } 1654 }
1736 return None; 1655
1656 return pixmap;
1737} 1657}
1738 1658
1739#ifdef HAVE_BG_PIXMAP 1659#ifdef HAVE_BG_PIXMAP
1740int 1660
1661void
1741rxvt_term::update_background () 1662rxvt_term::update_background ()
1742{ 1663{
1664 if (update_background_ev.is_active ())
1665 return;
1666
1743 bgPixmap.invalidate (); 1667 bgPixmap.invalidate ();
1744 1668
1745 /* no chance of real time refresh if we are blurring ! */ 1669 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1746 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1670
1671 if (to_wait <= 0.)
1747 bgPixmap.render (); 1672 bgPixmap.render ();
1748 else 1673 else
1749 { 1674 update_background_ev.start (to_wait);
1675}
1676
1677void
1678rxvt_term::update_background_cb (ev::timer &w, int revents)
1679{
1680 make_current ();
1681
1750 update_background_ev.stop (); 1682 update_background_ev.stop ();
1751 if (!bgPixmap.need_client_side_rendering())
1752 update_background_ev.start (NOW + .05);
1753 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1754 update_background_ev.start (NOW + .2); /* very slow !!! */
1755 else
1756 update_background_ev.start (NOW + .07);
1757 }
1758 return 0;
1759}
1760
1761void
1762rxvt_term::update_background_cb (time_watcher &w)
1763{
1764 bgPixmap.render (); 1683 bgPixmap.render ();
1684 refresh_check ();
1765} 1685}
1766 1686
1767#endif /* HAVE_BG_PIXMAP */ 1687#endif /* HAVE_BG_PIXMAP */
1768 1688
1769/*----------------------- end-of-file (C source) -----------------------*/ 1689/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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