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.192 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.301 by ayin, Sat Jan 19 13:00:10 2008 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-2007 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.
… …
38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H
48# include <termios.h> 43#include <termios.h>
44
45#ifdef HAVE_XSETLOCALE
46# define X_LOCALE
47# include <X11/Xlocale.h>
48#else
49# ifdef HAVE_SETLOCALE
50# include <clocale>
51# endif
49#endif 52#endif
50 53
51vector<rxvt_term *> rxvt_term::termlist; 54vector<rxvt_term *> rxvt_term::termlist;
52 55
53// used to tell global functions which terminal instance is "active" 56// used to tell global functions which terminal instance is "active"
… …
56static char curlocale[128], savelocale[128]; 59static char curlocale[128], savelocale[128];
57 60
58bool 61bool
59rxvt_set_locale (const char *locale) NOTHROW 62rxvt_set_locale (const char *locale) NOTHROW
60{ 63{
64 int size = strlen (locale) + 1;
65
66 if (size > sizeof (curlocale))
67 rxvt_fatal ("locale string too long, aborting.\n");
68
61 if (!locale || !strncmp (locale, curlocale, 128)) 69 if (!locale || !memcmp (locale, curlocale, size))
62 return false; 70 return false;
63 71
64 strncpy (curlocale, locale, 128); 72 memcpy (curlocale, locale, size);
65 setlocale (LC_CTYPE, curlocale); 73 setlocale (LC_CTYPE, curlocale);
66 return true; 74 return true;
67} 75}
68 76
69void 77void
… …
83class rxvt_composite_vec rxvt_composite; 91class rxvt_composite_vec rxvt_composite;
84 92
85text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 93text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
86{ 94{
87 compose_char *cc; 95 compose_char *cc;
88 96
89 // break compose chains, as stupid readline really likes to duplicate 97 // break compose chains, as stupid readline really likes to duplicate
90 // composing characters for some reason near the end of a line. 98 // composing characters for some reason near the end of a line.
91 cc = (*this)[c1]; 99 cc = (*this)[c1];
92 while (cc) 100 while (cc)
93 { 101 {
… …
142 150
143} 151}
144#endif 152#endif
145 153
146rxvt_term::rxvt_term () 154rxvt_term::rxvt_term ()
147 : 155{
148#if TRANSPARENT 156#if HAVE_BG_PIXMAP
149 rootwin_ev (this, &rxvt_term::rootwin_cb), 157 update_background_ev.set<rxvt_term, &rxvt_term::update_background_cb> (this);
158#endif
159#ifdef CURSOR_BLINK
160 cursor_blink_ev.set <rxvt_term, &rxvt_term::cursor_blink_cb> (this); cursor_blink_ev.set (0., CURSOR_BLINK_INTERVAL);
161#endif
162#ifdef TEXT_BLINK
163 text_blink_ev.set <rxvt_term, &rxvt_term::text_blink_cb> (this); text_blink_ev.set (0., TEXT_BLINK_INTERVAL);
164#endif
165#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
166 cont_scroll_ev.set <rxvt_term, &rxvt_term::cont_scroll_cb> (this);
167#endif
168#ifdef SELECTION_SCROLLING
169 sel_scroll_ev.set <rxvt_term, &rxvt_term::sel_scroll_cb> (this);
170#endif
171#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
172 slip_wheel_ev.set <rxvt_term, &rxvt_term::slip_wheel_cb> (this);
173#endif
174#if ENABLE_TRANSPARENCY || ENABLE_PERL
175 rootwin_ev.set <rxvt_term, &rxvt_term::rootwin_cb> (this),
150#endif 176#endif
151#ifdef HAVE_SCROLLBARS 177#ifdef HAVE_SCROLLBARS
152 scrollbar_ev (this, &rxvt_term::x_cb), 178 scrollbar_ev.set <rxvt_term, &rxvt_term::x_cb> (this),
153#endif 179#endif
154#ifdef CURSOR_BLINK 180#ifdef USE_XIM
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 181 im_ev.set <rxvt_term, &rxvt_term::im_cb> (this),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif 182#endif
169#ifdef POINTER_BLANK 183#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb), 184 pointer_ev.set <rxvt_term, &rxvt_term::pointer_cb> (this);
171#endif 185#endif
172#ifdef USE_XIM 186#ifndef NO_BELL
173 im_ev (this, &rxvt_term::im_cb), 187 bell_ev.set <rxvt_term, &rxvt_term::bell_cb> (this);
174#endif 188#endif
175 termwin_ev (this, &rxvt_term::x_cb), 189 child_ev.set <rxvt_term, &rxvt_term::child_cb> (this);
176 vt_ev (this, &rxvt_term::x_cb), 190 flush_ev.set <rxvt_term, &rxvt_term::flush_cb> (this);
177 child_ev (this, &rxvt_term::child_cb), 191 destroy_ev.set <rxvt_term, &rxvt_term::destroy_cb> (this);
178 check_ev (this, &rxvt_term::check_cb), 192 pty_ev.set <rxvt_term, &rxvt_term::pty_cb> (this);
179 flush_ev (this, &rxvt_term::flush_cb), 193 incr_ev.set <rxvt_term, &rxvt_term::incr_cb> (this);
180 destroy_ev (this, &rxvt_term::destroy_cb), 194 termwin_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
181 pty_ev (this, &rxvt_term::pty_cb), 195 vt_ev.set <rxvt_term, &rxvt_term::x_cb> (this);
182 incr_ev (this, &rxvt_term::incr_cb) 196
183{
184 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 197 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
185 198
186 termlist.push_back (this); 199 termlist.push_back (this);
187 200
188#ifdef KEYSYM_RESOURCE 201#ifdef KEYSYM_RESOURCE
… …
190#endif 203#endif
191} 204}
192 205
193// clean up the most important stuff, do *not* call x or free mem etc. 206// clean up the most important stuff, do *not* call x or free mem etc.
194// for use before an emergency exit 207// for use before an emergency exit
208void
195void rxvt_term::emergency_cleanup () 209rxvt_term::emergency_cleanup ()
196{ 210{
197 if (cmd_pid) 211 if (cmd_pid)
198 kill (-cmd_pid, SIGHUP); 212 kill (-cmd_pid, SIGHUP);
199 213
214 pty_ev.stop ();
200 delete pty; pty = 0; 215 delete pty; pty = 0;
201} 216}
202 217
203rxvt_term::~rxvt_term () 218rxvt_term::~rxvt_term ()
204{ 219{
… …
211 if (fontset[i] != fontset[0]) 226 if (fontset[i] != fontset[0])
212 delete fontset[i]; 227 delete fontset[i];
213#endif 228#endif
214 delete fontset[0]; 229 delete fontset[0];
215 230
231#ifdef HAVE_BG_PIXMAP
232 bgPixmap.destroy ();
233#endif
234
216 if (display) 235 if (display)
217 { 236 {
218 dDisp;
219
220 selection_clear (); 237 selection_clear ();
221 238
222#ifdef USE_XIM 239#ifdef USE_XIM
223 im_destroy (); 240 im_destroy ();
224#endif 241#endif
225#ifdef XTERM_SCROLLBAR 242#ifdef XTERM_SCROLLBAR
226 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 243 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
227 if (ShadowGC) XFreeGC (disp, ShadowGC); 244 if (ShadowGC) XFreeGC (dpy, ShadowGC);
228#endif 245#endif
229#ifdef PLAIN_SCROLLBAR 246#ifdef PLAIN_SCROLLBAR
230 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 247 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
231#endif 248#endif
232#ifdef NEXT_SCROLLBAR 249#ifdef NEXT_SCROLLBAR
233 if (blackGC) XFreeGC (disp, blackGC); 250 if (blackGC) XFreeGC (dpy, blackGC);
234 if (whiteGC) XFreeGC (disp, whiteGC); 251 if (whiteGC) XFreeGC (dpy, whiteGC);
235 if (grayGC) XFreeGC (disp, grayGC); 252 if (grayGC) XFreeGC (dpy, grayGC);
236 if (darkGC) XFreeGC (disp, darkGC); 253 if (darkGC) XFreeGC (dpy, darkGC);
237 if (stippleGC) XFreeGC (disp, stippleGC); 254 if (stippleGC) XFreeGC (dpy, stippleGC);
238 if (dimple) XFreePixmap (disp, dimple); 255 if (dimple) XFreePixmap (dpy, dimple);
239 if (upArrow) XFreePixmap (disp, upArrow); 256 if (upArrow) XFreePixmap (dpy, upArrow);
240 if (downArrow) XFreePixmap (disp, downArrow); 257 if (downArrow) XFreePixmap (dpy, downArrow);
241 if (upArrowHi) XFreePixmap (disp, upArrowHi); 258 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
242 if (downArrowHi) XFreePixmap (disp, downArrowHi); 259 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
243#endif 260#endif
244#ifdef RXVT_SCROLLBAR 261#ifdef RXVT_SCROLLBAR
245 if (topShadowGC) XFreeGC (disp, topShadowGC); 262 if (topShadowGC) XFreeGC (dpy, topShadowGC);
246 if (botShadowGC) XFreeGC (disp, botShadowGC); 263 if (botShadowGC) XFreeGC (dpy, botShadowGC);
247 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 264 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
248#endif 265#endif
249 if (gc) XFreeGC (disp, gc); 266 if (gc) XFreeGC (dpy, gc);
250 267
251 delete drawable; 268 delete drawable;
252 // destroy all windows 269 // destroy all windows
253 if (parent[0]) 270 if (parent[0])
254 XDestroyWindow (disp, parent[0]); 271 XDestroyWindow (dpy, parent[0]);
255 }
256 272
257 // TODO: free pixcolours, colours should become part of rxvt_display 273 for (int i = 0; i < TOTAL_COLORS; i++)
258 delete pix_colors_focused; 274 if (ISSET_PIXCOLOR (i))
275 {
276 pix_colors_focused [i].free (this);
259#if OFF_FOCUS_FADING 277#if OFF_FOCUS_FADING
260 delete pix_colors_unfocused; 278 pix_colors_unfocused [i].free (this);
261#endif 279#endif
280 }
262 281
282 clear ();
283
284 display->flush (); /* ideally .put should do this */
263 displays.put (display); 285 displays.put (display);
286 }
264 287
265 scr_release (); 288 scr_release ();
266 289
267 /* clear all resources */ 290 /* clear all resources */
268 for (int i = 0; i < allocated.size (); i++) 291 for (int i = 0; i < allocated.size (); i++)
269 free (allocated [i]); 292 free (allocated [i]);
270 293
271 free (selection.text); 294 free (selection.text);
272 // TODO: manage env vars in child only(!) 295 // TODO: manage env vars in child only(!)
273 free (env_windowid);
274 free (env_display); 296 free (env_display);
275 free (env_term); 297 free (env_term);
276 free (env_colorfgbg);
277 free (locale); 298 free (locale);
278 free (v_buffer); 299 free (v_buffer);
279 free (incr_buf); 300 free (incr_buf);
280 301
281 delete envv; 302 delete envv;
282 delete argv; 303 delete argv;
283 304
284#ifdef KEYSYM_RESOURCE 305#ifdef KEYSYM_RESOURCE
285 delete keyboard; 306 delete keyboard;
286#endif 307#endif
308#ifndef NO_RESOURCES
309 XrmDestroyDatabase (option_db);
310#endif
287} 311}
288 312
289// child has exited, usually destroys 313// child has exited, usually destroys
290void 314void
291rxvt_term::child_cb (child_watcher &w, int status) 315rxvt_term::child_cb (ev::child &w, int status)
292{ 316{
293 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 317 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
294 318
295 cmd_pid = 0; 319 cmd_pid = 0;
296 320
297 if (!OPTION (Opt_hold)) 321 if (!option (Opt_hold))
298 destroy (); 322 destroy ();
299} 323}
300 324
301void 325void
302rxvt_term::destroy () 326rxvt_term::destroy ()
303{ 327{
304 if (destroy_ev.active) 328 if (destroy_ev.is_active ())
305 return; 329 return;
306 330
307 if (HOOK_INVOKE ((this, HOOK_DESTROY, DT_END))) 331 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
308 return;
309 332
310#if ENABLE_OVERLAY 333#if ENABLE_OVERLAY
311 scr_overlay_off (); 334 scr_overlay_off ();
312#endif 335#endif
313 336
… …
317 im_ev.stop (display); 340 im_ev.stop (display);
318#endif 341#endif
319#if HAVE_SCROLLBARS 342#if HAVE_SCROLLBARS
320 scrollbar_ev.stop (display); 343 scrollbar_ev.stop (display);
321#endif 344#endif
322#if TRANSPARENT 345#if ENABLE_TRANSPARENCY || ENABLE_PERL
323 rootwin_ev.stop (display); 346 rootwin_ev.stop (display);
324#endif 347#endif
325 incr_ev.stop (); 348 incr_ev.stop ();
326 termwin_ev.stop (display); 349 termwin_ev.stop (display);
327 vt_ev.stop (display); 350 vt_ev.stop (display);
328 } 351 }
329 352
330 check_ev.stop (); 353 flush_ev.stop ();
331 pty_ev.stop (); 354 pty_ev.stop ();
332#ifdef CURSOR_BLINK 355#ifdef CURSOR_BLINK
333 cursor_blink_ev.stop (); 356 cursor_blink_ev.stop ();
334#endif 357#endif
335#ifdef TEXT_BLINK 358#ifdef TEXT_BLINK
… …
343#endif 366#endif
344#ifdef POINTER_BLANK 367#ifdef POINTER_BLANK
345 pointer_ev.stop (); 368 pointer_ev.stop ();
346#endif 369#endif
347 370
348 destroy_ev.start (0); 371 destroy_ev.start ();
349} 372}
350 373
351void 374void
352rxvt_term::destroy_cb (time_watcher &w) 375rxvt_term::destroy_cb (ev::idle &w, int revents)
353{ 376{
354 make_current (); 377 make_current ();
355 378
356 delete this; 379 delete this;
357} 380}
… …
368{ 391{
369 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 392 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
370 (*t)->emergency_cleanup (); 393 (*t)->emergency_cleanup ();
371} 394}
372 395
373#if ENABLE_FRILLS 396#if !ENABLE_MINIMAL
374static void 397static void
375print_x_error (Display *dpy, XErrorEvent *event) 398print_x_error (Display *dpy, XErrorEvent *event)
376{ 399{
377 char buffer[BUFSIZ]; 400 char buffer[BUFSIZ];
378 char mesg[BUFSIZ]; 401 char mesg[BUFSIZ];
… …
411 else 434 else
412 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 435 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
413 mesg, BUFSIZ); 436 mesg, BUFSIZ);
414 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 437 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
415 } 438 }
416 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 439 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
417 mesg, BUFSIZ); 440 mesg, BUFSIZ);
418 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 441 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
419} 442}
420#endif 443#endif
421 444
… …
426 GET_R->allowedxerror = event->error_code; 449 GET_R->allowedxerror = event->error_code;
427 else 450 else
428 { 451 {
429 // GET_R is most likely not the terminal which caused the error, 452 // GET_R is most likely not the terminal which caused the error,
430 // so just output the error and continue 453 // so just output the error and continue
431#if ENABLE_FRILLS 454#if ENABLE_MINIMAL
455 old_xerror_handler (display, event);
456#else
432 print_x_error (display, event); 457 print_x_error (display, event);
433#else
434 old_xerror_handler (display, event);
435#endif 458#endif
436 } 459 }
437 460
438 return 0; 461 return 0;
439} 462}
… …
445 DisplayString (display)); 468 DisplayString (display));
446 rxvt_emergency_cleanup (); 469 rxvt_emergency_cleanup ();
447 _exit (EXIT_FAILURE); 470 _exit (EXIT_FAILURE);
448} 471}
449 472
450/*----------------------------------------------------------------------*/
451bool
452rxvt_term::init (int argc, const char *const *argv)
453{
454 SET_R (this);
455 set_locale ("");
456 set_environ (envv); // few things in X do not call setlocale :(
457
458 if (!init_vars ())
459 return false;
460
461 init_secondary ();
462
463 const char **cmd_argv = init_resources (argc, argv);
464
465#ifdef KEYSYM_RESOURCE
466 keyboard->register_done ();
467#endif
468
469#ifdef HAVE_SCROLLBARS
470 if (OPTION (Opt_scrollBar))
471 scrollBar.setIdle (); /* set existence for size calculations */
472#endif
473
474 pty = rxvt_new_ptytty ();
475
476 create_windows (argc, argv);
477
478 dDisp;
479
480 init_xlocale ();
481
482 scr_reset (); // initialize screen
483
484#if 0
485 XSynchronize (disp, 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 (disp, 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 XMapWindow (disp, vt);
515 XMapWindow (disp, parent[0]);
516
517 return true;
518}
519
520static struct sig_handlers 473static struct sig_handlers
521{ 474{
522 sig_watcher sw_term, sw_int; 475 ev::sig sw_term, sw_int;
523 476
524 /* 477 /*
525 * Catch a fatal signal and tidy up before quitting 478 * Catch a fatal signal and tidy up before quitting
526 */ 479 */
527 void 480 void sig_term (ev::sig &w, int revents);
528 sig_term (sig_watcher &w) 481
482 sig_handlers ()
529 { 483 {
530#ifdef DEBUG_CMD 484 sw_term.set<sig_handlers, &sig_handlers::sig_term> (this);
531 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
532#endif
533 rxvt_emergency_cleanup ();
534 signal (w.signum, SIG_DFL);
535 kill (getpid (), w.signum);
536 }
537
538 sig_handlers ()
539 : sw_term (this, &sig_handlers::sig_term),
540 sw_int (this, &sig_handlers::sig_term) 485 sw_int .set<sig_handlers, &sig_handlers::sig_term> (this);
541 {
542 } 486 }
543} sig_handlers; 487} sig_handlers;
544 488
489void
490sig_handlers::sig_term (ev::sig &w, int revents)
491{
492 rxvt_emergency_cleanup ();
493 w.stop ();
494 kill (getpid (), w.signum);
495}
496
545char **rxvt_environ; // startup environment 497char **rxvt_environ; // startup environment
546 498
547void 499void
548rxvt_init () 500rxvt_init ()
549{ 501{
550 uid_t uid = getuid (); 502 ptytty::init ();
551 gid_t gid = getgid ();
552
553 // before doing anything else, check for setuid/setgid operation,
554 // start the helper process and drop privileges
555 if (uid != geteuid ()
556 || gid != getegid ())
557 {
558#if PTYTTY_HELPER
559 rxvt_ptytty_server ();
560#else
561 rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
562#endif
563 503
564 // drop privileges 504 if (!ev_default_loop (0))
565#if HAVE_SETRESUID 505 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
566 setresgid (gid, gid, gid);
567 setresuid (uid, uid, uid);
568#elif HAVE_SETREUID
569 setregid (gid, gid);
570 setreuid (uid, uid);
571#elif HAVE_SETUID
572 setgid (gid);
573 setuid (uid);
574#endif
575
576 if (uid != geteuid ()
577 || gid != getegid ())
578 rxvt_fatal ("unable to drop privileges, aborting.\n");
579 }
580 506
581 rxvt_environ = environ; 507 rxvt_environ = environ;
582 508
583 signal (SIGHUP, SIG_IGN); 509 signal (SIGHUP, SIG_IGN);
584 signal (SIGPIPE, SIG_IGN); 510 signal (SIGPIPE, SIG_IGN);
585 511
586 sig_handlers.sw_term.start (SIGTERM); 512 sig_handlers.sw_term.start (SIGTERM); ev_unref ();
587 sig_handlers.sw_int.start (SIGINT); 513 sig_handlers.sw_int.start (SIGINT); ev_unref ();
588 514
589 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 515 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
590 /* signal (SIGURG, SIG_DFL); */ 516 /* signal (SIGURG, SIG_DFL); */
591 517
592 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 518 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
… …
594 XSetIOErrorHandler (rxvt_xioerror_handler); 520 XSetIOErrorHandler (rxvt_xioerror_handler);
595 521
596 XrmInitialize (); 522 XrmInitialize ();
597} 523}
598 524
599/* ------------------------------------------------------------------------- *
600 * MEMORY ALLOCATION WRAPPERS *
601 * ------------------------------------------------------------------------- */
602void *
603rxvt_malloc (size_t size)
604{
605 void *p = malloc (size);
606
607 if (!p)
608 rxvt_fatal ("memory allocation failure. aborting.\n");
609
610 return p;
611}
612
613void *
614rxvt_calloc (size_t number, size_t size)
615{
616 void *p = calloc (number, size);
617
618 if (!p)
619 rxvt_fatal ("memory allocation failure. aborting.\n");
620
621 return p;
622}
623
624void *
625rxvt_realloc (void *ptr, size_t size)
626{
627 void *p = realloc (ptr, size);
628
629 if (!p)
630 rxvt_fatal ("memory allocation failure. aborting.\n");
631
632 return p;
633}
634
635/*----------------------------------------------------------------------*/ 525/*----------------------------------------------------------------------*/
636/* 526/*
637 * window size/position calculcations for XSizeHint and other storage. 527 * window size/position calculations for XSizeHint and other storage.
638 * if width/height are non-zero then override calculated width/height 528 * if width/height are non-zero then override calculated width/height
639 */ 529 */
640void 530void
641rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 531rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
642{ 532{
643 short recalc_x, recalc_y; 533 short recalc_x, recalc_y;
644 int x, y, sb_w, flags; 534 int x, y, sb_w, flags;
645 unsigned int w, h; 535 unsigned int w, h;
646 unsigned int max_width, max_height; 536 unsigned int max_width, max_height;
647 dDisp;
648
649 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
650 ncol, nrow, szHint.width, szHint.height));
651 537
652 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 538 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
653 szHint.win_gravity = NorthWestGravity; 539 szHint.win_gravity = NorthWestGravity;
654 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 540 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
655 541
… …
717 603
718 if (scrollBar.state) 604 if (scrollBar.state)
719 { 605 {
720 sb_w = scrollbar_TotalWidth (); 606 sb_w = scrollbar_TotalWidth ();
721 szHint.base_width += sb_w; 607 szHint.base_width += sb_w;
608
722 if (!OPTION (Opt_scrollBar_right)) 609 if (!option (Opt_scrollBar_right))
723 window_vt_x += sb_w; 610 window_vt_x += sb_w;
724 } 611 }
725 612
726 szHint.width_inc = fwidth; 613 szHint.width_inc = fwidth;
727 szHint.height_inc = fheight; 614 szHint.height_inc = fheight;
728 szHint.min_width = szHint.base_width + szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
729 szHint.min_height = szHint.base_height + szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
730 617
731 if (newwidth && newwidth - szHint.base_width < max_width) 618 if (newwidth && newwidth - szHint.base_width < max_width)
732 { 619 {
733 szHint.width = newwidth; 620 szHint.width = newwidth;
… …
748 { 635 {
749 min_it (height, max_height); 636 min_it (height, max_height);
750 szHint.height = szHint.base_height + height; 637 szHint.height = szHint.base_height + height;
751 } 638 }
752 639
753 if (scrollBar.state && OPTION (Opt_scrollBar_right)) 640 if (scrollBar.state && option (Opt_scrollBar_right))
754 window_sb_x = szHint.width - sb_w; 641 window_sb_x = szHint.width - sb_w;
755 642
756 if (recalc_x) 643 if (recalc_x)
757 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 644 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
645
758 if (recalc_y) 646 if (recalc_y)
759 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 647 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
760 648
761 ncol = width / fwidth; 649 ncol = width / fwidth;
762 nrow = height / fheight; 650 nrow = height / fheight;
763 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
764 ncol, nrow, szHint.width,
765 szHint.height));
766 return;
767} 651}
768 652
769/*----------------------------------------------------------------------*/ 653/*----------------------------------------------------------------------*/
770/* 654/*
771 * Tell the teletype handler what size the window is. 655 * Tell the teletype handler what size the window is.
… …
784 ws.ws_xpixel = width; 668 ws.ws_xpixel = width;
785 ws.ws_ypixel = height; 669 ws.ws_ypixel = height;
786 (void)ioctl (pty->pty, TIOCSWINSZ, &ws); 670 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
787 671
788#if 0 672#if 0
789 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 673 // TIOCSWINSZ is supposed to do this automatically and correctly
790 if (cmd_pid) /* force through to the command */ 674 if (cmd_pid) /* force through to the command */
791 kill (-cmd_pid, SIGWINCH); 675 kill (-cmd_pid, SIGWINCH);
792#endif 676#endif
793} 677}
794 678
… …
823 delete fontset[0]; 707 delete fontset[0];
824 fontset[0] = fs; 708 fontset[0] = fs;
825 709
826 prop = (*fs)[1]->properties (); 710 prop = (*fs)[1]->properties ();
827 prop.height += lineSpace; 711 prop.height += lineSpace;
712
828 fs->set_prop (prop); 713 fs->set_prop (prop, false);
829 714
830 fwidth = prop.width; 715 fwidth = prop.width;
831 fheight = prop.height; 716 fheight = prop.height;
832 fbase = prop.ascent; 717 fbase = prop.ascent;
833 718
… …
842 { 727 {
843 fontset[style] = fs = new rxvt_fontset (this); 728 fontset[style] = fs = new rxvt_fontset (this);
844 rxvt_fontprop prop2 = prop; 729 rxvt_fontprop prop2 = prop;
845 730
846 if (res) 731 if (res)
847 prop2.weight = prop2.slant = rxvt_fontprop::unset; 732 {
733 fs->populate (res);
734 fs->set_prop (prop2, false);
735 }
848 else 736 else
849 { 737 {
850 res = fontset[0]->fontdesc; 738 fs->populate (fontset[0]->fontdesc);
851 739
852 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 740 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
853 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 741 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
742
743 fs->set_prop (prop2, true);
854 } 744 }
855 745
856 fs->populate (res);
857 fs->set_prop (prop2);
858 } 746 }
859#else 747#else
860 fontset[style] = fontset[0]; 748 fontset[style] = fontset[0];
861#endif 749#endif
862 } 750 }
… …
864 if (parent[0]) 752 if (parent[0])
865 { 753 {
866 resize_all_windows (0, 0, 0); 754 resize_all_windows (0, 0, 0);
867 scr_remap_chars (); 755 scr_remap_chars ();
868 scr_touch (true); 756 scr_touch (true);
869 } 757 }
870 758
871 return true; 759 return true;
872} 760}
873 761
762void
874void rxvt_term::set_string_property (Atom prop, const char *str, int len) 763rxvt_term::set_string_property (Atom prop, const char *str, int len)
875{ 764{
876 XChangeProperty (display->display, parent[0], 765 XChangeProperty (dpy, parent[0],
877 prop, XA_STRING, 8, PropModeReplace, 766 prop, XA_STRING, 8, PropModeReplace,
878 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 767 (const unsigned char *)str, len >= 0 ? len : strlen (str));
879} 768}
880 769
770void
881void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 771rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
882{ 772{
883 wchar_t *ws = rxvt_mbstowcs (str, len); 773 wchar_t *ws = rxvt_mbstowcs (str, len);
884 char *s = rxvt_wcstoutf8 (ws); 774 char *s = rxvt_wcstoutf8 (ws);
885 775
886 XChangeProperty (display->display, parent[0], 776 XChangeProperty (dpy, parent[0],
887 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 777 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
888 (const unsigned char *)s, strlen (s)); 778 (const unsigned char *)s, strlen (s));
889 779
890 free (s); 780 free (s);
891 free (ws); 781 free (ws);
… …
910#if ENABLE_EWMH 800#if ENABLE_EWMH
911 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 801 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
912#endif 802#endif
913} 803}
914 804
805void
806rxvt_term::set_window_color (int idx, const char *color)
807{
915#ifdef XTERM_COLOR_CHANGE 808#ifdef XTERM_COLOR_CHANGE
916void
917rxvt_term::set_window_color (int idx, const char *color)
918{
919 rxvt_color xcol; 809 rxvt_color xcol;
920 int i; 810 int i;
921 811
922 if (color == NULL || *color == '\0') 812 if (color == NULL || *color == '\0')
923 return; 813 return;
924 814
815 color = strdup (color);
816 allocated.push_back ((void *)color);
817 rs[Rs_color + idx] = color;
818
925 /* handle color aliases */ 819 /* handle color aliases */
926 if (isdigit (*color)) 820 if (isdigit (*color))
927 { 821 {
928 i = atoi (color); 822 i = atoi (color);
929 823
930 if (i >= 8 && i <= 15) 824 if (i >= 8 && i <= 15)
825 {
931 { /* bright colors */ 826 /* bright colors */
932 i -= 8;
933 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 827 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i - 8];
934 SET_PIXCOLOR (idx);
935 goto done; 828 goto done;
936 } 829 }
937 830
938 if (i >= 0 && i <= 7) 831 if (i >= 0 && i <= 7)
832 {
939 { /* normal colors */ 833 /* normal colors */
940 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 834 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
941 SET_PIXCOLOR (idx);
942 goto done; 835 goto done;
943 } 836 }
944 } 837 }
945 838
946 if (!rXParseAllocColor (&xcol, color)) 839 set_color (xcol, color);
947 return;
948
949 /* XStoreColor (display->display, display->cmap, XColor*); */
950 840
951 /* 841 /*
952 * FIXME: should free colors here, but no idea how to do it so instead, 842 * FIXME: should free colors here, but no idea how to do it so instead,
953 * so just keep gobbling up the colormap 843 * so just keep gobbling up the colormap
954 */ 844 */
955# if 0
956 for (i = Color_Black; i <= Color_White; i++)
957 if (pix_colors[idx] == pix_colors[i])
958 break;
959 if (i > Color_White)
960 {
961 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
962 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
963 DisplayPlanes (display->display, display->screen));
964 }
965# endif
966 845
967 pix_colors_focused[idx] = xcol; 846 pix_colors_focused[idx] = xcol;
968 SET_PIXCOLOR (idx);
969 847
970 /* XSetWindowAttributes attr; */
971 /* Cursor cursor; */
972done: 848done:
973
974#if OFF_FOCUS_FADING
975 if (rs[Rs_fade])
976 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
977#endif
978
979 /*TODO: handle Color_BD, scrollbar background, etc. */ 849 /*TODO: handle Color_BD, scrollbar background, etc. */
980 850
851 update_fade_color (idx);
981 recolour_cursor (); 852 recolour_cursor ();
982 scr_recolour (); 853 scr_recolour ();
854#endif /* XTERM_COLOR_CHANGE */
983} 855}
984
985#else
986# define set_window_color (idx,color) ((void)0)
987#endif /* XTERM_COLOR_CHANGE */
988 856
989void 857void
990rxvt_term::recolour_cursor () 858rxvt_term::recolour_cursor ()
991{ 859{
992 XColor xcol[2]; 860 XColor fg, bg;
993 861
994 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 862 (ISSET_PIXCOLOR (Color_pointer_fg)
995 ? pix_colors_focused[Color_pointer_fg] 863 ? pix_colors_focused[Color_pointer_fg]
996 : pix_colors_focused[Color_fg]; 864 : pix_colors_focused[Color_fg]).get (fg);
865
997 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 866 (ISSET_PIXCOLOR (Color_pointer_bg)
998 ? pix_colors_focused[Color_pointer_bg] 867 ? pix_colors_focused[Color_pointer_bg]
999 : pix_colors_focused[Color_bg]; 868 : pix_colors_focused[Color_bg]).get (bg);
1000 869
1001 XQueryColors (display->display, display->cmap, xcol, 2); 870 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1002 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1003} 871}
1004 872
1005/*----------------------------------------------------------------------*/ 873/*----------------------------------------------------------------------*/
1006/* 874/*
1007 * find if fg/bg matches any of the normal (low-intensity) colors 875 * find if fg/bg matches any of the normal (low-intensity) colors
1008 */ 876 */
1009void 877void
1010rxvt_term::set_colorfgbg () 878rxvt_term::set_colorfgbg ()
1011{ 879{
1012 unsigned int i; 880 unsigned int i;
1013 const char *xpmb = "\0"; 881 const char *xpmb = "";
1014 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 882 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1015 883
1016 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1017 strcpy (fstr, "default"); 884 strcpy (fstr, "default");
1018 strcpy (bstr, "default"); 885 strcpy (bstr, "default");
1019 for (i = Color_Black; i <= Color_White; i++) 886 for (i = Color_Black; i <= Color_White; i++)
1020 if (pix_colors[Color_fg] == pix_colors[i]) 887 if (pix_colors[Color_fg] == pix_colors[i])
1021 { 888 {
… …
1025 892
1026 for (i = Color_Black; i <= Color_White; i++) 893 for (i = Color_Black; i <= Color_White; i++)
1027 if (pix_colors[Color_bg] == pix_colors[i]) 894 if (pix_colors[Color_bg] == pix_colors[i])
1028 { 895 {
1029 sprintf (bstr, "%d", (i - Color_Black)); 896 sprintf (bstr, "%d", (i - Color_Black));
1030#ifdef XPM_BACKGROUND 897#ifdef BG_IMAGE_FROM_FILE
1031 xpmb = "default;"; 898 xpmb = "default;";
1032#endif 899#endif
1033 break; 900 break;
1034 } 901 }
1035 902
1036 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 903 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1037} 904}
1038 905
1039/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
1040 907
1041int 908bool
1042rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 909rxvt_term::set_color (rxvt_color &color, const char *name)
1043{ 910{
1044 if (!screen_in_out->set (display, colour)) 911 if (color.set (this, name))
1045 {
1046 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1047 return false;
1048 }
1049
1050 return true; 912 return true;
913
914 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
915 return false;
916}
917
918void
919rxvt_term::alias_color (int dst, int src)
920{
921 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1051} 922}
1052 923
1053/* -------------------------------------------------------------------- * 924/* -------------------------------------------------------------------- *
1054 * - WINDOW RESIZING - * 925 * - WINDOW RESIZING - *
1055 * -------------------------------------------------------------------- */ 926 * -------------------------------------------------------------------- */
1056void 927void
1057rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 928rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1058{ 929{
1059 int fix_screen; 930 int fix_screen;
1060 int old_width = szHint.width, old_height = szHint.height; 931 int old_width = szHint.width;
1061 dDisp; 932 int old_height = szHint.height;
1062 933
1063 window_calc (newwidth, newheight); 934 window_calc (newwidth, newheight);
935
936 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1064 XSetWMNormalHints (disp, parent[0], &szHint); 937 XSetWMNormalHints (dpy, parent[0], &szHint);
1065 938
1066 if (!ignoreparent) 939 if (!ignoreparent)
1067 { 940 {
1068#ifdef SMART_RESIZE 941#ifdef SMART_RESIZE
1069 /* 942 /*
… …
1073 int x, y, x1, y1; 946 int x, y, x1, y1;
1074 int dx, dy; 947 int dx, dy;
1075 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 948 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1076 Window unused_cr; 949 Window unused_cr;
1077 950
1078 XTranslateCoordinates (disp, parent[0], display->root, 951 XTranslateCoordinates (dpy, parent[0], display->root,
1079 0, 0, &x, &y, &unused_cr); 952 0, 0, &x, &y, &unused_cr);
1080 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 953 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1081 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 954 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1082 /* 955 /*
1083 * if display->root isn't the parent window, a WM will probably have offset 956 * if display->root isn't the parent window, a WM will probably have offset
1084 * our position for handles and decorations. Counter it 957 * our position for handles and decorations. Counter it
1085 */ 958 */
… …
1087 { 960 {
1088 x -= x1; 961 x -= x1;
1089 y -= y1; 962 y -= y1;
1090 } 963 }
1091 964
1092 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 965 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1093 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 966 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1094 dx = old_width - szHint.width; 967 dx = old_width - szHint.width;
1095 dy = old_height - szHint.height; 968 dy = old_height - szHint.height;
1096 969
1097 /* Check position of the center of the window */ 970 /* Check position of the center of the window */
1098 if (x < x1) /* left half */ 971 if (x < x1) /* left half */
1099 dx = 0; 972 dx = 0;
… …
1102 if (y < y1) /* top half */ 975 if (y < y1) /* top half */
1103 dy = 0; 976 dy = 0;
1104 else if (y == y1) /* exact center */ 977 else if (y == y1) /* exact center */
1105 dy /= 2; 978 dy /= 2;
1106 979
1107 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 980 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1108 szHint.width, szHint.height); 981 szHint.width, szHint.height);
1109#else 982#else
1110 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 983 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1111#endif 984#endif
1112 } 985 }
1113 986
1114 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 987 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1115 988
1116 if (fix_screen || newwidth != old_width || newheight != old_height) 989 if (fix_screen || newwidth != old_width || newheight != old_height)
1117 { 990 {
1118 if (scrollBar.state) 991 if (scrollBar.state)
1119 { 992 {
1120 XMoveResizeWindow (disp, scrollBar.win, 993 XMoveResizeWindow (dpy, scrollBar.win,
1121 window_sb_x, 0, 994 window_sb_x, 0,
1122 scrollbar_TotalWidth (), szHint.height); 995 scrollbar_TotalWidth (), szHint.height);
1123 resize_scrollbar (); 996 resize_scrollbar ();
1124 } 997 }
1125 998
1126 XMoveResizeWindow (disp, vt, 999 XMoveResizeWindow (dpy, vt,
1127 window_vt_x, window_vt_y, 1000 window_vt_x, window_vt_y,
1128 width, height); 1001 width, height);
1129 1002
1003#ifdef HAVE_BG_PIXMAP
1004 if (bgPixmap.window_size_sensitive ())
1005 update_background ();
1006#endif
1007
1130 scr_clear (); 1008 scr_clear ();
1131#ifdef XPM_BACKGROUND
1132 resize_pixmap ();
1133#endif
1134 } 1009 }
1135 1010
1136 if (fix_screen || old_height == 0) 1011 if (fix_screen || old_height == 0)
1137 {
1138 int curr_screen = -1;
1139 int old_ncol = prev_ncol;
1140
1141 /* scr_reset only works on the primary screen */
1142 if (old_height) /* this is not the first time through */
1143 {
1144 unsigned int ocol = ncol;
1145 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1146 curr_screen = scr_change_screen (PRIMARY);
1147 ncol = ocol;
1148 }
1149
1150 scr_reset (); 1012 scr_reset ();
1151 1013
1152 if (curr_screen >= 0) /* this is not the first time through */ 1014 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1153 { 1015 //scr_touch (false);
1154 scr_change_screen (curr_screen);
1155 selection_check (old_ncol != ncol ? 4 : 0);
1156 }
1157 }
1158 1016
1159 old_width = szHint.width; 1017#ifdef HAVE_BG_PIXMAP
1160 old_height = szHint.height; 1018// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1161 1019// if (bgPixmap.pixmap)
1162#ifdef XPM_BACKGROUND
1163 if (pixmap)
1164 scr_touch (false); 1020// scr_touch (false);
1165#endif 1021#endif
1166 1022
1167#ifdef USE_XIM 1023#ifdef USE_XIM
1168 IMSetStatusPosition (); 1024 IMSetPosition ();
1169#endif 1025#endif
1170} 1026}
1171 1027
1172/* 1028/*
1173 * Set the width/height of the vt window in characters. Units are pixels. 1029 * Set the width/height of the vt window in characters. Units are pixels.
… …
1178{ 1034{
1179 XWindowAttributes wattr; 1035 XWindowAttributes wattr;
1180 1036
1181 if (newwidth == 0 || newheight == 0) 1037 if (newwidth == 0 || newheight == 0)
1182 { 1038 {
1183 XGetWindowAttributes (display->display, display->root, &wattr); 1039 XGetWindowAttributes (dpy, display->root, &wattr);
1184 1040
1185 if (newwidth == 0) 1041 if (newwidth == 0)
1186 newwidth = wattr.width - szHint.base_width; 1042 newwidth = wattr.width - szHint.base_width;
1187 if (newheight == 0) 1043 if (newheight == 0)
1188 newheight = wattr.height - szHint.base_height; 1044 newheight = wattr.height - szHint.base_height;
… …
1202#ifdef USE_XIM 1058#ifdef USE_XIM
1203 1059
1204void 1060void
1205rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1061rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1206{ 1062{
1207 fg = pix_colors[Color_fg]; 1063 fg = pix_colors [Color_fg];
1208 bg = pix_colors[Color_bg]; 1064 bg = pix_colors [Color_bg];
1209} 1065}
1210 1066
1211void 1067void
1212rxvt_term::im_set_size (XRectangle &size) 1068rxvt_term::im_set_size (XRectangle &size)
1213{ 1069{
… …
1250 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1106 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1251 1107
1252 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1108 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1253 *p = '\0'; 1109 *p = '\0';
1254 1110
1255 atom = XInternAtom (display->display, server, False); 1111 atom = XInternAtom (dpy, server, False);
1256 win = XGetSelectionOwner (display->display, atom); 1112 win = XGetSelectionOwner (dpy, atom);
1257 1113
1258 if (win != None) 1114 if (win != None)
1259 return True; 1115 return True;
1260 } 1116 }
1261 1117
… …
1268 XPoint nspot; 1124 XPoint nspot;
1269 XVaNestedList preedit_attr; 1125 XVaNestedList preedit_attr;
1270 1126
1271 if (!Input_Context 1127 if (!Input_Context
1272 || !focus 1128 || !focus
1273 || !(input_style & XIMPreeditPosition)) 1129 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1274 return; 1130 return;
1275 1131
1276 im_set_position (nspot); 1132 im_set_position (nspot);
1277 1133
1278 if (nspot.x == spot.x && nspot.y == spot.y) 1134 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1297 input_method = 0; 1153 input_method = 0;
1298 } 1154 }
1299 1155
1300 Input_Context = 0; 1156 Input_Context = 0;
1301} 1157}
1158
1159#ifdef ENABLE_XIM_ONTHESPOT
1160
1161static void
1162xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1163{
1164 ((rxvt_term *)client_data)->make_current ();
1165 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1166}
1167
1168static void
1169xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1170{
1171 ((rxvt_term *)client_data)->make_current ();
1172 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1173}
1174
1175static void
1176xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1177{
1178 rxvt_term *term = (rxvt_term *)client_data;
1179 XIMText *text = call_data->text;
1180
1181 term->make_current ();
1182
1183 if (text)
1184 {
1185 void *str;
1186
1187 if (!text->encoding_is_wchar && text->string.multi_byte)
1188 {
1189 // of course, X makes it ugly again
1190 if (term->rs[Rs_imLocale])
1191 SET_LOCALE (term->rs[Rs_imLocale]);
1192
1193 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1194 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1195
1196 if (term->rs[Rs_imLocale])
1197 SET_LOCALE (term->locale);
1198 }
1199 else
1200 str = (void *)text->string.wide_char;
1201
1202 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1203 DT_INT, call_data->caret,
1204 DT_INT, call_data->chg_first,
1205 DT_INT, call_data->chg_length,
1206 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1207 DT_WCS_LEN, str, str ? (int)text->length : 0,
1208 DT_END));
1209 }
1210 else
1211 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1212 DT_INT, call_data->caret,
1213 DT_INT, call_data->chg_first,
1214 DT_INT, call_data->chg_length,
1215 DT_END));
1216}
1217
1218#if 0
1219static void
1220xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1221{
1222 ((rxvt_term *)client_data)->make_current ();
1223 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1224 DT_INT, call_data->position,
1225 DT_INT, call_data->direction,
1226 DT_INT, call_data->style,
1227 DT_END));
1228}
1229#endif
1230
1231#endif
1302 1232
1303/* 1233/*
1304 * Try to open a XIM with the current modifiers, then see if we can 1234 * Try to open a XIM with the current modifiers, then see if we can
1305 * open a suitable preedit type 1235 * open a suitable preedit type
1306 */ 1236 */
… …
1313 XRectangle rect, status_rect, needed_rect; 1243 XRectangle rect, status_rect, needed_rect;
1314 unsigned long fg, bg; 1244 unsigned long fg, bg;
1315 const char *p; 1245 const char *p;
1316 char **s; 1246 char **s;
1317 XIMStyles *xim_styles; 1247 XIMStyles *xim_styles;
1248#ifdef ENABLE_XIM_ONTHESPOT
1249 XIMCallback xcb[4];
1250#endif
1318 1251
1319 set_environ (envv); 1252 set_environ (envv);
1320 1253
1321 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1254 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1322 return false; 1255 return false;
1323 1256
1324 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1325 input_method = display->get_xim (locale, modifiers); 1257 input_method = display->get_xim (locale, modifiers);
1326 if (input_method == NULL) 1258 if (input_method == NULL)
1327 return false; 1259 return false;
1328 1260
1329 xim = input_method->xim; 1261 xim = input_method->xim;
… …
1349 s = rxvt_splitcommastring (p); 1281 s = rxvt_splitcommastring (p);
1350 1282
1351 for (i = found = 0; !found && s[i]; i++) 1283 for (i = found = 0; !found && s[i]; i++)
1352 { 1284 {
1353 if (!strcmp (s[i], "OverTheSpot")) 1285 if (!strcmp (s[i], "OverTheSpot"))
1354 input_style = (XIMPreeditPosition | XIMStatusNothing); 1286 input_style = XIMPreeditPosition | XIMStatusNothing;
1355 else if (!strcmp (s[i], "OffTheSpot")) 1287 else if (!strcmp (s[i], "OffTheSpot"))
1356 input_style = (XIMPreeditArea | XIMStatusArea); 1288 input_style = XIMPreeditArea | XIMStatusArea;
1357 else if (!strcmp (s[i], "Root")) 1289 else if (!strcmp (s[i], "Root"))
1358 input_style = (XIMPreeditNothing | XIMStatusNothing); 1290 input_style = XIMPreeditNothing | XIMStatusNothing;
1359 else if (!strcmp (s[i], "None")) 1291 else if (!strcmp (s[i], "None"))
1360 input_style = (XIMPreeditNone | XIMStatusNone); 1292 input_style = XIMPreeditNone | XIMStatusNone;
1293#ifdef ENABLE_XIM_ONTHESPOT
1294 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1295 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1296#endif
1297 else
1298 input_style = XIMPreeditNothing | XIMStatusNothing;
1361 1299
1362 for (j = 0; j < xim_styles->count_styles; j++) 1300 for (j = 0; j < xim_styles->count_styles; j++)
1363 if (input_style == xim_styles->supported_styles[j]) 1301 if (input_style == xim_styles->supported_styles[j])
1364 { 1302 {
1365 rxvt_freecommastring (s); 1303 rxvt_freecommastring (s);
… …
1403 "*", 1341 "*",
1404 fheight, 1342 fheight,
1405 fheight + 1, fheight - 1, 1343 fheight + 1, fheight - 1,
1406 fheight - 2, fheight + 2); 1344 fheight - 2, fheight + 2);
1407 1345
1408 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1346 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1409 &missing_charset_list, &missing_charset_count, &def_string); 1347 &missing_charset_list, &missing_charset_count, &def_string);
1410 1348
1411 if (missing_charset_list) 1349 if (missing_charset_list)
1412 XFreeStringList (missing_charset_list); 1350 XFreeStringList (missing_charset_list);
1413 1351
… …
1454 XNBackground, bg, 1392 XNBackground, bg,
1455 XNArea, &status_rect, 1393 XNArea, &status_rect,
1456 XNFontSet, fs, 1394 XNFontSet, fs,
1457 NULL); 1395 NULL);
1458 } 1396 }
1397#if ENABLE_XIM_ONTHESPOT
1398 else if (input_style & XIMPreeditCallbacks)
1399 {
1400 im_set_position (spot);
1401
1402 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1403 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1404 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1405# if 0
1406 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1407# endif
1408
1409 preedit_attr = XVaCreateNestedList (0,
1410 XNSpotLocation, &spot,
1411 XNPreeditStartCallback, &xcb[0],
1412 XNPreeditDoneCallback , &xcb[1],
1413 XNPreeditDrawCallback , &xcb[2],
1414# if 0
1415 XNPreeditCaretCallback, &xcb[3],
1416# endif
1417 NULL);
1418 }
1419#endif
1459 1420
1460 Input_Context = XCreateIC (xim, 1421 Input_Context = XCreateIC (xim,
1461 XNInputStyle, input_style, 1422 XNInputStyle, input_style,
1462 XNClientWindow, vt, 1423 XNClientWindow, vt,
1463 XNFocusWindow, parent[0], 1424 XNFocusWindow, parent[0],
… …
1465 preedit_attr, 1426 preedit_attr,
1466 status_attr ? XNStatusAttributes : NULL, 1427 status_attr ? XNStatusAttributes : NULL,
1467 status_attr, NULL); 1428 status_attr, NULL);
1468 1429
1469 if (preedit_attr) XFree (preedit_attr); 1430 if (preedit_attr) XFree (preedit_attr);
1470 if (status_attr) XFree (status_attr); 1431 if (status_attr) XFree (status_attr);
1471 if (fs) XFreeFontSet (display->display, fs); 1432 if (fs) XFreeFontSet (dpy, fs);
1472 1433
1473 if (Input_Context == NULL) 1434 if (Input_Context == NULL)
1474 { 1435 {
1475 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1436 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1476 im_destroy (); 1437 im_destroy ();
1477 return false; 1438 return false;
1478 } 1439 }
1479 1440
1480 if (input_style & XIMPreeditArea) 1441#if 0
1442 // unfortunately, only the focus window is used by XIM, hard to fix
1443 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1444 vt_select_input ();
1445#endif
1446
1481 IMSetStatusPosition (); 1447 IMSetPosition ();
1482 1448
1483 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1484 return true; 1449 return true;
1485} 1450}
1486 1451
1487void 1452void
1488rxvt_term::im_cb () 1453rxvt_term::im_cb ()
… …
1494 1459
1495 make_current (); 1460 make_current ();
1496 1461
1497 im_destroy (); 1462 im_destroy ();
1498 1463
1499 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1500 if (Input_Context) 1464 if (Input_Context)
1501 return; 1465 return;
1502 1466
1503#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1467#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1504 if (rs[Rs_imLocale]) 1468 if (rs[Rs_imLocale])
… …
1546 SET_LOCALE (locale); 1510 SET_LOCALE (locale);
1547#endif 1511#endif
1548} 1512}
1549 1513
1550void 1514void
1551rxvt_term::IMSetStatusPosition () 1515rxvt_term::IMSetPosition ()
1552{ 1516{
1553 XRectangle preedit_rect, status_rect, *needed_rect; 1517 XRectangle preedit_rect, status_rect, *needed_rect;
1554 XVaNestedList preedit_attr, status_attr; 1518 XVaNestedList preedit_attr, status_attr;
1555 1519
1556 if (!Input_Context 1520 if (!Input_Context
1557 || !focus 1521 || !focus
1558 || !(input_style & XIMPreeditArea) 1522 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1559 || !IMisRunning ()) 1523 || !IMisRunning ())
1560 return; 1524 return;
1561 1525
1526 if (input_style & XIMPreeditPosition)
1527 {
1528 im_set_size (preedit_rect);
1529 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1530
1531 XSetICValues (Input_Context,
1532 XNPreeditAttributes, preedit_attr, NULL);
1533 }
1534 else
1535 {
1562 /* Getting the necessary width of preedit area */ 1536 /* Getting the necessary width of preedit area */
1563 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1537 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1538 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565 XFree (status_attr); 1539 XFree (status_attr);
1566 1540
1567 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1541 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1568 XFree (needed_rect); 1542 XFree (needed_rect);
1569 1543
1570 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1544 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1571 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1545 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1572 1546
1573 XSetICValues (Input_Context, 1547 XSetICValues (Input_Context,
1574 XNPreeditAttributes, preedit_attr, 1548 XNPreeditAttributes, preedit_attr,
1575 XNStatusAttributes, status_attr, NULL); 1549 XNStatusAttributes, status_attr,
1550 NULL);
1576 1551
1552 XFree (status_attr);
1553 }
1554
1577 XFree (preedit_attr); 1555 XFree (preedit_attr);
1578 XFree (status_attr);
1579} 1556}
1580#endif /* USE_XIM */ 1557#endif /* USE_XIM */
1558
1559void
1560rxvt_term::get_window_origin (int &x, int &y)
1561{
1562 Window cr;
1563 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1564/* fprintf (stderr, "origin is %+d%+d\n", x, y);*/
1565}
1566
1567Pixmap
1568rxvt_term::get_pixmap_property (int prop_id)
1569{
1570 if (prop_id > 0 && prop_id < NUM_XA)
1571 if (xa[prop_id])
1572 {
1573 int aformat;
1574 unsigned long nitems, bytes_after;
1575 Atom atype;
1576 unsigned char *prop = NULL;
1577 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1578 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1579 &nitems, &bytes_after, &prop);
1580 if (result == Success && prop && atype == XA_PIXMAP)
1581 return *(Pixmap *)prop;
1582 }
1583
1584 return None;
1585}
1586
1587#ifdef HAVE_BG_PIXMAP
1588# if TRACE_PIXMAPS
1589# undef update_background
1590void
1591rxvt_term::trace_update_background (const char *file, int line)
1592{
1593 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1594 update_background ();
1595}
1596# endif
1597
1598void
1599rxvt_term::update_background ()
1600{
1601 if (update_background_ev.is_active ())
1602 return;
1603
1604 bgPixmap.invalidate ();
1605
1606 ev_tstamp to_wait = 0.5 - (ev::now () - bgPixmap.valid_since);
1607
1608 if (to_wait <= 0.)
1609 bgPixmap.render ();
1610 else
1611 update_background_ev.start (to_wait);
1612}
1613
1614void
1615rxvt_term::update_background_cb (ev::timer &w, int revents)
1616{
1617 make_current ();
1618
1619 update_background_ev.stop ();
1620 bgPixmap.render ();
1621 refresh_check ();
1622}
1623
1624#endif /* HAVE_BG_PIXMAP */
1581 1625
1582/*----------------------- end-of-file (C source) -----------------------*/ 1626/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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