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.250 by sasha, Wed Sep 12 21:06:08 2007 UTC vs.
Revision 1.353 by sf-exg, Sat Feb 12 00:30:00 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 TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
… …
88class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
89 95
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 97{
92 compose_char *cc; 98 compose_char *cc;
93 99
94 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
96 cc = (*this)[c1]; 102 cc = (*this)[c1];
97 while (cc) 103 while (cc)
98 { 104 {
99 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
101 } 107 }
102 108
103 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
105 {
106 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
108 }
109 113
110 // allocate a new combination 114 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 { 116 {
113 static int seen; 117 static int seen;
114 118
115 if (!seen++) 119 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
117 121
118 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
119 } 123 }
120 124
121 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
147 151
148} 152}
149#endif 153#endif
150 154
151rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
152 : 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
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 177#endif
156#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
158#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
159#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif
162#ifdef CURSOR_BLINK
163 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
164#endif
165#ifdef TEXT_BLINK
166 text_blink_ev (this, &rxvt_term::text_blink_cb),
167#endif
168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
169 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
170#endif
171#ifdef SELECTION_SCROLLING
172 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
173#endif
174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
175 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
176#endif 181#endif
177#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 184#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 185#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 187#endif
186 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 194
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 196
197 termlist.push_back (this); 197 termlist.push_back (this);
198 198
199#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
201#endif 201#endif
202} 202}
203 203
204// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 205// for use before an emergency exit
206void
206void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
207{ 208{
208 if (cmd_pid) 209 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
210 211
211 pty_ev.stop (); 212 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
224 delete fontset[i]; 225 delete fontset[i];
225#endif 226#endif
226 delete fontset[0]; 227 delete fontset[0];
227 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
228 if (display) 233 if (display)
229 { 234 {
230 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
231 237
232#ifdef USE_XIM 238#ifdef USE_XIM
233 im_destroy (); 239 im_destroy ();
234#endif 240#endif
235#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
260 243
261 delete drawable; 244 delete drawable;
262 // destroy all windows 245 // destroy all windows
263 if (parent[0]) 246 if (parent[0])
… …
271 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
272#endif 255#endif
273 } 256 }
274 257
275 clear (); 258 clear ();
276 }
277 259
278 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 261 displays.put (display);
262 }
284 263
285 scr_release (); 264 scr_release ();
286 265
287 /* clear all resources */ 266 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 268 free (allocated [i]);
290 269
291 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
292 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
293 free (env_display); 273 free (env_display);
294 free (env_term); 274 free (env_term);
295 free (locale); 275 free (locale);
296 free (v_buffer); 276 free (v_buffer);
297 free (incr_buf); 277
278 delete selection_req;
298 279
299 delete envv; 280 delete envv;
300 delete argv; 281 delete argv;
301 282
302#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
303 delete keyboard; 284 delete keyboard;
304#endif 285#endif
286#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db);
288#endif
305} 289}
306 290
307// child has exited, usually destroys 291// child has exited, usually destroys
308void 292void
309rxvt_term::child_cb (child_watcher &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
310{ 294{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 295 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 296
313 cmd_pid = 0; 297 cmd_pid = 0;
314 298
… …
317} 301}
318 302
319void 303void
320rxvt_term::destroy () 304rxvt_term::destroy ()
321{ 305{
322 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
323 return; 307 return;
324 308
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 310
327#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
331 if (display) 315 if (display)
332 { 316 {
333#if USE_XIM 317#if USE_XIM
334 im_ev.stop (display); 318 im_ev.stop (display);
335#endif 319#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
341#endif 323#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 324 termwin_ev.stop (display);
344 vt_ev.stop (display); 325 vt_ev.stop (display);
345 } 326 }
346 327
347 check_ev.stop (); 328 flush_ev.stop ();
348 pty_ev.stop (); 329 pty_ev.stop ();
349#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
351#endif 332#endif
352#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
360#endif 341#endif
361#ifdef POINTER_BLANK 342#ifdef POINTER_BLANK
362 pointer_ev.stop (); 343 pointer_ev.stop ();
363#endif 344#endif
364 345
365 destroy_ev.start (0); 346 destroy_ev.start ();
366} 347}
367 348
368void 349void
369rxvt_term::destroy_cb (time_watcher &w) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 351{
371 make_current (); 352 make_current ();
372 353
373 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);
374} 367}
375 368
376/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
377/* 370/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
392print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
393{ 386{
394 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
396 char number[32]; 389 char number[32];
397 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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");
401 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ); 402 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 404 }
412 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ); 417 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ); 420 mesg, BUFSIZ);
428 else 421 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 423 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 425 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 427 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 429}
437#endif 430#endif
438 431
439int 432int
… …
462 DisplayString (display)); 455 DisplayString (display));
463 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
465} 458}
466 459
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef BG_IMAGE_FROM_FILE
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
546 if (!bgPixmap.window_position_sensitive ())
547 update_background ();
548 }
549#endif
550 }
551#endif
552
553#if ENABLE_PERL
554 rootwin_ev.start (display, display->root);
555#endif
556
557 set_colorfgbg ();
558
559 init_command (cmd_argv);
560
561 free (cmd_argv);
562
563 if (pty->pty >= 0)
564 pty_ev.start (pty->pty, EVENT_READ);
565
566 check_ev.start ();
567
568 HOOK_INVOKE ((this, HOOK_START, DT_END));
569
570#if ENABLE_XEMBED
571 if (rs[Rs_embed])
572 {
573 long info[2] = { 0, XEMBED_MAPPED };
574
575 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
576 32, PropModeReplace, (unsigned char *)&info, 2);
577 }
578#endif
579
580 XMapWindow (dpy, vt);
581 XMapWindow (dpy, parent[0]);
582
583 return true;
584}
585
586static struct sig_handlers 460static struct sig_handlers
587{ 461{
588 sig_watcher sw_term, sw_int; 462 ev::sig sw_term, sw_int;
589 463
590 /* 464 /*
591 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
592 */ 466 */
593 void 467 void sig_term (ev::sig &w, int revents);
594 sig_term (sig_watcher &w) 468
469 sig_handlers ()
595 { 470 {
596 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
597 signal (w.signum, SIG_DFL);
598 kill (getpid (), w.signum);
599 }
600
601 sig_handlers ()
602 : sw_term (this, &sig_handlers::sig_term),
603 sw_int (this, &sig_handlers::sig_term) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
604 {
605 } 473 }
606} sig_handlers; 474} sig_handlers;
607 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
608char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
609 552
610void 553void
611rxvt_init () 554rxvt_init ()
612{ 555{
613 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))));
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
565 if (!ev_default_loop ())
566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
614 567
615 rxvt_environ = environ; 568 rxvt_environ = environ;
616 569
617 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
618 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
619 572
620 sig_handlers.sw_term.start (SIGTERM); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
621 sig_handlers.sw_int.start (SIGINT); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
622
623 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
624 /* signal (SIGURG, SIG_DFL); */
625 575
626 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
627 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
628 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
629 579
630 XrmInitialize (); 580 XrmInitialize ();
631}
632
633/* ------------------------------------------------------------------------- *
634 * MEMORY ALLOCATION WRAPPERS *
635 * ------------------------------------------------------------------------- */
636void *
637rxvt_malloc (size_t size)
638{
639 void *p = malloc (size);
640
641 if (!p)
642 rxvt_fatal ("memory allocation failure. aborting.\n");
643
644 return p;
645}
646
647void *
648rxvt_calloc (size_t number, size_t size)
649{
650 void *p = calloc (number, size);
651
652 if (!p)
653 rxvt_fatal ("memory allocation failure. aborting.\n");
654
655 return p;
656}
657
658void *
659rxvt_realloc (void *ptr, size_t size)
660{
661 void *p = realloc (ptr, size);
662
663 if (!p)
664 rxvt_fatal ("memory allocation failure. aborting.\n");
665
666 return p;
667} 581}
668 582
669/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
670/* 584/*
671 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
673 */ 587 */
674void 588void
675rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
676{ 590{
677 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
678 int x, y, sb_w, flags; 592 int x, y, flags;
679 unsigned int w, h; 593 unsigned int w, h;
680 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
681 595
682 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
683 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
693 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
694 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
695 609
696 if (flags & WidthValue) 610 if (flags & WidthValue)
697 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
698 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
699 szHint.flags |= USSize; 616 szHint.flags |= USSize;
700 } 617 }
701 618
702 if (flags & HeightValue) 619 if (flags & HeightValue)
703 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
704 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
705 szHint.flags |= USSize; 625 szHint.flags |= USSize;
706 } 626 }
707 627
708 if (flags & XValue) 628 if (flags & XValue)
709 { 629 {
… …
740 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
741 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
742 662
743 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
744 664
745 sb_w = 0;
746 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
747 666
748 if (scrollBar.state) 667 if (scrollBar.state)
749 { 668 {
750 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
751 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
752 671
753 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
754 window_vt_x += sb_w; 673 window_vt_x += sb_w;
755 } 674 }
… …
779 { 698 {
780 min_it (height, max_height); 699 min_it (height, max_height);
781 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
782 } 701 }
783 702
784 if (scrollBar.state && option (Opt_scrollBar_right))
785 window_sb_x = szHint.width - sb_w;
786
787 if (recalc_x) 703 if (recalc_x)
788 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
789 705
790 if (recalc_y) 706 if (recalc_y)
791 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
792 708
793 ncol = width / fwidth; 709 ncol = width / fwidth;
794 nrow = height / fheight; 710 nrow = height / fheight;
795} 711}
796 712
797/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
798/* 714/*
… …
809 725
810 ws.ws_col = ncol; 726 ws.ws_col = ncol;
811 ws.ws_row = nrow; 727 ws.ws_row = nrow;
812 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
813 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
814 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
815 731
816#if 0 732#if 0
817 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
818 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
819 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
820#endif 736#endif
821} 737}
822 738
… …
849#endif 765#endif
850 766
851 delete fontset[0]; 767 delete fontset[0];
852 fontset[0] = fs; 768 fontset[0] = fs;
853 769
854 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
855 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
856 773
857 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
858 775
859 fwidth = prop.width; 776 fwidth = prop.width;
860 fheight = prop.height; 777 fheight = prop.height;
… …
896 if (parent[0]) 813 if (parent[0])
897 { 814 {
898 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
899 scr_remap_chars (); 816 scr_remap_chars ();
900 scr_touch (true); 817 scr_touch (true);
901 } 818 }
902 819
903 return true; 820 return true;
904} 821}
905 822
823void
906void rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
907{ 825{
908 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent[0],
909 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
910 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
911} 829}
912 830
831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent[0], &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
913void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
914{ 845{
915 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
916 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
917 848
918 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent[0],
… …
927/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
928/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
929void 860void
930rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
931{ 862{
932 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
933#if ENABLE_EWMH 864#if ENABLE_EWMH
934 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
935#endif 866#endif
936} 867}
937 868
938void 869void
939rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
940{ 871{
941 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
942#if ENABLE_EWMH 873#if ENABLE_EWMH
943 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
944#endif 875#endif
945} 876}
946 877
878void
879rxvt_term::set_window_color (int idx, const char *color)
880{
947#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
948void
949rxvt_term::set_window_color (int idx, const char *color)
950{
951 rxvt_color xcol; 882 rxvt_color xcol;
952 int i; 883
953
954 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
955 return; 885 return;
956 886
957 color = strdup (color); 887 color = strdup (color);
958 allocated.push_back ((void *)color); 888 allocated.push_back ((void *)color);
959 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
960 890
961 /* handle color aliases */ 891 /* handle color aliases */
962 if (isdigit (*color)) 892 if (isdigit (*color))
963 { 893 {
964 i = atoi (color); 894 int i = atoi (color);
965 895
966 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
897 {
967 { /* bright colors */ 898 /* bright colors */
968 i -= 8;
969 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
970 goto done; 900 goto done;
971 } 901 }
972 902
973 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
904 {
974 { /* normal colors */ 905 /* normal colors */
975 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976 goto done; 907 goto done;
977 } 908 }
978 } 909 }
979 910
… …
984 * so just keep gobbling up the colormap 915 * so just keep gobbling up the colormap
985 */ 916 */
986 917
987 pix_colors_focused[idx] = xcol; 918 pix_colors_focused[idx] = xcol;
988 919
989 /* XSetWindowAttributes attr; */
990 /* Cursor cursor; */
991done: 920done:
992 /*TODO: handle Color_BD, scrollbar background, etc. */ 921 /*TODO: handle Color_BD, scrollbar background, etc. */
993 922
994 update_fade_color (idx); 923 update_fade_color (idx);
995 recolour_cursor (); 924 recolour_cursor ();
996 scr_recolour (); 925 scr_recolour ();
926#endif /* XTERM_COLOR_CHANGE */
997} 927}
998
999#else
1000# define set_window_color (idx,color) ((void)0)
1001#endif /* XTERM_COLOR_CHANGE */
1002 928
1003void 929void
1004rxvt_term::recolour_cursor () 930rxvt_term::recolour_cursor ()
1005{ 931{
1006 XColor fg, bg; 932 XColor fg, bg;
… …
1022 */ 948 */
1023void 949void
1024rxvt_term::set_colorfgbg () 950rxvt_term::set_colorfgbg ()
1025{ 951{
1026 unsigned int i; 952 unsigned int i;
1027 const char *xpmb = "\0"; 953 const char *xpmb = "";
1028 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
1029 956
1030 strcpy (fstr, "default");
1031 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 957 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 958 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 959 {
1035 sprintf (fstr, "%d", (i - Color_Black)); 960 sprintf (fstr, "%d", i - Color_Black);
1036 break; 961 break;
1037 } 962 }
1038 963
1039 for (i = Color_Black; i <= Color_White; i++) 964 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 965 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 966 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 967 sprintf (bstr, "%d", i - Color_Black);
1043#ifdef BG_IMAGE_FROM_FILE 968#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 969 xpmb = "default;";
1045#endif 970#endif
1046 break; 971 break;
1047 } 972 }
… …
1077 int old_width = szHint.width; 1002 int old_width = szHint.width;
1078 int old_height = szHint.height; 1003 int old_height = szHint.height;
1079 1004
1080 window_calc (newwidth, newheight); 1005 window_calc (newwidth, newheight);
1081 1006
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1007 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1008
1009 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1010 if (set_hint)
1011 {
1012 szHint.flags &= ~(PBaseSize | PResizeInc);
1083 XSetWMNormalHints (dpy, parent[0], &szHint); 1013 XSetWMNormalHints (dpy, parent[0], &szHint);
1014 szHint.flags |= PBaseSize | PResizeInc;
1015 }
1084 1016
1085 if (!ignoreparent) 1017 if (!ignoreparent)
1086 { 1018 {
1087#ifdef SMART_RESIZE 1019#ifdef SMART_RESIZE
1088 /* 1020 /*
… …
1128#else 1060#else
1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1061 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1130#endif 1062#endif
1131 } 1063 }
1132 1064
1065 if (set_hint)
1066 XSetWMNormalHints (dpy, parent[0], &szHint);
1067
1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1068 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1134 1069
1135 if (fix_screen || newwidth != old_width || newheight != old_height) 1070 if (fix_screen || newwidth != old_width || newheight != old_height)
1136 { 1071 {
1137 if (scrollBar.state) 1072 if (scrollBar.state)
1138 { 1073 scrollBar.resize ();
1139 XMoveResizeWindow (dpy, scrollBar.win,
1140 window_sb_x, 0,
1141 scrollbar_TotalWidth (), szHint.height);
1142 resize_scrollbar ();
1143 }
1144 1074
1145 XMoveResizeWindow (dpy, vt, 1075 XMoveResizeWindow (dpy, vt,
1146 window_vt_x, window_vt_y, 1076 window_vt_x, window_vt_y,
1147 width, height); 1077 width, height);
1148 1078
1149#ifdef HAVE_BG_PIXMAP 1079#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ()) 1080 if (bg_window_size_sensitive ())
1151 update_background (); 1081 update_background ();
1152#endif 1082#endif
1153
1154 scr_clear ();
1155 } 1083 }
1156 1084
1157 if (fix_screen || old_height == 0) 1085 if (fix_screen || old_height == 0)
1158 scr_reset (); 1086 scr_reset ();
1159
1160 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1161 //scr_touch (false);
1162
1163#ifdef HAVE_BG_PIXMAP
1164// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1165// if (bgPixmap.pixmap)
1166// scr_touch (false);
1167#endif
1168 1087
1169#ifdef USE_XIM 1088#ifdef USE_XIM
1170 IMSetPosition (); 1089 IMSetPosition ();
1171#endif 1090#endif
1172} 1091}
… …
1238 1157
1239/* Checking whether input method is running. */ 1158/* Checking whether input method is running. */
1240bool 1159bool
1241rxvt_term::IMisRunning () 1160rxvt_term::IMisRunning ()
1242{ 1161{
1243 char *p;
1244 Atom atom; 1162 Atom atom;
1245 Window win; 1163 Window win;
1246 char server[IMBUFSIZ]; 1164 char server[IMBUFSIZ];
1247 1165
1248 /* get current locale modifier */ 1166 /* get current locale modifier */
1249 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1167 if (char *p = XSetLocaleModifiers (0))
1250 { 1168 {
1251 strcpy (server, "@server="); 1169 strcpy (server, "@server=");
1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1170 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1253 1171
1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1172 if (p = strchr (server + 1, '@')) /* first one only */
1255 *p = '\0'; 1173 *p = '\0';
1256 1174
1257 atom = XInternAtom (dpy, server, False); 1175 atom = XInternAtom (dpy, server, False);
1258 win = XGetSelectionOwner (dpy, atom); 1176 win = XGetSelectionOwner (dpy, atom);
1259 1177
1260 if (win != None) 1178 if (win != None)
1261 return True; 1179 return true;
1262 } 1180 }
1263 1181
1264 return False; 1182 return false;
1265} 1183}
1266 1184
1267void 1185void
1268rxvt_term::IMSendSpot () 1186rxvt_term::IMSendSpot ()
1269{ 1187{
… …
1326 1244
1327 term->make_current (); 1245 term->make_current ();
1328 1246
1329 if (text) 1247 if (text)
1330 { 1248 {
1331 void *str; 1249 wchar_t *str;
1332 1250
1333 if (!text->encoding_is_wchar && text->string.multi_byte) 1251 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 { 1252 {
1335 // of course, X makes it ugly again 1253 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]); 1255 SET_LOCALE (term->rs[Rs_imLocale]);
1338 1256
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1257 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1258 mbstowcs (str, text->string.multi_byte, text->length + 1);
1341 1259
1342 if (term->rs[Rs_imLocale]) 1260 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1261 SET_LOCALE (term->locale);
1344 } 1262 }
1345 else 1263 else
1346 str = (void *)text->string.wide_char; 1264 str = text->string.wide_char;
1347 1265
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1266 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1267 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1268 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1269 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1270 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1422 p = pet[pi]; 1340 p = pet[pi];
1423 1341
1424 if (!p) 1342 if (!p)
1425 continue; 1343 continue;
1426 1344
1427 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1428 1346
1429 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1430 { 1348 {
1431 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1432 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1444 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1445 1363
1446 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1447 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1448 { 1366 {
1449 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1450 1368
1451 found = 1; 1369 found = 1;
1452 goto foundpet; 1370 goto foundpet;
1453 } 1371 }
1454 1372
1455 } 1373 }
1456 1374
1457 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1458 } 1376 }
1459 1377
1460foundpet: 1378foundpet:
1461 1379
1462 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1618 p = rs[Rs_inputMethod]; 1536 p = rs[Rs_inputMethod];
1619 if (p && *p) 1537 if (p && *p)
1620 { 1538 {
1621 bool found = false; 1539 bool found = false;
1622 1540
1623 s = rxvt_splitcommastring (p); 1541 s = rxvt_strsplit (',', p);
1624 1542
1625 for (i = 0; s[i]; i++) 1543 for (i = 0; s[i]; i++)
1626 { 1544 {
1627 if (*s[i]) 1545 if (*s[i])
1628 { 1546 {
… …
1634 break; 1552 break;
1635 } 1553 }
1636 } 1554 }
1637 } 1555 }
1638 1556
1639 rxvt_freecommastring (s); 1557 rxvt_free_strsplit (s);
1640 1558
1641 if (found) 1559 if (found)
1642 goto done; 1560 goto done;
1643 } 1561 }
1644 1562
… …
1671 1589
1672 if (input_style & XIMPreeditPosition) 1590 if (input_style & XIMPreeditPosition)
1673 { 1591 {
1674 im_set_size (preedit_rect); 1592 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1593 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1594
1677 XSetICValues (Input_Context, 1595 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1596 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1597 }
1680 else 1598 else
1681 { 1599 {
… …
1698 XFree (status_attr); 1616 XFree (status_attr);
1699 } 1617 }
1700 1618
1701 XFree (preedit_attr); 1619 XFree (preedit_attr);
1702} 1620}
1703#endif /* USE_XIM */ 1621#endif /* USE_XIM */
1704 1622
1705void 1623void
1706rxvt_term::get_window_origin (int &x, int &y) 1624rxvt_term::get_window_origin (int &x, int &y)
1707{ 1625{
1708 Window cr; 1626 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1627 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711} 1628}
1712 1629
1713Pixmap 1630Pixmap
1714rxvt_term::get_pixmap_property (int prop_id) 1631rxvt_term::get_pixmap_property (Atom property)
1715{ 1632{
1716 if (prop_id > 0 && prop_id < NUM_XA) 1633 Pixmap pixmap = None;
1717 if (xa[prop_id]) 1634
1718 {
1719 int aformat; 1635 int aformat;
1720 unsigned long nitems, bytes_after; 1636 unsigned long nitems, bytes_after;
1721 Atom atype; 1637 Atom atype;
1722 unsigned char *prop = NULL; 1638 unsigned char *prop;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1639 int result = XGetWindowProperty (dpy, display->root, property,
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1640 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop); 1641 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP) 1642 if (result == Success)
1727 { 1643 {
1728 return *(Pixmap *)prop; 1644 if (atype == XA_PIXMAP)
1729 } 1645 pixmap = *(Pixmap *)prop;
1646 XFree (prop);
1730 } 1647 }
1731 return None; 1648
1649 return pixmap;
1732} 1650}
1733 1651
1734#ifdef HAVE_BG_PIXMAP 1652#ifdef HAVE_BG_PIXMAP
1735int 1653
1654void
1736rxvt_term::update_background () 1655rxvt_term::update_background ()
1737{ 1656{
1657 if (update_background_ev.is_active ())
1658 return;
1659
1738 bgPixmap.invalidate(); 1660 bg_invalidate ();
1739 1661
1740 /* no chance of real time refresh if we are blurring ! */ 1662 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1663
1664 if (to_wait <= 0.)
1742 bgPixmap.render(); 1665 bg_render ();
1743 else 1666 else
1744 { 1667 update_background_ev.start (to_wait);
1668}
1669
1670void
1671rxvt_term::update_background_cb (ev::timer &w, int revents)
1672{
1673 make_current ();
1674
1745 update_background_ev.stop (); 1675 update_background_ev.stop ();
1746 if (!bgPixmap.need_client_side_rendering())
1747 update_background_ev.start (NOW + .05);
1748 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1749 update_background_ev.start (NOW + .2); /* very slow !!! */
1750 else
1751 update_background_ev.start (NOW + .07);
1752 }
1753 return 0;
1754}
1755
1756void
1757rxvt_term::update_background_cb (time_watcher &w)
1758{
1759 bgPixmap.render (); 1676 bg_render ();
1677 refresh_check ();
1760} 1678}
1761 1679
1762#endif /* HAVE_BG_PIXMAP */ 1680#endif /* HAVE_BG_PIXMAP */
1763 1681
1764/*----------------------- end-of-file (C source) -----------------------*/ 1682/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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