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.374 by root, Sun Jun 3 10:42:34 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 <assert.h>
40#include <csignal> 42#include <signal.h>
41#include <cstring> 43#include <string.h>
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>
49#endif
50 46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# include <locale.h>
52#endif
53
54struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 55vector<rxvt_term *> rxvt_term::termlist;
52 56
53// used to tell global functions which terminal instance is "active" 57// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 58rxvt_t rxvt_current_term;
55 59
… …
88class rxvt_composite_vec rxvt_composite; 92class rxvt_composite_vec rxvt_composite;
89 93
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 94text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 95{
92 compose_char *cc; 96 compose_char *cc;
93 97
94 // break compose chains, as stupid readline really likes to duplicate 98 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 99 // composing characters for some reason, near the end of a line.
96 cc = (*this)[c1]; 100 cc = (*this)[c1];
97 while (cc) 101 while (cc)
98 { 102 {
99 if (cc->c2 == c2) return c1; 103 if (cc->c2 == c2) return c1;
100 cc = (*this)[cc->c1]; 104 cc = (*this)[cc->c1];
101 } 105 }
102 106
103 // check to see wether this combination already exists otherwise 107 // check to see whether this combination already exists otherwise
104 for (cc = v.end (); cc-- > v.begin (); ) 108 for (cc = v.begin (); cc < v.end (); cc++)
105 {
106 if (cc->c1 == c1 && cc->c2 == c2) 109 if (cc->c1 == c1 && cc->c2 == c2)
107 return COMPOSE_LO + (cc - v.begin ()); 110 return COMPOSE_LO + (cc - v.begin ());
108 }
109 111
110 // allocate a new combination 112 // allocate a new combination
111 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1) 113 if (v.size () == COMPOSE_HI - COMPOSE_LO + 1)
112 { 114 {
113 static int seen; 115 static int seen;
114 116
115 if (!seen++) 117 if (!seen++)
116 fprintf (stderr, "too many unrepresentable composite characters, try --enable-unicode3\n"); 118 rxvt_warn ("too many unrepresentable composite characters, try --enable-unicode3\n");
117 119
118 return REPLACEMENT_CHAR; 120 return REPLACEMENT_CHAR;
119 } 121 }
120 122
121 v.push_back (compose_char (c1, c2)); 123 v.push_back (compose_char (c1, c2));
… …
147 149
148} 150}
149#endif 151#endif
150 152
151rxvt_term::rxvt_term () 153rxvt_term::rxvt_term ()
152 : 154{
155#if HAVE_BG_PIXMAP
156 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
157#endif
158#ifdef CURSOR_BLINK
159 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
160#endif
161#ifdef TEXT_BLINK
162 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
163#endif
164#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
165 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
166#endif
167#ifdef SELECTION_SCROLLING
168 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
169#endif
170#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
171 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
172#endif
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 173#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 174 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
155#endif 175#endif
156#if HAVE_BG_PIXMAP 176 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
157 update_background_ev(this, &rxvt_term::update_background_cb), 177#ifdef USE_XIM
158#endif 178 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 179#endif
177#ifdef POINTER_BLANK 180#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 181 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
179#endif 182#endif
180#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb),
182#endif
183#ifndef NO_BELL 183#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 184 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
185#endif 185#endif
186 termwin_ev (this, &rxvt_term::x_cb), 186 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
187 vt_ev (this, &rxvt_term::x_cb), 187 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
188 child_ev (this, &rxvt_term::child_cb), 188 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
189 check_ev (this, &rxvt_term::check_cb), 189 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
190 flush_ev (this, &rxvt_term::flush_cb), 190 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
191 destroy_ev (this, &rxvt_term::destroy_cb), 191 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
192 pty_ev (this, &rxvt_term::pty_cb), 192
193 incr_ev (this, &rxvt_term::incr_cb)
194{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 193 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 194
197 termlist.push_back (this); 195 termlist.push_back (this);
198 196
199#ifdef KEYSYM_RESOURCE 197#ifdef KEYSYM_RESOURCE
… …
201#endif 199#endif
202} 200}
203 201
204// clean up the most important stuff, do *not* call x or free mem etc. 202// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 203// for use before an emergency exit
204void
206void rxvt_term::emergency_cleanup () 205rxvt_term::emergency_cleanup ()
207{ 206{
208 if (cmd_pid) 207 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 208 kill (-cmd_pid, SIGHUP);
210 209
211 pty_ev.stop (); 210 pty_ev.stop ();
… …
223 if (fontset[i] != fontset[0]) 222 if (fontset[i] != fontset[0])
224 delete fontset[i]; 223 delete fontset[i];
225#endif 224#endif
226 delete fontset[0]; 225 delete fontset[0];
227 226
227#ifdef HAVE_BG_PIXMAP
228 bg_destroy ();
229#endif
230
228 if (display) 231 if (display)
229 { 232 {
230 selection_clear (); 233 selection_clear ();
234 selection_clear (true);
231 235
232#ifdef USE_XIM 236#ifdef USE_XIM
233 im_destroy (); 237 im_destroy ();
234#endif 238#endif
235#ifdef XTERM_SCROLLBAR 239 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); 240 if (gc) XFreeGC (dpy, gc);
260 241
261 delete drawable; 242 delete drawable;
262 // destroy all windows 243 // destroy all windows
263 if (parent[0]) 244 if (parent)
264 XDestroyWindow (dpy, parent[0]); 245 XDestroyWindow (dpy, parent);
265 246
266 for (int i = 0; i < TOTAL_COLORS; i++) 247 for (int i = 0; i < TOTAL_COLORS; i++)
267 if (ISSET_PIXCOLOR (i)) 248 if (ISSET_PIXCOLOR (i))
268 { 249 {
269 pix_colors_focused [i].free (this); 250 pix_colors_focused [i].free (this);
… …
271 pix_colors_unfocused [i].free (this); 252 pix_colors_unfocused [i].free (this);
272#endif 253#endif
273 } 254 }
274 255
275 clear (); 256 clear ();
276 }
277 257
278 delete [] pix_colors_focused; 258 display->flush (); /* ideally .put should do this */
279#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused;
281#endif
282
283 displays.put (display); 259 displays.put (display);
260 }
284 261
285 scr_release (); 262 scr_release ();
286 263
287 /* clear all resources */ 264 /* clear all resources */
288 for (int i = 0; i < allocated.size (); i++) 265 for (int i = 0; i < allocated.size (); i++)
289 free (allocated [i]); 266 free (allocated [i]);
290 267
291 free (selection.text); 268 free (selection.text);
292 // TODO: manage env vars in child only(!) 269 free (selection.clip_text);
293 free (env_display);
294 free (env_term);
295 free (locale); 270 free (locale);
296 free (v_buffer); 271 free (v_buffer);
297 free (incr_buf); 272
273 delete selection_req;
298 274
299 delete envv; 275 delete envv;
300 delete argv; 276 delete argv;
301 277
302#ifdef KEYSYM_RESOURCE 278#ifdef KEYSYM_RESOURCE
303 delete keyboard; 279 delete keyboard;
304#endif 280#endif
281#ifndef NO_RESOURCES
282 XrmDestroyDatabase (option_db);
283#endif
305} 284}
306 285
307// child has exited, usually destroys 286// child has exited, usually destroys
308void 287void
309rxvt_term::child_cb (child_watcher &w, int status) 288rxvt_term::child_cb (ev::child &w, int status)
310{ 289{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 290 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 291
313 cmd_pid = 0; 292 cmd_pid = 0;
314 293
… …
317} 296}
318 297
319void 298void
320rxvt_term::destroy () 299rxvt_term::destroy ()
321{ 300{
322 if (destroy_ev.active) 301 if (destroy_ev.is_active ())
323 return; 302 return;
324 303
325 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 304 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
326 305
327#if ENABLE_OVERLAY 306#if ENABLE_OVERLAY
… …
331 if (display) 310 if (display)
332 { 311 {
333#if USE_XIM 312#if USE_XIM
334 im_ev.stop (display); 313 im_ev.stop (display);
335#endif 314#endif
336#if HAVE_SCROLLBARS
337 scrollbar_ev.stop (display); 315 scrollbar_ev.stop (display);
338#endif
339#if ENABLE_TRANSPARENCY || ENABLE_PERL 316#if ENABLE_TRANSPARENCY || ENABLE_PERL
340 rootwin_ev.stop (display); 317 rootwin_ev.stop (display);
341#endif 318#endif
342 incr_ev.stop ();
343 termwin_ev.stop (display); 319 termwin_ev.stop (display);
344 vt_ev.stop (display); 320 vt_ev.stop (display);
345 } 321 }
346 322
347 check_ev.stop (); 323 flush_ev.stop ();
348 pty_ev.stop (); 324 pty_ev.stop ();
349#ifdef CURSOR_BLINK 325#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 326 cursor_blink_ev.stop ();
351#endif 327#endif
352#ifdef TEXT_BLINK 328#ifdef TEXT_BLINK
… …
360#endif 336#endif
361#ifdef POINTER_BLANK 337#ifdef POINTER_BLANK
362 pointer_ev.stop (); 338 pointer_ev.stop ();
363#endif 339#endif
364 340
365 destroy_ev.start (0); 341 destroy_ev.start ();
366} 342}
367 343
368void 344void
369rxvt_term::destroy_cb (time_watcher &w) 345rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 346{
371 make_current (); 347 make_current ();
372 348
373 delete this; 349 delete this;
350}
351
352void
353rxvt_term::set_option (uint8_t opt, bool set) NOTHROW
354{
355 if (!opt)
356 return;
357
358 uint8_t mask = 1 << (opt & 7);
359 uint8_t &val = options [opt >> 3];
360
361 val = val & ~mask | (set ? mask : 0);
374} 362}
375 363
376/*----------------------------------------------------------------------*/ 364/*----------------------------------------------------------------------*/
377/* 365/*
378 * Exit gracefully, clearing the utmp entry and restoring tty attributes 366 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
386 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 374 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
387 (*t)->emergency_cleanup (); 375 (*t)->emergency_cleanup ();
388} 376}
389 377
390#if !ENABLE_MINIMAL 378#if !ENABLE_MINIMAL
391static void 379static void ecb_cold
392print_x_error (Display *dpy, XErrorEvent *event) 380print_x_error (Display *dpy, XErrorEvent *event)
393{ 381{
394 char buffer[BUFSIZ]; 382 char buffer[BUFSIZ];
395 char mesg[BUFSIZ]; 383 char mesg[BUFSIZ];
396 char number[32]; 384 char number[32];
397 char *mtype = "XlibMessage"; 385 const char mtype[] = "XlibMessage";
398 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 386 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
399 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 387 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
400 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 388 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
401 rxvt_warn ("%s: %s\n", mesg, buffer); 389 rxvt_warn ("%s: %s\n", mesg, buffer);
402 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 390 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
403 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 391 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
404 sprintf(number, "%d", event->request_code); 392 sprintf(number, "%d", event->request_code);
405 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 393 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
406 rxvt_warn ("(which is %s)\n", buffer); 394 rxvt_warn ("(which is %s)\n", buffer);
407 if (event->request_code >= 128) { 395 if (event->request_code >= 128) {
408 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 396 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
409 mesg, BUFSIZ); 397 mesg, BUFSIZ);
410 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 398 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
411 } 399 }
412 if ((event->error_code == BadWindow) || 400 if ((event->error_code == BadWindow) ||
413 (event->error_code == BadPixmap) || 401 (event->error_code == BadPixmap) ||
414 (event->error_code == BadCursor) || 402 (event->error_code == BadCursor) ||
415 (event->error_code == BadFont) || 403 (event->error_code == BadFont) ||
416 (event->error_code == BadDrawable) || 404 (event->error_code == BadDrawable) ||
417 (event->error_code == BadColor) || 405 (event->error_code == BadColor) ||
418 (event->error_code == BadGC) || 406 (event->error_code == BadGC) ||
419 (event->error_code == BadIDChoice) || 407 (event->error_code == BadIDChoice) ||
420 (event->error_code == BadValue) || 408 (event->error_code == BadValue) ||
421 (event->error_code == BadAtom)) { 409 (event->error_code == BadAtom)) {
422 if (event->error_code == BadValue) 410 if (event->error_code == BadValue)
423 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 411 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
424 mesg, BUFSIZ); 412 mesg, BUFSIZ);
425 else if (event->error_code == BadAtom) 413 else if (event->error_code == BadAtom)
426 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 414 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
427 mesg, BUFSIZ); 415 mesg, BUFSIZ);
428 else 416 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 417 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 418 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 419 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 420 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 421 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 422 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 423 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 424}
437#endif 425#endif
438 426
439int 427int ecb_cold
440rxvt_xerror_handler (Display *display, XErrorEvent *event) 428rxvt_xerror_handler (Display *display, XErrorEvent *event)
441{ 429{
442 if (GET_R->allowedxerror == -1) 430 if (GET_R->allowedxerror == -1)
443 GET_R->allowedxerror = event->error_code; 431 GET_R->allowedxerror = event->error_code;
444 else 432 else
… …
453 } 441 }
454 442
455 return 0; 443 return 0;
456} 444}
457 445
458int 446int ecb_cold
459rxvt_xioerror_handler (Display *display) 447rxvt_xioerror_handler (Display *display)
460{ 448{
461 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n", 449 rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
462 DisplayString (display)); 450 DisplayString (display));
463 rxvt_emergency_cleanup (); 451 rxvt_emergency_cleanup ();
464 _exit (EXIT_FAILURE); 452 _exit (EXIT_FAILURE);
465} 453}
466 454
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 455static struct sig_handlers
591{ 456{
592 sig_watcher sw_term, sw_int; 457 ev::sig sw_term, sw_int;
593 458
594 /* 459 /*
595 * Catch a fatal signal and tidy up before quitting 460 * Catch a fatal signal and tidy up before quitting
596 */ 461 */
597 void 462 void sig_term (ev::sig &w, int revents);
598 sig_term (sig_watcher &w) 463
464 sig_handlers ()
599 { 465 {
600 rxvt_emergency_cleanup (); 466 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) 467 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
608 {
609 } 468 }
610} sig_handlers; 469} sig_handlers;
611 470
471void
472sig_handlers::sig_term (ev::sig &w, int revents)
473{
474 rxvt_emergency_cleanup ();
475 w.stop ();
476 kill (getpid (), w.signum);
477}
478
479static void
480rxvt_get_ttymode (struct termios *tio)
481{
482 if (tcgetattr (STDIN_FILENO, tio) < 0)
483 memset (tio, 0, sizeof (struct termios));
484
485 for (int i = 0; i < NCCS; i++)
486 tio->c_cc[i] = VDISABLE;
487
488 tio->c_cc[VINTR] = CINTR;
489 tio->c_cc[VQUIT] = CQUIT;
490 tio->c_cc[VERASE] = CERASE;
491#ifdef VERASE2
492 tio->c_cc[VERASE2] = CERASE2;
493#endif
494 tio->c_cc[VKILL] = CKILL;
495 tio->c_cc[VEOF] = CEOF;
496 tio->c_cc[VSTART] = CSTART;
497 tio->c_cc[VSTOP] = CSTOP;
498 tio->c_cc[VSUSP] = CSUSP;
499# ifdef VDSUSP
500 tio->c_cc[VDSUSP] = CDSUSP;
501# endif
502# ifdef VREPRINT
503 tio->c_cc[VREPRINT] = CRPRNT;
504# endif
505# ifdef VDISCRD
506 tio->c_cc[VDISCRD] = CFLUSH;
507# endif
508# ifdef VWERSE
509 tio->c_cc[VWERSE] = CWERASE;
510# endif
511# ifdef VLNEXT
512 tio->c_cc[VLNEXT] = CLNEXT;
513# endif
514# ifdef VSTATUS
515 tio->c_cc[VSTATUS] = CSTATUS;
516# endif
517
518# if VMIN != VEOF
519 tio->c_cc[VMIN] = 1;
520# endif
521# if VTIME != VEOL
522 tio->c_cc[VTIME] = 0;
523# endif
524
525 /* input modes */
526 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
527# ifdef IMAXBEL
528 | IMAXBEL
529# endif
530 | IXON);
531
532 /* output modes */
533 tio->c_oflag = (OPOST | ONLCR);
534
535 /* control modes */
536 tio->c_cflag = (CS8 | CREAD);
537
538 /* local modes */
539 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
540# if defined (ECHOCTL) && defined (ECHOKE)
541 | ECHOCTL | ECHOKE
542# endif
543 | ECHOE | ECHOK);
544}
545
612char **rxvt_environ; // startup environment 546char **rxvt_environ; // startup environment
613 547
614void 548void
615rxvt_init () 549rxvt_init ()
616{ 550{
617 ptytty::init (); 551 assert (("fontMask must not overlap other RS masks",
552 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
553
554 rxvt_get_ttymode (&rxvt_term::def_tio);
555
556 // get rid of stdin/stdout as we don't need them, to free resources
557 dup2 (STDERR_FILENO, STDIN_FILENO);
558 dup2 (STDERR_FILENO, STDOUT_FILENO);
559
560 if (!ev_default_loop ())
561 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
618 562
619 rxvt_environ = environ; 563 rxvt_environ = environ;
620 564
621 signal (SIGHUP, SIG_IGN); 565 signal (SIGHUP, SIG_IGN);
622 signal (SIGPIPE, SIG_IGN); 566 signal (SIGPIPE, SIG_IGN);
623 567
624 sig_handlers.sw_term.start (SIGTERM); 568 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
625 sig_handlers.sw_int.start (SIGINT); 569 sig_handlers.sw_int.start (SIGINT); ev_unref ();
626
627 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
628 /* signal (SIGURG, SIG_DFL); */
629 570
630 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 571 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
631 // TODO: handle this with exceptions and tolerate the memory loss 572 // TODO: handle this with exceptions and tolerate the memory loss
632 XSetIOErrorHandler (rxvt_xioerror_handler); 573 XSetIOErrorHandler (rxvt_xioerror_handler);
633 574
634 XrmInitialize (); 575 XrmInitialize ();
635}
636 576
637/* ------------------------------------------------------------------------- * 577#ifdef HAVE_PIXBUF
638 * MEMORY ALLOCATION WRAPPERS * 578 g_type_init ();
639 * ------------------------------------------------------------------------- */ 579#endif
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} 580}
672 581
673/*----------------------------------------------------------------------*/ 582/*----------------------------------------------------------------------*/
674/* 583/*
675 * window size/position calculations for XSizeHint and other storage. 584 * window size/position calculations for XSizeHint and other storage.
… …
677 */ 586 */
678void 587void
679rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 588rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
680{ 589{
681 short recalc_x, recalc_y; 590 short recalc_x, recalc_y;
682 int x, y, sb_w, flags; 591 int x, y, flags;
683 unsigned int w, h; 592 unsigned int w, h;
684 unsigned int max_width, max_height; 593 unsigned int max_width, max_height;
685 594
686 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 595 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
687 szHint.win_gravity = NorthWestGravity; 596 szHint.win_gravity = NorthWestGravity;
… …
697 if (rs[Rs_geometry]) 606 if (rs[Rs_geometry])
698 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 607 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
699 608
700 if (flags & WidthValue) 609 if (flags & WidthValue)
701 { 610 {
611 if (!w)
612 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
613
702 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 614 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
703 szHint.flags |= USSize; 615 szHint.flags |= USSize;
704 } 616 }
705 617
706 if (flags & HeightValue) 618 if (flags & HeightValue)
707 { 619 {
620 if (!h)
621 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
622
708 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 623 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
709 szHint.flags |= USSize; 624 szHint.flags |= USSize;
710 } 625 }
711 626
712 if (flags & XValue) 627 if (flags & XValue)
713 { 628 {
… …
744 max_width = MAX_COLS * fwidth; 659 max_width = MAX_COLS * fwidth;
745 max_height = MAX_ROWS * fheight; 660 max_height = MAX_ROWS * fheight;
746 661
747 szHint.base_width = szHint.base_height = 2 * int_bwidth; 662 szHint.base_width = szHint.base_height = 2 * int_bwidth;
748 663
749 sb_w = 0;
750 window_vt_x = window_vt_y = int_bwidth; 664 window_vt_x = window_vt_y = int_bwidth;
751 665
752 if (scrollBar.state) 666 if (scrollBar.state)
753 { 667 {
754 sb_w = scrollbar_TotalWidth (); 668 int sb_w = scrollBar.total_width ();
755 szHint.base_width += sb_w; 669 szHint.base_width += sb_w;
756 670
757 if (!option (Opt_scrollBar_right)) 671 if (!option (Opt_scrollBar_right))
758 window_vt_x += sb_w; 672 window_vt_x += sb_w;
759 } 673 }
… …
783 { 697 {
784 min_it (height, max_height); 698 min_it (height, max_height);
785 szHint.height = szHint.base_height + height; 699 szHint.height = szHint.base_height + height;
786 } 700 }
787 701
788 if (scrollBar.state && option (Opt_scrollBar_right))
789 window_sb_x = szHint.width - sb_w;
790
791 if (recalc_x) 702 if (recalc_x)
792 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth; 703 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
793 704
794 if (recalc_y) 705 if (recalc_y)
795 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth; 706 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
796 707
797 ncol = width / fwidth; 708 ncol = width / fwidth;
798 nrow = height / fheight; 709 nrow = height / fheight;
710
711 // When the size of the vt window is not a multiple of the cell
712 // size, i.e., when the wm does not honour our size hints, there are
713 // extra areas not covered by the terminal screen. Such gaps, when a
714 // bg pixmap is set, would have to be cleared manually to properly
715 // refresh the background. We take the simpler route and shrink the
716 // vt window so as to avoid creating gaps.
717 vt_width = ncol * fwidth;
718 vt_height = nrow * fheight;
799} 719}
800 720
801/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
802/* 722/*
803 * Tell the teletype handler what size the window is. 723 * Tell the teletype handler what size the window is.
… …
811 731
812 struct winsize ws; 732 struct winsize ws;
813 733
814 ws.ws_col = ncol; 734 ws.ws_col = ncol;
815 ws.ws_row = nrow; 735 ws.ws_row = nrow;
816 ws.ws_xpixel = width; 736 ws.ws_xpixel = vt_width;
817 ws.ws_ypixel = height; 737 ws.ws_ypixel = vt_height;
818 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 738 ioctl (pty->pty, TIOCSWINSZ, &ws);
819 739
820#if 0 740#if 0
821 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 741 // TIOCSWINSZ is supposed to do this automatically and correctly
822 if (cmd_pid) /* force through to the command */ 742 if (cmd_pid) /* force through to the command */
823 kill (-cmd_pid, SIGWINCH); 743 kill (-cmd_pid, SIGWINCH);
824#endif 744#endif
825} 745}
826 746
827/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
828/* set_fonts () - load and set the various fonts 748/* 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 749bool
836rxvt_term::set_fonts () 750rxvt_term::set_fonts ()
837{ 751{
838 rxvt_fontset *fs = new rxvt_fontset (this); 752 rxvt_fontset *fs = new rxvt_fontset (this);
839 rxvt_fontprop prop; 753 rxvt_fontprop prop;
… …
853#endif 767#endif
854 768
855 delete fontset[0]; 769 delete fontset[0];
856 fontset[0] = fs; 770 fontset[0] = fs;
857 771
858 prop = (*fs)[1]->properties (); 772 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
859 prop.height += lineSpace; 773 prop.width += letterSpace;
860 774
861 fs->set_prop (prop, false); 775 fs->set_prop (prop, false);
862 776
863 fwidth = prop.width; 777 fwidth = prop.width;
864 fheight = prop.height; 778 fheight = prop.height + lineSpace;
865 fbase = prop.ascent; 779 fbase = prop.ascent;
866 780
867 for (int style = 1; style < 4; style++) 781 for (int style = 1; style < 4; style++)
868 { 782 {
869#if ENABLE_STYLES 783#if ENABLE_STYLES
… …
895#else 809#else
896 fontset[style] = fontset[0]; 810 fontset[style] = fontset[0];
897#endif 811#endif
898 } 812 }
899 813
900 if (parent[0]) 814 if (parent)
901 { 815 {
902 resize_all_windows (0, 0, 0); 816 resize_all_windows (0, 0, 0);
903 scr_remap_chars (); 817 scr_remap_chars ();
904 scr_touch (true); 818 scr_touch (true);
905 } 819 }
906 820
907 return true; 821 return true;
908} 822}
909 823
824void
910void rxvt_term::set_string_property (Atom prop, const char *str, int len) 825rxvt_term::set_string_property (Atom prop, const char *str, int len)
911{ 826{
912 XChangeProperty (dpy, parent[0], 827 XChangeProperty (dpy, parent,
913 prop, XA_STRING, 8, PropModeReplace, 828 prop, XA_STRING, 8, PropModeReplace,
914 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 829 (const unsigned char *)str, len >= 0 ? len : strlen (str));
915} 830}
916 831
832void
833rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
834{
835 XTextProperty ct;
836
837 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
838 {
839 XSetTextProperty (dpy, parent, &ct, prop);
840 XFree (ct.value);
841 }
842}
843
844void
917void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 845rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
918{ 846{
919 wchar_t *ws = rxvt_mbstowcs (str, len); 847 wchar_t *ws = rxvt_mbstowcs (str, len);
920 char *s = rxvt_wcstoutf8 (ws); 848 char *s = rxvt_wcstoutf8 (ws);
921 849
922 XChangeProperty (dpy, parent[0], 850 XChangeProperty (dpy, parent,
923 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 851 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
924 (const unsigned char *)s, strlen (s)); 852 (const unsigned char *)s, strlen (s));
925 853
926 free (s); 854 free (s);
927 free (ws); 855 free (ws);
… …
931/*----------------------------------------------------------------------*/ 859/*----------------------------------------------------------------------*/
932/* xterm sequences - title, iconName, color (exptl) */ 860/* xterm sequences - title, iconName, color (exptl) */
933void 861void
934rxvt_term::set_title (const char *str) 862rxvt_term::set_title (const char *str)
935{ 863{
936 set_string_property (XA_WM_NAME, str); 864 set_mbstring_property (XA_WM_NAME, str);
937#if ENABLE_EWMH 865#if ENABLE_EWMH
938 set_utf8_property (xa[XA_NET_WM_NAME], str); 866 set_utf8_property (xa[XA_NET_WM_NAME], str);
939#endif 867#endif
940} 868}
941 869
942void 870void
943rxvt_term::set_icon_name (const char *str) 871rxvt_term::set_icon_name (const char *str)
944{ 872{
945 set_string_property (XA_WM_ICON_NAME, str); 873 set_mbstring_property (XA_WM_ICON_NAME, str);
946#if ENABLE_EWMH 874#if ENABLE_EWMH
947 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 875 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
948#endif 876#endif
949} 877}
950 878
879void
880rxvt_term::set_window_color (int idx, const char *color)
881{
951#ifdef XTERM_COLOR_CHANGE 882#ifdef XTERM_COLOR_CHANGE
952void
953rxvt_term::set_window_color (int idx, const char *color)
954{
955 rxvt_color xcol; 883 rxvt_color xcol;
956 int i; 884
957
958 if (color == NULL || *color == '\0') 885 if (color == NULL || *color == '\0')
959 return; 886 return;
960 887
961 color = strdup (color); 888 color = strdup (color);
962 allocated.push_back ((void *)color); 889 allocated.push_back ((void *)color);
963 rs[Rs_color + idx] = color; 890 rs[Rs_color + idx] = color;
964 891
965 /* handle color aliases */ 892 /* handle color aliases */
966 if (isdigit (*color)) 893 if (isdigit (*color))
967 { 894 {
968 i = atoi (color); 895 int i = atoi (color);
969 896
970 if (i >= 8 && i <= 15) 897 if (i >= 8 && i <= 15)
898 {
971 { /* bright colors */ 899 /* bright colors */
972 i -= 8;
973 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 900 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
974 goto done; 901 goto done;
975 } 902 }
976 903
977 if (i >= 0 && i <= 7) 904 if (i >= 0 && i <= 7)
905 {
978 { /* normal colors */ 906 /* normal colors */
979 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 907 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
980 goto done; 908 goto done;
981 } 909 }
982 } 910 }
983 911
… …
988 * so just keep gobbling up the colormap 916 * so just keep gobbling up the colormap
989 */ 917 */
990 918
991 pix_colors_focused[idx] = xcol; 919 pix_colors_focused[idx] = xcol;
992 920
993 /* XSetWindowAttributes attr; */
994 /* Cursor cursor; */
995done: 921done:
996 /*TODO: handle Color_BD, scrollbar background, etc. */ 922 /*TODO: handle Color_BD, scrollbar background, etc. */
997 923
998 update_fade_color (idx); 924 update_fade_color (idx);
999 recolour_cursor (); 925 recolour_cursor ();
1000 scr_recolour (); 926 scr_recolour ();
927#endif /* XTERM_COLOR_CHANGE */
1001} 928}
1002
1003#else
1004# define set_window_color (idx,color) ((void)0)
1005#endif /* XTERM_COLOR_CHANGE */
1006 929
1007void 930void
1008rxvt_term::recolour_cursor () 931rxvt_term::recolour_cursor ()
1009{ 932{
1010 XColor fg, bg; 933 XColor fg, bg;
… …
1022 945
1023/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
1024/* 947/*
1025 * find if fg/bg matches any of the normal (low-intensity) colors 948 * find if fg/bg matches any of the normal (low-intensity) colors
1026 */ 949 */
1027void 950char *
1028rxvt_term::set_colorfgbg () 951rxvt_term::get_colorfgbg ()
1029{ 952{
1030 unsigned int i; 953 unsigned int i;
1031 const char *xpmb = "\0"; 954 const char *xpmb = "";
1032 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 955 char fstr[] = "default";
956 char bstr[] = "default";
957 char *env_colorfgbg;
1033 958
1034 strcpy (fstr, "default");
1035 strcpy (bstr, "default");
1036 for (i = Color_Black; i <= Color_White; i++) 959 for (i = Color_Black; i <= Color_White; i++)
1037 if (pix_colors[Color_fg] == pix_colors[i]) 960 if (pix_colors[Color_fg] == pix_colors[i])
1038 { 961 {
1039 sprintf (fstr, "%d", (i - Color_Black)); 962 sprintf (fstr, "%d", i - Color_Black);
1040 break; 963 break;
1041 } 964 }
1042 965
1043 for (i = Color_Black; i <= Color_White; i++) 966 for (i = Color_Black; i <= Color_White; i++)
1044 if (pix_colors[Color_bg] == pix_colors[i]) 967 if (pix_colors[Color_bg] == pix_colors[i])
1045 { 968 {
1046 sprintf (bstr, "%d", (i - Color_Black)); 969 sprintf (bstr, "%d", i - Color_Black);
1047#ifdef XPM_BACKGROUND 970#ifdef BG_IMAGE_FROM_FILE
1048 xpmb = "default;"; 971 xpmb = "default;";
1049#endif 972#endif
1050 break; 973 break;
1051 } 974 }
1052 975
976 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg"));
1053 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 977 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
978 return env_colorfgbg;
1054} 979}
1055 980
1056/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
1057 982
1058bool 983bool
… …
1081 int old_width = szHint.width; 1006 int old_width = szHint.width;
1082 int old_height = szHint.height; 1007 int old_height = szHint.height;
1083 1008
1084 window_calc (newwidth, newheight); 1009 window_calc (newwidth, newheight);
1085 1010
1086 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END))) 1011 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1012
1013 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1014 if (set_hint)
1015 {
1016 szHint.flags &= ~(PBaseSize | PResizeInc);
1087 XSetWMNormalHints (dpy, parent[0], &szHint); 1017 XSetWMNormalHints (dpy, parent, &szHint);
1018 szHint.flags |= PBaseSize | PResizeInc;
1019 }
1088 1020
1089 if (!ignoreparent) 1021 if (!ignoreparent)
1090 { 1022 {
1091#ifdef SMART_RESIZE 1023#ifdef SMART_RESIZE
1092 /* 1024 /*
… …
1096 int x, y, x1, y1; 1028 int x, y, x1, y1;
1097 int dx, dy; 1029 int dx, dy;
1098 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1030 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1099 Window unused_cr; 1031 Window unused_cr;
1100 1032
1101 XTranslateCoordinates (dpy, parent[0], display->root, 1033 XTranslateCoordinates (dpy, parent, display->root,
1102 0, 0, &x, &y, &unused_cr); 1034 0, 0, &x, &y, &unused_cr);
1103 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1, 1035 XGetGeometry (dpy, parent, &unused_cr, &x1, &y1,
1104 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1036 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1105 /* 1037 /*
1106 * if display->root isn't the parent window, a WM will probably have offset 1038 * if display->root isn't the parent window, a WM will probably have offset
1107 * our position for handles and decorations. Counter it 1039 * our position for handles and decorations. Counter it
1108 */ 1040 */
… …
1125 if (y < y1) /* top half */ 1057 if (y < y1) /* top half */
1126 dy = 0; 1058 dy = 0;
1127 else if (y == y1) /* exact center */ 1059 else if (y == y1) /* exact center */
1128 dy /= 2; 1060 dy /= 2;
1129 1061
1130 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy, 1062 XMoveResizeWindow (dpy, parent, x + dx, y + dy,
1131 szHint.width, szHint.height); 1063 szHint.width, szHint.height);
1132#else 1064#else
1133 XResizeWindow (dpy, parent[0], szHint.width, szHint.height); 1065 XResizeWindow (dpy, parent, szHint.width, szHint.height);
1134#endif 1066#endif
1135 } 1067 }
1068
1069 if (set_hint)
1070 XSetWMNormalHints (dpy, parent, &szHint);
1136 1071
1137 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1072 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1138 1073
1139 if (fix_screen || newwidth != old_width || newheight != old_height) 1074 if (fix_screen || newwidth != old_width || newheight != old_height)
1140 { 1075 {
1141 if (scrollBar.state) 1076 if (scrollBar.state)
1142 { 1077 scrollBar.resize ();
1143 XMoveResizeWindow (dpy, scrollBar.win,
1144 window_sb_x, 0,
1145 scrollbar_TotalWidth (), szHint.height);
1146 resize_scrollbar ();
1147 }
1148 1078
1149 XMoveResizeWindow (dpy, vt, 1079 XMoveResizeWindow (dpy, vt,
1150 window_vt_x, window_vt_y, 1080 window_vt_x, window_vt_y,
1151 width, height); 1081 vt_width, vt_height);
1152 1082
1153#ifdef XPM_BACKGROUND 1083#ifdef HAVE_BG_PIXMAP
1154 /* TODO: replace with update_pixmap() that should unify transparency and bg image handling ! */
1155 if (bgPixmap.window_size_sensitive ()) 1084 if (bg_window_size_sensitive ())
1156 update_background (); 1085 update_background ();
1157#endif 1086#endif
1158
1159 scr_clear ();
1160 } 1087 }
1161 1088
1162 if (fix_screen || old_height == 0) 1089 if (fix_screen || old_height == 0)
1163 scr_reset (); 1090 scr_reset ();
1164 1091
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 1092#ifdef USE_XIM
1175 IMSetPosition (); 1093 im_set_position ();
1176#endif 1094#endif
1177} 1095}
1178 1096
1179/* 1097/*
1180 * Set the width/height of the vt window in characters. Units are pixels. 1098 * Set the width/height of the vt window in characters. Units are pixels.
… …
1193 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1194 if (newheight == 0) 1112 if (newheight == 0)
1195 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
1196 } 1114 }
1197 1115
1198 if (newwidth != width || newheight != height) 1116 if (newwidth != vt_width || newheight != vt_height)
1199 { 1117 {
1200 newwidth += szHint.base_width; 1118 newwidth += szHint.base_width;
1201 newheight += szHint.base_height; 1119 newheight += szHint.base_height;
1202 resize_all_windows (newwidth, newheight, 0); 1120 resize_all_windows (newwidth, newheight, 0);
1203 } 1121 }
… …
1241 status_rect.height = fheight; 1159 status_rect.height = fheight;
1242} 1160}
1243 1161
1244/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1245bool 1163bool
1246rxvt_term::IMisRunning () 1164rxvt_term::im_is_running ()
1247{ 1165{
1248 char *p;
1249 Atom atom; 1166 Atom atom;
1250 Window win; 1167 Window win;
1251 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1252 1169
1253 /* get current locale modifier */ 1170 /* get current locale modifier */
1254 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1255 { 1172 {
1256 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1257 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1258 1175
1259 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1260 *p = '\0'; 1177 *p = '\0';
1261 1178
1262 atom = XInternAtom (dpy, server, False); 1179 atom = XInternAtom (dpy, server, False);
1263 win = XGetSelectionOwner (dpy, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1264 1181
1265 if (win != None) 1182 if (win != None)
1266 return True; 1183 return true;
1267 } 1184 }
1268 1185
1269 return False; 1186 return false;
1270} 1187}
1271 1188
1272void 1189void
1273rxvt_term::IMSendSpot () 1190rxvt_term::im_send_spot ()
1274{ 1191{
1275 XPoint nspot; 1192 XPoint nspot;
1276 XVaNestedList preedit_attr; 1193 XVaNestedList preedit_attr;
1277 1194
1278 if (!Input_Context 1195 if (!Input_Context
… …
1331 1248
1332 term->make_current (); 1249 term->make_current ();
1333 1250
1334 if (text) 1251 if (text)
1335 { 1252 {
1336 void *str; 1253 wchar_t *str;
1337 1254
1338 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1339 { 1256 {
1340 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1341 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1342 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1343 1260
1344 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1345 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1346 1263
1347 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1348 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1349 } 1266 }
1350 else 1267 else
1351 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1352 1269
1353 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1354 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1355 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1356 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
1357 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1274 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1384/* 1301/*
1385 * Try to open a XIM with the current modifiers, then see if we can 1302 * Try to open a XIM with the current modifiers, then see if we can
1386 * open a suitable preedit type 1303 * open a suitable preedit type
1387 */ 1304 */
1388bool 1305bool
1389rxvt_term::IM_get_IC (const char *modifiers) 1306rxvt_term::im_get_ic (const char *modifiers)
1390{ 1307{
1391 int i, j, found; 1308 int i, j, found;
1392 XIM xim; 1309 XIM xim;
1393 XPoint spot; 1310 XPoint spot;
1394 XRectangle rect, status_rect, needed_rect; 1311 XRectangle rect, status_rect, needed_rect;
1395 unsigned long fg, bg; 1312 unsigned long fg, bg;
1396 const char *p; 1313 const char *p;
1397 char **s; 1314 char **s;
1398 XIMStyles *xim_styles; 1315 XIMStyles *xim_styles;
1399#ifdef ENABLE_XIM_ONTHESPOT
1400 XIMCallback xcb[4];
1401#endif
1402 1316
1403 set_environ (envv); 1317 set_environ (envv);
1404 1318
1405 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1319 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1406 return false; 1320 return false;
… …
1427 p = pet[pi]; 1341 p = pet[pi];
1428 1342
1429 if (!p) 1343 if (!p)
1430 continue; 1344 continue;
1431 1345
1432 s = rxvt_splitcommastring (p); 1346 s = rxvt_strsplit (',', p);
1433 1347
1434 for (i = found = 0; !found && s[i]; i++) 1348 for (i = found = 0; !found && s[i]; i++)
1435 { 1349 {
1436 if (!strcmp (s[i], "OverTheSpot")) 1350 if (!strcmp (s[i], "OverTheSpot"))
1437 input_style = XIMPreeditPosition | XIMStatusNothing; 1351 input_style = XIMPreeditPosition | XIMStatusNothing;
… …
1449 input_style = XIMPreeditNothing | XIMStatusNothing; 1363 input_style = XIMPreeditNothing | XIMStatusNothing;
1450 1364
1451 for (j = 0; j < xim_styles->count_styles; j++) 1365 for (j = 0; j < xim_styles->count_styles; j++)
1452 if (input_style == xim_styles->supported_styles[j]) 1366 if (input_style == xim_styles->supported_styles[j])
1453 { 1367 {
1454 rxvt_freecommastring (s); 1368 rxvt_free_strsplit (s);
1455 1369
1456 found = 1; 1370 found = 1;
1457 goto foundpet; 1371 goto foundpet;
1458 } 1372 }
1459 1373
1460 } 1374 }
1461 1375
1462 rxvt_freecommastring (s); 1376 rxvt_free_strsplit (s);
1463 } 1377 }
1464 1378
1465foundpet: 1379foundpet:
1466 1380
1467 XFree (xim_styles); 1381 XFree (xim_styles);
… …
1546 NULL); 1460 NULL);
1547 } 1461 }
1548#if ENABLE_XIM_ONTHESPOT 1462#if ENABLE_XIM_ONTHESPOT
1549 else if (input_style & XIMPreeditCallbacks) 1463 else if (input_style & XIMPreeditCallbacks)
1550 { 1464 {
1465 XIMCallback xcb[4];
1466
1551 im_set_position (spot); 1467 im_set_position (spot);
1552 1468
1553 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start; 1469 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; 1470 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; 1471 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
… …
1570#endif 1486#endif
1571 1487
1572 Input_Context = XCreateIC (xim, 1488 Input_Context = XCreateIC (xim,
1573 XNInputStyle, input_style, 1489 XNInputStyle, input_style,
1574 XNClientWindow, vt, 1490 XNClientWindow, vt,
1575 XNFocusWindow, parent[0], 1491 XNFocusWindow, parent,
1576 preedit_attr ? XNPreeditAttributes : NULL, 1492 preedit_attr ? XNPreeditAttributes : NULL,
1577 preedit_attr, 1493 preedit_attr,
1578 status_attr ? XNStatusAttributes : NULL, 1494 status_attr ? XNStatusAttributes : NULL,
1579 status_attr, NULL); 1495 status_attr, NULL);
1580 1496
… …
1593 // unfortunately, only the focus window is used by XIM, hard to fix 1509 // unfortunately, only the focus window is used by XIM, hard to fix
1594 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1510 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1595 vt_select_input (); 1511 vt_select_input ();
1596#endif 1512#endif
1597 1513
1598 IMSetPosition (); 1514 im_set_position ();
1599 1515
1600 return true; 1516 return true;
1601} 1517}
1602 1518
1603void 1519void
… …
1613 im_destroy (); 1529 im_destroy ();
1614 1530
1615 if (Input_Context) 1531 if (Input_Context)
1616 return; 1532 return;
1617 1533
1618#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1619 if (rs[Rs_imLocale]) 1534 if (rs[Rs_imLocale])
1620 SET_LOCALE (rs[Rs_imLocale]); 1535 SET_LOCALE (rs[Rs_imLocale]);
1621#endif
1622 1536
1623 p = rs[Rs_inputMethod]; 1537 p = rs[Rs_inputMethod];
1624 if (p && *p) 1538 if (p && *p)
1625 { 1539 {
1626 bool found = false; 1540 bool found = false;
1627 1541
1628 s = rxvt_splitcommastring (p); 1542 s = rxvt_strsplit (',', p);
1629 1543
1630 for (i = 0; s[i]; i++) 1544 for (i = 0; s[i]; i++)
1631 { 1545 {
1632 if (*s[i]) 1546 if (*s[i])
1633 { 1547 {
1634 strcpy (buf, "@im="); 1548 strcpy (buf, "@im=");
1635 strncat (buf, s[i], IMBUFSIZ - 5); 1549 strncat (buf, s[i], IMBUFSIZ - 5);
1636 if (IM_get_IC (buf)) 1550 if (im_get_ic (buf))
1637 { 1551 {
1638 found = true; 1552 found = true;
1639 break; 1553 break;
1640 } 1554 }
1641 } 1555 }
1642 } 1556 }
1643 1557
1644 rxvt_freecommastring (s); 1558 rxvt_free_strsplit (s);
1645 1559
1646 if (found) 1560 if (found)
1647 goto done; 1561 goto done;
1648 } 1562 }
1649 1563
1650 /* try with XMODIFIERS env. var. */ 1564 /* try with XMODIFIERS env. var. */
1651 if (IM_get_IC ("")) 1565 if (im_get_ic (""))
1652 goto done; 1566 goto done;
1653 1567
1654 /* try with no modifiers base IF the user didn't specify an IM */ 1568 /* try with no modifiers base IF the user didn't specify an IM */
1655 if (IM_get_IC ("@im=none")) 1569 if (im_get_ic ("@im=none"))
1656 goto done; 1570 goto done;
1657 1571
1658done: 1572done:
1659#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1660 if (rs[Rs_imLocale]) 1573 if (rs[Rs_imLocale])
1661 SET_LOCALE (locale); 1574 SET_LOCALE (locale);
1662#endif
1663} 1575}
1664 1576
1665void 1577void
1666rxvt_term::IMSetPosition () 1578rxvt_term::im_set_position ()
1667{ 1579{
1668 XRectangle preedit_rect, status_rect, *needed_rect; 1580 XRectangle preedit_rect, status_rect, *needed_rect;
1669 XVaNestedList preedit_attr, status_attr; 1581 XVaNestedList preedit_attr, status_attr;
1670 1582
1671 if (!Input_Context 1583 if (!Input_Context
1672 || !focus 1584 || !focus
1673 || !(input_style & (XIMPreeditArea | XIMPreeditPosition)) 1585 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1674 || !IMisRunning ()) 1586 || !im_is_running ())
1675 return; 1587 return;
1676 1588
1677 if (input_style & XIMPreeditPosition) 1589 if (input_style & XIMPreeditPosition)
1678 { 1590 {
1679 im_set_size (preedit_rect); 1591 im_set_size (preedit_rect);
1680 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1592 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1681 1593
1682 XSetICValues (Input_Context, 1594 XSetICValues (Input_Context,
1683 XNPreeditAttributes, preedit_attr, NULL); 1595 XNPreeditAttributes, preedit_attr, NULL);
1684 } 1596 }
1685 else 1597 else
1686 { 1598 {
… …
1703 XFree (status_attr); 1615 XFree (status_attr);
1704 } 1616 }
1705 1617
1706 XFree (preedit_attr); 1618 XFree (preedit_attr);
1707} 1619}
1708#endif /* USE_XIM */ 1620#endif /* USE_XIM */
1621
1622void
1623rxvt_term::get_window_origin (int &x, int &y)
1624{
1625 Window cr;
1626 XTranslateCoordinates (dpy, parent, display->root, 0, 0, &x, &y, &cr);
1627}
1628
1629Pixmap
1630rxvt_term::get_pixmap_property (Atom property)
1631{
1632 Pixmap pixmap = None;
1633
1634 int aformat;
1635 unsigned long nitems, bytes_after;
1636 Atom atype;
1637 unsigned char *prop;
1638 int result = XGetWindowProperty (dpy, display->root, property,
1639 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1640 &nitems, &bytes_after, &prop);
1641 if (result == Success)
1642 {
1643 if (atype == XA_PIXMAP)
1644 pixmap = *(Pixmap *)prop;
1645 XFree (prop);
1646 }
1647
1648 return pixmap;
1649}
1650
1651#ifdef HAVE_BG_PIXMAP
1652
1653void
1654rxvt_term::update_background ()
1655{
1656 if (update_background_ev.is_active ())
1657 return;
1658
1659 bg_invalidate ();
1660
1661 if (!mapped)
1662 return;
1663
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bg_valid_since);
1665
1666 if (to_wait <= 0.)
1667 bg_render ();
1668 else
1669 update_background_ev.start (to_wait);
1670}
1671
1672void
1673rxvt_term::update_background_cb (ev::timer &w, int revents)
1674{
1675 make_current ();
1676
1677 update_background_ev.stop ();
1678 bg_render ();
1679 refresh_check ();
1680}
1681
1682#endif /* HAVE_BG_PIXMAP */
1709 1683
1710/*----------------------- end-of-file (C source) -----------------------*/ 1684/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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