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.253 by ayin, Mon Oct 15 07:33:48 2007 UTC vs.
Revision 1.365 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef 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.begin (); cc < v.end (); cc++)
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
… …
224 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
225 delete fontset[i]; 225 delete fontset[i];
226#endif 226#endif
227 delete fontset[0]; 227 delete fontset[0];
228 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
229 if (display) 233 if (display)
230 { 234 {
231 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
232 237
233#ifdef USE_XIM 238#ifdef USE_XIM
234 im_destroy (); 239 im_destroy ();
235#endif 240#endif
236#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
237 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
238 if (ShadowGC) XFreeGC (dpy, ShadowGC);
239#endif
240#ifdef PLAIN_SCROLLBAR
241 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
242#endif
243#ifdef NEXT_SCROLLBAR
244 if (blackGC) XFreeGC (dpy, blackGC);
245 if (whiteGC) XFreeGC (dpy, whiteGC);
246 if (grayGC) XFreeGC (dpy, grayGC);
247 if (darkGC) XFreeGC (dpy, darkGC);
248 if (stippleGC) XFreeGC (dpy, stippleGC);
249 if (dimple) XFreePixmap (dpy, dimple);
250 if (upArrow) XFreePixmap (dpy, upArrow);
251 if (downArrow) XFreePixmap (dpy, downArrow);
252 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
253 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
254#endif
255#ifdef RXVT_SCROLLBAR
256 if (topShadowGC) XFreeGC (dpy, topShadowGC);
257 if (botShadowGC) XFreeGC (dpy, botShadowGC);
258 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
259#endif
260 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
261 243
262 delete drawable; 244 delete drawable;
263 // destroy all windows 245 // destroy all windows
264 if (parent[0]) 246 if (parent)
265 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
266 248
267 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
268 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
269 { 251 {
270 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
272 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
273#endif 255#endif
274 } 256 }
275 257
276 clear (); 258 clear ();
277 }
278 259
279 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
280#if OFF_FOCUS_FADING
281 delete [] pix_colors_unfocused;
282#endif
283
284 displays.put (display); 261 displays.put (display);
262 }
285 263
286 scr_release (); 264 scr_release ();
287 265
288 /* clear all resources */ 266 /* clear all resources */
289 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
290 free (allocated [i]); 268 free (allocated [i]);
291 269
292 free (selection.text); 270 free (selection.text);
293 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
294 free (env_display);
295 free (env_term);
296 free (locale); 272 free (locale);
297 free (v_buffer); 273 free (v_buffer);
298 free (incr_buf); 274
275 delete selection_req;
299 276
300 delete envv; 277 delete envv;
301 delete argv; 278 delete argv;
302 279
303#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
304 delete keyboard; 281 delete keyboard;
305#endif 282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
306} 286}
307 287
308// child has exited, usually destroys 288// child has exited, usually destroys
309void 289void
310rxvt_term::child_cb (child_watcher &w, int status) 290rxvt_term::child_cb (ev::child &w, int status)
311{ 291{
312 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
313 293
314 cmd_pid = 0; 294 cmd_pid = 0;
315 295
… …
318} 298}
319 299
320void 300void
321rxvt_term::destroy () 301rxvt_term::destroy ()
322{ 302{
323 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
324 return; 304 return;
325 305
326 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
327 307
328#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
… …
332 if (display) 312 if (display)
333 { 313 {
334#if USE_XIM 314#if USE_XIM
335 im_ev.stop (display); 315 im_ev.stop (display);
336#endif 316#endif
337#if HAVE_SCROLLBARS
338 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
339#endif
340#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
341 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
342#endif 320#endif
343 incr_ev.stop ();
344 termwin_ev.stop (display); 321 termwin_ev.stop (display);
345 vt_ev.stop (display); 322 vt_ev.stop (display);
346 } 323 }
347 324
348 check_ev.stop (); 325 flush_ev.stop ();
349 pty_ev.stop (); 326 pty_ev.stop ();
350#ifdef CURSOR_BLINK 327#ifdef CURSOR_BLINK
351 cursor_blink_ev.stop (); 328 cursor_blink_ev.stop ();
352#endif 329#endif
353#ifdef TEXT_BLINK 330#ifdef TEXT_BLINK
… …
361#endif 338#endif
362#ifdef POINTER_BLANK 339#ifdef POINTER_BLANK
363 pointer_ev.stop (); 340 pointer_ev.stop ();
364#endif 341#endif
365 342
366 destroy_ev.start (0); 343 destroy_ev.start ();
367} 344}
368 345
369void 346void
370rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
371{ 348{
372 make_current (); 349 make_current ();
373 350
374 delete this; 351 delete this;
352}
353
354void
355rxvt_term::set_option (uint8_t opt, bool set)
356{
357 if (!opt)
358 return;
359
360 uint8_t mask = 1 << (opt & 7);
361 uint8_t &val = options [opt >> 3];
362
363 val = val & ~mask | (set ? mask : 0);
375} 364}
376 365
377/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
378/* 367/*
379 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
393print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
394{ 383{
395 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
396 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
397 char number[32]; 386 char number[32];
398 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
399 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
400 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
401 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
402 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
403 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
405 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
406 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
407 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
408 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
409 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
410 mesg, BUFSIZ); 399 mesg, BUFSIZ);
411 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
412 } 401 }
413 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
414 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
415 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
416 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
417 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
418 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
419 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
420 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
421 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
422 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
423 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
424 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
425 mesg, BUFSIZ); 414 mesg, BUFSIZ);
426 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
427 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
428 mesg, BUFSIZ); 417 mesg, BUFSIZ);
429 else 418 else
430 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
431 mesg, BUFSIZ); 420 mesg, BUFSIZ);
432 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
433 } 422 }
434 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
435 mesg, BUFSIZ); 424 mesg, BUFSIZ);
436 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
437} 426}
438#endif 427#endif
439 428
440int 429int
… …
463 DisplayString (display)); 452 DisplayString (display));
464 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
465 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
466} 455}
467 456
468/*----------------------------------------------------------------------*/
469bool
470rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
471{
472 this->envv = envv;
473
474 SET_R (this);
475 set_locale ("");
476 set_environ (envv); // few things in X do not call setlocale :(
477
478 if (!init_vars ())
479 return false;
480
481 init_secondary ();
482
483 const char **cmd_argv = init_resources (argc, argv);
484
485#ifdef KEYSYM_RESOURCE
486 keyboard->register_done ();
487#endif
488
489#ifdef HAVE_SCROLLBARS
490 if (option (Opt_scrollBar))
491 scrollBar.setIdle (); /* set existence for size calculations */
492#endif
493
494 pty = ptytty::create ();
495
496 create_windows (argc, argv);
497
498 init_xlocale ();
499
500 scr_reset (); // initialize screen
501
502#if 0
503 XSynchronize (dpy, True);
504#endif
505
506#ifdef HAVE_SCROLLBARS
507 if (option (Opt_scrollBar))
508 resize_scrollbar (); /* create and map scrollbar */
509#endif
510#ifdef HAVE_BG_PIXMAP
511 {
512 bgPixmap.set_target (this);
513
514#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent))
516 {
517 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif
522 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]);
526
527 bgPixmap.set_root_pixmap ();
528 XSelectInput (dpy, display->root, PropertyChangeMask);
529 rootwin_ev.start (display, display->root);
530 }
531#endif
532
533#ifdef BG_IMAGE_FROM_FILE
534 if (rs[Rs_backgroundPixmap] != NULL)
535 {
536 const char *p = rs[Rs_backgroundPixmap];
537
538 if ((p = strchr (p, ';')) != NULL)
539 {
540 p++;
541 bgPixmap.set_geometry (p);
542 }
543 else
544 bgPixmap.set_defaultGeometry ();
545
546 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
547 if (!bgPixmap.window_position_sensitive ())
548 update_background ();
549 }
550#endif
551 }
552#endif
553
554#if ENABLE_PERL
555 rootwin_ev.start (display, display->root);
556#endif
557
558 set_colorfgbg ();
559
560 init_command (cmd_argv);
561
562 free (cmd_argv);
563
564 if (pty->pty >= 0)
565 pty_ev.start (pty->pty, EVENT_READ);
566
567 check_ev.start ();
568
569 HOOK_INVOKE ((this, HOOK_START, DT_END));
570
571#if ENABLE_XEMBED
572 if (rs[Rs_embed])
573 {
574 long info[2] = { 0, XEMBED_MAPPED };
575
576 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
577 32, PropModeReplace, (unsigned char *)&info, 2);
578 }
579#endif
580
581 XMapWindow (dpy, vt);
582 XMapWindow (dpy, parent[0]);
583
584 return true;
585}
586
587static struct sig_handlers 457static struct sig_handlers
588{ 458{
589 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
590 460
591 /* 461 /*
592 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
593 */ 463 */
594 void 464 void sig_term (ev::sig &w, int revents);
595 sig_term (sig_watcher &w) 465
466 sig_handlers ()
596 { 467 {
597 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
598 signal (w.signum, SIG_DFL);
599 kill (getpid (), w.signum);
600 }
601
602 sig_handlers ()
603 : sw_term (this, &sig_handlers::sig_term),
604 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
605 {
606 } 470 }
607} sig_handlers; 471} sig_handlers;
608 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
609char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
610 549
611void 550void
612rxvt_init () 551rxvt_init ()
613{ 552{
614 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
562 if (!ev_default_loop ())
563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
615 564
616 rxvt_environ = environ; 565 rxvt_environ = environ;
617 566
618 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
619 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
620 569
621 sig_handlers.sw_term.start (SIGTERM); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
622 sig_handlers.sw_int.start (SIGINT); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
623
624 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
625 /* signal (SIGURG, SIG_DFL); */
626 572
627 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
628 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
629 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
630 576
631 XrmInitialize (); 577 XrmInitialize ();
632}
633
634/* ------------------------------------------------------------------------- *
635 * MEMORY ALLOCATION WRAPPERS *
636 * ------------------------------------------------------------------------- */
637void *
638rxvt_malloc (size_t size)
639{
640 void *p = malloc (size);
641
642 if (!p)
643 rxvt_fatal ("memory allocation failure. aborting.\n");
644
645 return p;
646}
647
648void *
649rxvt_calloc (size_t number, size_t size)
650{
651 void *p = calloc (number, size);
652
653 if (!p)
654 rxvt_fatal ("memory allocation failure. aborting.\n");
655
656 return p;
657}
658
659void *
660rxvt_realloc (void *ptr, size_t size)
661{
662 void *p = realloc (ptr, size);
663
664 if (!p)
665 rxvt_fatal ("memory allocation failure. aborting.\n");
666
667 return p;
668} 578}
669 579
670/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
671/* 581/*
672 * window size/position calculations for XSizeHint and other storage. 582 * window size/position calculations for XSizeHint and other storage.
… …
674 */ 584 */
675void 585void
676rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
677{ 587{
678 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
679 int x, y, sb_w, flags; 589 int x, y, flags;
680 unsigned int w, h; 590 unsigned int w, h;
681 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
682 592
683 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
684 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
694 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
695 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
696 606
697 if (flags & WidthValue) 607 if (flags & WidthValue)
698 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
699 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
700 szHint.flags |= USSize; 613 szHint.flags |= USSize;
701 } 614 }
702 615
703 if (flags & HeightValue) 616 if (flags & HeightValue)
704 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
705 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
706 szHint.flags |= USSize; 622 szHint.flags |= USSize;
707 } 623 }
708 624
709 if (flags & XValue) 625 if (flags & XValue)
710 { 626 {
… …
741 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
742 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
743 659
744 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
745 661
746 sb_w = 0;
747 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
748 663
749 if (scrollBar.state) 664 if (scrollBar.state)
750 { 665 {
751 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
752 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
753 668
754 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
755 window_vt_x += sb_w; 670 window_vt_x += sb_w;
756 } 671 }
… …
780 { 695 {
781 min_it (height, max_height); 696 min_it (height, max_height);
782 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
783 } 698 }
784 699
785 if (scrollBar.state && option (Opt_scrollBar_right))
786 window_sb_x = szHint.width - sb_w;
787
788 if (recalc_x) 700 if (recalc_x)
789 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
790 702
791 if (recalc_y) 703 if (recalc_y)
792 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
793 705
794 ncol = width / fwidth; 706 ncol = width / fwidth;
795 nrow = height / fheight; 707 nrow = height / fheight;
708
709 // When the size of the vt window is not a multiple of the cell
710 // size, i.e., when the wm does not honour our size hints, there are
711 // extra areas not covered by the terminal screen. Such gaps, when a
712 // bg pixmap is set, would have to be cleared manually to properly
713 // refresh the background. We take the simpler route and shrink the
714 // vt window so as to avoid creating gaps.
715 width = ncol * fwidth;
716 height = nrow * fheight;
796} 717}
797 718
798/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
799/* 720/*
800 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
810 731
811 ws.ws_col = ncol; 732 ws.ws_col = ncol;
812 ws.ws_row = nrow; 733 ws.ws_row = nrow;
813 ws.ws_xpixel = width; 734 ws.ws_xpixel = width;
814 ws.ws_ypixel = height; 735 ws.ws_ypixel = height;
815 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
816 737
817#if 0 738#if 0
818 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
819 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
820 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
821#endif 742#endif
822} 743}
823 744
824/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
825/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
826 *
827 * init = 1 - initialize
828 *
829 * fontname == FONT_UP - switch to bigger font
830 * fontname == FONT_DN - switch to smaller font
831 */
832bool 747bool
833rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
834{ 749{
835 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
836 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
850#endif 765#endif
851 766
852 delete fontset[0]; 767 delete fontset[0];
853 fontset[0] = fs; 768 fontset[0] = fs;
854 769
855 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
856 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
857 773
858 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
859 775
860 fwidth = prop.width; 776 fwidth = prop.width;
861 fheight = prop.height; 777 fheight = prop.height;
… …
892#else 808#else
893 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
894#endif 810#endif
895 } 811 }
896 812
897 if (parent[0]) 813 if (parent)
898 { 814 {
899 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
900 scr_remap_chars (); 816 scr_remap_chars ();
901 scr_touch (true); 817 scr_touch (true);
902 } 818 }
903 819
904 return true; 820 return true;
905} 821}
906 822
907void 823void
908rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
909{ 825{
910 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
911 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
912 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
913} 829}
914 830
915void 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, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
916rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
917{ 845{
918 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
919 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
920 848
921 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
922 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
923 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
924 852
925 free (s); 853 free (s);
926 free (ws); 854 free (ws);
… …
930/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
931/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
932void 860void
933rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
934{ 862{
935 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
936#if ENABLE_EWMH 864#if ENABLE_EWMH
937 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
938#endif 866#endif
939} 867}
940 868
941void 869void
942rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
943{ 871{
944 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
945#if ENABLE_EWMH 873#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
947#endif 875#endif
948} 876}
949 877
950void 878void
951rxvt_term::set_window_color (int idx, const char *color) 879rxvt_term::set_window_color (int idx, const char *color)
952{ 880{
953#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
954 rxvt_color xcol; 882 rxvt_color xcol;
955 int i; 883
956
957 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
958 return; 885 return;
959 886
960 color = strdup (color); 887 color = strdup (color);
961 allocated.push_back ((void *)color); 888 allocated.push_back ((void *)color);
962 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
963 890
964 /* handle color aliases */ 891 /* handle color aliases */
965 if (isdigit (*color)) 892 if (isdigit (*color))
966 { 893 {
967 i = atoi (color); 894 int i = atoi (color);
968 895
969 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
897 {
970 { /* bright colors */ 898 /* bright colors */
971 i -= 8;
972 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
973 goto done; 900 goto done;
974 } 901 }
975 902
976 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
904 {
977 { /* normal colors */ 905 /* normal colors */
978 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
979 goto done; 907 goto done;
980 } 908 }
981 } 909 }
982 910
… …
987 * so just keep gobbling up the colormap 915 * so just keep gobbling up the colormap
988 */ 916 */
989 917
990 pix_colors_focused[idx] = xcol; 918 pix_colors_focused[idx] = xcol;
991 919
992 /* XSetWindowAttributes attr; */
993 /* Cursor cursor; */
994done: 920done:
995 /*TODO: handle Color_BD, scrollbar background, etc. */ 921 /*TODO: handle Color_BD, scrollbar background, etc. */
996 922
997 update_fade_color (idx); 923 update_fade_color (idx);
998 recolour_cursor (); 924 recolour_cursor ();
999 scr_recolour (); 925 scr_recolour ();
1000#endif /* XTERM_COLOR_CHANGE */ 926#endif /* XTERM_COLOR_CHANGE */
1001} 927}
1002 928
1003void 929void
1004rxvt_term::recolour_cursor () 930rxvt_term::recolour_cursor ()
1005{ 931{
… …
1018 944
1019/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
1020/* 946/*
1021 * find if fg/bg matches any of the normal (low-intensity) colors 947 * find if fg/bg matches any of the normal (low-intensity) colors
1022 */ 948 */
1023void 949char *
1024rxvt_term::set_colorfgbg () 950rxvt_term::get_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";
956 char *env_colorfgbg;
1029 957
1030 strcpy (fstr, "default");
1031 strcpy (bstr, "default");
1032 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1033 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
1034 { 960 {
1035 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
1036 break; 962 break;
1037 } 963 }
1038 964
1039 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1040 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1041 { 967 {
1042 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1043#ifdef BG_IMAGE_FROM_FILE 969#ifdef BG_IMAGE_FROM_FILE
1044 xpmb = "default;"; 970 xpmb = "default;";
1045#endif 971#endif
1046 break; 972 break;
1047 } 973 }
1048 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1049 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 976 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
977 return env_colorfgbg;
1050} 978}
1051 979
1052/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1053 981
1054bool 982bool
… …
1077 int old_width = szHint.width; 1005 int old_width = szHint.width;
1078 int old_height = szHint.height; 1006 int old_height = szHint.height;
1079 1007
1080 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
1081 1009
1082 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1010 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1011
1012 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1013 if (set_hint)
1014 {
1015 szHint.flags &= ~(PBaseSize | PResizeInc);
1083 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
1084 1019
1085 if (!ignoreparent) 1020 if (!ignoreparent)
1086 { 1021 {
1087#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
1088 /* 1023 /*
… …
1092 int x, y, x1, y1; 1027 int x, y, x1, y1;
1093 int dx, dy; 1028 int dx, dy;
1094 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1095 Window unused_cr; 1030 Window unused_cr;
1096 1031
1097 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1098 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1099 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1100 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1101 /* 1036 /*
1102 * if display->root isn't the parent window, a WM will probably have offset 1037 * if display->root isn't the parent window, a WM will probably have offset
1103 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1104 */ 1039 */
… …
1121 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1122 dy = 0; 1057 dy = 0;
1123 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1124 dy /= 2; 1059 dy /= 2;
1125 1060
1126 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1127 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1128#else 1063#else
1129 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1130#endif 1065#endif
1131 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
1132 1070
1133 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1134 1072
1135 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1136 { 1074 {
1137 if (scrollBar.state) 1075 if (scrollBar.state)
1138 { 1076 scrollBar.resize ();
1139 XMoveResizeWindow (dpy, scrollBar.win,
1140 window_sb_x, 0,
1141 scrollbar_TotalWidth (), szHint.height);
1142 resize_scrollbar ();
1143 }
1144 1077
1145 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1146 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1147 width, height); 1080 width, height);
1148 1081
1149#ifdef HAVE_BG_PIXMAP 1082#ifdef HAVE_BG_PIXMAP
1150 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1151 update_background (); 1084 update_background ();
1152#endif 1085#endif
1153
1154 scr_clear ();
1155 } 1086 }
1156 1087
1157 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1158 scr_reset (); 1089 scr_reset ();
1159 1090
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
1169#ifdef USE_XIM 1091#ifdef USE_XIM
1170 IMSetPosition (); 1092 im_set_position ();
1171#endif 1093#endif
1172} 1094}
1173 1095
1174/* 1096/*
1175 * Set the width/height of the vt window in characters. Units are pixels. 1097 * Set the width/height of the vt window in characters. Units are pixels.
… …
1236 status_rect.height = fheight; 1158 status_rect.height = fheight;
1237} 1159}
1238 1160
1239/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1240bool 1162bool
1241rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1242{ 1164{
1243 char *p;
1244 Atom atom; 1165 Atom atom;
1245 Window win; 1166 Window win;
1246 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1247 1168
1248 /* get current locale modifier */ 1169 /* get current locale modifier */
1249 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1250 { 1171 {
1251 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1252 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1253 1174
1254 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1255 *p = '\0'; 1176 *p = '\0';
1256 1177
1257 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1258 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1259 1180
1260 if (win != None) 1181 if (win != None)
1261 return True; 1182 return true;
1262 } 1183 }
1263 1184
1264 return False; 1185 return false;
1265} 1186}
1266 1187
1267void 1188void
1268rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1269{ 1190{
1270 XPoint nspot; 1191 XPoint nspot;
1271 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1272 1193
1273 if (!Input_Context 1194 if (!Input_Context
… …
1326 1247
1327 term->make_current (); 1248 term->make_current ();
1328 1249
1329 if (text) 1250 if (text)
1330 { 1251 {
1331 void *str; 1252 wchar_t *str;
1332 1253
1333 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1334 { 1255 {
1335 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1336 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1337 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1338 1259
1339 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1340 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1341 1262
1342 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1343 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1344 } 1265 }
1345 else 1266 else
1346 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1347 1268
1348 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1349 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1350 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1351 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
1352 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1273 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1379/* 1300/*
1380 * Try to open a XIM with the current modifiers, then see if we can 1301 * Try to open a XIM with the current modifiers, then see if we can
1381 * open a suitable preedit type 1302 * open a suitable preedit type
1382 */ 1303 */
1383bool 1304bool
1384rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1385{ 1306{
1386 int i, j, found; 1307 int i, j, found;
1387 XIM xim; 1308 XIM xim;
1388 XPoint spot; 1309 XPoint spot;
1389 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1390 unsigned long fg, bg; 1311 unsigned long fg, bg;
1391 const char *p; 1312 const char *p;
1392 char **s; 1313 char **s;
1393 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1394#ifdef ENABLE_XIM_ONTHESPOT
1395 XIMCallback xcb[4];
1396#endif
1397 1315
1398 set_environ (envv); 1316 set_environ (envv);
1399 1317
1400 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1401 return false; 1319 return false;
… …
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);
… …
1541 NULL); 1459 NULL);
1542 } 1460 }
1543#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1544 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1545 { 1463 {
1464 XIMCallback xcb[4];
1465
1546 im_set_position (spot); 1466 im_set_position (spot);
1547 1467
1548 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1468 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1549 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1469 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1550 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1470 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1565#endif 1485#endif
1566 1486
1567 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1568 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1569 XNClientWindow, vt, 1489 XNClientWindow, vt,
1570 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1571 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1572 preedit_attr, 1492 preedit_attr,
1573 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1574 status_attr, NULL); 1494 status_attr, NULL);
1575 1495
… …
1588 // unfortunately, only the focus window is used by XIM, hard to fix 1508 // unfortunately, only the focus window is used by XIM, hard to fix
1589 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1590 vt_select_input (); 1510 vt_select_input ();
1591#endif 1511#endif
1592 1512
1593 IMSetPosition (); 1513 im_set_position ();
1594 1514
1595 return true; 1515 return true;
1596} 1516}
1597 1517
1598void 1518void
… …
1618 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1619 if (p && *p) 1539 if (p && *p)
1620 { 1540 {
1621 bool found = false; 1541 bool found = false;
1622 1542
1623 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1624 1544
1625 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1626 { 1546 {
1627 if (*s[i]) 1547 if (*s[i])
1628 { 1548 {
1629 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1630 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1631 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1632 { 1552 {
1633 found = true; 1553 found = true;
1634 break; 1554 break;
1635 } 1555 }
1636 } 1556 }
1637 } 1557 }
1638 1558
1639 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1640 1560
1641 if (found) 1561 if (found)
1642 goto done; 1562 goto done;
1643 } 1563 }
1644 1564
1645 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1646 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1647 goto done; 1567 goto done;
1648 1568
1649 /* try with no modifiers base IF the user didn't specify an IM */ 1569 /* try with no modifiers base IF the user didn't specify an IM */
1650 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1651 goto done; 1571 goto done;
1652 1572
1653done: 1573done:
1654#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1655 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1656 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1657#endif 1577#endif
1658} 1578}
1659 1579
1660void 1580void
1661rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1662{ 1582{
1663 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1664 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1665 1585
1666 if (!Input_Context 1586 if (!Input_Context
1667 || !focus 1587 || !focus
1668 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1669 || !IMisRunning ()) 1589 || !im_is_running ())
1670 return; 1590 return;
1671 1591
1672 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1673 { 1593 {
1674 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
1675 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1595 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1676 1596
1677 XSetICValues (Input_Context, 1597 XSetICValues (Input_Context,
1678 XNPreeditAttributes, preedit_attr, NULL); 1598 XNPreeditAttributes, preedit_attr, NULL);
1679 } 1599 }
1680 else 1600 else
1681 { 1601 {
… …
1698 XFree (status_attr); 1618 XFree (status_attr);
1699 } 1619 }
1700 1620
1701 XFree (preedit_attr); 1621 XFree (preedit_attr);
1702} 1622}
1703#endif /* USE_XIM */ 1623#endif /* USE_XIM */
1704 1624
1705void 1625void
1706rxvt_term::get_window_origin (int &x, int &y) 1626rxvt_term::get_window_origin (int &x, int &y)
1707{ 1627{
1708 Window cr; 1628 Window cr;
1709 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1710/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1711} 1630}
1712 1631
1713Pixmap 1632Pixmap
1714rxvt_term::get_pixmap_property (int prop_id) 1633rxvt_term::get_pixmap_property (Atom property)
1715{ 1634{
1716 if (prop_id > 0 && prop_id < NUM_XA) 1635 Pixmap pixmap = None;
1717 if (xa[prop_id]) 1636
1718 {
1719 int aformat; 1637 int aformat;
1720 unsigned long nitems, bytes_after; 1638 unsigned long nitems, bytes_after;
1721 Atom atype; 1639 Atom atype;
1722 unsigned char *prop = NULL; 1640 unsigned char *prop;
1723 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1641 int result = XGetWindowProperty (dpy, display->root, property,
1724 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1725 &nitems, &bytes_after, &prop); 1643 &nitems, &bytes_after, &prop);
1726 if (result == Success && prop && atype == XA_PIXMAP) 1644 if (result == Success)
1727 { 1645 {
1728 return *(Pixmap *)prop; 1646 if (atype == XA_PIXMAP)
1729 } 1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1730 } 1649 }
1731 return None; 1650
1651 return pixmap;
1732} 1652}
1733 1653
1734#ifdef HAVE_BG_PIXMAP 1654#ifdef HAVE_BG_PIXMAP
1735int 1655
1656void
1736rxvt_term::update_background () 1657rxvt_term::update_background ()
1737{ 1658{
1659 if (update_background_ev.is_active ())
1660 return;
1661
1738 bgPixmap.invalidate (); 1662 bg_invalidate ();
1739 1663
1740 /* no chance of real time refresh if we are blurring ! */ 1664 if (!mapped)
1741 if (bgPixmap.invalid_since + 0.5 < NOW && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1665 return;
1666
1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668
1669 if (to_wait <= 0.)
1742 bgPixmap.render (); 1670 bg_render ();
1743 else 1671 else
1744 { 1672 update_background_ev.start (to_wait);
1673}
1674
1675void
1676rxvt_term::update_background_cb (ev::timer &w, int revents)
1677{
1678 make_current ();
1679
1745 update_background_ev.stop (); 1680 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 (); 1681 bg_render ();
1682 refresh_check ();
1760} 1683}
1761 1684
1762#endif /* HAVE_BG_PIXMAP */ 1685#endif /* HAVE_BG_PIXMAP */
1763 1686
1764/*----------------------- end-of-file (C source) -----------------------*/ 1687/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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