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.205 by root, Wed Jan 25 13:24:45 2006 UTC vs.
Revision 1.343 by sf-exg, Tue Dec 21 10:37:42 2010 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: main.C 2 * File: main.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2010 Marc Lehmann <pcg@goof.com>
17 * 17 *
18 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
19 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
20 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
21 * (at your option) any later version. 21 * (at your option) any later version.
… …
30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 30 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31 *---------------------------------------------------------------------*/ 31 *---------------------------------------------------------------------*/
32 32
33#include "../config.h" /* NECESSARY */ 33#include "../config.h" /* NECESSARY */
34#include "rxvt.h" /* NECESSARY */ 34#include "rxvt.h" /* NECESSARY */
35#include "init.h"
35#include "keyboard.h" 36#include "keyboard.h"
36#include "rxvtperl.h" 37#include "rxvtperl.h"
37 38
38#include <limits> 39#include <limits>
39 40
41#include <cassert>
40#include <csignal> 42#include <csignal>
41#include <cstring> 43#include <cstring>
42 44
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 45#include <termios.h>
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
49#endif 53# endif
54#endif
50 55
56struct termios rxvt_term::def_tio;
51vector<rxvt_term *> rxvt_term::termlist; 57vector<rxvt_term *> rxvt_term::termlist;
52 58
53// used to tell global functions which terminal instance is "active" 59// used to tell global functions which terminal instance is "active"
54rxvt_t rxvt_current_term; 60rxvt_t rxvt_current_term;
55 61
56static char curlocale[128], savelocale[128]; 62static char curlocale[128], savelocale[128];
57 63
58bool 64bool
59rxvt_set_locale (const char *locale) NOTHROW 65rxvt_set_locale (const char *locale) NOTHROW
60{ 66{
67 int size = strlen (locale) + 1;
68
69 if (size > sizeof (curlocale))
70 rxvt_fatal ("locale string too long, aborting.\n");
71
61 if (!locale || !strncmp (locale, curlocale, 128)) 72 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 73 return false;
63 74
64 strncpy (curlocale, locale, 128); 75 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 76 setlocale (LC_CTYPE, curlocale);
66 return true; 77 return true;
67} 78}
68 79
69void 80void
… …
83class rxvt_composite_vec rxvt_composite; 94class rxvt_composite_vec rxvt_composite;
84 95
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 96text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 97{
87 compose_char *cc; 98 compose_char *cc;
88 99
89 // break compose chains, as stupid readline really likes to duplicate 100 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 101 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 102 cc = (*this)[c1];
92 while (cc) 103 while (cc)
93 { 104 {
94 if (cc->c2 == c2) return c1; 105 if (cc->c2 == c2) return c1;
95 cc = (*this)[cc->c1]; 106 cc = (*this)[cc->c1];
96 } 107 }
97 108
98 // check to see wether this combination already exists otherwise 109 // check to see whether this combination already exists otherwise
99 for (cc = v.end (); cc-- > v.begin (); ) 110 for (cc = v.end (); cc-- > v.begin (); )
100 { 111 {
101 if (cc->c1 == c1 && cc->c2 == c2) 112 if (cc->c1 == c1 && cc->c2 == c2)
102 return COMPOSE_LO + (cc - v.begin ()); 113 return COMPOSE_LO + (cc - v.begin ());
103 } 114 }
… …
142 153
143} 154}
144#endif 155#endif
145 156
146rxvt_term::rxvt_term () 157rxvt_term::rxvt_term ()
147 : 158{
148#if TRANSPARENT 159#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 160 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
150#endif
151#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb),
153#endif 161#endif
154#ifdef CURSOR_BLINK 162#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 163 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
156#endif 164#endif
157#ifdef TEXT_BLINK 165#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb), 166 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
159#endif 167#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 168#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb), 169 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
162#endif 170#endif
163#ifdef SELECTION_SCROLLING 171#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb), 172 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
165#endif 173#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 174#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb), 175 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
176#endif
177#if ENABLE_TRANSPARENCY || ENABLE_PERL
178 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
179#endif
180 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
181#ifdef USE_XIM
182 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
168#endif 183#endif
169#ifdef POINTER_BLANK 184#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 185 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 186#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175#ifndef NO_BELL 187#ifndef NO_BELL
176 bell_ev (this, &rxvt_term::bell_cb), 188 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
177#endif 189#endif
178 termwin_ev (this, &rxvt_term::x_cb), 190 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
179 vt_ev (this, &rxvt_term::x_cb), 191 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
180 child_ev (this, &rxvt_term::child_cb), 192 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
181 check_ev (this, &rxvt_term::check_cb), 193 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
182 flush_ev (this, &rxvt_term::flush_cb), 194 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
183 destroy_ev (this, &rxvt_term::destroy_cb), 195 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
184 pty_ev (this, &rxvt_term::pty_cb), 196 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
185 incr_ev (this, &rxvt_term::incr_cb) 197
186{
187 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 198 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
188 199
189 termlist.push_back (this); 200 termlist.push_back (this);
190 201
191#ifdef KEYSYM_RESOURCE 202#ifdef KEYSYM_RESOURCE
… …
193#endif 204#endif
194} 205}
195 206
196// clean up the most important stuff, do *not* call x or free mem etc. 207// clean up the most important stuff, do *not* call x or free mem etc.
197// for use before an emergency exit 208// for use before an emergency exit
209void
198void rxvt_term::emergency_cleanup () 210rxvt_term::emergency_cleanup ()
199{ 211{
200 if (cmd_pid) 212 if (cmd_pid)
201 kill (-cmd_pid, SIGHUP); 213 kill (-cmd_pid, SIGHUP);
202 214
215 pty_ev.stop ();
203 delete pty; pty = 0; 216 delete pty; pty = 0;
204} 217}
205 218
206rxvt_term::~rxvt_term () 219rxvt_term::~rxvt_term ()
207{ 220{
… …
214 if (fontset[i] != fontset[0]) 227 if (fontset[i] != fontset[0])
215 delete fontset[i]; 228 delete fontset[i];
216#endif 229#endif
217 delete fontset[0]; 230 delete fontset[0];
218 231
232#ifdef HAVE_BG_PIXMAP
233 bgPixmap.destroy ();
234#endif
235#ifdef HAVE_AFTERIMAGE
236 if (asv)
237 destroy_asvisual (asv, 0);
238 if (asimman)
239 destroy_image_manager (asimman, 0);
240#endif
241
219 if (display) 242 if (display)
220 { 243 {
221 dDisp;
222
223 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
224 246
225#ifdef USE_XIM 247#ifdef USE_XIM
226 im_destroy (); 248 im_destroy ();
227#endif 249#endif
228#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
229 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
230 if (ShadowGC) XFreeGC (disp, ShadowGC);
231#endif
232#ifdef PLAIN_SCROLLBAR
233 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
234#endif
235#ifdef NEXT_SCROLLBAR
236 if (blackGC) XFreeGC (disp, blackGC);
237 if (whiteGC) XFreeGC (disp, whiteGC);
238 if (grayGC) XFreeGC (disp, grayGC);
239 if (darkGC) XFreeGC (disp, darkGC);
240 if (stippleGC) XFreeGC (disp, stippleGC);
241 if (dimple) XFreePixmap (disp, dimple);
242 if (upArrow) XFreePixmap (disp, upArrow);
243 if (downArrow) XFreePixmap (disp, downArrow);
244 if (upArrowHi) XFreePixmap (disp, upArrowHi);
245 if (downArrowHi) XFreePixmap (disp, downArrowHi);
246#endif
247#ifdef RXVT_SCROLLBAR
248 if (topShadowGC) XFreeGC (disp, topShadowGC);
249 if (botShadowGC) XFreeGC (disp, botShadowGC);
250 if (scrollbarGC) XFreeGC (disp, scrollbarGC);
251#endif
252 if (gc) XFreeGC (disp, gc); 251 if (gc) XFreeGC (dpy, gc);
253 252
254 delete drawable; 253 delete drawable;
255 // destroy all windows 254 // destroy all windows
256 if (parent[0]) 255 if (parent[0])
257 XDestroyWindow (disp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
258 }
259 257
260 // TODO: free pixcolours, colours should become part of rxvt_display 258 for (int i = 0; i < TOTAL_COLORS; i++)
261 delete pix_colors_focused; 259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING 262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused; 263 pix_colors_unfocused [i].free (this);
264#endif 264#endif
265 }
265 266
267 clear ();
268
269 display->flush (); /* ideally .put should do this */
266 displays.put (display); 270 displays.put (display);
271 }
267 272
268 scr_release (); 273 scr_release ();
269 274
270 /* clear all resources */ 275 /* clear all resources */
271 for (int i = 0; i < allocated.size (); i++) 276 for (int i = 0; i < allocated.size (); i++)
272 free (allocated [i]); 277 free (allocated [i]);
273 278
274 free (selection.text); 279 free (selection.text);
280 free (selection.clip_text);
275 // TODO: manage env vars in child only(!) 281 // TODO: manage env vars in child only(!)
276 free (env_display); 282 free (env_display);
277 free (env_term); 283 free (env_term);
278 free (locale); 284 free (locale);
279 free (v_buffer); 285 free (v_buffer);
… …
283 delete argv; 289 delete argv;
284 290
285#ifdef KEYSYM_RESOURCE 291#ifdef KEYSYM_RESOURCE
286 delete keyboard; 292 delete keyboard;
287#endif 293#endif
294#ifndef NO_RESOURCES
295 XrmDestroyDatabase (option_db);
296#endif
288} 297}
289 298
290// child has exited, usually destroys 299// child has exited, usually destroys
291void 300void
292rxvt_term::child_cb (child_watcher &w, int status) 301rxvt_term::child_cb (ev::child &w, int status)
293{ 302{
294 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 303 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
295 304
296 cmd_pid = 0; 305 cmd_pid = 0;
297 306
298 if (!OPTION (Opt_hold)) 307 if (!option (Opt_hold))
299 destroy (); 308 destroy ();
300} 309}
301 310
302void 311void
303rxvt_term::destroy () 312rxvt_term::destroy ()
304{ 313{
305 if (destroy_ev.active) 314 if (destroy_ev.is_active ())
306 return; 315 return;
307 316
308 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END)); 317 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
309 318
310#if ENABLE_OVERLAY 319#if ENABLE_OVERLAY
… …
314 if (display) 323 if (display)
315 { 324 {
316#if USE_XIM 325#if USE_XIM
317 im_ev.stop (display); 326 im_ev.stop (display);
318#endif 327#endif
319#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 328 scrollbar_ev.stop (display);
321#endif 329#if ENABLE_TRANSPARENCY || ENABLE_PERL
322#if TRANSPARENT
323 rootwin_ev.stop (display); 330 rootwin_ev.stop (display);
324#endif 331#endif
325 incr_ev.stop (); 332 incr_ev.stop ();
326 termwin_ev.stop (display); 333 termwin_ev.stop (display);
327 vt_ev.stop (display); 334 vt_ev.stop (display);
328 } 335 }
329 336
330 check_ev.stop (); 337 flush_ev.stop ();
331 pty_ev.stop (); 338 pty_ev.stop ();
332#ifdef CURSOR_BLINK 339#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 340 cursor_blink_ev.stop ();
334#endif 341#endif
335#ifdef TEXT_BLINK 342#ifdef TEXT_BLINK
… …
343#endif 350#endif
344#ifdef POINTER_BLANK 351#ifdef POINTER_BLANK
345 pointer_ev.stop (); 352 pointer_ev.stop ();
346#endif 353#endif
347 354
348 destroy_ev.start (0); 355 destroy_ev.start ();
349} 356}
350 357
351void 358void
352rxvt_term::destroy_cb (time_watcher &w) 359rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 360{
354 make_current (); 361 make_current ();
355 362
356 delete this; 363 delete this;
364}
365
366void
367rxvt_term::set_option (uint8_t opt, bool set)
368{
369 if (!opt)
370 return;
371
372 uint8_t mask = 1 << (opt & 7);
373 uint8_t &val = options [opt >> 3];
374
375 val = val & ~mask | (set ? mask : 0);
357} 376}
358 377
359/*----------------------------------------------------------------------*/ 378/*----------------------------------------------------------------------*/
360/* 379/*
361 * Exit gracefully, clearing the utmp entry and restoring tty attributes 380 * Exit gracefully, clearing the utmp entry and restoring tty attributes
… …
368{ 387{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 388 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 389 (*t)->emergency_cleanup ();
371} 390}
372 391
373#if ENABLE_FRILLS 392#if !ENABLE_MINIMAL
374static void 393static void
375print_x_error (Display *dpy, XErrorEvent *event) 394print_x_error (Display *dpy, XErrorEvent *event)
376{ 395{
377 char buffer[BUFSIZ]; 396 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 397 char mesg[BUFSIZ];
379 char number[32]; 398 char number[32];
380 char *mtype = "XlibMessage"; 399 const char mtype[] = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 400 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 401 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 402 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 403 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 404 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 405 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 406 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 407 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 408 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 409 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 410 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 411 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 412 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 413 }
395 if ((event->error_code == BadWindow) || 414 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 415 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 416 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 417 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 418 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 419 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 420 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 421 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 422 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 423 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 424 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 425 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 426 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 427 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 428 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 429 mesg, BUFSIZ);
411 else 430 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 431 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 432 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 433 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 434 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 435 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 436 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 438}
420#endif 439#endif
421 440
422int 441int
… …
426 GET_R->allowedxerror = event->error_code; 445 GET_R->allowedxerror = event->error_code;
427 else 446 else
428 { 447 {
429 // GET_R is most likely not the terminal which caused the error, 448 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 449 // so just output the error and continue
431#if ENABLE_FRILLS 450#if ENABLE_MINIMAL
451 old_xerror_handler (display, event);
452#else
432 print_x_error (display, event); 453 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 454#endif
436 } 455 }
437 456
438 return 0; 457 return 0;
439} 458}
… …
445 DisplayString (display)); 464 DisplayString (display));
446 rxvt_emergency_cleanup (); 465 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 466 _exit (EXIT_FAILURE);
448} 467}
449 468
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
453{
454 this->envv = envv;
455
456 SET_R (this);
457 set_locale ("");
458 set_environ (envv); // few things in X do not call setlocale :(
459
460 if (!init_vars ())
461 return false;
462
463 init_secondary ();
464
465 const char **cmd_argv = init_resources (argc, argv);
466
467#ifdef KEYSYM_RESOURCE
468 keyboard->register_done ();
469#endif
470
471#ifdef HAVE_SCROLLBARS
472 if (OPTION (Opt_scrollBar))
473 scrollBar.setIdle (); /* set existence for size calculations */
474#endif
475
476 pty = ptytty::create ();
477
478 create_windows (argc, argv);
479
480 dDisp;
481
482 init_xlocale ();
483
484 scr_reset (); // initialize screen
485
486#if 0
487 XSynchronize (disp, True);
488#endif
489
490#ifdef HAVE_SCROLLBARS
491 if (OPTION (Opt_scrollBar))
492 resize_scrollbar (); /* create and map scrollbar */
493#endif
494#ifdef TRANSPARENT
495 if (OPTION (Opt_transparent))
496 {
497 XSelectInput (disp, display->root, PropertyChangeMask);
498 check_our_parents ();
499 rootwin_ev.start (display, display->root);
500 }
501#endif
502
503 set_colorfgbg ();
504
505 init_command (cmd_argv);
506
507 free (cmd_argv);
508
509 if (pty->pty >= 0)
510 pty_ev.start (pty->pty, EVENT_READ);
511
512 check_ev.start ();
513
514 HOOK_INVOKE ((this, HOOK_START, DT_END));
515
516#if ENABLE_XEMBED
517 if (rs[Rs_embed])
518 {
519 long info[2] = { 0, XEMBED_MAPPED };
520
521 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
522 32, PropModeReplace, (unsigned char *)&info, 2);
523 }
524#endif
525
526 XMapWindow (disp, vt);
527 XMapWindow (disp, parent[0]);
528
529 return true;
530}
531
532static struct sig_handlers 469static struct sig_handlers
533{ 470{
534 sig_watcher sw_term, sw_int; 471 ev::sig sw_term, sw_int;
535 472
536 /* 473 /*
537 * Catch a fatal signal and tidy up before quitting 474 * Catch a fatal signal and tidy up before quitting
538 */ 475 */
539 void 476 void sig_term (ev::sig &w, int revents);
540 sig_term (sig_watcher &w) 477
478 sig_handlers ()
541 { 479 {
542 rxvt_emergency_cleanup (); 480 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
543 signal (w.signum, SIG_DFL);
544 kill (getpid (), w.signum);
545 }
546
547 sig_handlers ()
548 : sw_term (this, &sig_handlers::sig_term),
549 sw_int (this, &sig_handlers::sig_term) 481 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
550 {
551 } 482 }
552} sig_handlers; 483} sig_handlers;
553 484
485void
486sig_handlers::sig_term (ev::sig &w, int revents)
487{
488 rxvt_emergency_cleanup ();
489 w.stop ();
490 kill (getpid (), w.signum);
491}
492
493static void
494rxvt_get_ttymode (struct termios *tio)
495{
496 if (tcgetattr (STDIN_FILENO, tio) < 0)
497 memset (tio, 0, sizeof (struct termios));
498
499 for (int i = 0; i < NCCS; i++)
500 tio->c_cc[i] = VDISABLE;
501
502 tio->c_cc[VINTR] = CINTR;
503 tio->c_cc[VQUIT] = CQUIT;
504 tio->c_cc[VERASE] = CERASE;
505#ifdef VERASE2
506 tio->c_cc[VERASE2] = CERASE2;
507#endif
508 tio->c_cc[VKILL] = CKILL;
509 tio->c_cc[VEOF] = CEOF;
510 tio->c_cc[VSTART] = CSTART;
511 tio->c_cc[VSTOP] = CSTOP;
512 tio->c_cc[VSUSP] = CSUSP;
513# ifdef VDSUSP
514 tio->c_cc[VDSUSP] = CDSUSP;
515# endif
516# ifdef VREPRINT
517 tio->c_cc[VREPRINT] = CRPRNT;
518# endif
519# ifdef VDISCRD
520 tio->c_cc[VDISCRD] = CFLUSH;
521# endif
522# ifdef VWERSE
523 tio->c_cc[VWERSE] = CWERASE;
524# endif
525# ifdef VLNEXT
526 tio->c_cc[VLNEXT] = CLNEXT;
527# endif
528# ifdef VSTATUS
529 tio->c_cc[VSTATUS] = CSTATUS;
530# endif
531
532# if VMIN != VEOF
533 tio->c_cc[VMIN] = 1;
534# endif
535# if VTIME != VEOL
536 tio->c_cc[VTIME] = 0;
537# endif
538
539 /* input modes */
540 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
541# ifdef IMAXBEL
542 | IMAXBEL
543# endif
544 | IXON);
545
546 /* output modes */
547 tio->c_oflag = (OPOST | ONLCR);
548
549 /* control modes */
550 tio->c_cflag = (CS8 | CREAD);
551
552 /* local modes */
553 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
554# if defined (ECHOCTL) && defined (ECHOKE)
555 | ECHOCTL | ECHOKE
556# endif
557 | ECHOE | ECHOK);
558}
559
554char **rxvt_environ; // startup environment 560char **rxvt_environ; // startup environment
555 561
556void 562void
557rxvt_init () 563rxvt_init ()
558{ 564{
559 ptytty::init (); 565 assert (("fontMask must not overlap other RS masks",
566 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
567
568 rxvt_get_ttymode (&rxvt_term::def_tio);
569
570 // get rid of stdin/stdout as we don't need them, to free resources
571 dup2 (STDERR_FILENO, STDIN_FILENO);
572 dup2 (STDERR_FILENO, STDOUT_FILENO);
573
574 if (!ev_default_loop ())
575 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
560 576
561 rxvt_environ = environ; 577 rxvt_environ = environ;
562 578
563 signal (SIGHUP, SIG_IGN); 579 signal (SIGHUP, SIG_IGN);
564 signal (SIGPIPE, SIG_IGN); 580 signal (SIGPIPE, SIG_IGN);
565 581
566 sig_handlers.sw_term.start (SIGTERM); 582 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
567 sig_handlers.sw_int.start (SIGINT); 583 sig_handlers.sw_int.start (SIGINT); ev_unref ();
568
569 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
570 /* signal (SIGURG, SIG_DFL); */
571 584
572 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 585 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
573 // TODO: handle this with exceptions and tolerate the memory loss 586 // TODO: handle this with exceptions and tolerate the memory loss
574 XSetIOErrorHandler (rxvt_xioerror_handler); 587 XSetIOErrorHandler (rxvt_xioerror_handler);
575 588
576 XrmInitialize (); 589 XrmInitialize ();
577} 590}
578 591
579/* ------------------------------------------------------------------------- *
580 * MEMORY ALLOCATION WRAPPERS *
581 * ------------------------------------------------------------------------- */
582void *
583rxvt_malloc (size_t size)
584{
585 void *p = malloc (size);
586
587 if (!p)
588 rxvt_fatal ("memory allocation failure. aborting.\n");
589
590 return p;
591}
592
593void *
594rxvt_calloc (size_t number, size_t size)
595{
596 void *p = calloc (number, size);
597
598 if (!p)
599 rxvt_fatal ("memory allocation failure. aborting.\n");
600
601 return p;
602}
603
604void *
605rxvt_realloc (void *ptr, size_t size)
606{
607 void *p = realloc (ptr, size);
608
609 if (!p)
610 rxvt_fatal ("memory allocation failure. aborting.\n");
611
612 return p;
613}
614
615/*----------------------------------------------------------------------*/ 592/*----------------------------------------------------------------------*/
616/* 593/*
617 * window size/position calculcations for XSizeHint and other storage. 594 * window size/position calculations for XSizeHint and other storage.
618 * if width/height are non-zero then override calculated width/height 595 * if width/height are non-zero then override calculated width/height
619 */ 596 */
620void 597void
621rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 598rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
622{ 599{
623 short recalc_x, recalc_y; 600 short recalc_x, recalc_y;
624 int x, y, sb_w, flags; 601 int x, y, flags;
625 unsigned int w, h; 602 unsigned int w, h;
626 unsigned int max_width, max_height; 603 unsigned int max_width, max_height;
627 dDisp;
628 604
629 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 605 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
630 szHint.win_gravity = NorthWestGravity; 606 szHint.win_gravity = NorthWestGravity;
631 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 607 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
632 608
… …
640 if (rs[Rs_geometry]) 616 if (rs[Rs_geometry])
641 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 617 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
642 618
643 if (flags & WidthValue) 619 if (flags & WidthValue)
644 { 620 {
621 if (!w)
622 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
623
645 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 624 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
646 szHint.flags |= USSize; 625 szHint.flags |= USSize;
647 } 626 }
648 627
649 if (flags & HeightValue) 628 if (flags & HeightValue)
650 { 629 {
630 if (!h)
631 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
632
651 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 633 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
652 szHint.flags |= USSize; 634 szHint.flags |= USSize;
653 } 635 }
654 636
655 if (flags & XValue) 637 if (flags & XValue)
656 { 638 {
… …
687 max_width = MAX_COLS * fwidth; 669 max_width = MAX_COLS * fwidth;
688 max_height = MAX_ROWS * fheight; 670 max_height = MAX_ROWS * fheight;
689 671
690 szHint.base_width = szHint.base_height = 2 * int_bwidth; 672 szHint.base_width = szHint.base_height = 2 * int_bwidth;
691 673
692 sb_w = 0;
693 window_vt_x = window_vt_y = int_bwidth; 674 window_vt_x = window_vt_y = int_bwidth;
694 675
695 if (scrollBar.state) 676 if (scrollBar.state)
696 { 677 {
697 sb_w = scrollbar_TotalWidth (); 678 int sb_w = scrollBar.total_width ();
698 szHint.base_width += sb_w; 679 szHint.base_width += sb_w;
680
699 if (!OPTION (Opt_scrollBar_right)) 681 if (!option (Opt_scrollBar_right))
700 window_vt_x += sb_w; 682 window_vt_x += sb_w;
701 } 683 }
702 684
703 szHint.width_inc = fwidth; 685 szHint.width_inc = fwidth;
704 szHint.height_inc = fheight; 686 szHint.height_inc = fheight;
705 szHint.min_width = szHint.base_width + szHint.width_inc; 687 szHint.min_width = szHint.base_width + szHint.width_inc;
706 szHint.min_height = szHint.base_height + szHint.height_inc; 688 szHint.min_height = szHint.base_height + szHint.height_inc;
707 689
708 if (newwidth && newwidth - szHint.base_width < max_width) 690 if (newwidth && newwidth - szHint.base_width < max_width)
709 { 691 {
710 szHint.width = newwidth; 692 szHint.width = newwidth;
… …
725 { 707 {
726 min_it (height, max_height); 708 min_it (height, max_height);
727 szHint.height = szHint.base_height + height; 709 szHint.height = szHint.base_height + height;
728 } 710 }
729 711
730 if (scrollBar.state && OPTION (Opt_scrollBar_right))
731 window_sb_x = szHint.width - sb_w;
732
733 if (recalc_x) 712 if (recalc_x)
734 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 713 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
714
735 if (recalc_y) 715 if (recalc_y)
736 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 716 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
737 717
738 ncol = width / fwidth; 718 ncol = width / fwidth;
739 nrow = height / fheight; 719 nrow = height / fheight;
740} 720}
741 721
742/*----------------------------------------------------------------------*/ 722/*----------------------------------------------------------------------*/
743/* 723/*
… …
754 734
755 ws.ws_col = ncol; 735 ws.ws_col = ncol;
756 ws.ws_row = nrow; 736 ws.ws_row = nrow;
757 ws.ws_xpixel = width; 737 ws.ws_xpixel = width;
758 ws.ws_ypixel = height; 738 ws.ws_ypixel = height;
759 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 739 ioctl (pty->pty, TIOCSWINSZ, &ws);
760 740
761#if 0 741#if 0
762 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 742 // TIOCSWINSZ is supposed to do this automatically and correctly
763 if (cmd_pid) /* force through to the command */ 743 if (cmd_pid) /* force through to the command */
764 kill (-cmd_pid, SIGWINCH); 744 kill (-cmd_pid, SIGWINCH);
765#endif 745#endif
766} 746}
767 747
… …
794#endif 774#endif
795 775
796 delete fontset[0]; 776 delete fontset[0];
797 fontset[0] = fs; 777 fontset[0] = fs;
798 778
799 prop = (*fs)[1]->properties (); 779 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
800 prop.height += lineSpace; 780 prop.height += lineSpace;
781 prop.width += letterSpace;
782
801 fs->set_prop (prop); 783 fs->set_prop (prop, false);
802 784
803 fwidth = prop.width; 785 fwidth = prop.width;
804 fheight = prop.height; 786 fheight = prop.height;
805 fbase = prop.ascent; 787 fbase = prop.ascent;
806 788
… …
815 { 797 {
816 fontset[style] = fs = new rxvt_fontset (this); 798 fontset[style] = fs = new rxvt_fontset (this);
817 rxvt_fontprop prop2 = prop; 799 rxvt_fontprop prop2 = prop;
818 800
819 if (res) 801 if (res)
820 prop2.weight = prop2.slant = rxvt_fontprop::unset; 802 {
803 fs->populate (res);
804 fs->set_prop (prop2, false);
805 }
821 else 806 else
822 { 807 {
823 res = fontset[0]->fontdesc; 808 fs->populate (fontset[0]->fontdesc);
824 809
825 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 810 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
826 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 811 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
812
813 fs->set_prop (prop2, true);
827 } 814 }
828 815
829 fs->populate (res);
830 fs->set_prop (prop2);
831 } 816 }
832#else 817#else
833 fontset[style] = fontset[0]; 818 fontset[style] = fontset[0];
834#endif 819#endif
835 } 820 }
… …
837 if (parent[0]) 822 if (parent[0])
838 { 823 {
839 resize_all_windows (0, 0, 0); 824 resize_all_windows (0, 0, 0);
840 scr_remap_chars (); 825 scr_remap_chars ();
841 scr_touch (true); 826 scr_touch (true);
842 } 827 }
843 828
844 return true; 829 return true;
845} 830}
846 831
832void
847void rxvt_term::set_string_property (Atom prop, const char *str, int len) 833rxvt_term::set_string_property (Atom prop, const char *str, int len)
848{ 834{
849 XChangeProperty (display->display, parent[0], 835 XChangeProperty (dpy, parent[0],
850 prop, XA_STRING, 8, PropModeReplace, 836 prop, XA_STRING, 8, PropModeReplace,
851 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 837 (const unsigned char *)str, len >= 0 ? len : strlen (str));
852} 838}
853 839
840void
841rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
842{
843 XTextProperty ct;
844
845 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
846 {
847 XSetTextProperty (dpy, parent[0], &ct, prop);
848 XFree (ct.value);
849 }
850}
851
852void
854void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 853rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
855{ 854{
856 wchar_t *ws = rxvt_mbstowcs (str, len); 855 wchar_t *ws = rxvt_mbstowcs (str, len);
857 char *s = rxvt_wcstoutf8 (ws); 856 char *s = rxvt_wcstoutf8 (ws);
858 857
859 XChangeProperty (display->display, parent[0], 858 XChangeProperty (dpy, parent[0],
860 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 859 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
861 (const unsigned char *)s, strlen (s)); 860 (const unsigned char *)s, strlen (s));
862 861
863 free (s); 862 free (s);
864 free (ws); 863 free (ws);
… …
868/*----------------------------------------------------------------------*/ 867/*----------------------------------------------------------------------*/
869/* xterm sequences - title, iconName, color (exptl) */ 868/* xterm sequences - title, iconName, color (exptl) */
870void 869void
871rxvt_term::set_title (const char *str) 870rxvt_term::set_title (const char *str)
872{ 871{
873 set_string_property (XA_WM_NAME, str); 872 set_mbstring_property (XA_WM_NAME, str);
874#if ENABLE_EWMH 873#if ENABLE_EWMH
875 set_utf8_property (xa[XA_NET_WM_NAME], str); 874 set_utf8_property (xa[XA_NET_WM_NAME], str);
876#endif 875#endif
877} 876}
878 877
879void 878void
880rxvt_term::set_icon_name (const char *str) 879rxvt_term::set_icon_name (const char *str)
881{ 880{
882 set_string_property (XA_WM_ICON_NAME, str); 881 set_mbstring_property (XA_WM_ICON_NAME, str);
883#if ENABLE_EWMH 882#if ENABLE_EWMH
884 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 883 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
885#endif 884#endif
886} 885}
887 886
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
888#ifdef XTERM_COLOR_CHANGE 890#ifdef XTERM_COLOR_CHANGE
889void
890rxvt_term::set_window_color (int idx, const char *color)
891{
892 rxvt_color xcol; 891 rxvt_color xcol;
893 int i;
894 892
895 if (color == NULL || *color == '\0') 893 if (color == NULL || *color == '\0')
896 return; 894 return;
897 895
896 color = strdup (color);
897 allocated.push_back ((void *)color);
898 rs[Rs_color + idx] = color;
899
898 /* handle color aliases */ 900 /* handle color aliases */
899 if (isdigit (*color)) 901 if (isdigit (*color))
900 { 902 {
901 i = atoi (color); 903 int i = atoi (color);
902 904
903 if (i >= 8 && i <= 15) 905 if (i >= 8 && i <= 15)
906 {
904 { /* bright colors */ 907 /* bright colors */
905 i -= 8;
906 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 908 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
907 SET_PIXCOLOR (idx);
908 goto done; 909 goto done;
909 } 910 }
910 911
911 if (i >= 0 && i <= 7) 912 if (i >= 0 && i <= 7)
913 {
912 { /* normal colors */ 914 /* normal colors */
913 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 915 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
914 SET_PIXCOLOR (idx);
915 goto done; 916 goto done;
916 } 917 }
917 } 918 }
918 919
919 if (!rXParseAllocColor (&xcol, color)) 920 set_color (xcol, color);
920 return;
921
922 /* XStoreColor (display->display, display->cmap, XColor*); */
923 921
924 /* 922 /*
925 * FIXME: should free colors here, but no idea how to do it so instead, 923 * FIXME: should free colors here, but no idea how to do it so instead,
926 * so just keep gobbling up the colormap 924 * so just keep gobbling up the colormap
927 */ 925 */
928# if 0
929 for (i = Color_Black; i <= Color_White; i++)
930 if (pix_colors[idx] == pix_colors[i])
931 break;
932 if (i > Color_White)
933 {
934 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
935 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
936 DisplayPlanes (display->display, display->screen));
937 }
938# endif
939 926
940 pix_colors_focused[idx] = xcol; 927 pix_colors_focused[idx] = xcol;
941 SET_PIXCOLOR (idx);
942 928
943 /* XSetWindowAttributes attr; */
944 /* Cursor cursor; */
945done: 929done:
946
947#if OFF_FOCUS_FADING
948 if (rs[Rs_fade])
949 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
950#endif
951
952 /*TODO: handle Color_BD, scrollbar background, etc. */ 930 /*TODO: handle Color_BD, scrollbar background, etc. */
953 931
932 update_fade_color (idx);
954 recolour_cursor (); 933 recolour_cursor ();
955 scr_recolour (); 934 scr_recolour ();
935#endif /* XTERM_COLOR_CHANGE */
956} 936}
957
958#else
959# define set_window_color (idx,color) ((void)0)
960#endif /* XTERM_COLOR_CHANGE */
961 937
962void 938void
963rxvt_term::recolour_cursor () 939rxvt_term::recolour_cursor ()
964{ 940{
965 XColor xcol[2]; 941 XColor fg, bg;
966 942
967 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 943 (ISSET_PIXCOLOR (Color_pointer_fg)
968 ? pix_colors_focused[Color_pointer_fg] 944 ? pix_colors_focused[Color_pointer_fg]
969 : pix_colors_focused[Color_fg]; 945 : pix_colors_focused[Color_fg]).get (fg);
946
970 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 947 (ISSET_PIXCOLOR (Color_pointer_bg)
971 ? pix_colors_focused[Color_pointer_bg] 948 ? pix_colors_focused[Color_pointer_bg]
972 : pix_colors_focused[Color_bg]; 949 : pix_colors_focused[Color_bg]).get (bg);
973 950
974 XQueryColors (display->display, display->cmap, xcol, 2); 951 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
975 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
976} 952}
977 953
978/*----------------------------------------------------------------------*/ 954/*----------------------------------------------------------------------*/
979/* 955/*
980 * find if fg/bg matches any of the normal (low-intensity) colors 956 * find if fg/bg matches any of the normal (low-intensity) colors
981 */ 957 */
982void 958void
983rxvt_term::set_colorfgbg () 959rxvt_term::set_colorfgbg ()
984{ 960{
985 unsigned int i; 961 unsigned int i;
986 const char *xpmb = "\0"; 962 const char *xpmb = "";
987 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 963 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
988 964
989 strcpy (fstr, "default"); 965 strcpy (fstr, "default");
990 strcpy (bstr, "default"); 966 strcpy (bstr, "default");
991 for (i = Color_Black; i <= Color_White; i++) 967 for (i = Color_Black; i <= Color_White; i++)
… …
997 973
998 for (i = Color_Black; i <= Color_White; i++) 974 for (i = Color_Black; i <= Color_White; i++)
999 if (pix_colors[Color_bg] == pix_colors[i]) 975 if (pix_colors[Color_bg] == pix_colors[i])
1000 { 976 {
1001 sprintf (bstr, "%d", (i - Color_Black)); 977 sprintf (bstr, "%d", (i - Color_Black));
1002#ifdef XPM_BACKGROUND 978#ifdef BG_IMAGE_FROM_FILE
1003 xpmb = "default;"; 979 xpmb = "default;";
1004#endif 980#endif
1005 break; 981 break;
1006 } 982 }
1007 983
1008 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 984 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1009} 985}
1010 986
1011/*----------------------------------------------------------------------*/ 987/*----------------------------------------------------------------------*/
1012 988
1013int 989bool
1014rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 990rxvt_term::set_color (rxvt_color &color, const char *name)
1015{ 991{
1016 if (!screen_in_out->set (display, colour)) 992 if (color.set (this, name))
1017 {
1018 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1019 return false;
1020 }
1021
1022 return true; 993 return true;
994
995 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
996 return false;
997}
998
999void
1000rxvt_term::alias_color (int dst, int src)
1001{
1002 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1023} 1003}
1024 1004
1025/* -------------------------------------------------------------------- * 1005/* -------------------------------------------------------------------- *
1026 * - WINDOW RESIZING - * 1006 * - WINDOW RESIZING - *
1027 * -------------------------------------------------------------------- */ 1007 * -------------------------------------------------------------------- */
… …
1029rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1009rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1030{ 1010{
1031 int fix_screen; 1011 int fix_screen;
1032 int old_width = szHint.width; 1012 int old_width = szHint.width;
1033 int old_height = szHint.height; 1013 int old_height = szHint.height;
1034 dDisp;
1035 1014
1036 window_calc (newwidth, newheight); 1015 window_calc (newwidth, newheight);
1016
1017 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1018
1019 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1020 if (set_hint)
1021 {
1022 szHint.flags &= ~(PBaseSize | PResizeInc);
1037 XSetWMNormalHints (disp, parent[0], &szHint); 1023 XSetWMNormalHints (dpy, parent[0], &szHint);
1024 szHint.flags |= PBaseSize | PResizeInc;
1025 }
1038 1026
1039 if (!ignoreparent) 1027 if (!ignoreparent)
1040 { 1028 {
1041#ifdef SMART_RESIZE 1029#ifdef SMART_RESIZE
1042 /* 1030 /*
… …
1046 int x, y, x1, y1; 1034 int x, y, x1, y1;
1047 int dx, dy; 1035 int dx, dy;
1048 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1036 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1049 Window unused_cr; 1037 Window unused_cr;
1050 1038
1051 XTranslateCoordinates (disp, parent[0], display->root, 1039 XTranslateCoordinates (dpy, parent[0], display->root,
1052 0, 0, &x, &y, &unused_cr); 1040 0, 0, &x, &y, &unused_cr);
1053 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1041 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1054 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1042 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1055 /* 1043 /*
1056 * if display->root isn't the parent window, a WM will probably have offset 1044 * if display->root isn't the parent window, a WM will probably have offset
1057 * our position for handles and decorations. Counter it 1045 * our position for handles and decorations. Counter it
1058 */ 1046 */
… …
1060 { 1048 {
1061 x -= x1; 1049 x -= x1;
1062 y -= y1; 1050 y -= y1;
1063 } 1051 }
1064 1052
1065 x1 = (DisplayWidth (disp, display->screen) - old_width ) / 2; 1053 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1066 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1054 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1067 dx = old_width - szHint.width; 1055 dx = old_width - szHint.width;
1068 dy = old_height - szHint.height; 1056 dy = old_height - szHint.height;
1069 1057
1070 /* Check position of the center of the window */ 1058 /* Check position of the center of the window */
1071 if (x < x1) /* left half */ 1059 if (x < x1) /* left half */
… …
1075 if (y < y1) /* top half */ 1063 if (y < y1) /* top half */
1076 dy = 0; 1064 dy = 0;
1077 else if (y == y1) /* exact center */ 1065 else if (y == y1) /* exact center */
1078 dy /= 2; 1066 dy /= 2;
1079 1067
1080 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1068 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1081 szHint.width, szHint.height); 1069 szHint.width, szHint.height);
1082#else 1070#else
1083 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1071 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1084#endif 1072#endif
1085 } 1073 }
1074
1075 if (set_hint)
1076 XSetWMNormalHints (dpy, parent[0], &szHint);
1086 1077
1087 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1078 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1088 1079
1089 if (fix_screen || newwidth != old_width || newheight != old_height) 1080 if (fix_screen || newwidth != old_width || newheight != old_height)
1090 { 1081 {
1091 if (scrollBar.state) 1082 if (scrollBar.state)
1092 { 1083 scrollBar.resize ();
1093 XMoveResizeWindow (disp, scrollBar.win,
1094 window_sb_x, 0,
1095 scrollbar_TotalWidth (), szHint.height);
1096 resize_scrollbar ();
1097 }
1098 1084
1099 XMoveResizeWindow (disp, vt, 1085 XMoveResizeWindow (dpy, vt,
1100 window_vt_x, window_vt_y, 1086 window_vt_x, window_vt_y,
1101 width, height); 1087 width, height);
1102 1088
1103 scr_clear (); 1089#ifdef HAVE_BG_PIXMAP
1104#ifdef XPM_BACKGROUND 1090 if (bgPixmap.window_size_sensitive ())
1105 resize_pixmap (); 1091 update_background ();
1106#endif 1092#endif
1107 } 1093 }
1108 1094
1109 if (fix_screen || old_height == 0) 1095 if (fix_screen || old_height == 0)
1110 scr_reset (); 1096 scr_reset ();
1111 1097
1112#ifdef XPM_BACKGROUND 1098#ifdef HAVE_BG_PIXMAP
1113 if (pixmap) 1099// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1100// if (bgPixmap.pixmap)
1114 scr_touch (false); 1101// scr_touch (false);
1115#endif 1102#endif
1116 1103
1117#ifdef USE_XIM 1104#ifdef USE_XIM
1118 IMSetStatusPosition (); 1105 IMSetPosition ();
1119#endif 1106#endif
1120} 1107}
1121 1108
1122/* 1109/*
1123 * Set the width/height of the vt window in characters. Units are pixels. 1110 * Set the width/height of the vt window in characters. Units are pixels.
… …
1128{ 1115{
1129 XWindowAttributes wattr; 1116 XWindowAttributes wattr;
1130 1117
1131 if (newwidth == 0 || newheight == 0) 1118 if (newwidth == 0 || newheight == 0)
1132 { 1119 {
1133 XGetWindowAttributes (display->display, display->root, &wattr); 1120 XGetWindowAttributes (dpy, display->root, &wattr);
1134 1121
1135 if (newwidth == 0) 1122 if (newwidth == 0)
1136 newwidth = wattr.width - szHint.base_width; 1123 newwidth = wattr.width - szHint.base_width;
1137 if (newheight == 0) 1124 if (newheight == 0)
1138 newheight = wattr.height - szHint.base_height; 1125 newheight = wattr.height - szHint.base_height;
… …
1152#ifdef USE_XIM 1139#ifdef USE_XIM
1153 1140
1154void 1141void
1155rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1142rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1156{ 1143{
1157 fg = pix_colors[Color_fg]; 1144 fg = pix_colors [Color_fg];
1158 bg = pix_colors[Color_bg]; 1145 bg = pix_colors [Color_bg];
1159} 1146}
1160 1147
1161void 1148void
1162rxvt_term::im_set_size (XRectangle &size) 1149rxvt_term::im_set_size (XRectangle &size)
1163{ 1150{
… …
1186 1173
1187/* Checking whether input method is running. */ 1174/* Checking whether input method is running. */
1188bool 1175bool
1189rxvt_term::IMisRunning () 1176rxvt_term::IMisRunning ()
1190{ 1177{
1191 char *p;
1192 Atom atom; 1178 Atom atom;
1193 Window win; 1179 Window win;
1194 char server[IMBUFSIZ]; 1180 char server[IMBUFSIZ];
1195 1181
1196 /* get current locale modifier */ 1182 /* get current locale modifier */
1197 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1183 if (char *p = XSetLocaleModifiers (0))
1198 { 1184 {
1199 strcpy (server, "@server="); 1185 strcpy (server, "@server=");
1200 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1186 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1201 1187
1202 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1188 if (p = strchr (server + 1, '@')) /* first one only */
1203 *p = '\0'; 1189 *p = '\0';
1204 1190
1205 atom = XInternAtom (display->display, server, False); 1191 atom = XInternAtom (dpy, server, False);
1206 win = XGetSelectionOwner (display->display, atom); 1192 win = XGetSelectionOwner (dpy, atom);
1207 1193
1208 if (win != None) 1194 if (win != None)
1209 return True; 1195 return True;
1210 } 1196 }
1211 1197
… …
1274 1260
1275 term->make_current (); 1261 term->make_current ();
1276 1262
1277 if (text) 1263 if (text)
1278 { 1264 {
1279 void *str; 1265 wchar_t *str;
1280 1266
1281 if (!text->encoding_is_wchar && text->string.multi_byte) 1267 if (!text->encoding_is_wchar && text->string.multi_byte)
1282 { 1268 {
1283 // of course, X makes it ugly again 1269 // of course, X makes it ugly again
1284 if (term->rs[Rs_imLocale]) 1270 if (term->rs[Rs_imLocale])
1285 SET_LOCALE (term->rs[Rs_imLocale]); 1271 SET_LOCALE (term->rs[Rs_imLocale]);
1286 1272
1287 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1273 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1288 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1274 mbstowcs (str, text->string.multi_byte, text->length + 1);
1289 1275
1290 if (term->rs[Rs_imLocale]) 1276 if (term->rs[Rs_imLocale])
1291 SET_LOCALE (term->locale); 1277 SET_LOCALE (term->locale);
1292 } 1278 }
1293 else 1279 else
1294 str = (void *)text->string.wide_char; 1280 str = text->string.wide_char;
1295 1281
1296 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1282 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1297 DT_INT, call_data->caret, 1283 DT_INT, call_data->caret,
1298 DT_INT, call_data->chg_first, 1284 DT_INT, call_data->chg_first,
1299 DT_INT, call_data->chg_length, 1285 DT_INT, call_data->chg_length,
1300 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1286 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
… …
1435 "*", 1421 "*",
1436 fheight, 1422 fheight,
1437 fheight + 1, fheight - 1, 1423 fheight + 1, fheight - 1,
1438 fheight - 2, fheight + 2); 1424 fheight - 2, fheight + 2);
1439 1425
1440 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1426 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1441 &missing_charset_list, &missing_charset_count, &def_string); 1427 &missing_charset_list, &missing_charset_count, &def_string);
1442 1428
1443 if (missing_charset_list) 1429 if (missing_charset_list)
1444 XFreeStringList (missing_charset_list); 1430 XFreeStringList (missing_charset_list);
1445 1431
… …
1520 preedit_attr, 1506 preedit_attr,
1521 status_attr ? XNStatusAttributes : NULL, 1507 status_attr ? XNStatusAttributes : NULL,
1522 status_attr, NULL); 1508 status_attr, NULL);
1523 1509
1524 if (preedit_attr) XFree (preedit_attr); 1510 if (preedit_attr) XFree (preedit_attr);
1525 if (status_attr) XFree (status_attr); 1511 if (status_attr) XFree (status_attr);
1526 if (fs) XFreeFontSet (display->display, fs); 1512 if (fs) XFreeFontSet (dpy, fs);
1527 1513
1528 if (Input_Context == NULL) 1514 if (Input_Context == NULL)
1529 { 1515 {
1530 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1516 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1531 im_destroy (); 1517 im_destroy ();
… …
1536 // unfortunately, only the focus window is used by XIM, hard to fix 1522 // unfortunately, only the focus window is used by XIM, hard to fix
1537 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1523 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1538 vt_select_input (); 1524 vt_select_input ();
1539#endif 1525#endif
1540 1526
1541 if (input_style & XIMPreeditArea)
1542 IMSetStatusPosition (); 1527 IMSetPosition ();
1543 1528
1544 return true; 1529 return true;
1545} 1530}
1546 1531
1547void 1532void
… …
1605 SET_LOCALE (locale); 1590 SET_LOCALE (locale);
1606#endif 1591#endif
1607} 1592}
1608 1593
1609void 1594void
1610rxvt_term::IMSetStatusPosition () 1595rxvt_term::IMSetPosition ()
1611{ 1596{
1612 XRectangle preedit_rect, status_rect, *needed_rect; 1597 XRectangle preedit_rect, status_rect, *needed_rect;
1613 XVaNestedList preedit_attr, status_attr; 1598 XVaNestedList preedit_attr, status_attr;
1614 1599
1615 if (!Input_Context 1600 if (!Input_Context
1616 || !focus 1601 || !focus
1617 || !(input_style & XIMPreeditArea) 1602 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1618 || !IMisRunning ()) 1603 || !IMisRunning ())
1619 return; 1604 return;
1620 1605
1606 if (input_style & XIMPreeditPosition)
1607 {
1608 im_set_size (preedit_rect);
1609 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1610
1611 XSetICValues (Input_Context,
1612 XNPreeditAttributes, preedit_attr, NULL);
1613 }
1614 else
1615 {
1621 /* Getting the necessary width of preedit area */ 1616 /* Getting the necessary width of preedit area */
1622 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1617 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1623 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1618 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1624 XFree (status_attr); 1619 XFree (status_attr);
1625 1620
1626 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1621 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1627 XFree (needed_rect); 1622 XFree (needed_rect);
1628 1623
1629 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1624 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1630 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1625 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1631 1626
1632 XSetICValues (Input_Context, 1627 XSetICValues (Input_Context,
1633 XNPreeditAttributes, preedit_attr, 1628 XNPreeditAttributes, preedit_attr,
1634 XNStatusAttributes, status_attr, NULL); 1629 XNStatusAttributes, status_attr,
1630 NULL);
1635 1631
1632 XFree (status_attr);
1633 }
1634
1636 XFree (preedit_attr); 1635 XFree (preedit_attr);
1637 XFree (status_attr);
1638} 1636}
1639#endif /* USE_XIM */ 1637#endif /* USE_XIM */
1638
1639void
1640rxvt_term::get_window_origin (int &x, int &y)
1641{
1642 Window cr;
1643 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1644}
1645
1646Pixmap
1647rxvt_term::get_pixmap_property (Atom property)
1648{
1649 Pixmap pixmap = None;
1650
1651 int aformat;
1652 unsigned long nitems, bytes_after;
1653 Atom atype;
1654 unsigned char *prop;
1655 int result = XGetWindowProperty (dpy, display->root, property,
1656 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1657 &nitems, &bytes_after, &prop);
1658 if (result == Success)
1659 {
1660 if (atype == XA_PIXMAP)
1661 pixmap = *(Pixmap *)prop;
1662 XFree (prop);
1663 }
1664
1665 return pixmap;
1666}
1667
1668#ifdef HAVE_BG_PIXMAP
1669
1670void
1671rxvt_term::update_background ()
1672{
1673 if (update_background_ev.is_active ())
1674 return;
1675
1676 bgPixmap.invalidate ();
1677
1678 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1679
1680 if (to_wait <= 0.)
1681 bgPixmap.render ();
1682 else
1683 update_background_ev.start (to_wait);
1684}
1685
1686void
1687rxvt_term::update_background_cb (ev::timer &w, int revents)
1688{
1689 make_current ();
1690
1691 update_background_ev.stop ();
1692 bgPixmap.render ();
1693 refresh_check ();
1694}
1695
1696#endif /* HAVE_BG_PIXMAP */
1640 1697
1641/*----------------------- end-of-file (C source) -----------------------*/ 1698/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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