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.261 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.357 by sf-exg, Sat Jul 9 13:14:47 2011 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <schmorp@schmorp.de>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45#include <termios.h>
45#endif
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE 51# ifdef HAVE_SETLOCALE
52# include <clocale> 52# include <clocale>
53# endif 53# endif
54#endif 54#endif
55 55
56struct termios rxvt_term::def_tio;
56vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
57 58
58// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
60 61
… …
95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
96{ 97{
97 compose_char *cc; 98 compose_char *cc;
98 99
99 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
100 // composing characters for some reason near the end of a line. 101 // composing characters for some reason, near the end of a line.
101 cc = (*this)[c1]; 102 cc = (*this)[c1];
102 while (cc) 103 while (cc)
103 { 104 {
104 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
105 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
106 } 107 }
107 108
108 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
109 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
110 {
111 if (cc->c1 == c1 && cc->c2 == c2) 111 if (cc->c1 == c1 && cc->c2 == c2)
112 return COMPOSE_LO + (cc - v.begin ()); 112 return COMPOSE_LO + (cc - v.begin ());
113 }
114 113
115 // allocate a new combination 114 // allocate a new combination
116 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 115 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
117 { 116 {
118 static int seen; 117 static int seen;
119 118
120 if (!seen++) 119 if (!seen++)
121 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 120 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
122 121
123 return REPLACEMENT_CHAR; 122 return REPLACEMENT_CHAR;
124 } 123 }
125 124
126 v.push_back (compose_char (c1, c2)); 125 v.push_back (compose_char (c1, c2));
… …
152 151
153} 152}
154#endif 153#endif
155 154
156rxvt_term::rxvt_term () 155rxvt_term::rxvt_term ()
157 : 156{
157#if HAVE_BG_PIXMAP
158 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
159#endif
160#ifdef CURSOR_BLINK
161 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
162#endif
163#ifdef TEXT_BLINK
164 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
165#endif
166#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
167 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
168#endif
169#ifdef SELECTION_SCROLLING
170 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
171#endif
172#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
173 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
174#endif
158#if ENABLE_TRANSPARENCY || ENABLE_PERL 175#if ENABLE_TRANSPARENCY || ENABLE_PERL
159 rootwin_ev (this, &rxvt_term::rootwin_cb), 176 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
160#endif 177#endif
161#if HAVE_BG_PIXMAP 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
162 update_background_ev(this, &rxvt_term::update_background_cb), 179#ifdef USE_XIM
163#endif 180 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
164#ifdef HAVE_SCROLLBARS
165 scrollbar_ev (this, &rxvt_term::x_cb),
166#endif
167#ifdef CURSOR_BLINK
168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
169#endif
170#ifdef TEXT_BLINK
171 text_blink_ev (this, &rxvt_term::text_blink_cb),
172#endif
173#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
174 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
175#endif
176#ifdef SELECTION_SCROLLING
177 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
178#endif
179#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
180 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
181#endif 181#endif
182#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
183 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
184#endif
185#ifdef USE_XIM
186 im_ev (this, &rxvt_term::im_cb),
187#endif 184#endif
188#ifndef NO_BELL 185#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb), 186 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
190#endif 187#endif
191 termwin_ev (this, &rxvt_term::x_cb), 188 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
192 vt_ev (this, &rxvt_term::x_cb), 189 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
193 child_ev (this, &rxvt_term::child_cb), 190 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
194 prepare_ev (this, &rxvt_term::prepare_cb), 191 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
195 flush_ev (this, &rxvt_term::flush_cb), 192 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
196 destroy_ev (this, &rxvt_term::destroy_cb), 193 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
197 pty_ev (this, &rxvt_term::pty_cb), 194
198 incr_ev (this, &rxvt_term::incr_cb)
199{
200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
201 196
202 termlist.push_back (this); 197 termlist.push_back (this);
203 198
204#ifdef KEYSYM_RESOURCE 199#ifdef KEYSYM_RESOURCE
… …
229 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
230 delete fontset[i]; 225 delete fontset[i];
231#endif 226#endif
232 delete fontset[0]; 227 delete fontset[0];
233 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
234 if (display) 233 if (display)
235 { 234 {
236 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
237 237
238#ifdef USE_XIM 238#ifdef USE_XIM
239 im_destroy (); 239 im_destroy ();
240#endif 240#endif
241#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
244#endif
245#ifdef PLAIN_SCROLLBAR
246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
247#endif
248#ifdef NEXT_SCROLLBAR
249 if (blackGC) XFreeGC (dpy, blackGC);
250 if (whiteGC) XFreeGC (dpy, whiteGC);
251 if (grayGC) XFreeGC (dpy, grayGC);
252 if (darkGC) XFreeGC (dpy, darkGC);
253 if (stippleGC) XFreeGC (dpy, stippleGC);
254 if (dimple) XFreePixmap (dpy, dimple);
255 if (upArrow) XFreePixmap (dpy, upArrow);
256 if (downArrow) XFreePixmap (dpy, downArrow);
257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
259#endif
260#ifdef RXVT_SCROLLBAR
261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
264#endif
265 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
266 243
267 delete drawable; 244 delete drawable;
268 // destroy all windows 245 // destroy all windows
269 if (parent[0]) 246 if (parent)
270 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
271 248
272 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
273 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
274 { 251 {
275 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
277 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
278#endif 255#endif
279 } 256 }
280 257
281 clear (); 258 clear ();
282 }
283 259
284 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
285#if OFF_FOCUS_FADING
286 delete [] pix_colors_unfocused;
287#endif
288
289 bgPixmap.destroy ();
290 displays.put (display); 261 displays.put (display);
262 }
291 263
292 scr_release (); 264 scr_release ();
293 265
294 /* clear all resources */ 266 /* clear all resources */
295 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
296 free (allocated [i]); 268 free (allocated [i]);
297 269
298 free (selection.text); 270 free (selection.text);
271 free (selection.clip_text);
299 // TODO: manage env vars in child only(!) 272 // TODO: manage env vars in child only(!)
300 free (env_display); 273 free (env_display);
301 free (env_term); 274 free (env_term);
302 free (locale); 275 free (locale);
303 free (v_buffer); 276 free (v_buffer);
304 free (incr_buf); 277
278 delete selection_req;
305 279
306 delete envv; 280 delete envv;
307 delete argv; 281 delete argv;
308 282
309#ifdef KEYSYM_RESOURCE 283#ifdef KEYSYM_RESOURCE
310 delete keyboard; 284 delete keyboard;
311#endif 285#endif
286#ifndef NO_RESOURCES
287 XrmDestroyDatabase (option_db);
288#endif
312} 289}
313 290
314// child has exited, usually destroys 291// child has exited, usually destroys
315void 292void
316rxvt_term::child_cb (ev::child &w, int status) 293rxvt_term::child_cb (ev::child &w, int status)
… …
324} 301}
325 302
326void 303void
327rxvt_term::destroy () 304rxvt_term::destroy ()
328{ 305{
329 if (destroy_ev.active) 306 if (destroy_ev.is_active ())
330 return; 307 return;
331 308
332 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 309 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
333 310
334#if ENABLE_OVERLAY 311#if ENABLE_OVERLAY
… …
338 if (display) 315 if (display)
339 { 316 {
340#if USE_XIM 317#if USE_XIM
341 im_ev.stop (display); 318 im_ev.stop (display);
342#endif 319#endif
343#if HAVE_SCROLLBARS
344 scrollbar_ev.stop (display); 320 scrollbar_ev.stop (display);
345#endif
346#if ENABLE_TRANSPARENCY || ENABLE_PERL 321#if ENABLE_TRANSPARENCY || ENABLE_PERL
347 rootwin_ev.stop (display); 322 rootwin_ev.stop (display);
348#endif 323#endif
349 incr_ev.stop ();
350 termwin_ev.stop (display); 324 termwin_ev.stop (display);
351 vt_ev.stop (display); 325 vt_ev.stop (display);
352 } 326 }
353 327
354 prepare_ev.stop (); 328 flush_ev.stop ();
355 pty_ev.stop (); 329 pty_ev.stop ();
356#ifdef CURSOR_BLINK 330#ifdef CURSOR_BLINK
357 cursor_blink_ev.stop (); 331 cursor_blink_ev.stop ();
358#endif 332#endif
359#ifdef TEXT_BLINK 333#ifdef TEXT_BLINK
… …
376rxvt_term::destroy_cb (ev::idle &w, int revents) 350rxvt_term::destroy_cb (ev::idle &w, int revents)
377{ 351{
378 make_current (); 352 make_current ();
379 353
380 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);
381} 367}
382 368
383/*----------------------------------------------------------------------*/ 369/*----------------------------------------------------------------------*/
384/* 370/*
385 * Exit gracefully, clearing the utmp entry and restoring tty attributes 371 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
399print_x_error (Display *dpy, XErrorEvent *event) 385print_x_error (Display *dpy, XErrorEvent *event)
400{ 386{
401 char buffer[BUFSIZ]; 387 char buffer[BUFSIZ];
402 char mesg[BUFSIZ]; 388 char mesg[BUFSIZ];
403 char number[32]; 389 char number[32];
404 char *mtype = "XlibMessage"; 390 const char mtype[] = "XlibMessage";
405 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 391 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
406 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
407 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");
408 rxvt_warn ("%s: %s\n", mesg, buffer); 394 rxvt_warn ("%s: %s\n", mesg, buffer);
409 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 395 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 396 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
411 sprintf(number, "%d", event->request_code); 397 sprintf(number, "%d", event->request_code);
412 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 398 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
413 rxvt_warn ("(which is %s)\n", buffer); 399 rxvt_warn ("(which is %s)\n", buffer);
414 if (event->request_code >= 128) { 400 if (event->request_code >= 128) {
415 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 401 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
416 mesg, BUFSIZ); 402 mesg, BUFSIZ);
417 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
418 } 404 }
419 if ((event->error_code == BadWindow) || 405 if ((event->error_code == BadWindow) ||
420 (event->error_code == BadPixmap) || 406 (event->error_code == BadPixmap) ||
421 (event->error_code == BadCursor) || 407 (event->error_code == BadCursor) ||
422 (event->error_code == BadFont) || 408 (event->error_code == BadFont) ||
423 (event->error_code == BadDrawable) || 409 (event->error_code == BadDrawable) ||
424 (event->error_code == BadColor) || 410 (event->error_code == BadColor) ||
425 (event->error_code == BadGC) || 411 (event->error_code == BadGC) ||
426 (event->error_code == BadIDChoice) || 412 (event->error_code == BadIDChoice) ||
427 (event->error_code == BadValue) || 413 (event->error_code == BadValue) ||
428 (event->error_code == BadAtom)) { 414 (event->error_code == BadAtom)) {
429 if (event->error_code == BadValue) 415 if (event->error_code == BadValue)
430 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
431 mesg, BUFSIZ); 417 mesg, BUFSIZ);
432 else if (event->error_code == BadAtom) 418 else if (event->error_code == BadAtom)
433 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
434 mesg, BUFSIZ); 420 mesg, BUFSIZ);
435 else 421 else
436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 422 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
437 mesg, BUFSIZ); 423 mesg, BUFSIZ);
438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 424 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
439 } 425 }
440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 426 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
441 mesg, BUFSIZ); 427 mesg, BUFSIZ);
442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 428 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
443} 429}
444#endif 430#endif
445 431
446int 432int
… …
469 DisplayString (display)); 455 DisplayString (display));
470 rxvt_emergency_cleanup (); 456 rxvt_emergency_cleanup ();
471 _exit (EXIT_FAILURE); 457 _exit (EXIT_FAILURE);
472} 458}
473 459
474/*----------------------------------------------------------------------*/
475bool
476rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
477{
478 this->envv = envv;
479
480 SET_R (this);
481 set_locale ("");
482 set_environ (envv); // few things in X do not call setlocale :(
483
484 if (!init_vars ())
485 return false;
486
487 init_secondary ();
488
489 const char **cmd_argv = init_resources (argc, argv);
490
491#ifdef KEYSYM_RESOURCE
492 keyboard->register_done ();
493#endif
494
495#ifdef HAVE_SCROLLBARS
496 if (option (Opt_scrollBar))
497 scrollBar.setIdle (); /* set existence for size calculations */
498#endif
499
500 pty = ptytty::create ();
501
502 create_windows (argc, argv);
503
504 init_xlocale ();
505
506 scr_reset (); // initialize screen
507
508#if 0
509 XSynchronize (dpy, True);
510#endif
511
512#ifdef HAVE_SCROLLBARS
513 if (option (Opt_scrollBar))
514 resize_scrollbar (); /* create and map scrollbar */
515#endif
516#ifdef HAVE_BG_PIXMAP
517 {
518 bgPixmap.set_target (this);
519
520#ifdef ENABLE_TRANSPARENCY
521 if (option (Opt_transparent))
522 {
523 bgPixmap.set_transparent ();
524#ifdef HAVE_AFTERIMAGE
525 if (rs [Rs_blurradius])
526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
527#endif
528 if (ISSET_PIXCOLOR (Color_tint))
529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
530 if (rs [Rs_shade])
531 bgPixmap.set_shade (rs [Rs_shade]);
532
533 bgPixmap.set_root_pixmap ();
534 XSelectInput (dpy, display->root, PropertyChangeMask);
535 rootwin_ev.start (display, display->root);
536 }
537#endif
538
539#ifdef BG_IMAGE_FROM_FILE
540 if (rs[Rs_backgroundPixmap] != NULL)
541 {
542 const char *p = rs[Rs_backgroundPixmap];
543
544 if ((p = strchr (p, ';')) != NULL)
545 {
546 p++;
547 bgPixmap.set_geometry (p);
548 }
549 else
550 bgPixmap.set_defaultGeometry ();
551
552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
555 }
556#endif
557 }
558#endif
559
560#if ENABLE_PERL
561 rootwin_ev.start (display, display->root);
562#endif
563
564 set_colorfgbg ();
565
566 init_command (cmd_argv);
567
568 free (cmd_argv);
569
570 if (pty->pty >= 0)
571 pty_ev.start (pty->pty, ev::READ);
572
573 prepare_ev.start ();
574
575 HOOK_INVOKE ((this, HOOK_START, DT_END));
576
577#if ENABLE_XEMBED
578 if (rs[Rs_embed])
579 {
580 long info[2] = { 0, XEMBED_MAPPED };
581
582 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
583 32, PropModeReplace, (unsigned char *)&info, 2);
584 }
585#endif
586
587 XMapWindow (dpy, vt);
588 XMapWindow (dpy, parent[0]);
589
590 return true;
591}
592
593static struct sig_handlers 460static struct sig_handlers
594{ 461{
595 ev::sig sw_term, sw_int; 462 ev::sig sw_term, sw_int;
596 463
597 /* 464 /*
598 * Catch a fatal signal and tidy up before quitting 465 * Catch a fatal signal and tidy up before quitting
599 */ 466 */
600 void
601 sig_term (ev::sig &w, int revents) 467 void sig_term (ev::sig &w, int revents);
468
469 sig_handlers ()
602 { 470 {
603 rxvt_emergency_cleanup (); 471 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
604 w.stop ();
605 kill (getpid (), w.signum);
606 }
607
608 sig_handlers ()
609 : sw_term (this, &sig_handlers::sig_term),
610 sw_int (this, &sig_handlers::sig_term) 472 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
611 {
612 } 473 }
613} sig_handlers; 474} sig_handlers;
614 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
615char **rxvt_environ; // startup environment 551char **rxvt_environ; // startup environment
616 552
617void 553void
618rxvt_init () 554rxvt_init ()
619{ 555{
620 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))));
621 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
622 if (!ev::ev_default_loop (0)) 565 if (!ev_default_loop ())
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n"); 566 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624 567
625 rxvt_environ = environ; 568 rxvt_environ = environ;
626 569
627 signal (SIGHUP, SIG_IGN); 570 signal (SIGHUP, SIG_IGN);
628 signal (SIGPIPE, SIG_IGN); 571 signal (SIGPIPE, SIG_IGN);
629 572
630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref (); 573 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref (); 574 sig_handlers.sw_int.start (SIGINT); ev_unref ();
632
633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
634 /* signal (SIGURG, SIG_DFL); */
635 575
636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 576 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
637 // TODO: handle this with exceptions and tolerate the memory loss 577 // TODO: handle this with exceptions and tolerate the memory loss
638 XSetIOErrorHandler (rxvt_xioerror_handler); 578 XSetIOErrorHandler (rxvt_xioerror_handler);
639 579
640 XrmInitialize (); 580 XrmInitialize ();
641}
642
643/* ------------------------------------------------------------------------- *
644 * MEMORY ALLOCATION WRAPPERS *
645 * ------------------------------------------------------------------------- */
646void *
647rxvt_malloc (size_t size)
648{
649 void *p = malloc (size);
650
651 if (!p)
652 rxvt_fatal ("memory allocation failure. aborting.\n");
653
654 return p;
655}
656
657void *
658rxvt_calloc (size_t number, size_t size)
659{
660 void *p = calloc (number, size);
661
662 if (!p)
663 rxvt_fatal ("memory allocation failure. aborting.\n");
664
665 return p;
666}
667
668void *
669rxvt_realloc (void *ptr, size_t size)
670{
671 void *p = realloc (ptr, size);
672
673 if (!p)
674 rxvt_fatal ("memory allocation failure. aborting.\n");
675
676 return p;
677} 581}
678 582
679/*----------------------------------------------------------------------*/ 583/*----------------------------------------------------------------------*/
680/* 584/*
681 * window size/position calculations for XSizeHint and other storage. 585 * window size/position calculations for XSizeHint and other storage.
… …
683 */ 587 */
684void 588void
685rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 589rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
686{ 590{
687 short recalc_x, recalc_y; 591 short recalc_x, recalc_y;
688 int x, y, sb_w, flags; 592 int x, y, flags;
689 unsigned int w, h; 593 unsigned int w, h;
690 unsigned int max_width, max_height; 594 unsigned int max_width, max_height;
691 595
692 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 596 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
693 szHint.win_gravity = NorthWestGravity; 597 szHint.win_gravity = NorthWestGravity;
… …
703 if (rs[Rs_geometry]) 607 if (rs[Rs_geometry])
704 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 608 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
705 609
706 if (flags & WidthValue) 610 if (flags & WidthValue)
707 { 611 {
612 if (!w)
613 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
614
708 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 615 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 616 szHint.flags |= USSize;
710 } 617 }
711 618
712 if (flags & HeightValue) 619 if (flags & HeightValue)
713 { 620 {
621 if (!h)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
714 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 624 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
715 szHint.flags |= USSize; 625 szHint.flags |= USSize;
716 } 626 }
717 627
718 if (flags & XValue) 628 if (flags & XValue)
719 { 629 {
… …
750 max_width = MAX_COLS * fwidth; 660 max_width = MAX_COLS * fwidth;
751 max_height = MAX_ROWS * fheight; 661 max_height = MAX_ROWS * fheight;
752 662
753 szHint.base_width = szHint.base_height = 2 * int_bwidth; 663 szHint.base_width = szHint.base_height = 2 * int_bwidth;
754 664
755 sb_w = 0;
756 window_vt_x = window_vt_y = int_bwidth; 665 window_vt_x = window_vt_y = int_bwidth;
757 666
758 if (scrollBar.state) 667 if (scrollBar.state)
759 { 668 {
760 sb_w = scrollbar_TotalWidth (); 669 int sb_w = scrollBar.total_width ();
761 szHint.base_width += sb_w; 670 szHint.base_width += sb_w;
762 671
763 if (!option (Opt_scrollBar_right)) 672 if (!option (Opt_scrollBar_right))
764 window_vt_x += sb_w; 673 window_vt_x += sb_w;
765 } 674 }
… …
789 { 698 {
790 min_it (height, max_height); 699 min_it (height, max_height);
791 szHint.height = szHint.base_height + height; 700 szHint.height = szHint.base_height + height;
792 } 701 }
793 702
794 if (scrollBar.state && option (Opt_scrollBar_right))
795 window_sb_x = szHint.width - sb_w;
796
797 if (recalc_x) 703 if (recalc_x)
798 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 704 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
799 705
800 if (recalc_y) 706 if (recalc_y)
801 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 707 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
802 708
803 ncol = width / fwidth; 709 ncol = width / fwidth;
804 nrow = height / fheight; 710 nrow = height / fheight;
805} 711}
806 712
807/*----------------------------------------------------------------------*/ 713/*----------------------------------------------------------------------*/
808/* 714/*
… …
819 725
820 ws.ws_col = ncol; 726 ws.ws_col = ncol;
821 ws.ws_row = nrow; 727 ws.ws_row = nrow;
822 ws.ws_xpixel = width; 728 ws.ws_xpixel = width;
823 ws.ws_ypixel = height; 729 ws.ws_ypixel = height;
824 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 730 ioctl (pty->pty, TIOCSWINSZ, &ws);
825 731
826#if 0 732#if 0
827 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 733 // TIOCSWINSZ is supposed to do this automatically and correctly
828 if (cmd_pid) /* force through to the command */ 734 if (cmd_pid) /* force through to the command */
829 kill (-cmd_pid, SIGWINCH); 735 kill (-cmd_pid, SIGWINCH);
830#endif 736#endif
831} 737}
832 738
833/*----------------------------------------------------------------------*/ 739/*----------------------------------------------------------------------*/
834/* set_fonts () - load and set the various fonts 740/* load and set the various fonts */
835 *
836 * init = 1 - initialize
837 *
838 * fontname == FONT_UP - switch to bigger font
839 * fontname == FONT_DN - switch to smaller font
840 */
841bool 741bool
842rxvt_term::set_fonts () 742rxvt_term::set_fonts ()
843{ 743{
844 rxvt_fontset *fs = new rxvt_fontset (this); 744 rxvt_fontset *fs = new rxvt_fontset (this);
845 rxvt_fontprop prop; 745 rxvt_fontprop prop;
… …
859#endif 759#endif
860 760
861 delete fontset[0]; 761 delete fontset[0];
862 fontset[0] = fs; 762 fontset[0] = fs;
863 763
864 prop = (*fs)[1]->properties (); 764 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
865 prop.height += lineSpace; 765 prop.height += lineSpace;
766 prop.width += letterSpace;
866 767
867 fs->set_prop (prop, false); 768 fs->set_prop (prop, false);
868 769
869 fwidth = prop.width; 770 fwidth = prop.width;
870 fheight = prop.height; 771 fheight = prop.height;
… …
901#else 802#else
902 fontset[style] = fontset[0]; 803 fontset[style] = fontset[0];
903#endif 804#endif
904 } 805 }
905 806
906 if (parent[0]) 807 if (parent)
907 { 808 {
908 resize_all_windows (0, 0, 0); 809 resize_all_windows (0, 0, 0);
909 scr_remap_chars (); 810 scr_remap_chars ();
910 scr_touch (true); 811 scr_touch (true);
911 } 812 }
… …
914} 815}
915 816
916void 817void
917rxvt_term::set_string_property (Atom prop, const char *str, int len) 818rxvt_term::set_string_property (Atom prop, const char *str, int len)
918{ 819{
919 XChangeProperty (dpy, parent[0], 820 XChangeProperty (dpy, parent,
920 prop, XA_STRING, 8, PropModeReplace, 821 prop, XA_STRING, 8, PropModeReplace,
921 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 822 (const unsigned char *)str, len >= 0 ? len : strlen (str));
922} 823}
923 824
924void 825void
826rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
827{
828 XTextProperty ct;
829
830 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
831 {
832 XSetTextProperty (dpy, parent, &ct, prop);
833 XFree (ct.value);
834 }
835}
836
837void
925rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 838rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
926{ 839{
927 wchar_t *ws = rxvt_mbstowcs (str, len); 840 wchar_t *ws = rxvt_mbstowcs (str, len);
928 char *s = rxvt_wcstoutf8 (ws); 841 char *s = rxvt_wcstoutf8 (ws);
929 842
930 XChangeProperty (dpy, parent[0], 843 XChangeProperty (dpy, parent,
931 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 844 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
932 (const unsigned char *)s, strlen (s)); 845 (const unsigned char *)s, strlen (s));
933 846
934 free (s); 847 free (s);
935 free (ws); 848 free (ws);
… …
939/*----------------------------------------------------------------------*/ 852/*----------------------------------------------------------------------*/
940/* xterm sequences - title, iconName, color (exptl) */ 853/* xterm sequences - title, iconName, color (exptl) */
941void 854void
942rxvt_term::set_title (const char *str) 855rxvt_term::set_title (const char *str)
943{ 856{
944 set_string_property (XA_WM_NAME, str); 857 set_mbstring_property (XA_WM_NAME, str);
945#if ENABLE_EWMH 858#if ENABLE_EWMH
946 set_utf8_property (xa[XA_NET_WM_NAME], str); 859 set_utf8_property (xa[XA_NET_WM_NAME], str);
947#endif 860#endif
948} 861}
949 862
950void 863void
951rxvt_term::set_icon_name (const char *str) 864rxvt_term::set_icon_name (const char *str)
952{ 865{
953 set_string_property (XA_WM_ICON_NAME, str); 866 set_mbstring_property (XA_WM_ICON_NAME, str);
954#if ENABLE_EWMH 867#if ENABLE_EWMH
955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 868 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
956#endif 869#endif
957} 870}
958 871
959void 872void
960rxvt_term::set_window_color (int idx, const char *color) 873rxvt_term::set_window_color (int idx, const char *color)
961{ 874{
962#ifdef XTERM_COLOR_CHANGE 875#ifdef XTERM_COLOR_CHANGE
963 rxvt_color xcol; 876 rxvt_color xcol;
964 int i;
965 877
966 if (color == NULL || *color == '\0') 878 if (color == NULL || *color == '\0')
967 return; 879 return;
968 880
969 color = strdup (color); 881 color = strdup (color);
… …
971 rs[Rs_color + idx] = color; 883 rs[Rs_color + idx] = color;
972 884
973 /* handle color aliases */ 885 /* handle color aliases */
974 if (isdigit (*color)) 886 if (isdigit (*color))
975 { 887 {
976 i = atoi (color); 888 int i = atoi (color);
977 889
978 if (i >= 8 && i <= 15) 890 if (i >= 8 && i <= 15)
891 {
979 { /* bright colors */ 892 /* bright colors */
980 i -= 8;
981 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 893 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
982 goto done; 894 goto done;
983 } 895 }
984 896
985 if (i >= 0 && i <= 7) 897 if (i >= 0 && i <= 7)
898 {
986 { /* normal colors */ 899 /* normal colors */
987 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
988 goto done; 901 goto done;
989 } 902 }
990 } 903 }
991 904
… …
996 * so just keep gobbling up the colormap 909 * so just keep gobbling up the colormap
997 */ 910 */
998 911
999 pix_colors_focused[idx] = xcol; 912 pix_colors_focused[idx] = xcol;
1000 913
1001 /* XSetWindowAttributes attr; */
1002 /* Cursor cursor; */
1003done: 914done:
1004 /*TODO: handle Color_BD, scrollbar background, etc. */ 915 /*TODO: handle Color_BD, scrollbar background, etc. */
1005 916
1006 update_fade_color (idx); 917 update_fade_color (idx);
1007 recolour_cursor (); 918 recolour_cursor ();
… …
1031 */ 942 */
1032void 943void
1033rxvt_term::set_colorfgbg () 944rxvt_term::set_colorfgbg ()
1034{ 945{
1035 unsigned int i; 946 unsigned int i;
1036 const char *xpmb = "\0"; 947 const char *xpmb = "";
1037 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 948 char fstr[] = "default";
949 char bstr[] = "default";
1038 950
1039 strcpy (fstr, "default");
1040 strcpy (bstr, "default");
1041 for (i = Color_Black; i <= Color_White; i++) 951 for (i = Color_Black; i <= Color_White; i++)
1042 if (pix_colors[Color_fg] == pix_colors[i]) 952 if (pix_colors[Color_fg] == pix_colors[i])
1043 { 953 {
1044 sprintf (fstr, "%d", (i - Color_Black)); 954 sprintf (fstr, "%d", i - Color_Black);
1045 break; 955 break;
1046 } 956 }
1047 957
1048 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1049 if (pix_colors[Color_bg] == pix_colors[i]) 959 if (pix_colors[Color_bg] == pix_colors[i])
1050 { 960 {
1051 sprintf (bstr, "%d", (i - Color_Black)); 961 sprintf (bstr, "%d", i - Color_Black);
1052#ifdef BG_IMAGE_FROM_FILE 962#ifdef BG_IMAGE_FROM_FILE
1053 xpmb = "default;"; 963 xpmb = "default;";
1054#endif 964#endif
1055 break; 965 break;
1056 } 966 }
… …
1086 int old_width = szHint.width; 996 int old_width = szHint.width;
1087 int old_height = szHint.height; 997 int old_height = szHint.height;
1088 998
1089 window_calc (newwidth, newheight); 999 window_calc (newwidth, newheight);
1090 1000
1091 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1001 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1002
1003 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1004 if (set_hint)
1005 {
1006 szHint.flags &= ~(PBaseSize | PResizeInc);
1092 XSetWMNormalHints (dpy, parent[0], &szHint); 1007 XSetWMNormalHints (dpy, parent, &szHint);
1008 szHint.flags |= PBaseSize | PResizeInc;
1009 }
1093 1010
1094 if (!ignoreparent) 1011 if (!ignoreparent)
1095 { 1012 {
1096#ifdef SMART_RESIZE 1013#ifdef SMART_RESIZE
1097 /* 1014 /*
… …
1101 int x, y, x1, y1; 1018 int x, y, x1, y1;
1102 int dx, dy; 1019 int dx, dy;
1103 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1020 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1104 Window unused_cr; 1021 Window unused_cr;
1105 1022
1106 XTranslateCoordinates (dpy, parent[0], display->root, 1023 XTranslateCoordinates (dpy, parent, display->root,
1107 0, 0, &x, &y, &unused_cr); 1024 0, 0, &x, &y, &unused_cr);
1108 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1025 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1109 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1026 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1110 /* 1027 /*
1111 * if display->root isn't the parent window, a WM will probably have offset 1028 * if display->root isn't the parent window, a WM will probably have offset
1112 * our position for handles and decorations. Counter it 1029 * our position for handles and decorations. Counter it
1113 */ 1030 */
… …
1130 if (y < y1) /* top half */ 1047 if (y < y1) /* top half */
1131 dy = 0; 1048 dy = 0;
1132 else if (y == y1) /* exact center */ 1049 else if (y == y1) /* exact center */
1133 dy /= 2; 1050 dy /= 2;
1134 1051
1135 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1052 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1136 szHint.width, szHint.height); 1053 szHint.width, szHint.height);
1137#else 1054#else
1138 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1055 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1139#endif 1056#endif
1140 } 1057 }
1058
1059 if (set_hint)
1060 XSetWMNormalHints (dpy, parent, &szHint);
1141 1061
1142 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1062 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1143 1063
1144 if (fix_screen || newwidth != old_width || newheight != old_height) 1064 if (fix_screen || newwidth != old_width || newheight != old_height)
1145 { 1065 {
1146 if (scrollBar.state) 1066 if (scrollBar.state)
1147 { 1067 scrollBar.resize ();
1148 XMoveResizeWindow (dpy, scrollBar.win,
1149 window_sb_x, 0,
1150 scrollbar_TotalWidth (), szHint.height);
1151 resize_scrollbar ();
1152 }
1153 1068
1154 XMoveResizeWindow (dpy, vt, 1069 XMoveResizeWindow (dpy, vt,
1155 window_vt_x, window_vt_y, 1070 window_vt_x, window_vt_y,
1156 width, height); 1071 width, height);
1157 1072
1158#ifdef HAVE_BG_PIXMAP 1073#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ()) 1074 if (bg_window_size_sensitive ())
1160 update_background (); 1075 update_background ();
1161#endif 1076#endif
1162
1163 scr_clear ();
1164 } 1077 }
1165 1078
1166 if (fix_screen || old_height == 0) 1079 if (fix_screen || old_height == 0)
1167 scr_reset (); 1080 scr_reset ();
1168
1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1170 //scr_touch (false);
1171
1172#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1174// if (bgPixmap.pixmap)
1175// scr_touch (false);
1176#endif
1177 1081
1178#ifdef USE_XIM 1082#ifdef USE_XIM
1179 IMSetPosition (); 1083 IMSetPosition ();
1180#endif 1084#endif
1181} 1085}
… …
1247 1151
1248/* Checking whether input method is running. */ 1152/* Checking whether input method is running. */
1249bool 1153bool
1250rxvt_term::IMisRunning () 1154rxvt_term::IMisRunning ()
1251{ 1155{
1252 char *p;
1253 Atom atom; 1156 Atom atom;
1254 Window win; 1157 Window win;
1255 char server[IMBUFSIZ]; 1158 char server[IMBUFSIZ];
1256 1159
1257 /* get current locale modifier */ 1160 /* get current locale modifier */
1258 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1161 if (char *p = XSetLocaleModifiers (0))
1259 { 1162 {
1260 strcpy (server, "@server="); 1163 strcpy (server, "@server=");
1261 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1164 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1262 1165
1263 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1166 if (p = strchr (server + 1, '@')) /* first one only */
1264 *p = '\0'; 1167 *p = '\0';
1265 1168
1266 atom = XInternAtom (dpy, server, False); 1169 atom = XInternAtom (dpy, server, False);
1267 win = XGetSelectionOwner (dpy, atom); 1170 win = XGetSelectionOwner (dpy, atom);
1268 1171
1269 if (win != None) 1172 if (win != None)
1270 return True; 1173 return true;
1271 } 1174 }
1272 1175
1273 return False; 1176 return false;
1274} 1177}
1275 1178
1276void 1179void
1277rxvt_term::IMSendSpot () 1180rxvt_term::IMSendSpot ()
1278{ 1181{
… …
1335 1238
1336 term->make_current (); 1239 term->make_current ();
1337 1240
1338 if (text) 1241 if (text)
1339 { 1242 {
1340 void *str; 1243 wchar_t *str;
1341 1244
1342 if (!text->encoding_is_wchar && text->string.multi_byte) 1245 if (!text->encoding_is_wchar && text->string.multi_byte)
1343 { 1246 {
1344 // of course, X makes it ugly again 1247 // of course, X makes it ugly again
1345 if (term->rs[Rs_imLocale]) 1248 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->rs[Rs_imLocale]); 1249 SET_LOCALE (term->rs[Rs_imLocale]);
1347 1250
1348 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1251 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1349 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1252 mbstowcs (str, text->string.multi_byte, text->length + 1);
1350 1253
1351 if (term->rs[Rs_imLocale]) 1254 if (term->rs[Rs_imLocale])
1352 SET_LOCALE (term->locale); 1255 SET_LOCALE (term->locale);
1353 } 1256 }
1354 else 1257 else
1355 str = (void *)text->string.wide_char; 1258 str = text->string.wide_char;
1356 1259
1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1260 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1358 DT_INT, call_data->caret, 1261 DT_INT, call_data->caret,
1359 DT_INT, call_data->chg_first, 1262 DT_INT, call_data->chg_first,
1360 DT_INT, call_data->chg_length, 1263 DT_INT, call_data->chg_length,
… …
1398 XRectangle rect, status_rect, needed_rect; 1301 XRectangle rect, status_rect, needed_rect;
1399 unsigned long fg, bg; 1302 unsigned long fg, bg;
1400 const char *p; 1303 const char *p;
1401 char **s; 1304 char **s;
1402 XIMStyles *xim_styles; 1305 XIMStyles *xim_styles;
1403#ifdef ENABLE_XIM_ONTHESPOT
1404 XIMCallback xcb[4];
1405#endif
1406 1306
1407 set_environ (envv); 1307 set_environ (envv);
1408 1308
1409 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1309 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1410 return false; 1310 return false;
… …
1431 p = pet[pi]; 1331 p = pet[pi];
1432 1332
1433 if (!p) 1333 if (!p)
1434 continue; 1334 continue;
1435 1335
1436 s = rxvt_splitcommastring (p); 1336 s = rxvt_strsplit (',', p);
1437 1337
1438 for (i = found = 0; !found && s[i]; i++) 1338 for (i = found = 0; !found && s[i]; i++)
1439 { 1339 {
1440 if (!strcmp (s[i], "OverTheSpot")) 1340 if (!strcmp (s[i], "OverTheSpot"))
1441 input_style = XIMPreeditPosition | XIMStatusNothing; 1341 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1453 input_style = XIMPreeditNothing | XIMStatusNothing; 1353 input_style = XIMPreeditNothing | XIMStatusNothing;
1454 1354
1455 for (j = 0; j < xim_styles->count_styles; j++) 1355 for (j = 0; j < xim_styles->count_styles; j++)
1456 if (input_style == xim_styles->supported_styles[j]) 1356 if (input_style == xim_styles->supported_styles[j])
1457 { 1357 {
1458 rxvt_freecommastring (s); 1358 rxvt_free_strsplit (s);
1459 1359
1460 found = 1; 1360 found = 1;
1461 goto foundpet; 1361 goto foundpet;
1462 } 1362 }
1463 1363
1464 } 1364 }
1465 1365
1466 rxvt_freecommastring (s); 1366 rxvt_free_strsplit (s);
1467 } 1367 }
1468 1368
1469foundpet: 1369foundpet:
1470 1370
1471 XFree (xim_styles); 1371 XFree (xim_styles);
… …
1550 NULL); 1450 NULL);
1551 } 1451 }
1552#if ENABLE_XIM_ONTHESPOT 1452#if ENABLE_XIM_ONTHESPOT
1553 else if (input_style & XIMPreeditCallbacks) 1453 else if (input_style & XIMPreeditCallbacks)
1554 { 1454 {
1455 XIMCallback xcb[4];
1456
1555 im_set_position (spot); 1457 im_set_position (spot);
1556 1458
1557 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1459 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1558 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done; 1460 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1559 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw; 1461 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1574#endif 1476#endif
1575 1477
1576 Input_Context = XCreateIC (xim, 1478 Input_Context = XCreateIC (xim,
1577 XNInputStyle, input_style, 1479 XNInputStyle, input_style,
1578 XNClientWindow, vt, 1480 XNClientWindow, vt,
1579 XNFocusWindow, parent[0], 1481 XNFocusWindow, parent,
1580 preedit_attr ? XNPreeditAttributes : NULL, 1482 preedit_attr ? XNPreeditAttributes : NULL,
1581 preedit_attr, 1483 preedit_attr,
1582 status_attr ? XNStatusAttributes : NULL, 1484 status_attr ? XNStatusAttributes : NULL,
1583 status_attr, NULL); 1485 status_attr, NULL);
1584 1486
… …
1627 p = rs[Rs_inputMethod]; 1529 p = rs[Rs_inputMethod];
1628 if (p && *p) 1530 if (p && *p)
1629 { 1531 {
1630 bool found = false; 1532 bool found = false;
1631 1533
1632 s = rxvt_splitcommastring (p); 1534 s = rxvt_strsplit (',', p);
1633 1535
1634 for (i = 0; s[i]; i++) 1536 for (i = 0; s[i]; i++)
1635 { 1537 {
1636 if (*s[i]) 1538 if (*s[i])
1637 { 1539 {
… …
1643 break; 1545 break;
1644 } 1546 }
1645 } 1547 }
1646 } 1548 }
1647 1549
1648 rxvt_freecommastring (s); 1550 rxvt_free_strsplit (s);
1649 1551
1650 if (found) 1552 if (found)
1651 goto done; 1553 goto done;
1652 } 1554 }
1653 1555
… …
1713 1615
1714void 1616void
1715rxvt_term::get_window_origin (int &x, int &y) 1617rxvt_term::get_window_origin (int &x, int &y)
1716{ 1618{
1717 Window cr; 1619 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr); 1620 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720} 1621}
1721 1622
1722Pixmap 1623Pixmap
1723rxvt_term::get_pixmap_property (int prop_id) 1624rxvt_term::get_pixmap_property (Atom property)
1724{ 1625{
1725 if (prop_id > 0 && prop_id < NUM_XA) 1626 Pixmap pixmap = None;
1726 if (xa[prop_id]) 1627
1727 {
1728 int aformat; 1628 int aformat;
1729 unsigned long nitems, bytes_after; 1629 unsigned long nitems, bytes_after;
1730 Atom atype; 1630 Atom atype;
1731 unsigned char *prop = NULL; 1631 unsigned char *prop;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id], 1632 int result = XGetWindowProperty (dpy, display->root, property,
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 1633 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop); 1634 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP) 1635 if (result == Success)
1736 { 1636 {
1737 return *(Pixmap *)prop; 1637 if (atype == XA_PIXMAP)
1738 } 1638 pixmap = *(Pixmap *)prop;
1639 XFree (prop);
1739 } 1640 }
1740 return None; 1641
1642 return pixmap;
1741} 1643}
1742 1644
1743#ifdef HAVE_BG_PIXMAP 1645#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS 1646
1745# undef update_background 1647void
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background () 1648rxvt_term::update_background ()
1754{ 1649{
1650 if (update_background_ev.is_active ())
1651 return;
1652
1755 bgPixmap.invalidate (); 1653 bg_invalidate ();
1756 1654
1757 /* no chance of real time refresh if we are blurring! */ 1655 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded)) 1656
1657 if (to_wait <= 0.)
1759 bgPixmap.render (); 1658 bg_render ();
1760 else 1659 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05); 1660 update_background_ev.start (to_wait);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773} 1661}
1774 1662
1775void 1663void
1776rxvt_term::update_background_cb (ev::timer &w, int revents) 1664rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{ 1665{
1666 make_current ();
1667
1668 update_background_ev.stop ();
1778 bgPixmap.render (); 1669 bg_render ();
1670 refresh_check ();
1779} 1671}
1780 1672
1781#endif /* HAVE_BG_PIXMAP */ 1673#endif /* HAVE_BG_PIXMAP */
1782 1674
1783/*----------------------- end-of-file (C source) -----------------------*/ 1675/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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