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.206 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.336 by sf-exg, Tue Nov 2 13:32:50 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-2008 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 selection_clear (); 244 selection_clear ();
245 selection_clear (true);
222 246
223#ifdef USE_XIM 247#ifdef USE_XIM
224 im_destroy (); 248 im_destroy ();
225#endif 249#endif
226#ifdef XTERM_SCROLLBAR 250 scrollBar.destroy ();
227 if (xscrollbarGC) XFreeGC (xdisp, xscrollbarGC);
228 if (ShadowGC) XFreeGC (xdisp, ShadowGC);
229#endif
230#ifdef PLAIN_SCROLLBAR
231 if (pscrollbarGC) XFreeGC (xdisp, pscrollbarGC);
232#endif
233#ifdef NEXT_SCROLLBAR
234 if (blackGC) XFreeGC (xdisp, blackGC);
235 if (whiteGC) XFreeGC (xdisp, whiteGC);
236 if (grayGC) XFreeGC (xdisp, grayGC);
237 if (darkGC) XFreeGC (xdisp, darkGC);
238 if (stippleGC) XFreeGC (xdisp, stippleGC);
239 if (dimple) XFreePixmap (xdisp, dimple);
240 if (upArrow) XFreePixmap (xdisp, upArrow);
241 if (downArrow) XFreePixmap (xdisp, downArrow);
242 if (upArrowHi) XFreePixmap (xdisp, upArrowHi);
243 if (downArrowHi) XFreePixmap (xdisp, downArrowHi);
244#endif
245#ifdef RXVT_SCROLLBAR
246 if (topShadowGC) XFreeGC (xdisp, topShadowGC);
247 if (botShadowGC) XFreeGC (xdisp, botShadowGC);
248 if (scrollbarGC) XFreeGC (xdisp, scrollbarGC);
249#endif
250 if (gc) XFreeGC (xdisp, gc); 251 if (gc) XFreeGC (dpy, gc);
251 252
252 delete drawable; 253 delete drawable;
253 // destroy all windows 254 // destroy all windows
254 if (parent[0]) 255 if (parent[0])
255 XDestroyWindow (xdisp, parent[0]); 256 XDestroyWindow (dpy, parent[0]);
257
258 for (int i = 0; i < TOTAL_COLORS; i++)
259 if (ISSET_PIXCOLOR (i))
260 {
261 pix_colors_focused [i].free (this);
262#if OFF_FOCUS_FADING
263 pix_colors_unfocused [i].free (this);
264#endif
265 }
256 266
257 clear (); 267 clear ();
258 }
259 268
260 // TODO: free pixcolours, colours should become part of rxvt_display 269 display->flush (); /* ideally .put should do this */
261 delete pix_colors_focused;
262#if OFF_FOCUS_FADING
263 delete pix_colors_unfocused;
264#endif
265
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;
357} 364}
… …
368{ 375{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 376 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 377 (*t)->emergency_cleanup ();
371} 378}
372 379
373#if ENABLE_FRILLS 380#if !ENABLE_MINIMAL
374static void 381static void
375print_x_error (Display *dpy, XErrorEvent *event) 382print_x_error (Display *dpy, XErrorEvent *event)
376{ 383{
377 char buffer[BUFSIZ]; 384 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 385 char mesg[BUFSIZ];
379 char number[32]; 386 char number[32];
380 char *mtype = "XlibMessage"; 387 char *mtype = "XlibMessage";
381 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ); 388 XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
382 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ); 389 XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
383 rxvt_warn ("An X Error occured, trying to continue after report.\n"); 390 rxvt_warn ("An X Error occurred, trying to continue after report.\n");
384 rxvt_warn ("%s: %s\n", mesg, buffer); 391 rxvt_warn ("%s: %s\n", mesg, buffer);
385 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ); 392 XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
386 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code); 393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
387 sprintf(number, "%d", event->request_code); 394 sprintf(number, "%d", event->request_code);
388 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ); 395 XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
389 rxvt_warn ("(which is %s)\n", buffer); 396 rxvt_warn ("(which is %s)\n", buffer);
390 if (event->request_code >= 128) { 397 if (event->request_code >= 128) {
391 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d", 398 XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
392 mesg, BUFSIZ); 399 mesg, BUFSIZ);
393 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code); 400 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
394 } 401 }
395 if ((event->error_code == BadWindow) || 402 if ((event->error_code == BadWindow) ||
396 (event->error_code == BadPixmap) || 403 (event->error_code == BadPixmap) ||
397 (event->error_code == BadCursor) || 404 (event->error_code == BadCursor) ||
398 (event->error_code == BadFont) || 405 (event->error_code == BadFont) ||
399 (event->error_code == BadDrawable) || 406 (event->error_code == BadDrawable) ||
400 (event->error_code == BadColor) || 407 (event->error_code == BadColor) ||
401 (event->error_code == BadGC) || 408 (event->error_code == BadGC) ||
402 (event->error_code == BadIDChoice) || 409 (event->error_code == BadIDChoice) ||
403 (event->error_code == BadValue) || 410 (event->error_code == BadValue) ||
404 (event->error_code == BadAtom)) { 411 (event->error_code == BadAtom)) {
405 if (event->error_code == BadValue) 412 if (event->error_code == BadValue)
406 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x", 413 XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
407 mesg, BUFSIZ); 414 mesg, BUFSIZ);
408 else if (event->error_code == BadAtom) 415 else if (event->error_code == BadAtom)
409 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x", 416 XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
410 mesg, BUFSIZ); 417 mesg, BUFSIZ);
411 else 418 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 419 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 420 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 421 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 422 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 423 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 424 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 425 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 426}
420#endif 427#endif
421 428
422int 429int
… …
426 GET_R->allowedxerror = event->error_code; 433 GET_R->allowedxerror = event->error_code;
427 else 434 else
428 { 435 {
429 // GET_R is most likely not the terminal which caused the error, 436 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 437 // so just output the error and continue
431#if ENABLE_FRILLS 438#if ENABLE_MINIMAL
439 old_xerror_handler (display, event);
440#else
432 print_x_error (display, event); 441 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 442#endif
436 } 443 }
437 444
438 return 0; 445 return 0;
439} 446}
… …
445 DisplayString (display)); 452 DisplayString (display));
446 rxvt_emergency_cleanup (); 453 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 454 _exit (EXIT_FAILURE);
448} 455}
449 456
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 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (xdisp, True);
486#endif
487
488#ifdef HAVE_SCROLLBARS
489 if (OPTION (Opt_scrollBar))
490 resize_scrollbar (); /* create and map scrollbar */
491#endif
492#ifdef TRANSPARENT
493 if (OPTION (Opt_transparent))
494 {
495 XSelectInput (xdisp, display->root, PropertyChangeMask);
496 check_our_parents ();
497 rootwin_ev.start (display, display->root);
498 }
499#endif
500
501 set_colorfgbg ();
502
503 init_command (cmd_argv);
504
505 free (cmd_argv);
506
507 if (pty->pty >= 0)
508 pty_ev.start (pty->pty, EVENT_READ);
509
510 check_ev.start ();
511
512 HOOK_INVOKE ((this, HOOK_START, DT_END));
513
514#if ENABLE_XEMBED
515 if (rs[Rs_embed])
516 {
517 long info[2] = { 0, XEMBED_MAPPED };
518
519 XChangeProperty (display->display, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
520 32, PropModeReplace, (unsigned char *)&info, 2);
521 }
522#endif
523
524 XMapWindow (xdisp, vt);
525 XMapWindow (xdisp, parent[0]);
526
527 return true;
528}
529
530static struct sig_handlers 457static struct sig_handlers
531{ 458{
532 sig_watcher sw_term, sw_int; 459 ev::sig sw_term, sw_int;
533 460
534 /* 461 /*
535 * Catch a fatal signal and tidy up before quitting 462 * Catch a fatal signal and tidy up before quitting
536 */ 463 */
537 void 464 void sig_term (ev::sig &w, int revents);
538 sig_term (sig_watcher &w) 465
466 sig_handlers ()
539 { 467 {
540 rxvt_emergency_cleanup (); 468 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
541 signal (w.signum, SIG_DFL);
542 kill (getpid (), w.signum);
543 }
544
545 sig_handlers ()
546 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 469 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
548 {
549 } 470 }
550} sig_handlers; 471} sig_handlers;
551 472
473void
474sig_handlers::sig_term (ev::sig &w, int revents)
475{
476 rxvt_emergency_cleanup ();
477 w.stop ();
478 kill (getpid (), w.signum);
479}
480
481static void
482rxvt_get_ttymode (struct termios *tio)
483{
484 if (tcgetattr (STDIN_FILENO, tio) < 0)
485 memset (tio, 0, sizeof (struct termios));
486
487 for (int i = 0; i < NCCS; i++)
488 tio->c_cc[i] = VDISABLE;
489
490 tio->c_cc[VINTR] = CINTR;
491 tio->c_cc[VQUIT] = CQUIT;
492 tio->c_cc[VERASE] = CERASE;
493#ifdef VERASE2
494 tio->c_cc[VERASE2] = CERASE2;
495#endif
496 tio->c_cc[VKILL] = CKILL;
497 tio->c_cc[VEOF] = CEOF;
498 tio->c_cc[VSTART] = CSTART;
499 tio->c_cc[VSTOP] = CSTOP;
500 tio->c_cc[VSUSP] = CSUSP;
501# ifdef VDSUSP
502 tio->c_cc[VDSUSP] = CDSUSP;
503# endif
504# ifdef VREPRINT
505 tio->c_cc[VREPRINT] = CRPRNT;
506# endif
507# ifdef VDISCRD
508 tio->c_cc[VDISCRD] = CFLUSH;
509# endif
510# ifdef VWERSE
511 tio->c_cc[VWERSE] = CWERASE;
512# endif
513# ifdef VLNEXT
514 tio->c_cc[VLNEXT] = CLNEXT;
515# endif
516# ifdef VSTATUS
517 tio->c_cc[VSTATUS] = CSTATUS;
518# endif
519
520# if VMIN != VEOF
521 tio->c_cc[VMIN] = 1;
522# endif
523# if VTIME != VEOL
524 tio->c_cc[VTIME] = 0;
525# endif
526
527 /* input modes */
528 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
529# ifdef IMAXBEL
530 | IMAXBEL
531# endif
532 | IXON);
533
534 /* output modes */
535 tio->c_oflag = (OPOST | ONLCR);
536
537 /* control modes */
538 tio->c_cflag = (CS8 | CREAD);
539
540 /* local modes */
541 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
542# if defined (ECHOCTL) && defined (ECHOKE)
543 | ECHOCTL | ECHOKE
544# endif
545 | ECHOE | ECHOK);
546}
547
552char **rxvt_environ; // startup environment 548char **rxvt_environ; // startup environment
553 549
554void 550void
555rxvt_init () 551rxvt_init ()
556{ 552{
557 ptytty::init (); 553 assert (("fontMask must not overlap other RS masks",
554 0 == (RS_fontMask & (RS_Sel | RS_baseattrMask | RS_customMask | RS_bgMask | RS_fgMask))));
555
556 rxvt_get_ttymode (&rxvt_term::def_tio);
557
558 // get rid of stdin/stdout as we don't need them, to free resources
559 dup2 (STDERR_FILENO, STDIN_FILENO);
560 dup2 (STDERR_FILENO, STDOUT_FILENO);
561
562 if (!ev_default_loop ())
563 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
558 564
559 rxvt_environ = environ; 565 rxvt_environ = environ;
560 566
561 signal (SIGHUP, SIG_IGN); 567 signal (SIGHUP, SIG_IGN);
562 signal (SIGPIPE, SIG_IGN); 568 signal (SIGPIPE, SIG_IGN);
563 569
564 sig_handlers.sw_term.start (SIGTERM); 570 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
565 sig_handlers.sw_int.start (SIGINT); 571 sig_handlers.sw_int.start (SIGINT); ev_unref ();
566
567 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
568 /* signal (SIGURG, SIG_DFL); */
569 572
570 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 573 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
571 // TODO: handle this with exceptions and tolerate the memory loss 574 // TODO: handle this with exceptions and tolerate the memory loss
572 XSetIOErrorHandler (rxvt_xioerror_handler); 575 XSetIOErrorHandler (rxvt_xioerror_handler);
573 576
574 XrmInitialize (); 577 XrmInitialize ();
575} 578}
576 579
577/* ------------------------------------------------------------------------- *
578 * MEMORY ALLOCATION WRAPPERS *
579 * ------------------------------------------------------------------------- */
580void *
581rxvt_malloc (size_t size)
582{
583 void *p = malloc (size);
584
585 if (!p)
586 rxvt_fatal ("memory allocation failure. aborting.\n");
587
588 return p;
589}
590
591void *
592rxvt_calloc (size_t number, size_t size)
593{
594 void *p = calloc (number, size);
595
596 if (!p)
597 rxvt_fatal ("memory allocation failure. aborting.\n");
598
599 return p;
600}
601
602void *
603rxvt_realloc (void *ptr, size_t size)
604{
605 void *p = realloc (ptr, size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613/*----------------------------------------------------------------------*/ 580/*----------------------------------------------------------------------*/
614/* 581/*
615 * window size/position calculcations for XSizeHint and other storage. 582 * window size/position calculations for XSizeHint and other storage.
616 * if width/height are non-zero then override calculated width/height 583 * if width/height are non-zero then override calculated width/height
617 */ 584 */
618void 585void
619rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 586rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
620{ 587{
621 short recalc_x, recalc_y; 588 short recalc_x, recalc_y;
622 int x, y, sb_w, flags; 589 int x, y, flags;
623 unsigned int w, h; 590 unsigned int w, h;
624 unsigned int max_width, max_height; 591 unsigned int max_width, max_height;
625 592
626 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 593 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
627 szHint.win_gravity = NorthWestGravity; 594 szHint.win_gravity = NorthWestGravity;
… …
637 if (rs[Rs_geometry]) 604 if (rs[Rs_geometry])
638 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 605 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
639 606
640 if (flags & WidthValue) 607 if (flags & WidthValue)
641 { 608 {
609 if (!w)
610 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
611
642 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ()); 612 ncol = clamp (w, 1, std::numeric_limits<int16_t>::max ());
643 szHint.flags |= USSize; 613 szHint.flags |= USSize;
644 } 614 }
645 615
646 if (flags & HeightValue) 616 if (flags & HeightValue)
647 { 617 {
618 if (!h)
619 rxvt_fatal ("illegal window geometry (width and height must be non-zero), aborting.\n");
620
648 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ()); 621 nrow = clamp (h, 1, std::numeric_limits<int16_t>::max ());
649 szHint.flags |= USSize; 622 szHint.flags |= USSize;
650 } 623 }
651 624
652 if (flags & XValue) 625 if (flags & XValue)
653 { 626 {
… …
684 max_width = MAX_COLS * fwidth; 657 max_width = MAX_COLS * fwidth;
685 max_height = MAX_ROWS * fheight; 658 max_height = MAX_ROWS * fheight;
686 659
687 szHint.base_width = szHint.base_height = 2 * int_bwidth; 660 szHint.base_width = szHint.base_height = 2 * int_bwidth;
688 661
689 sb_w = 0;
690 window_vt_x = window_vt_y = int_bwidth; 662 window_vt_x = window_vt_y = int_bwidth;
691 663
692 if (scrollBar.state) 664 if (scrollBar.state)
693 { 665 {
694 sb_w = scrollbar_TotalWidth (); 666 int sb_w = scrollBar.total_width ();
695 szHint.base_width += sb_w; 667 szHint.base_width += sb_w;
668
696 if (!OPTION (Opt_scrollBar_right)) 669 if (!option (Opt_scrollBar_right))
697 window_vt_x += sb_w; 670 window_vt_x += sb_w;
698 } 671 }
699 672
700 szHint.width_inc = fwidth; 673 szHint.width_inc = fwidth;
701 szHint.height_inc = fheight; 674 szHint.height_inc = fheight;
702 szHint.min_width = szHint.base_width + szHint.width_inc; 675 szHint.min_width = szHint.base_width + szHint.width_inc;
703 szHint.min_height = szHint.base_height + szHint.height_inc; 676 szHint.min_height = szHint.base_height + szHint.height_inc;
704 677
705 if (newwidth && newwidth - szHint.base_width < max_width) 678 if (newwidth && newwidth - szHint.base_width < max_width)
706 { 679 {
707 szHint.width = newwidth; 680 szHint.width = newwidth;
… …
722 { 695 {
723 min_it (height, max_height); 696 min_it (height, max_height);
724 szHint.height = szHint.base_height + height; 697 szHint.height = szHint.base_height + height;
725 } 698 }
726 699
727 if (scrollBar.state && OPTION (Opt_scrollBar_right))
728 window_sb_x = szHint.width - sb_w;
729
730 if (recalc_x) 700 if (recalc_x)
731 szHint.x += DisplayWidth (xdisp, display->screen) - szHint.width - 2 * ext_bwidth; 701 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
732 702
733 if (recalc_y) 703 if (recalc_y)
734 szHint.y += DisplayHeight (xdisp, display->screen) - szHint.height - 2 * ext_bwidth; 704 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
735 705
736 ncol = width / fwidth; 706 ncol = width / fwidth;
737 nrow = height / fheight; 707 nrow = height / fheight;
738} 708}
739 709
740/*----------------------------------------------------------------------*/ 710/*----------------------------------------------------------------------*/
741/* 711/*
… …
752 722
753 ws.ws_col = ncol; 723 ws.ws_col = ncol;
754 ws.ws_row = nrow; 724 ws.ws_row = nrow;
755 ws.ws_xpixel = width; 725 ws.ws_xpixel = width;
756 ws.ws_ypixel = height; 726 ws.ws_ypixel = height;
757 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 727 ioctl (pty->pty, TIOCSWINSZ, &ws);
758 728
759#if 0 729#if 0
760 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 730 // TIOCSWINSZ is supposed to do this automatically and correctly
761 if (cmd_pid) /* force through to the command */ 731 if (cmd_pid) /* force through to the command */
762 kill (-cmd_pid, SIGWINCH); 732 kill (-cmd_pid, SIGWINCH);
763#endif 733#endif
764} 734}
765 735
… …
792#endif 762#endif
793 763
794 delete fontset[0]; 764 delete fontset[0];
795 fontset[0] = fs; 765 fontset[0] = fs;
796 766
797 prop = (*fs)[1]->properties (); 767 prop = (*fs)[rxvt_fontset::firstFont]->properties ();
798 prop.height += lineSpace; 768 prop.height += lineSpace;
769 prop.width += letterSpace;
770
799 fs->set_prop (prop); 771 fs->set_prop (prop, false);
800 772
801 fwidth = prop.width; 773 fwidth = prop.width;
802 fheight = prop.height; 774 fheight = prop.height;
803 fbase = prop.ascent; 775 fbase = prop.ascent;
804 776
… …
813 { 785 {
814 fontset[style] = fs = new rxvt_fontset (this); 786 fontset[style] = fs = new rxvt_fontset (this);
815 rxvt_fontprop prop2 = prop; 787 rxvt_fontprop prop2 = prop;
816 788
817 if (res) 789 if (res)
818 prop2.weight = prop2.slant = rxvt_fontprop::unset; 790 {
791 fs->populate (res);
792 fs->set_prop (prop2, false);
793 }
819 else 794 else
820 { 795 {
821 res = fontset[0]->fontdesc; 796 fs->populate (fontset[0]->fontdesc);
822 797
823 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 798 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
824 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 799 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
800
801 fs->set_prop (prop2, true);
825 } 802 }
826 803
827 fs->populate (res);
828 fs->set_prop (prop2);
829 } 804 }
830#else 805#else
831 fontset[style] = fontset[0]; 806 fontset[style] = fontset[0];
832#endif 807#endif
833 } 808 }
… …
835 if (parent[0]) 810 if (parent[0])
836 { 811 {
837 resize_all_windows (0, 0, 0); 812 resize_all_windows (0, 0, 0);
838 scr_remap_chars (); 813 scr_remap_chars ();
839 scr_touch (true); 814 scr_touch (true);
840 } 815 }
841 816
842 return true; 817 return true;
843} 818}
844 819
820void
845void rxvt_term::set_string_property (Atom prop, const char *str, int len) 821rxvt_term::set_string_property (Atom prop, const char *str, int len)
846{ 822{
847 XChangeProperty (display->display, parent[0], 823 XChangeProperty (dpy, parent[0],
848 prop, XA_STRING, 8, PropModeReplace, 824 prop, XA_STRING, 8, PropModeReplace,
849 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 825 (const unsigned char *)str, len >= 0 ? len : strlen (str));
850} 826}
851 827
828void
829rxvt_term::set_mbstring_property (Atom prop, const char *str, int len)
830{
831 XTextProperty ct;
832
833 if (XmbTextListToTextProperty (dpy, (char **)&str, 1, XStdICCTextStyle, &ct) >= 0)
834 {
835 XSetTextProperty (dpy, parent[0], &ct, prop);
836 XFree (ct.value);
837 }
838}
839
840void
852void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 841rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
853{ 842{
854 wchar_t *ws = rxvt_mbstowcs (str, len); 843 wchar_t *ws = rxvt_mbstowcs (str, len);
855 char *s = rxvt_wcstoutf8 (ws); 844 char *s = rxvt_wcstoutf8 (ws);
856 845
857 XChangeProperty (display->display, parent[0], 846 XChangeProperty (dpy, parent[0],
858 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 847 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
859 (const unsigned char *)s, strlen (s)); 848 (const unsigned char *)s, strlen (s));
860 849
861 free (s); 850 free (s);
862 free (ws); 851 free (ws);
… …
866/*----------------------------------------------------------------------*/ 855/*----------------------------------------------------------------------*/
867/* xterm sequences - title, iconName, color (exptl) */ 856/* xterm sequences - title, iconName, color (exptl) */
868void 857void
869rxvt_term::set_title (const char *str) 858rxvt_term::set_title (const char *str)
870{ 859{
871 set_string_property (XA_WM_NAME, str); 860 set_mbstring_property (XA_WM_NAME, str);
872#if ENABLE_EWMH 861#if ENABLE_EWMH
873 set_utf8_property (xa[XA_NET_WM_NAME], str); 862 set_utf8_property (xa[XA_NET_WM_NAME], str);
874#endif 863#endif
875} 864}
876 865
877void 866void
878rxvt_term::set_icon_name (const char *str) 867rxvt_term::set_icon_name (const char *str)
879{ 868{
880 set_string_property (XA_WM_ICON_NAME, str); 869 set_mbstring_property (XA_WM_ICON_NAME, str);
881#if ENABLE_EWMH 870#if ENABLE_EWMH
882 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 871 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
883#endif 872#endif
884} 873}
885 874
875void
876rxvt_term::set_window_color (int idx, const char *color)
877{
886#ifdef XTERM_COLOR_CHANGE 878#ifdef XTERM_COLOR_CHANGE
887void
888rxvt_term::set_window_color (int idx, const char *color)
889{
890 rxvt_color xcol; 879 rxvt_color xcol;
891 int i;
892 880
893 if (color == NULL || *color == '\0') 881 if (color == NULL || *color == '\0')
894 return; 882 return;
895 883
884 color = strdup (color);
885 allocated.push_back ((void *)color);
886 rs[Rs_color + idx] = color;
887
896 /* handle color aliases */ 888 /* handle color aliases */
897 if (isdigit (*color)) 889 if (isdigit (*color))
898 { 890 {
899 i = atoi (color); 891 int i = atoi (color);
900 892
901 if (i >= 8 && i <= 15) 893 if (i >= 8 && i <= 15)
894 {
902 { /* bright colors */ 895 /* bright colors */
903 i -= 8;
904 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 896 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
905 SET_PIXCOLOR (idx);
906 goto done; 897 goto done;
907 } 898 }
908 899
909 if (i >= 0 && i <= 7) 900 if (i >= 0 && i <= 7)
901 {
910 { /* normal colors */ 902 /* normal colors */
911 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 903 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
912 SET_PIXCOLOR (idx);
913 goto done; 904 goto done;
914 } 905 }
915 } 906 }
916 907
917 if (!rXParseAllocColor (&xcol, color)) 908 set_color (xcol, color);
918 return;
919
920 /* XStoreColor (display->display, display->cmap, XColor*); */
921 909
922 /* 910 /*
923 * FIXME: should free colors here, but no idea how to do it so instead, 911 * FIXME: should free colors here, but no idea how to do it so instead,
924 * so just keep gobbling up the colormap 912 * so just keep gobbling up the colormap
925 */ 913 */
926# if 0
927 for (i = Color_Black; i <= Color_White; i++)
928 if (pix_colors[idx] == pix_colors[i])
929 break;
930 if (i > Color_White)
931 {
932 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
933 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
934 DisplayPlanes (display->display, display->screen));
935 }
936# endif
937 914
938 pix_colors_focused[idx] = xcol; 915 pix_colors_focused[idx] = xcol;
939 SET_PIXCOLOR (idx);
940 916
941 /* XSetWindowAttributes attr; */
942 /* Cursor cursor; */
943done: 917done:
944
945#if OFF_FOCUS_FADING
946 if (rs[Rs_fade])
947 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (this, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
948#endif
949
950 /*TODO: handle Color_BD, scrollbar background, etc. */ 918 /*TODO: handle Color_BD, scrollbar background, etc. */
951 919
920 update_fade_color (idx);
952 recolour_cursor (); 921 recolour_cursor ();
953 scr_recolour (); 922 scr_recolour ();
923#endif /* XTERM_COLOR_CHANGE */
954} 924}
955
956#else
957# define set_window_color (idx,color) ((void)0)
958#endif /* XTERM_COLOR_CHANGE */
959 925
960void 926void
961rxvt_term::recolour_cursor () 927rxvt_term::recolour_cursor ()
962{ 928{
963 XColor xcol[2]; 929 XColor fg, bg;
964 930
965 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 931 (ISSET_PIXCOLOR (Color_pointer_fg)
966 ? pix_colors_focused[Color_pointer_fg] 932 ? pix_colors_focused[Color_pointer_fg]
967 : pix_colors_focused[Color_fg]; 933 : pix_colors_focused[Color_fg]).get (fg);
934
968 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 935 (ISSET_PIXCOLOR (Color_pointer_bg)
969 ? pix_colors_focused[Color_pointer_bg] 936 ? pix_colors_focused[Color_pointer_bg]
970 : pix_colors_focused[Color_bg]; 937 : pix_colors_focused[Color_bg]).get (bg);
971 938
972 XQueryColors (display->display, cmap, xcol, 2); 939 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
973 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
974} 940}
975 941
976/*----------------------------------------------------------------------*/ 942/*----------------------------------------------------------------------*/
977/* 943/*
978 * find if fg/bg matches any of the normal (low-intensity) colors 944 * find if fg/bg matches any of the normal (low-intensity) colors
979 */ 945 */
980void 946void
981rxvt_term::set_colorfgbg () 947rxvt_term::set_colorfgbg ()
982{ 948{
983 unsigned int i; 949 unsigned int i;
984 const char *xpmb = "\0"; 950 const char *xpmb = "";
985 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 951 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
986 952
987 strcpy (fstr, "default"); 953 strcpy (fstr, "default");
988 strcpy (bstr, "default"); 954 strcpy (bstr, "default");
989 for (i = Color_Black; i <= Color_White; i++) 955 for (i = Color_Black; i <= Color_White; i++)
… …
995 961
996 for (i = Color_Black; i <= Color_White; i++) 962 for (i = Color_Black; i <= Color_White; i++)
997 if (pix_colors[Color_bg] == pix_colors[i]) 963 if (pix_colors[Color_bg] == pix_colors[i])
998 { 964 {
999 sprintf (bstr, "%d", (i - Color_Black)); 965 sprintf (bstr, "%d", (i - Color_Black));
1000#ifdef XPM_BACKGROUND 966#ifdef BG_IMAGE_FROM_FILE
1001 xpmb = "default;"; 967 xpmb = "default;";
1002#endif 968#endif
1003 break; 969 break;
1004 } 970 }
1005 971
1006 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 972 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1007} 973}
1008 974
1009/*----------------------------------------------------------------------*/ 975/*----------------------------------------------------------------------*/
1010 976
1011int 977bool
1012rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 978rxvt_term::set_color (rxvt_color &color, const char *name)
1013{ 979{
1014 if (!screen_in_out->set (this, colour)) 980 if (color.set (this, name))
1015 {
1016 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1017 return false;
1018 }
1019
1020 return true; 981 return true;
982
983 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
984 return false;
985}
986
987void
988rxvt_term::alias_color (int dst, int src)
989{
990 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1021} 991}
1022 992
1023/* -------------------------------------------------------------------- * 993/* -------------------------------------------------------------------- *
1024 * - WINDOW RESIZING - * 994 * - WINDOW RESIZING - *
1025 * -------------------------------------------------------------------- */ 995 * -------------------------------------------------------------------- */
… …
1029 int fix_screen; 999 int fix_screen;
1030 int old_width = szHint.width; 1000 int old_width = szHint.width;
1031 int old_height = szHint.height; 1001 int old_height = szHint.height;
1032 1002
1033 window_calc (newwidth, newheight); 1003 window_calc (newwidth, newheight);
1004
1005 bool set_hint = !HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END));
1006
1007 // to avoid races between us and the wm, we clear the incremental size hints around the xresizewindow
1008 if (set_hint)
1009 {
1010 szHint.flags &= ~(PBaseSize | PResizeInc);
1034 XSetWMNormalHints (xdisp, parent[0], &szHint); 1011 XSetWMNormalHints (dpy, parent[0], &szHint);
1012 szHint.flags |= PBaseSize | PResizeInc;
1013 }
1035 1014
1036 if (!ignoreparent) 1015 if (!ignoreparent)
1037 { 1016 {
1038#ifdef SMART_RESIZE 1017#ifdef SMART_RESIZE
1039 /* 1018 /*
… …
1043 int x, y, x1, y1; 1022 int x, y, x1, y1;
1044 int dx, dy; 1023 int dx, dy;
1045 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1024 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1046 Window unused_cr; 1025 Window unused_cr;
1047 1026
1048 XTranslateCoordinates (xdisp, parent[0], display->root, 1027 XTranslateCoordinates (dpy, parent[0], display->root,
1049 0, 0, &x, &y, &unused_cr); 1028 0, 0, &x, &y, &unused_cr);
1050 XGetGeometry (xdisp, parent[0], &unused_cr, &x1, &y1, 1029 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1051 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1030 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1052 /* 1031 /*
1053 * if display->root isn't the parent window, a WM will probably have offset 1032 * if display->root isn't the parent window, a WM will probably have offset
1054 * our position for handles and decorations. Counter it 1033 * our position for handles and decorations. Counter it
1055 */ 1034 */
… …
1057 { 1036 {
1058 x -= x1; 1037 x -= x1;
1059 y -= y1; 1038 y -= y1;
1060 } 1039 }
1061 1040
1062 x1 = (DisplayWidth (xdisp, display->screen) - old_width ) / 2; 1041 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1063 y1 = (DisplayHeight (xdisp, display->screen) - old_height) / 2; 1042 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1064 dx = old_width - szHint.width; 1043 dx = old_width - szHint.width;
1065 dy = old_height - szHint.height; 1044 dy = old_height - szHint.height;
1066 1045
1067 /* Check position of the center of the window */ 1046 /* Check position of the center of the window */
1068 if (x < x1) /* left half */ 1047 if (x < x1) /* left half */
… …
1072 if (y < y1) /* top half */ 1051 if (y < y1) /* top half */
1073 dy = 0; 1052 dy = 0;
1074 else if (y == y1) /* exact center */ 1053 else if (y == y1) /* exact center */
1075 dy /= 2; 1054 dy /= 2;
1076 1055
1077 XMoveResizeWindow (xdisp, parent[0], x + dx, y + dy, 1056 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1078 szHint.width, szHint.height); 1057 szHint.width, szHint.height);
1079#else 1058#else
1080 XResizeWindow (xdisp, parent[0], szHint.width, szHint.height); 1059 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1081#endif 1060#endif
1082 } 1061 }
1062
1063 if (set_hint)
1064 XSetWMNormalHints (dpy, parent[0], &szHint);
1083 1065
1084 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1066 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1085 1067
1086 if (fix_screen || newwidth != old_width || newheight != old_height) 1068 if (fix_screen || newwidth != old_width || newheight != old_height)
1087 { 1069 {
1088 if (scrollBar.state) 1070 if (scrollBar.state)
1089 { 1071 scrollBar.resize ();
1090 XMoveResizeWindow (xdisp, scrollBar.win,
1091 window_sb_x, 0,
1092 scrollbar_TotalWidth (), szHint.height);
1093 resize_scrollbar ();
1094 }
1095 1072
1096 XMoveResizeWindow (xdisp, vt, 1073 XMoveResizeWindow (dpy, vt,
1097 window_vt_x, window_vt_y, 1074 window_vt_x, window_vt_y,
1098 width, height); 1075 width, height);
1099 1076
1100 scr_clear (); 1077#ifdef HAVE_BG_PIXMAP
1101#ifdef XPM_BACKGROUND 1078 if (bgPixmap.window_size_sensitive ())
1102 resize_pixmap (); 1079 update_background ();
1103#endif 1080#endif
1104 } 1081 }
1105 1082
1106 if (fix_screen || old_height == 0) 1083 if (fix_screen || old_height == 0)
1107 scr_reset (); 1084 scr_reset ();
1108 1085
1109#ifdef XPM_BACKGROUND 1086#ifdef HAVE_BG_PIXMAP
1110 if (pixmap) 1087// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1088// if (bgPixmap.pixmap)
1111 scr_touch (false); 1089// scr_touch (false);
1112#endif 1090#endif
1113 1091
1114#ifdef USE_XIM 1092#ifdef USE_XIM
1115 IMSetStatusPosition (); 1093 IMSetPosition ();
1116#endif 1094#endif
1117} 1095}
1118 1096
1119/* 1097/*
1120 * 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.
… …
1125{ 1103{
1126 XWindowAttributes wattr; 1104 XWindowAttributes wattr;
1127 1105
1128 if (newwidth == 0 || newheight == 0) 1106 if (newwidth == 0 || newheight == 0)
1129 { 1107 {
1130 XGetWindowAttributes (display->display, display->root, &wattr); 1108 XGetWindowAttributes (dpy, display->root, &wattr);
1131 1109
1132 if (newwidth == 0) 1110 if (newwidth == 0)
1133 newwidth = wattr.width - szHint.base_width; 1111 newwidth = wattr.width - szHint.base_width;
1134 if (newheight == 0) 1112 if (newheight == 0)
1135 newheight = wattr.height - szHint.base_height; 1113 newheight = wattr.height - szHint.base_height;
… …
1149#ifdef USE_XIM 1127#ifdef USE_XIM
1150 1128
1151void 1129void
1152rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1130rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1153{ 1131{
1154 fg = pix_colors[Color_fg]; 1132 fg = pix_colors [Color_fg];
1155 bg = pix_colors[Color_bg]; 1133 bg = pix_colors [Color_bg];
1156} 1134}
1157 1135
1158void 1136void
1159rxvt_term::im_set_size (XRectangle &size) 1137rxvt_term::im_set_size (XRectangle &size)
1160{ 1138{
… …
1183 1161
1184/* Checking whether input method is running. */ 1162/* Checking whether input method is running. */
1185bool 1163bool
1186rxvt_term::IMisRunning () 1164rxvt_term::IMisRunning ()
1187{ 1165{
1188 char *p;
1189 Atom atom; 1166 Atom atom;
1190 Window win; 1167 Window win;
1191 char server[IMBUFSIZ]; 1168 char server[IMBUFSIZ];
1192 1169
1193 /* get current locale modifier */ 1170 /* get current locale modifier */
1194 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1171 if (char *p = XSetLocaleModifiers (0))
1195 { 1172 {
1196 strcpy (server, "@server="); 1173 strcpy (server, "@server=");
1197 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1174 strncat (server, p + 4, IMBUFSIZ - 9); /* skip "@im=" */
1198 1175
1199 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1176 if (p = strchr (server + 1, '@')) /* first one only */
1200 *p = '\0'; 1177 *p = '\0';
1201 1178
1202 atom = XInternAtom (display->display, server, False); 1179 atom = XInternAtom (dpy, server, False);
1203 win = XGetSelectionOwner (display->display, atom); 1180 win = XGetSelectionOwner (dpy, atom);
1204 1181
1205 if (win != None) 1182 if (win != None)
1206 return True; 1183 return True;
1207 } 1184 }
1208 1185
… …
1271 1248
1272 term->make_current (); 1249 term->make_current ();
1273 1250
1274 if (text) 1251 if (text)
1275 { 1252 {
1276 void *str; 1253 wchar_t *str;
1277 1254
1278 if (!text->encoding_is_wchar && text->string.multi_byte) 1255 if (!text->encoding_is_wchar && text->string.multi_byte)
1279 { 1256 {
1280 // of course, X makes it ugly again 1257 // of course, X makes it ugly again
1281 if (term->rs[Rs_imLocale]) 1258 if (term->rs[Rs_imLocale])
1282 SET_LOCALE (term->rs[Rs_imLocale]); 1259 SET_LOCALE (term->rs[Rs_imLocale]);
1283 1260
1284 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t)); 1261 str = rxvt_temp_buf<wchar_t> (text->length + 1);
1285 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1); 1262 mbstowcs (str, text->string.multi_byte, text->length + 1);
1286 1263
1287 if (term->rs[Rs_imLocale]) 1264 if (term->rs[Rs_imLocale])
1288 SET_LOCALE (term->locale); 1265 SET_LOCALE (term->locale);
1289 } 1266 }
1290 else 1267 else
1291 str = (void *)text->string.wide_char; 1268 str = text->string.wide_char;
1292 1269
1293 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1270 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1294 DT_INT, call_data->caret, 1271 DT_INT, call_data->caret,
1295 DT_INT, call_data->chg_first, 1272 DT_INT, call_data->chg_first,
1296 DT_INT, call_data->chg_length, 1273 DT_INT, call_data->chg_length,
1297 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,
… …
1432 "*", 1409 "*",
1433 fheight, 1410 fheight,
1434 fheight + 1, fheight - 1, 1411 fheight + 1, fheight - 1,
1435 fheight - 2, fheight + 2); 1412 fheight - 2, fheight + 2);
1436 1413
1437 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1414 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1438 &missing_charset_list, &missing_charset_count, &def_string); 1415 &missing_charset_list, &missing_charset_count, &def_string);
1439 1416
1440 if (missing_charset_list) 1417 if (missing_charset_list)
1441 XFreeStringList (missing_charset_list); 1418 XFreeStringList (missing_charset_list);
1442 1419
… …
1517 preedit_attr, 1494 preedit_attr,
1518 status_attr ? XNStatusAttributes : NULL, 1495 status_attr ? XNStatusAttributes : NULL,
1519 status_attr, NULL); 1496 status_attr, NULL);
1520 1497
1521 if (preedit_attr) XFree (preedit_attr); 1498 if (preedit_attr) XFree (preedit_attr);
1522 if (status_attr) XFree (status_attr); 1499 if (status_attr) XFree (status_attr);
1523 if (fs) XFreeFontSet (display->display, fs); 1500 if (fs) XFreeFontSet (dpy, fs);
1524 1501
1525 if (Input_Context == NULL) 1502 if (Input_Context == NULL)
1526 { 1503 {
1527 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1504 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1528 im_destroy (); 1505 im_destroy ();
… …
1533 // unfortunately, only the focus window is used by XIM, hard to fix 1510 // unfortunately, only the focus window is used by XIM, hard to fix
1534 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL)) 1511 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1535 vt_select_input (); 1512 vt_select_input ();
1536#endif 1513#endif
1537 1514
1538 if (input_style & XIMPreeditArea)
1539 IMSetStatusPosition (); 1515 IMSetPosition ();
1540 1516
1541 return true; 1517 return true;
1542} 1518}
1543 1519
1544void 1520void
… …
1602 SET_LOCALE (locale); 1578 SET_LOCALE (locale);
1603#endif 1579#endif
1604} 1580}
1605 1581
1606void 1582void
1607rxvt_term::IMSetStatusPosition () 1583rxvt_term::IMSetPosition ()
1608{ 1584{
1609 XRectangle preedit_rect, status_rect, *needed_rect; 1585 XRectangle preedit_rect, status_rect, *needed_rect;
1610 XVaNestedList preedit_attr, status_attr; 1586 XVaNestedList preedit_attr, status_attr;
1611 1587
1612 if (!Input_Context 1588 if (!Input_Context
1613 || !focus 1589 || !focus
1614 || !(input_style & XIMPreeditArea) 1590 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1615 || !IMisRunning ()) 1591 || !IMisRunning ())
1616 return; 1592 return;
1617 1593
1594 if (input_style & XIMPreeditPosition)
1595 {
1596 im_set_size (preedit_rect);
1597 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1598
1599 XSetICValues (Input_Context,
1600 XNPreeditAttributes, preedit_attr, NULL);
1601 }
1602 else
1603 {
1618 /* Getting the necessary width of preedit area */ 1604 /* Getting the necessary width of preedit area */
1619 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1605 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1620 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1606 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1621 XFree (status_attr); 1607 XFree (status_attr);
1622 1608
1623 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1609 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1624 XFree (needed_rect); 1610 XFree (needed_rect);
1625 1611
1626 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1612 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1627 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1613 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1628 1614
1629 XSetICValues (Input_Context, 1615 XSetICValues (Input_Context,
1630 XNPreeditAttributes, preedit_attr, 1616 XNPreeditAttributes, preedit_attr,
1631 XNStatusAttributes, status_attr, NULL); 1617 XNStatusAttributes, status_attr,
1618 NULL);
1632 1619
1620 XFree (status_attr);
1621 }
1622
1633 XFree (preedit_attr); 1623 XFree (preedit_attr);
1634 XFree (status_attr);
1635} 1624}
1636#endif /* USE_XIM */ 1625#endif /* USE_XIM */
1626
1627void
1628rxvt_term::get_window_origin (int &x, int &y)
1629{
1630 Window cr;
1631 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1632}
1633
1634Pixmap
1635rxvt_term::get_pixmap_property (int prop_id)
1636{
1637 if (prop_id > 0 && prop_id < NUM_XA)
1638 if (xa[prop_id])
1639 {
1640 int aformat;
1641 unsigned long nitems, bytes_after;
1642 Atom atype;
1643 unsigned char *prop = NULL;
1644 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1645 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1646 &nitems, &bytes_after, &prop);
1647 if (result == Success && prop && atype == XA_PIXMAP)
1648 return *(Pixmap *)prop;
1649 }
1650
1651 return None;
1652}
1653
1654#ifdef HAVE_BG_PIXMAP
1655
1656void
1657rxvt_term::update_background ()
1658{
1659 if (update_background_ev.is_active ())
1660 return;
1661
1662 bgPixmap.invalidate ();
1663
1664 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1665
1666 if (to_wait <= 0.)
1667 bgPixmap.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 bgPixmap.render ();
1679 refresh_check ();
1680}
1681
1682#endif /* HAVE_BG_PIXMAP */
1637 1683
1638/*----------------------- end-of-file (C source) -----------------------*/ 1684/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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