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.245 by sasha, Fri Aug 17 22:02:14 2007 UTC vs.
Revision 1.367 by root, Wed Jan 18 11:47:51 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
… …
201#endif 201#endif
202} 202}
203 203
204// clean up the most important stuff, do *not* call x or free mem etc. 204// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 205// for use before an emergency exit
206void
206void rxvt_term::emergency_cleanup () 207rxvt_term::emergency_cleanup ()
207{ 208{
208 if (cmd_pid) 209 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 210 kill (-cmd_pid, SIGHUP);
210 211
211 pty_ev.stop (); 212 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 224 if (fontset[i] != fontset[0])
224 delete fontset[i]; 225 delete fontset[i];
225#endif 226#endif
226 delete fontset[0]; 227 delete fontset[0];
227 228
229#ifdef HAVE_BG_PIXMAP
230 bg_destroy ();
231#endif
232
228 if (display) 233 if (display)
229 { 234 {
230 selection_clear (); 235 selection_clear ();
236 selection_clear (true);
231 237
232#ifdef USE_XIM 238#ifdef USE_XIM
233 im_destroy (); 239 im_destroy ();
234#endif 240#endif
235#ifdef XTERM_SCROLLBAR 241 scrollBar.destroy ();
236 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
237 if (ShadowGC) XFreeGC (dpy, ShadowGC);
238#endif
239#ifdef PLAIN_SCROLLBAR
240 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
241#endif
242#ifdef NEXT_SCROLLBAR
243 if (blackGC) XFreeGC (dpy, blackGC);
244 if (whiteGC) XFreeGC (dpy, whiteGC);
245 if (grayGC) XFreeGC (dpy, grayGC);
246 if (darkGC) XFreeGC (dpy, darkGC);
247 if (stippleGC) XFreeGC (dpy, stippleGC);
248 if (dimple) XFreePixmap (dpy, dimple);
249 if (upArrow) XFreePixmap (dpy, upArrow);
250 if (downArrow) XFreePixmap (dpy, downArrow);
251 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
252 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
253#endif
254#ifdef RXVT_SCROLLBAR
255 if (topShadowGC) XFreeGC (dpy, topShadowGC);
256 if (botShadowGC) XFreeGC (dpy, botShadowGC);
257 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
258#endif
259 if (gc) XFreeGC (dpy, gc); 242 if (gc) XFreeGC (dpy, gc);
260 243
261 delete drawable; 244 delete drawable;
262 // destroy all windows 245 // destroy all windows
263 if (parent[0]) 246 if (parent)
264 XDestroyWindow (dpy, parent[0]); 247 XDestroyWindow (dpy, parent);
265 248
266 for (int i = 0; i < TOTAL_COLORS; i++) 249 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 250 if (ISSET_PIXCOLOR (i))
268 { 251 {
269 pix_colors_focused [i].free (this); 252 pix_colors_focused [i].free (this);
… …
271 pix_colors_unfocused [i].free (this); 254 pix_colors_unfocused [i].free (this);
272#endif 255#endif
273 } 256 }
274 257
275 clear (); 258 clear ();
276 }
277 259
278 delete [] pix_colors_focused; 260 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 261 displays.put (display);
262 }
284 263
285 scr_release (); 264 scr_release ();
286 265
287 /* clear all resources */ 266 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 267 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 268 free (allocated [i]);
290 269
291 free (selection.text); 270 free (selection.text);
292 // TODO: manage env vars in child only(!) 271 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 272 free (locale);
296 free (v_buffer); 273 free (v_buffer);
297 free (incr_buf); 274
275 delete selection_req;
298 276
299 delete envv; 277 delete envv;
300 delete argv; 278 delete argv;
301 279
302#ifdef KEYSYM_RESOURCE 280#ifdef KEYSYM_RESOURCE
303 delete keyboard; 281 delete keyboard;
304#endif 282#endif
283#ifndef NO_RESOURCES
284 XrmDestroyDatabase (option_db);
285#endif
305} 286}
306 287
307// child has exited, usually destroys 288// child has exited, usually destroys
308void 289void
309rxvt_term::child_cb (child_watcher &w, int status) 290rxvt_term::child_cb (ev::child &w, int status)
310{ 291{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 292 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 293
313 cmd_pid = 0; 294 cmd_pid = 0;
314 295
… …
317} 298}
318 299
319void 300void
320rxvt_term::destroy () 301rxvt_term::destroy ()
321{ 302{
322 if (destroy_ev.active) 303 if (destroy_ev.is_active ())
323 return; 304 return;
324 305
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 306 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 307
327#if ENABLE_OVERLAY 308#if ENABLE_OVERLAY
… …
331 if (display) 312 if (display)
332 { 313 {
333#if USE_XIM 314#if USE_XIM
334 im_ev.stop (display); 315 im_ev.stop (display);
335#endif 316#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 317 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 318#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 319 rootwin_ev.stop (display);
341#endif 320#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 321 termwin_ev.stop (display);
344 vt_ev.stop (display); 322 vt_ev.stop (display);
345 } 323 }
346 324
347 check_ev.stop (); 325 flush_ev.stop ();
348 pty_ev.stop (); 326 pty_ev.stop ();
349#ifdef CURSOR_BLINK 327#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 328 cursor_blink_ev.stop ();
351#endif 329#endif
352#ifdef TEXT_BLINK 330#ifdef TEXT_BLINK
… …
360#endif 338#endif
361#ifdef POINTER_BLANK 339#ifdef POINTER_BLANK
362 pointer_ev.stop (); 340 pointer_ev.stop ();
363#endif 341#endif
364 342
365 destroy_ev.start (0); 343 destroy_ev.start ();
366} 344}
367 345
368void 346void
369rxvt_term::destroy_cb (time_watcher &w) 347rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 348{
371 make_current (); 349 make_current ();
372 350
373 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);
374} 364}
375 365
376/*----------------------------------------------------------------------*/ 366/*----------------------------------------------------------------------*/
377/* 367/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 368 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
392print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
393{ 383{
394 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
396 char number[32]; 386 char number[32];
397 char *mtype = "XlibMessage"; 387 const char mtype[] = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 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");
401 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ); 399 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 401 }
412 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ); 414 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ); 417 mesg, BUFSIZ);
428 else 418 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 420 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 422 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 424 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 426}
437#endif 427#endif
438 428
439int 429int
… …
462 DisplayString (display)); 452 DisplayString (display));
463 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
465} 455}
466 456
467/*----------------------------------------------------------------------*/
468bool
469rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
470{
471 this->envv = envv;
472
473 SET_R (this);
474 set_locale ("");
475 set_environ (envv); // few things in X do not call setlocale :(
476
477 if (!init_vars ())
478 return false;
479
480 init_secondary ();
481
482 const char **cmd_argv = init_resources (argc, argv);
483
484#ifdef KEYSYM_RESOURCE
485 keyboard->register_done ();
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (option (Opt_scrollBar))
490 scrollBar.setIdle (); /* set existence for size calculations */
491#endif
492
493 pty = ptytty::create ();
494
495 create_windows (argc, argv);
496
497 init_xlocale ();
498
499 scr_reset (); // initialize screen
500
501#if 0
502 XSynchronize (dpy, True);
503#endif
504
505#ifdef HAVE_SCROLLBARS
506 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */
508#endif
509#ifdef HAVE_BG_PIXMAP
510 {
511 bgPixmap.set_target (this);
512
513#ifdef ENABLE_TRANSPARENCY
514 if (option (Opt_transparent))
515 {
516 bgPixmap.set_transparent ();
517#ifdef HAVE_AFTERIMAGE
518 if (rs [Rs_blurradius])
519 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
520#endif
521 if (ISSET_PIXCOLOR (Color_tint))
522 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
523 if (rs [Rs_shade])
524 bgPixmap.set_shade (rs [Rs_shade]);
525
526 bgPixmap.set_root_pixmap ();
527 XSelectInput (dpy, display->root, PropertyChangeMask);
528 rootwin_ev.start (display, display->root);
529 }
530#endif
531
532#ifdef XPM_BACKGROUND
533 if (rs[Rs_backgroundPixmap] != NULL)
534 {
535 const char *p = rs[Rs_backgroundPixmap];
536
537 if ((p = strchr (p, ';')) != NULL)
538 {
539 p++;
540 bgPixmap.set_geometry (p);
541 }
542 else
543 bgPixmap.set_defaultGeometry ();
544
545 bgPixmap.set_file (rs[Rs_backgroundPixmap]);
546 }
547 /* do not want to render Pixmap yet if we are size/position dependant -
548 * wait for ConfigureNotify at least
549 * TODO: this does not work for some reason when transparency is disabled !!!!
550 */
551 if (!bgPixmap.window_size_sensitive ())
552 update_background ();
553#endif
554 }
555#endif
556
557#if ENABLE_PERL
558 rootwin_ev.start (display, display->root);
559#endif
560
561 set_colorfgbg ();
562
563 init_command (cmd_argv);
564
565 free (cmd_argv);
566
567 if (pty->pty >= 0)
568 pty_ev.start (pty->pty, EVENT_READ);
569
570 check_ev.start ();
571
572 HOOK_INVOKE ((this, HOOK_START, DT_END));
573
574#if ENABLE_XEMBED
575 if (rs[Rs_embed])
576 {
577 long info[2] = { 0, XEMBED_MAPPED };
578
579 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
580 32, PropModeReplace, (unsigned char *)&info, 2);
581 }
582#endif
583
584 XMapWindow (dpy, vt);
585 XMapWindow (dpy, parent[0]);
586
587 return true;
588}
589
590static struct sig_handlers 457static struct sig_handlers
591{ 458{
592 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
593 460
594 /* 461 /*
595 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
596 */ 463 */
597 void 464 void sig_term (ev::sig &w, int revents);
598 sig_term (sig_watcher &w) 465
466 sig_handlers ()
599 { 467 {
600 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
601 signal (w.signum, SIG_DFL);
602 kill (getpid (), w.signum);
603 }
604
605 sig_handlers ()
606 : sw_term (this, &sig_handlers::sig_term),
607 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
608 {
609 } 470 }
610} sig_handlers; 471} sig_handlers;
611 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
612char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
613 549
614void 550void
615rxvt_init () 551rxvt_init ()
616{ 552{
617 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");
618 564
619 rxvt_environ = environ; 565 rxvt_environ = environ;
620 566
621 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
622 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
623 569
624 sig_handlers.sw_term.start (SIGTERM); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
625 sig_handlers.sw_int.start (SIGINT); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
626
627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
628 /* signal (SIGURG, SIG_DFL); */
629 572
630 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
631 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
632 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
633 576
634 XrmInitialize (); 577 XrmInitialize ();
635}
636
637/* ------------------------------------------------------------------------- *
638 * MEMORY ALLOCATION WRAPPERS *
639 * ------------------------------------------------------------------------- */
640void *
641rxvt_malloc (size_t size)
642{
643 void *p = malloc (size);
644
645 if (!p)
646 rxvt_fatal ("memory allocation failure. aborting.\n");
647
648 return p;
649}
650
651void *
652rxvt_calloc (size_t number, size_t size)
653{
654 void *p = calloc (number, size);
655
656 if (!p)
657 rxvt_fatal ("memory allocation failure. aborting.\n");
658
659 return p;
660}
661
662void *
663rxvt_realloc (void *ptr, size_t size)
664{
665 void *p = realloc (ptr, size);
666
667 if (!p)
668 rxvt_fatal ("memory allocation failure. aborting.\n");
669
670 return p;
671} 578}
672 579
673/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
674/* 581/*
675 * window size/position calculations for XSizeHint and other storage. 582 * window size/position calculations for XSizeHint and other storage.
… …
677 */ 584 */
678void 585void
679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
680{ 587{
681 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
682 int x, y, sb_w, flags; 589 int x, y, flags;
683 unsigned int w, h; 590 unsigned int w, h;
684 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
685 592
686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
687 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
697 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
698 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
699 606
700 if (flags & WidthValue) 607 if (flags & WidthValue)
701 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
702 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
703 szHint.flags |= USSize; 613 szHint.flags |= USSize;
704 } 614 }
705 615
706 if (flags & HeightValue) 616 if (flags & HeightValue)
707 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
708 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 622 szHint.flags |= USSize;
710 } 623 }
711 624
712 if (flags & XValue) 625 if (flags & XValue)
713 { 626 {
… …
744 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
745 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
746 659
747 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
748 661
749 sb_w = 0;
750 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
751 663
752 if (scrollBar.state) 664 if (scrollBar.state)
753 { 665 {
754 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
755 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
756 668
757 if (!option (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
758 window_vt_x += sb_w; 670 window_vt_x += sb_w;
759 } 671 }
… …
783 { 695 {
784 min_it (height, max_height); 696 min_it (height, max_height);
785 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
786 } 698 }
787 699
788 if (scrollBar.state && option (Opt_scrollBar_right))
789 window_sb_x = szHint.width - sb_w;
790
791 if (recalc_x) 700 if (recalc_x)
792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793 702
794 if (recalc_y) 703 if (recalc_y)
795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
796 705
797 ncol = width / fwidth; 706 ncol = width / fwidth;
798 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 vt_width = ncol * fwidth;
716 vt_height = nrow * fheight;
799} 717}
800 718
801/*----------------------------------------------------------------------*/ 719/*----------------------------------------------------------------------*/
802/* 720/*
803 * Tell the teletype handler what size the window is. 721 * Tell the teletype handler what size the window is.
… …
811 729
812 struct winsize ws; 730 struct winsize ws;
813 731
814 ws.ws_col = ncol; 732 ws.ws_col = ncol;
815 ws.ws_row = nrow; 733 ws.ws_row = nrow;
816 ws.ws_xpixel = width; 734 ws.ws_xpixel = vt_width;
817 ws.ws_ypixel = height; 735 ws.ws_ypixel = vt_height;
818 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 736 ioctl (pty->pty, TIOCSWINSZ, &ws);
819 737
820#if 0 738#if 0
821 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 739 // TIOCSWINSZ is supposed to do this automatically and correctly
822 if (cmd_pid) /* force through to the command */ 740 if (cmd_pid) /* force through to the command */
823 kill (-cmd_pid, SIGWINCH); 741 kill (-cmd_pid, SIGWINCH);
824#endif 742#endif
825} 743}
826 744
827/*----------------------------------------------------------------------*/ 745/*----------------------------------------------------------------------*/
828/* set_fonts () - load and set the various fonts 746/* load and set the various fonts */
829 *
830 * init = 1 - initialize
831 *
832 * fontname == FONT_UP - switch to bigger font
833 * fontname == FONT_DN - switch to smaller font
834 */
835bool 747bool
836rxvt_term::set_fonts () 748rxvt_term::set_fonts ()
837{ 749{
838 rxvt_fontset *fs = new rxvt_fontset (this); 750 rxvt_fontset *fs = new rxvt_fontset (this);
839 rxvt_fontprop prop; 751 rxvt_fontprop prop;
… …
853#endif 765#endif
854 766
855 delete fontset[0]; 767 delete fontset[0];
856 fontset[0] = fs; 768 fontset[0] = fs;
857 769
858 prop = (*fs)[1]->properties (); 770 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
859 prop.height += lineSpace; 771 prop.height += lineSpace;
772 prop.width += letterSpace;
860 773
861 fs->set_prop (prop, false); 774 fs->set_prop (prop, false);
862 775
863 fwidth = prop.width; 776 fwidth = prop.width;
864 fheight = prop.height; 777 fheight = prop.height;
… …
895#else 808#else
896 fontset[style] = fontset[0]; 809 fontset[style] = fontset[0];
897#endif 810#endif
898 } 811 }
899 812
900 if (parent[0]) 813 if (parent)
901 { 814 {
902 resize_all_windows (0, 0, 0); 815 resize_all_windows (0, 0, 0);
903 scr_remap_chars (); 816 scr_remap_chars ();
904 scr_touch (true); 817 scr_touch (true);
905 } 818 }
906 819
907 return true; 820 return true;
908} 821}
909 822
823void
910void rxvt_term::set_string_property (Atom prop, const char *str, int len) 824rxvt_term::set_string_property (Atom prop, const char *str, int len)
911{ 825{
912 XChangeProperty (dpy, parent[0], 826 XChangeProperty (dpy, parent,
913 prop, XA_STRING, 8, PropModeReplace, 827 prop, XA_STRING, 8, PropModeReplace,
914 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 828 (const unsigned char *)str, len >= 0 ? len : strlen (str));
915} 829}
916 830
831void
832rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
833{
834 XTextProperty ct;
835
836 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
837 {
838 XSetTextProperty (dpy, parent, &ct, prop);
839 XFree (ct.value);
840 }
841}
842
843void
917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 844rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918{ 845{
919 wchar_t *ws = rxvt_mbstowcs (str, len); 846 wchar_t *ws = rxvt_mbstowcs (str, len);
920 char *s = rxvt_wcstoutf8 (ws); 847 char *s = rxvt_wcstoutf8 (ws);
921 848
922 XChangeProperty (dpy, parent[0], 849 XChangeProperty (dpy, parent,
923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 850 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
924 (const unsigned char *)s, strlen (s)); 851 (const unsigned char *)s, strlen (s));
925 852
926 free (s); 853 free (s);
927 free (ws); 854 free (ws);
… …
931/*----------------------------------------------------------------------*/ 858/*----------------------------------------------------------------------*/
932/* xterm sequences - title, iconName, color (exptl) */ 859/* xterm sequences - title, iconName, color (exptl) */
933void 860void
934rxvt_term::set_title (const char *str) 861rxvt_term::set_title (const char *str)
935{ 862{
936 set_string_property (XA_WM_NAME, str); 863 set_mbstring_property (XA_WM_NAME, str);
937#if ENABLE_EWMH 864#if ENABLE_EWMH
938 set_utf8_property (xa[XA_NET_WM_NAME], str); 865 set_utf8_property (xa[XA_NET_WM_NAME], str);
939#endif 866#endif
940} 867}
941 868
942void 869void
943rxvt_term::set_icon_name (const char *str) 870rxvt_term::set_icon_name (const char *str)
944{ 871{
945 set_string_property (XA_WM_ICON_NAME, str); 872 set_mbstring_property (XA_WM_ICON_NAME, str);
946#if ENABLE_EWMH 873#if ENABLE_EWMH
947 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948#endif 875#endif
949} 876}
950 877
878void
879rxvt_term::set_window_color (int idx, const char *color)
880{
951#ifdef XTERM_COLOR_CHANGE 881#ifdef XTERM_COLOR_CHANGE
952void
953rxvt_term::set_window_color (int idx, const char *color)
954{
955 rxvt_color xcol; 882 rxvt_color xcol;
956 int i; 883
957
958 if (color == NULL || *color == '\0') 884 if (color == NULL || *color == '\0')
959 return; 885 return;
960 886
961 color = strdup (color); 887 color = strdup (color);
962 allocated.push_back ((void *)color); 888 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color; 889 rs[Rs_color + idx] = color;
964 890
965 /* handle color aliases */ 891 /* handle color aliases */
966 if (isdigit (*color)) 892 if (isdigit (*color))
967 { 893 {
968 i = atoi (color); 894 int i = atoi (color);
969 895
970 if (i >= 8 && i <= 15) 896 if (i >= 8 && i <= 15)
897 {
971 { /* bright colors */ 898 /* bright colors */
972 i -= 8;
973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 899 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
974 goto done; 900 goto done;
975 } 901 }
976 902
977 if (i >= 0 && i <= 7) 903 if (i >= 0 && i <= 7)
904 {
978 { /* normal colors */ 905 /* normal colors */
979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 906 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
980 goto done; 907 goto done;
981 } 908 }
982 } 909 }
983 910
… …
988 * so just keep gobbling up the colormap 915 * so just keep gobbling up the colormap
989 */ 916 */
990 917
991 pix_colors_focused[idx] = xcol; 918 pix_colors_focused[idx] = xcol;
992 919
993 /* XSetWindowAttributes attr; */
994 /* Cursor cursor; */
995done: 920done:
996 /*TODO: handle Color_BD, scrollbar background, etc. */ 921 /*TODO: handle Color_BD, scrollbar background, etc. */
997 922
998 update_fade_color (idx); 923 update_fade_color (idx);
999 recolour_cursor (); 924 recolour_cursor ();
1000 scr_recolour (); 925 scr_recolour ();
926#endif /* XTERM_COLOR_CHANGE */
1001} 927}
1002
1003#else
1004# define set_window_color (idx,color) ((void)0)
1005#endif /* XTERM_COLOR_CHANGE */
1006 928
1007void 929void
1008rxvt_term::recolour_cursor () 930rxvt_term::recolour_cursor ()
1009{ 931{
1010 XColor fg, bg; 932 XColor fg, bg;
… …
1022 944
1023/*----------------------------------------------------------------------*/ 945/*----------------------------------------------------------------------*/
1024/* 946/*
1025 * 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
1026 */ 948 */
1027void 949char *
1028rxvt_term::set_colorfgbg () 950rxvt_term::get_colorfgbg ()
1029{ 951{
1030 unsigned int i; 952 unsigned int i;
1031 const char *xpmb = "\0"; 953 const char *xpmb = "";
1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 954 char fstr[] = "default";
955 char bstr[] = "default";
956 char *env_colorfgbg;
1033 957
1034 strcpy (fstr, "default");
1035 strcpy (bstr, "default");
1036 for (i = Color_Black; i <= Color_White; i++) 958 for (i = Color_Black; i <= Color_White; i++)
1037 if (pix_colors[Color_fg] == pix_colors[i]) 959 if (pix_colors[Color_fg] == pix_colors[i])
1038 { 960 {
1039 sprintf (fstr, "%d", (i - Color_Black)); 961 sprintf (fstr, "%d", i - Color_Black);
1040 break; 962 break;
1041 } 963 }
1042 964
1043 for (i = Color_Black; i <= Color_White; i++) 965 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_bg] == pix_colors[i]) 966 if (pix_colors[Color_bg] == pix_colors[i])
1045 { 967 {
1046 sprintf (bstr, "%d", (i - Color_Black)); 968 sprintf (bstr, "%d", i - Color_Black);
1047#ifdef XPM_BACKGROUND 969#ifdef BG_IMAGE_FROM_FILE
1048 xpmb = "default;"; 970 xpmb = "default;";
1049#endif 971#endif
1050 break; 972 break;
1051 } 973 }
1052 974
975 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1053 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;
1054} 978}
1055 979
1056/*----------------------------------------------------------------------*/ 980/*----------------------------------------------------------------------*/
1057 981
1058bool 982bool
… …
1081 int old_width = szHint.width; 1005 int old_width = szHint.width;
1082 int old_height = szHint.height; 1006 int old_height = szHint.height;
1083 1007
1084 window_calc (newwidth, newheight); 1008 window_calc (newwidth, newheight);
1085 1009
1086 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);
1087 XSetWMNormalHints (dpy, parent[0], &szHint); 1016 XSetWMNormalHints (dpy, parent, &szHint);
1017 szHint.flags |= PBaseSize | PResizeInc;
1018 }
1088 1019
1089 if (!ignoreparent) 1020 if (!ignoreparent)
1090 { 1021 {
1091#ifdef SMART_RESIZE 1022#ifdef SMART_RESIZE
1092 /* 1023 /*
… …
1096 int x, y, x1, y1; 1027 int x, y, x1, y1;
1097 int dx, dy; 1028 int dx, dy;
1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1029 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1099 Window unused_cr; 1030 Window unused_cr;
1100 1031
1101 XTranslateCoordinates (dpy, parent[0], display->root, 1032 XTranslateCoordinates (dpy, parent, display->root,
1102 0, 0, &x, &y, &unused_cr); 1033 0, 0, &x, &y, &unused_cr);
1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1034 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1035 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1105 /* 1036 /*
1106 * 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
1107 * our position for handles and decorations. Counter it 1038 * our position for handles and decorations. Counter it
1108 */ 1039 */
… …
1125 if (y < y1) /* top half */ 1056 if (y < y1) /* top half */
1126 dy = 0; 1057 dy = 0;
1127 else if (y == y1) /* exact center */ 1058 else if (y == y1) /* exact center */
1128 dy /= 2; 1059 dy /= 2;
1129 1060
1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1061 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1131 szHint.width, szHint.height); 1062 szHint.width, szHint.height);
1132#else 1063#else
1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1064 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1134#endif 1065#endif
1135 } 1066 }
1067
1068 if (set_hint)
1069 XSetWMNormalHints (dpy, parent, &szHint);
1136 1070
1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1071 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1138 1072
1139 if (fix_screen || newwidth != old_width || newheight != old_height) 1073 if (fix_screen || newwidth != old_width || newheight != old_height)
1140 { 1074 {
1141 if (scrollBar.state) 1075 if (scrollBar.state)
1142 { 1076 scrollBar.resize ();
1143 XMoveResizeWindow (dpy, scrollBar.win,
1144 window_sb_x, 0,
1145 scrollbar_TotalWidth (), szHint.height);
1146 resize_scrollbar ();
1147 }
1148 1077
1149 XMoveResizeWindow (dpy, vt, 1078 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1079 window_vt_x, window_vt_y,
1151 width, height); 1080 vt_width, vt_height);
1152 1081
1153#ifdef XPM_BACKGROUND 1082#ifdef HAVE_BG_PIXMAP
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1083 if (bg_window_size_sensitive ())
1156 update_background (); 1084 update_background ();
1157#endif 1085#endif
1158
1159 scr_clear ();
1160 } 1086 }
1161 1087
1162 if (fix_screen || old_height == 0) 1088 if (fix_screen || old_height == 0)
1163 scr_reset (); 1089 scr_reset ();
1164 1090
1165 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1166 //scr_touch (false);
1167
1168#ifdef HAVE_BG_PIXMAP
1169// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1170// if (bgPixmap.pixmap)
1171// scr_touch (false);
1172#endif
1173
1174#ifdef USE_XIM 1091#ifdef USE_XIM
1175 IMSetPosition (); 1092 im_set_position ();
1176#endif 1093#endif
1177} 1094}
1178 1095
1179/* 1096/*
1180 * 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.
… …
1193 newwidth = wattr.width - szHint.base_width; 1110 newwidth = wattr.width - szHint.base_width;
1194 if (newheight == 0) 1111 if (newheight == 0)
1195 newheight = wattr.height - szHint.base_height; 1112 newheight = wattr.height - szHint.base_height;
1196 } 1113 }
1197 1114
1198 if (newwidth != width || newheight != height) 1115 if (newwidth != vt_width || newheight != vt_height)
1199 { 1116 {
1200 newwidth += szHint.base_width; 1117 newwidth += szHint.base_width;
1201 newheight += szHint.base_height; 1118 newheight += szHint.base_height;
1202 resize_all_windows (newwidth, newheight, 0); 1119 resize_all_windows (newwidth, newheight, 0);
1203 } 1120 }
… …
1241 status_rect.height = fheight; 1158 status_rect.height = fheight;
1242} 1159}
1243 1160
1244/* Checking whether input method is running. */ 1161/* Checking whether input method is running. */
1245bool 1162bool
1246rxvt_term::IMisRunning () 1163rxvt_term::im_is_running ()
1247{ 1164{
1248 char *p;
1249 Atom atom; 1165 Atom atom;
1250 Window win; 1166 Window win;
1251 char server[IMBUFSIZ]; 1167 char server[IMBUFSIZ];
1252 1168
1253 /* get current locale modifier */ 1169 /* get current locale modifier */
1254 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1170 if (char *p = XSetLocaleModifiers (0))
1255 { 1171 {
1256 strcpy (server, "@server="); 1172 strcpy (server, "@server=");
1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1173 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1258 1174
1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1175 if (p = strchr (server + 1, '@')) /* first one only */
1260 *p = '\0'; 1176 *p = '\0';
1261 1177
1262 atom = XInternAtom (dpy, server, False); 1178 atom = XInternAtom (dpy, server, False);
1263 win = XGetSelectionOwner (dpy, atom); 1179 win = XGetSelectionOwner (dpy, atom);
1264 1180
1265 if (win != None) 1181 if (win != None)
1266 return True; 1182 return true;
1267 } 1183 }
1268 1184
1269 return False; 1185 return false;
1270} 1186}
1271 1187
1272void 1188void
1273rxvt_term::IMSendSpot () 1189rxvt_term::im_send_spot ()
1274{ 1190{
1275 XPoint nspot; 1191 XPoint nspot;
1276 XVaNestedList preedit_attr; 1192 XVaNestedList preedit_attr;
1277 1193
1278 if (!Input_Context 1194 if (!Input_Context
… …
1331 1247
1332 term->make_current (); 1248 term->make_current ();
1333 1249
1334 if (text) 1250 if (text)
1335 { 1251 {
1336 void *str; 1252 wchar_t *str;
1337 1253
1338 if (!text->encoding_is_wchar && text->string.multi_byte) 1254 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 { 1255 {
1340 // of course, X makes it ugly again 1256 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale]) 1257 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]); 1258 SET_LOCALE (term->rs[Rs_imLocale]);
1343 1259
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1260 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1261 mbstowcs (str, text->string.multi_byte, text->length + 1);
1346 1262
1347 if (term->rs[Rs_imLocale]) 1263 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1264 SET_LOCALE (term->locale);
1349 } 1265 }
1350 else 1266 else
1351 str = (void *)text->string.wide_char; 1267 str = text->string.wide_char;
1352 1268
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1269 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1270 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1271 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1272 DT_INT, call_data->chg_length,
1357 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,
… …
1384/* 1300/*
1385 * 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
1386 * open a suitable preedit type 1302 * open a suitable preedit type
1387 */ 1303 */
1388bool 1304bool
1389rxvt_term::IM_get_IC (const char *modifiers) 1305rxvt_term::im_get_ic (const char *modifiers)
1390{ 1306{
1391 int i, j, found; 1307 int i, j, found;
1392 XIM xim; 1308 XIM xim;
1393 XPoint spot; 1309 XPoint spot;
1394 XRectangle rect, status_rect, needed_rect; 1310 XRectangle rect, status_rect, needed_rect;
1395 unsigned long fg, bg; 1311 unsigned long fg, bg;
1396 const char *p; 1312 const char *p;
1397 char **s; 1313 char **s;
1398 XIMStyles *xim_styles; 1314 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1402 1315
1403 set_environ (envv); 1316 set_environ (envv);
1404 1317
1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1318 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1406 return false; 1319 return false;
… …
1427 p = pet[pi]; 1340 p = pet[pi];
1428 1341
1429 if (!p) 1342 if (!p)
1430 continue; 1343 continue;
1431 1344
1432 s = rxvt_splitcommastring (p); 1345 s = rxvt_strsplit (',', p);
1433 1346
1434 for (i = found = 0; !found && s[i]; i++) 1347 for (i = found = 0; !found && s[i]; i++)
1435 { 1348 {
1436 if (!strcmp (s[i], "OverTheSpot")) 1349 if (!strcmp (s[i], "OverTheSpot"))
1437 input_style = XIMPreeditPosition | XIMStatusNothing; 1350 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1449 input_style = XIMPreeditNothing | XIMStatusNothing; 1362 input_style = XIMPreeditNothing | XIMStatusNothing;
1450 1363
1451 for (j = 0; j < xim_styles->count_styles; j++) 1364 for (j = 0; j < xim_styles->count_styles; j++)
1452 if (input_style == xim_styles->supported_styles[j]) 1365 if (input_style == xim_styles->supported_styles[j])
1453 { 1366 {
1454 rxvt_freecommastring (s); 1367 rxvt_free_strsplit (s);
1455 1368
1456 found = 1; 1369 found = 1;
1457 goto foundpet; 1370 goto foundpet;
1458 } 1371 }
1459 1372
1460 } 1373 }
1461 1374
1462 rxvt_freecommastring (s); 1375 rxvt_free_strsplit (s);
1463 } 1376 }
1464 1377
1465foundpet: 1378foundpet:
1466 1379
1467 XFree (xim_styles); 1380 XFree (xim_styles);
… …
1546 NULL); 1459 NULL);
1547 } 1460 }
1548#if ENABLE_XIM_ONTHESPOT 1461#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks) 1462 else if (input_style & XIMPreeditCallbacks)
1550 { 1463 {
1464 XIMCallback xcb[4];
1465
1551 im_set_position (spot); 1466 im_set_position (spot);
1552 1467
1553 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;
1554 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;
1555 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;
… …
1570#endif 1485#endif
1571 1486
1572 Input_Context = XCreateIC (xim, 1487 Input_Context = XCreateIC (xim,
1573 XNInputStyle, input_style, 1488 XNInputStyle, input_style,
1574 XNClientWindow, vt, 1489 XNClientWindow, vt,
1575 XNFocusWindow, parent[0], 1490 XNFocusWindow, parent,
1576 preedit_attr ? XNPreeditAttributes : NULL, 1491 preedit_attr ? XNPreeditAttributes : NULL,
1577 preedit_attr, 1492 preedit_attr,
1578 status_attr ? XNStatusAttributes : NULL, 1493 status_attr ? XNStatusAttributes : NULL,
1579 status_attr, NULL); 1494 status_attr, NULL);
1580 1495
… …
1593 // 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
1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1509 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1595 vt_select_input (); 1510 vt_select_input ();
1596#endif 1511#endif
1597 1512
1598 IMSetPosition (); 1513 im_set_position ();
1599 1514
1600 return true; 1515 return true;
1601} 1516}
1602 1517
1603void 1518void
… …
1623 p = rs[Rs_inputMethod]; 1538 p = rs[Rs_inputMethod];
1624 if (p && *p) 1539 if (p && *p)
1625 { 1540 {
1626 bool found = false; 1541 bool found = false;
1627 1542
1628 s = rxvt_splitcommastring (p); 1543 s = rxvt_strsplit (',', p);
1629 1544
1630 for (i = 0; s[i]; i++) 1545 for (i = 0; s[i]; i++)
1631 { 1546 {
1632 if (*s[i]) 1547 if (*s[i])
1633 { 1548 {
1634 strcpy (buf, "@im="); 1549 strcpy (buf, "@im=");
1635 strncat (buf, s[i], IMBUFSIZ - 5); 1550 strncat (buf, s[i], IMBUFSIZ - 5);
1636 if (IM_get_IC (buf)) 1551 if (im_get_ic (buf))
1637 { 1552 {
1638 found = true; 1553 found = true;
1639 break; 1554 break;
1640 } 1555 }
1641 } 1556 }
1642 } 1557 }
1643 1558
1644 rxvt_freecommastring (s); 1559 rxvt_free_strsplit (s);
1645 1560
1646 if (found) 1561 if (found)
1647 goto done; 1562 goto done;
1648 } 1563 }
1649 1564
1650 /* try with XMODIFIERS env. var. */ 1565 /* try with XMODIFIERS env. var. */
1651 if (IM_get_IC ("")) 1566 if (im_get_ic (""))
1652 goto done; 1567 goto done;
1653 1568
1654 /* 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 */
1655 if (IM_get_IC ("@im=none")) 1570 if (im_get_ic ("@im=none"))
1656 goto done; 1571 goto done;
1657 1572
1658done: 1573done: ;
1659#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1660 if (rs[Rs_imLocale]) 1575 if (rs[Rs_imLocale])
1661 SET_LOCALE (locale); 1576 SET_LOCALE (locale);
1662#endif 1577#endif
1663} 1578}
1664 1579
1665void 1580void
1666rxvt_term::IMSetPosition () 1581rxvt_term::im_set_position ()
1667{ 1582{
1668 XRectangle preedit_rect, status_rect, *needed_rect; 1583 XRectangle preedit_rect, status_rect, *needed_rect;
1669 XVaNestedList preedit_attr, status_attr; 1584 XVaNestedList preedit_attr, status_attr;
1670 1585
1671 if (!Input_Context 1586 if (!Input_Context
1672 || !focus 1587 || !focus
1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1588 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1674 || !IMisRunning ()) 1589 || !im_is_running ())
1675 return; 1590 return;
1676 1591
1677 if (input_style & XIMPreeditPosition) 1592 if (input_style & XIMPreeditPosition)
1678 { 1593 {
1679 im_set_size (preedit_rect); 1594 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1595 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1596
1682 XSetICValues (Input_Context, 1597 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1598 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1599 }
1685 else 1600 else
1686 { 1601 {
… …
1703 XFree (status_attr); 1618 XFree (status_attr);
1704 } 1619 }
1705 1620
1706 XFree (preedit_attr); 1621 XFree (preedit_attr);
1707} 1622}
1708#endif /* USE_XIM */ 1623#endif /* USE_XIM */
1624
1625void
1626rxvt_term::get_window_origin (int &x, int &y)
1627{
1628 Window cr;
1629 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1630}
1631
1632Pixmap
1633rxvt_term::get_pixmap_property (Atom property)
1634{
1635 Pixmap pixmap = None;
1636
1637 int aformat;
1638 unsigned long nitems, bytes_after;
1639 Atom atype;
1640 unsigned char *prop;
1641 int result = XGetWindowProperty (dpy, display->root, property,
1642 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1643 &nitems, &bytes_after, &prop);
1644 if (result == Success)
1645 {
1646 if (atype == XA_PIXMAP)
1647 pixmap = *(Pixmap *)prop;
1648 XFree (prop);
1649 }
1650
1651 return pixmap;
1652}
1653
1654#ifdef HAVE_BG_PIXMAP
1655
1656void
1657rxvt_term::update_background ()
1658{
1659 if (update_background_ev.is_active ())
1660 return;
1661
1662 bg_invalidate ();
1663
1664 if (!mapped)
1665 return;
1666
1667 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1668
1669 if (to_wait <= 0.)
1670 bg_render ();
1671 else
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
1680 update_background_ev.stop ();
1681 bg_render ();
1682 refresh_check ();
1683}
1684
1685#endif /* HAVE_BG_PIXMAP */
1709 1686
1710/*----------------------- end-of-file (C source) -----------------------*/ 1687/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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