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.149 by root, Sun Dec 18 00:59:42 2005 UTC vs.
Revision 1.263 by ayin, Thu Nov 22 15:07:10 2007 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-2004 Marc Lehmann <pcg@goof.com> 16 * Copyright (c) 2003-2006 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 "keyboard.h"
36#include "rxvtperl.h"
37
38#include <limits>
35 39
36#include <csignal> 40#include <csignal>
37#include <cstring> 41#include <cstring>
38 42
39#ifdef TTY_GID_SUPPORT
40# include <grp.h>
41#endif
42
43#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
44# include <termios.h> 44# include <termios.h>
45#endif 45#endif
46 46
47#ifdef KEYSYM_RESOURCE 47#ifdef HAVE_XSETLOCALE
48# include "keyboard.h" 48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
49#endif 54#endif
50 55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
58// used to tell global functions which terminal instance is "active"
59rxvt_t rxvt_current_term;
60
53static char curlocale[128]; 61static char curlocale[128], savelocale[128];
54 62
55bool 63bool
56rxvt_set_locale (const char *locale) 64rxvt_set_locale (const char *locale) NOTHROW
57{ 65{
66 int size = strlen (locale) + 1;
67
68 if (size > sizeof (curlocale))
69 rxvt_fatal ("locale string too long, aborting.\n");
70
58 if (!locale || !strncmp (locale, curlocale, 128)) 71 if (!locale || !memcmp (locale, curlocale, size))
59 return false; 72 return false;
60 73
61 strncpy (curlocale, locale, 128); 74 memcpy (curlocale, locale, size);
62 setlocale (LC_CTYPE, curlocale); 75 setlocale (LC_CTYPE, curlocale);
63 return true; 76 return true;
64} 77}
65 78
79void
80rxvt_push_locale (const char *locale) NOTHROW
81{
82 strcpy (savelocale, curlocale);
83 rxvt_set_locale (locale);
84}
85
86void
87rxvt_pop_locale () NOTHROW
88{
89 rxvt_set_locale (savelocale);
90}
91
66#if ENABLE_COMBINING 92#if ENABLE_COMBINING
67class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
68 94
69text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
70{ 96{
71 compose_char *cc; 97 compose_char *cc;
72 98
73 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
74 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
75 cc = (*this)[c1]; 101 cc = (*this)[c1];
76 while (cc) 102 while (cc)
77 { 103 {
… …
127} 153}
128#endif 154#endif
129 155
130rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
131 : 157 :
132#if TRANSPARENT 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
133 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
160#endif
161#if HAVE_BG_PIXMAP
162 update_background_ev(this, &rxvt_term::update_background_cb),
134#endif 163#endif
135#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
136 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
137#endif 166#endif
138#ifdef MENUBAR
139 menubar_ev (this, &rxvt_term::x_cb),
140#endif
141#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
142 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 168 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
143#endif 169#endif
144#ifdef TEXT_BLINK 170#ifdef TEXT_BLINK
145 text_blink_ev (this, &rxvt_term::text_blink_cb), 171 text_blink_ev (this, &rxvt_term::text_blink_cb),
… …
155#endif 181#endif
156#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
157 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
158#endif 184#endif
159#ifdef USE_XIM 185#ifdef USE_XIM
160 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
187#endif
188#ifndef NO_BELL
189 bell_ev (this, &rxvt_term::bell_cb),
161#endif 190#endif
162 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
163 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
164 check_ev (this, &rxvt_term::check_cb), 193 child_ev (this, &rxvt_term::child_cb),
194 prepare_ev (this, &rxvt_term::prepare_cb),
165 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
166 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
167 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
168 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
169{ 199{
170 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
171 201
172 termlist.push_back (this); 202 termlist.push_back (this);
173 203
174#ifdef KEYSYM_RESOURCE 204#ifdef KEYSYM_RESOURCE
175 keyboard = new keyboard_manager; 205 keyboard = new keyboard_manager;
176
177 if (!keyboard)
178 rxvt_fatal ("out of memory, aborting.\n");
179#endif 206#endif
180} 207}
181 208
182// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
183// for use before an emergency exit 210// for use before an emergency exit
211void
184void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
185{ 213{
186 if (cmd_pid) 214 if (cmd_pid)
187 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
188 216
189#ifdef UTMP_SUPPORT 217 pty_ev.stop ();
190 privileged_utmp (RESTORE); 218 delete pty; pty = 0;
191#endif
192
193 pty.put ();
194} 219}
195 220
196rxvt_term::~rxvt_term () 221rxvt_term::~rxvt_term ()
197{ 222{
198 termlist.erase (find (termlist.begin (), termlist.end(), this)); 223 termlist.erase (find (termlist.begin (), termlist.end(), this));
… …
206#endif 231#endif
207 delete fontset[0]; 232 delete fontset[0];
208 233
209 if (display) 234 if (display)
210 { 235 {
211 dDisp;
212
213 selection_clear (); 236 selection_clear ();
214 237
215#ifdef USE_XIM 238#ifdef USE_XIM
216 im_destroy (); 239 im_destroy ();
217#endif 240#endif
218#ifdef MENUBAR
219 if (menubarGC) XFreeGC (disp, menubarGC);
220#endif
221#ifdef XTERM_SCROLLBAR 241#ifdef XTERM_SCROLLBAR
222 if (xscrollbarGC) XFreeGC (disp, xscrollbarGC); 242 if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
223 if (ShadowGC) XFreeGC (disp, ShadowGC); 243 if (ShadowGC) XFreeGC (dpy, ShadowGC);
224#endif 244#endif
225#ifdef PLAIN_SCROLLBAR 245#ifdef PLAIN_SCROLLBAR
226 if (pscrollbarGC) XFreeGC (disp, pscrollbarGC); 246 if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
227#endif 247#endif
228#ifdef NEXT_SCROLLBAR 248#ifdef NEXT_SCROLLBAR
229 if (blackGC) XFreeGC (disp, blackGC); 249 if (blackGC) XFreeGC (dpy, blackGC);
230 if (whiteGC) XFreeGC (disp, whiteGC); 250 if (whiteGC) XFreeGC (dpy, whiteGC);
231 if (grayGC) XFreeGC (disp, grayGC); 251 if (grayGC) XFreeGC (dpy, grayGC);
232 if (darkGC) XFreeGC (disp, darkGC); 252 if (darkGC) XFreeGC (dpy, darkGC);
233 if (stippleGC) XFreeGC (disp, stippleGC); 253 if (stippleGC) XFreeGC (dpy, stippleGC);
234 if (dimple) XFreePixmap (disp, dimple); 254 if (dimple) XFreePixmap (dpy, dimple);
235 if (upArrow) XFreePixmap (disp, upArrow); 255 if (upArrow) XFreePixmap (dpy, upArrow);
236 if (downArrow) XFreePixmap (disp, downArrow); 256 if (downArrow) XFreePixmap (dpy, downArrow);
237 if (upArrowHi) XFreePixmap (disp, upArrowHi); 257 if (upArrowHi) XFreePixmap (dpy, upArrowHi);
238 if (downArrowHi) XFreePixmap (disp, downArrowHi); 258 if (downArrowHi) XFreePixmap (dpy, downArrowHi);
239#endif 259#endif
240#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 260#ifdef RXVT_SCROLLBAR
241 if (topShadowGC) XFreeGC (disp, topShadowGC); 261 if (topShadowGC) XFreeGC (dpy, topShadowGC);
242 if (botShadowGC) XFreeGC (disp, botShadowGC); 262 if (botShadowGC) XFreeGC (dpy, botShadowGC);
243 if (scrollbarGC) XFreeGC (disp, scrollbarGC); 263 if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
244#endif 264#endif
245 if (gc) XFreeGC (disp, gc); 265 if (gc) XFreeGC (dpy, gc);
246 266
247#if defined(MENUBAR) && (MENUBAR_MAX > 1)
248 delete menuBar.drawable;
249 //if (menuBar.win)
250 // XDestroyWindow (disp, menuBar.win);
251#endif
252 delete drawable; 267 delete drawable;
253 // destroy all windows 268 // destroy all windows
254 if (parent[0]) 269 if (parent[0])
255 XDestroyWindow (disp, parent[0]); 270 XDestroyWindow (dpy, parent[0]);
256 }
257 271
258 // TODO: free pixcolours, colours should become part of rxvt_display 272 for (int i = 0; i < TOTAL_COLORS; i++)
259 273 if (ISSET_PIXCOLOR (i))
260 delete pix_colors_focused; 274 {
275 pix_colors_focused [i].free (this);
261#if OFF_FOCUS_FADING 276#if OFF_FOCUS_FADING
277 pix_colors_unfocused [i].free (this);
278#endif
279 }
280
281 clear ();
282 }
283
284 delete [] pix_colors_focused;
285#if OFF_FOCUS_FADING
262 delete pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
263#endif 287#endif
264 288
289#ifdef HAVE_BG_PIXMAP
290 bgPixmap.destroy ();
291#endif
265 displays.put (display); 292 displays.put (display);
266 293
267 scr_release (); 294 scr_release ();
268 295
269 /* clear all resources */ 296 /* clear all resources */
270 for (int i = 0; i < allocated.size (); i++) 297 for (int i = 0; i < allocated.size (); i++)
271 free (allocated [i]); 298 free (allocated [i]);
272 299
273 free (selection.text); 300 free (selection.text);
274 // TODO: manage env vars in child only(!) 301 // TODO: manage env vars in child only(!)
275 free (env_windowid);
276 free (env_display); 302 free (env_display);
277 free (env_term); 303 free (env_term);
278 free (env_colorfgbg);
279 free (locale); 304 free (locale);
280 free (v_buffer); 305 free (v_buffer);
281 free (incr_buf); 306 free (incr_buf);
282 307
283 delete envv; 308 delete envv;
284 delete argv; 309 delete argv;
285 310
286#ifdef KEYSYM_RESOURCE 311#ifdef KEYSYM_RESOURCE
287 delete keyboard; 312 delete keyboard;
288#endif 313#endif
314#ifndef NO_RESOURCES
315 XrmDestroyDatabase (option_db);
316#endif
317}
318
319// child has exited, usually destroys
320void
321rxvt_term::child_cb (ev::child &w, int status)
322{
323 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
324
325 cmd_pid = 0;
326
327 if (!option (Opt_hold))
328 destroy ();
289} 329}
290 330
291void 331void
292rxvt_term::destroy () 332rxvt_term::destroy ()
293{ 333{
294 if (destroy_ev.active) 334 if (destroy_ev.active)
295 return; 335 return;
296 336
337 HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
338
297#if ENABLE_OVERLAY 339#if ENABLE_OVERLAY
298 scr_overlay_off (); 340 scr_overlay_off ();
299#endif 341#endif
300 342
301 if (display) 343 if (display)
… …
304 im_ev.stop (display); 346 im_ev.stop (display);
305#endif 347#endif
306#if HAVE_SCROLLBARS 348#if HAVE_SCROLLBARS
307 scrollbar_ev.stop (display); 349 scrollbar_ev.stop (display);
308#endif 350#endif
309#if MENUBAR 351#if ENABLE_TRANSPARENCY || ENABLE_PERL
310 menubar_ev.stop (display);
311#endif
312#if TRANSPARENT
313 rootwin_ev.stop (display); 352 rootwin_ev.stop (display);
314#endif 353#endif
315 incr_ev.stop (); 354 incr_ev.stop ();
316 termwin_ev.stop (display); 355 termwin_ev.stop (display);
317 vt_ev.stop (display); 356 vt_ev.stop (display);
318 } 357 }
319 358
320 check_ev.stop (); 359 prepare_ev.stop ();
321 pty_ev.stop (); 360 pty_ev.stop ();
322#ifdef CURSOR_BLINK 361#ifdef CURSOR_BLINK
323 cursor_blink_ev.stop (); 362 cursor_blink_ev.stop ();
324#endif 363#endif
325#ifdef TEXT_BLINK 364#ifdef TEXT_BLINK
… …
333#endif 372#endif
334#ifdef POINTER_BLANK 373#ifdef POINTER_BLANK
335 pointer_ev.stop (); 374 pointer_ev.stop ();
336#endif 375#endif
337 376
338 destroy_ev.start (0); 377 destroy_ev.start ();
339} 378}
340 379
341void 380void
342rxvt_term::destroy_cb (time_watcher &w) 381rxvt_term::destroy_cb (ev::idle &w, int revents)
343{ 382{
344 SET_R (this); 383 make_current ();
345 384
346 delete this; 385 delete this;
347} 386}
348 387
349/*----------------------------------------------------------------------*/ 388/*----------------------------------------------------------------------*/
… …
358{ 397{
359 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++) 398 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
360 (*t)->emergency_cleanup (); 399 (*t)->emergency_cleanup ();
361} 400}
362 401
363#if ENABLE_FRILLS 402#if !ENABLE_MINIMAL
364static void 403static void
365print_x_error (Display *dpy, XErrorEvent *event) 404print_x_error (Display *dpy, XErrorEvent *event)
366{ 405{
367 char buffer[BUFSIZ]; 406 char buffer[BUFSIZ];
368 char mesg[BUFSIZ]; 407 char mesg[BUFSIZ];
… …
401 else 440 else
402 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 441 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
403 mesg, BUFSIZ); 442 mesg, BUFSIZ);
404 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 443 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
405 } 444 }
406 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 445 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
407 mesg, BUFSIZ); 446 mesg, BUFSIZ);
408 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 447 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
409} 448}
410#endif 449#endif
411 450
… …
416 GET_R->allowedxerror = event->error_code; 455 GET_R->allowedxerror = event->error_code;
417 else 456 else
418 { 457 {
419 // GET_R is most likely not the terminal which caused the error, 458 // GET_R is most likely not the terminal which caused the error,
420 // so just output the error and continue 459 // so just output the error and continue
421#if ENABLE_FRILLS 460#if ENABLE_MINIMAL
461 old_xerror_handler (display, event);
462#else
422 print_x_error (display, event); 463 print_x_error (display, event);
423#else
424 old_xerror_handler (display, event);
425#endif 464#endif
426 } 465 }
427 466
428 return 0; 467 return 0;
429} 468}
… …
437 _exit (EXIT_FAILURE); 476 _exit (EXIT_FAILURE);
438} 477}
439 478
440/*----------------------------------------------------------------------*/ 479/*----------------------------------------------------------------------*/
441bool 480bool
442rxvt_term::init (int argc, const char *const *argv) 481rxvt_term::init (int argc, const char *const *argv, stringvec *envv)
443{ 482{
483 this->envv = envv;
484
444 SET_R (this); 485 SET_R (this);
445
446 set_locale (""); 486 set_locale ("");
487 set_environ (envv); // few things in X do not call setlocale :(
447 488
448 if (!init_vars ()) 489 if (!init_vars ())
449 return false; 490 return false;
450 491
451 init_secondary (); 492 init_secondary ();
… …
454 495
455#ifdef KEYSYM_RESOURCE 496#ifdef KEYSYM_RESOURCE
456 keyboard->register_done (); 497 keyboard->register_done ();
457#endif 498#endif
458 499
459#if MENUBAR_MAX
460 menubar_read (rs[Rs_menu]);
461#endif
462#ifdef HAVE_SCROLLBARS 500#ifdef HAVE_SCROLLBARS
463 if (options & Opt_scrollBar) 501 if (option (Opt_scrollBar))
464 scrollBar.setIdle (); /* set existence for size calculations */ 502 scrollBar.setIdle (); /* set existence for size calculations */
465#endif 503#endif
466 504
505 pty = ptytty::create ();
506
467 create_windows (argc, argv); 507 create_windows (argc, argv);
468 508
469 dDisp;
470
471 init_xlocale (); 509 init_xlocale ();
472 510
473 scr_reset (); /* initialize screen */ 511 scr_reset (); // initialize screen
474 512
475#if 0 513#if 0
476 XSynchronize (disp, True); 514 XSynchronize (dpy, True);
477#endif 515#endif
478 516
479#ifdef HAVE_SCROLLBARS 517#ifdef HAVE_SCROLLBARS
480 if (options & Opt_scrollBar) 518 if (option (Opt_scrollBar))
481 resize_scrollbar (); /* create and map scrollbar */ 519 resize_scrollbar (); /* create and map scrollbar */
482#endif 520#endif
483#if (MENUBAR_MAX) 521#ifdef HAVE_BG_PIXMAP
484 if (menubar_visible ()) 522 {
485 XMapWindow (disp, menuBar.win); 523 bgPixmap.set_target (this);
486#endif 524
487#ifdef TRANSPARENT 525#ifdef ENABLE_TRANSPARENCY
488 if (options & Opt_transparent) 526 if (option (Opt_transparent))
489 { 527 {
528 bgPixmap.set_transparent ();
529#ifdef HAVE_AFTERIMAGE
530 if (rs [Rs_blurradius])
531 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
532#endif
533 if (ISSET_PIXCOLOR (Color_tint))
534 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
535 if (rs [Rs_shade])
536 bgPixmap.set_shade (rs [Rs_shade]);
537
538 bgPixmap.set_root_pixmap ();
490 XSelectInput (disp, display->root, PropertyChangeMask); 539 XSelectInput (dpy, display->root, PropertyChangeMask);
491 check_our_parents ();
492 rootwin_ev.start (display, display->root); 540 rootwin_ev.start (display, display->root);
493 } 541 }
494#endif 542#endif
495 543
496 XMapWindow (disp, vt); 544#ifdef BG_IMAGE_FROM_FILE
497 XMapWindow (disp, parent[0]); 545 if (rs[Rs_backgroundPixmap] != NULL)
546 {
547 const char *p = rs[Rs_backgroundPixmap];
548
549 if ((p = strchr (p, ';')) != NULL)
550 {
551 p++;
552 bgPixmap.set_geometry (p);
553 }
554 else
555 bgPixmap.set_defaultGeometry ();
556
557 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
558 if (!bgPixmap.window_position_sensitive ())
559 update_background ();
560 }
561#endif
562 }
563#endif
564
565#if ENABLE_PERL
566 rootwin_ev.start (display, display->root);
567#endif
498 568
499 set_colorfgbg (); 569 set_colorfgbg ();
500 570
501 init_command (cmd_argv); 571 init_command (cmd_argv);
502 572
503 free (cmd_argv); 573 free (cmd_argv);
504 574
575 if (pty->pty >= 0)
505 pty_ev.start (pty.pty, EVENT_READ); 576 pty_ev.start (pty->pty, ev::READ);
506 577
507 check_ev.start (); 578 prepare_ev.start ();
579
580 HOOK_INVOKE ((this, HOOK_START, DT_END));
581
582#if ENABLE_XEMBED
583 if (rs[Rs_embed])
584 {
585 long info[2] = { 0, XEMBED_MAPPED };
586
587 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
588 32, PropModeReplace, (unsigned char *)&info, 2);
589 }
590#endif
591
592 XMapWindow (dpy, vt);
593 XMapWindow (dpy, parent[0]);
508 594
509 return true; 595 return true;
510} 596}
511 597
512static struct sig_handlers 598static struct sig_handlers
513{ 599{
514 sig_watcher sw_chld, sw_term, sw_int; 600 ev::sig sw_term, sw_int;
515
516 void sig_chld (sig_watcher &w)
517 {
518 // we are being called for every SIGCHLD, find the corresponding term
519 int pid;
520
521 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
522 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
523 if (pid == (*t)->cmd_pid)
524 {
525 (*t)->destroy ();
526 break;
527 }
528 }
529 601
530 /* 602 /*
531 * Catch a fatal signal and tidy up before quitting 603 * Catch a fatal signal and tidy up before quitting
532 */ 604 */
533 void 605 void
534 sig_term (sig_watcher &w) 606 sig_term (ev::sig &w, int revents)
535 { 607 {
536#ifdef DEBUG_CMD
537 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
538#endif
539 rxvt_emergency_cleanup (); 608 rxvt_emergency_cleanup ();
540 signal (w.signum, SIG_DFL); 609 w.stop ();
541 kill (getpid (), w.signum); 610 kill (getpid (), w.signum);
542 } 611 }
543 612
544 sig_handlers () 613 sig_handlers ()
545 : sw_chld (this, &sig_handlers::sig_chld),
546 sw_term (this, &sig_handlers::sig_term), 614 : sw_term (this, &sig_handlers::sig_term),
547 sw_int (this, &sig_handlers::sig_term) 615 sw_int (this, &sig_handlers::sig_term)
548 { 616 {
549 } 617 }
550} sig_handlers; 618} sig_handlers;
551 619
620char **rxvt_environ; // startup environment
621
552void 622void
553rxvt_init () 623rxvt_init ()
554{ 624{
555 /* 625 ptytty::init ();
556 * Save and then give up any super-user privileges 626
557 * If we need privileges in any area then we must specifically request it. 627 if (!ev::ev_default_loop (0))
558 * We should only need to be root in these cases: 628 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
559 * 1. write utmp entries on some systems 629
560 * 2. chown tty on some systems 630 rxvt_environ = environ;
561 */
562 rxvt_privileges (SAVE);
563 rxvt_privileges (IGNORE);
564 631
565 signal (SIGHUP, SIG_IGN); 632 signal (SIGHUP, SIG_IGN);
566 signal (SIGPIPE, SIG_IGN); 633 signal (SIGPIPE, SIG_IGN);
567 634
568 sig_handlers.sw_chld.start (SIGCHLD);
569 sig_handlers.sw_term.start (SIGTERM); 635 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
570 sig_handlers.sw_int.start (SIGINT); 636 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
571 637
572 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 638 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
573 /* signal (SIGURG, SIG_DFL); */ 639 /* signal (SIGURG, SIG_DFL); */
574 640
575 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 641 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
576 // TODO: handle this with exceptions and tolerate the memory loss 642 // TODO: handle this with exceptions and tolerate the memory loss
577 XSetIOErrorHandler (rxvt_xioerror_handler); 643 XSetIOErrorHandler (rxvt_xioerror_handler);
644
645 XrmInitialize ();
578} 646}
579 647
580/* ------------------------------------------------------------------------- * 648/* ------------------------------------------------------------------------- *
581 * MEMORY ALLOCATION WRAPPERS * 649 * MEMORY ALLOCATION WRAPPERS *
582 * ------------------------------------------------------------------------- */ 650 * ------------------------------------------------------------------------- */
… …
600 rxvt_fatal ("memory allocation failure. aborting.\n"); 668 rxvt_fatal ("memory allocation failure. aborting.\n");
601 669
602 return p; 670 return p;
603} 671}
604 672
605void * 673void *
606rxvt_realloc (void *ptr, size_t size) 674rxvt_realloc (void *ptr, size_t size)
607{ 675{
608 void *p = realloc (ptr, size); 676 void *p = realloc (ptr, size);
609 677
610 if (!p) 678 if (!p)
611 rxvt_fatal ("memory allocation failure. aborting.\n"); 679 rxvt_fatal ("memory allocation failure. aborting.\n");
612 680
613 return p; 681 return p;
614} 682}
615 683
616/* ------------------------------------------------------------------------- *
617 * PRIVILEGED OPERATIONS *
618 * ------------------------------------------------------------------------- */
619/* take care of suid/sgid super-user (root) privileges */
620void
621rxvt_privileges (rxvt_privaction action)
622{
623#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
624 static uid_t euid;
625 static gid_t egid;
626#endif
627
628#if ! defined(__CYGWIN32__)
629# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
630 /* setreuid () is the poor man's setuid (), seteuid () */
631# define seteuid(a) setreuid(-1, (a))
632# define setegid(a) setregid(-1, (a))
633# define HAVE_SETEUID
634# endif
635# ifdef HAVE_SETEUID
636 switch (action)
637 {
638 case IGNORE:
639 /*
640 * change effective uid/gid - not real uid/gid - so we can switch
641 * back to root later, as required
642 */
643 seteuid (getuid ());
644 setegid (getgid ());
645 break;
646 case SAVE:
647 euid = geteuid ();
648 egid = getegid ();
649 break;
650 case RESTORE:
651 seteuid (euid);
652 setegid (egid);
653 break;
654 }
655# else
656 switch (action)
657 {
658 case IGNORE:
659 setuid (getuid ());
660 setgid (getgid ());
661 /* FALLTHROUGH */
662 case SAVE:
663 /* FALLTHROUGH */
664 case RESTORE:
665 break;
666 }
667# endif
668#endif
669}
670
671#ifdef UTMP_SUPPORT
672void
673rxvt_term::privileged_utmp (rxvt_privaction action)
674{
675 if ((options & Opt_utmpInhibit)
676 || !pty.name || !*pty.name)
677 return;
678
679 rxvt_privileges (RESTORE);
680
681 if (action == SAVE)
682 makeutent (pty.name, rs[Rs_display_name]);
683 else
684 cleanutent ();
685
686 rxvt_privileges (IGNORE);
687}
688#endif
689
690/*----------------------------------------------------------------------*/ 684/*----------------------------------------------------------------------*/
691/* 685/*
692 * window size/position calculcations for XSizeHint and other storage. 686 * window size/position calculations for XSizeHint and other storage.
693 * if width/height are non-zero then override calculated width/height 687 * if width/height are non-zero then override calculated width/height
694 */ 688 */
695void 689void
696rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight) 690rxvt_term::window_calc (unsigned int newwidth, unsigned int newheight)
697{ 691{
698 short recalc_x, recalc_y; 692 short recalc_x, recalc_y;
699 int x, y, sb_w, mb_h, flags; 693 int x, y, sb_w, flags;
700 unsigned int w, h; 694 unsigned int w, h;
701 unsigned int max_width, max_height; 695 unsigned int max_width, max_height;
702 dDisp;
703
704 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
705 ncol, nrow, szHint.width, szHint.height));
706 696
707 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 697 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
708 szHint.win_gravity = NorthWestGravity; 698 szHint.win_gravity = NorthWestGravity;
709 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 699 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
710 700
… …
718 if (rs[Rs_geometry]) 708 if (rs[Rs_geometry])
719 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h); 709 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
720 710
721 if (flags & WidthValue) 711 if (flags & WidthValue)
722 { 712 {
723 ncol = BOUND_POSITIVE_INT16 (w); 713 ncol = clamp (w, 0, std::numeric_limits<int16_t>::max ());
724 szHint.flags |= USSize; 714 szHint.flags |= USSize;
725 } 715 }
726 716
727 if (flags & HeightValue) 717 if (flags & HeightValue)
728 { 718 {
729 nrow = BOUND_POSITIVE_INT16 (h); 719 nrow = clamp (h, 0, std::numeric_limits<int16_t>::max ());
730 szHint.flags |= USSize; 720 szHint.flags |= USSize;
731 } 721 }
732 722
733 if (flags & XValue) 723 if (flags & XValue)
734 { 724 {
… …
765 max_width = MAX_COLS * fwidth; 755 max_width = MAX_COLS * fwidth;
766 max_height = MAX_ROWS * fheight; 756 max_height = MAX_ROWS * fheight;
767 757
768 szHint.base_width = szHint.base_height = 2 * int_bwidth; 758 szHint.base_width = szHint.base_height = 2 * int_bwidth;
769 759
770 sb_w = mb_h = 0; 760 sb_w = 0;
771 window_vt_x = window_vt_y = int_bwidth; 761 window_vt_x = window_vt_y = int_bwidth;
772 762
773 if (scrollbar_visible ()) 763 if (scrollBar.state)
774 { 764 {
775 sb_w = scrollbar_TotalWidth (); 765 sb_w = scrollbar_TotalWidth ();
776 szHint.base_width += sb_w; 766 szHint.base_width += sb_w;
767
777 if (!(options & Opt_scrollBar_right)) 768 if (!option (Opt_scrollBar_right))
778 window_vt_x += sb_w; 769 window_vt_x += sb_w;
779 } 770 }
780 771
781 if (menubar_visible ())
782 {
783 mb_h = menuBar_TotalHeight ();
784 szHint.base_height += mb_h;
785 window_vt_y += mb_h;
786 }
787
788 szHint.width_inc = fwidth; 772 szHint.width_inc = fwidth;
789 szHint.height_inc = fheight; 773 szHint.height_inc = fheight;
790 szHint.min_width = szHint.base_width + szHint.width_inc; 774 szHint.min_width = szHint.base_width + szHint.width_inc;
791 szHint.min_height = szHint.base_height + szHint.height_inc; 775 szHint.min_height = szHint.base_height + szHint.height_inc;
792 776
793 if (newwidth && newwidth - szHint.base_width < max_width) 777 if (newwidth && newwidth - szHint.base_width < max_width)
794 { 778 {
795 szHint.width = newwidth; 779 szHint.width = newwidth;
796 width = newwidth - szHint.base_width; 780 width = newwidth - szHint.base_width;
797 } 781 }
798 else 782 else
799 { 783 {
800 MIN_IT (width, max_width); 784 min_it (width, max_width);
801 szHint.width = szHint.base_width + width; 785 szHint.width = szHint.base_width + width;
802 } 786 }
803 787
804 if (newheight && newheight - szHint.base_height < max_height) 788 if (newheight && newheight - szHint.base_height < max_height)
805 { 789 {
806 szHint.height = newheight; 790 szHint.height = newheight;
807 height = newheight - szHint.base_height; 791 height = newheight - szHint.base_height;
808 } 792 }
809 else 793 else
810 { 794 {
811 MIN_IT (height, max_height); 795 min_it (height, max_height);
812 szHint.height = szHint.base_height + height; 796 szHint.height = szHint.base_height + height;
813 } 797 }
814 798
815 if (scrollbar_visible () && (options & Opt_scrollBar_right)) 799 if (scrollBar.state && option (Opt_scrollBar_right))
816 window_sb_x = szHint.width - sb_w; 800 window_sb_x = szHint.width - sb_w;
817 801
818 if (recalc_x) 802 if (recalc_x)
819 szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth; 803 szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
804
820 if (recalc_y) 805 if (recalc_y)
821 szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth; 806 szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
822 807
823 ncol = width / fwidth; 808 ncol = width / fwidth;
824 nrow = height / fheight; 809 nrow = height / fheight;
825 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
826 ncol, nrow, szHint.width,
827 szHint.height));
828 return;
829} 810}
830 811
831/*----------------------------------------------------------------------*/ 812/*----------------------------------------------------------------------*/
832/* 813/*
833 * Tell the teletype handler what size the window is. 814 * Tell the teletype handler what size the window is.
834 * Called after a window size change. 815 * Called after a window size change.
835 */ 816 */
836void 817void
837rxvt_term::tt_winch () 818rxvt_term::tt_winch ()
838{ 819{
839 if (pty.pty < 0) 820 if (pty->pty < 0)
840 return; 821 return;
841 822
842 struct winsize ws; 823 struct winsize ws;
843 824
844 ws.ws_col = ncol; 825 ws.ws_col = ncol;
845 ws.ws_row = nrow; 826 ws.ws_row = nrow;
846 ws.ws_xpixel = width; 827 ws.ws_xpixel = width;
847 ws.ws_ypixel = height; 828 ws.ws_ypixel = height;
848 (void)ioctl (pty.pty, TIOCSWINSZ, &ws); 829 (void)ioctl (pty->pty, TIOCSWINSZ, &ws);
849 830
850#if 0 831#if 0
851 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly 832 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
852 if (cmd_pid) /* force through to the command */ 833 if (cmd_pid) /* force through to the command */
853 kill (-cmd_pid, SIGWINCH); 834 kill (-cmd_pid, SIGWINCH);
… …
885 delete fontset[0]; 866 delete fontset[0];
886 fontset[0] = fs; 867 fontset[0] = fs;
887 868
888 prop = (*fs)[1]->properties (); 869 prop = (*fs)[1]->properties ();
889 prop.height += lineSpace; 870 prop.height += lineSpace;
871
890 fs->set_prop (prop); 872 fs->set_prop (prop, false);
891 873
892 fwidth = prop.width; 874 fwidth = prop.width;
893 fheight = prop.height; 875 fheight = prop.height;
894 fweight = prop.weight; 876 fbase = prop.ascent;
895 fslant = prop.slant;
896 fbase = (*fs)[1]->ascent;
897 877
898 for (int style = 1; style < 4; style++) 878 for (int style = 1; style < 4; style++)
899 { 879 {
900#if ENABLE_STYLES 880#if ENABLE_STYLES
901 const char *res = rs[Rs_font + style]; 881 const char *res = rs[Rs_font + style];
… …
906 { 886 {
907 fontset[style] = fs = new rxvt_fontset (this); 887 fontset[style] = fs = new rxvt_fontset (this);
908 rxvt_fontprop prop2 = prop; 888 rxvt_fontprop prop2 = prop;
909 889
910 if (res) 890 if (res)
911 prop2.weight = prop2.slant = rxvt_fontprop::unset; 891 {
892 fs->populate (res);
893 fs->set_prop (prop2, false);
894 }
912 else 895 else
913 { 896 {
914 res = fontset[0]->fontdesc; 897 fs->populate (fontset[0]->fontdesc);
915 898
916 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold; 899 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
917 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic; 900 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
901
902 fs->set_prop (prop2, true);
918 } 903 }
919 904
920 fs->populate (res);
921 fs->set_prop (prop2);
922 } 905 }
923#else 906#else
924 fontset[style] = fontset[0]; 907 fontset[style] = fontset[0];
925#endif 908#endif
926 } 909 }
… …
928 if (parent[0]) 911 if (parent[0])
929 { 912 {
930 resize_all_windows (0, 0, 0); 913 resize_all_windows (0, 0, 0);
931 scr_remap_chars (); 914 scr_remap_chars ();
932 scr_touch (true); 915 scr_touch (true);
933 } 916 }
934 917
935 return true; 918 return true;
936} 919}
937 920
921void
938void rxvt_term::set_string_property (Atom prop, const char *str, int len) 922rxvt_term::set_string_property (Atom prop, const char *str, int len)
939{ 923{
940 // TODO: SMART_WINDOW_TITLE
941 XChangeProperty (display->display, parent[0], 924 XChangeProperty (dpy, parent[0],
942 prop, XA_STRING, 8, PropModeReplace, 925 prop, XA_STRING, 8, PropModeReplace,
943 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 926 (const unsigned char *)str, len >= 0 ? len : strlen (str));
944} 927}
945 928
929void
946void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 930rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
947{ 931{
948 // TODO: SMART_WINDOW_TITLE
949 wchar_t *ws = rxvt_mbstowcs (str, len); 932 wchar_t *ws = rxvt_mbstowcs (str, len);
950 char *s = rxvt_wcstoutf8 (ws); 933 char *s = rxvt_wcstoutf8 (ws);
951 934
952 XChangeProperty (display->display, parent[0], 935 XChangeProperty (dpy, parent[0],
953 prop, xa[XA_UTF8_STRING], 8, PropModeReplace, 936 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
954 (const unsigned char *)s, strlen (s)); 937 (const unsigned char *)s, strlen (s));
955 938
956 free (s); 939 free (s);
957 free (ws); 940 free (ws);
… …
976#if ENABLE_EWMH 959#if ENABLE_EWMH
977 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 960 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
978#endif 961#endif
979} 962}
980 963
964void
965rxvt_term::set_window_color (int idx, const char *color)
966{
981#ifdef XTERM_COLOR_CHANGE 967#ifdef XTERM_COLOR_CHANGE
982void
983rxvt_term::set_window_color (int idx, const char *color)
984{
985 rxvt_color xcol; 968 rxvt_color xcol;
986 int i; 969 int i;
987 970
988 if (color == NULL || *color == '\0') 971 if (color == NULL || *color == '\0')
989 return; 972 return;
973
974 color = strdup (color);
975 allocated.push_back ((void *)color);
976 rs[Rs_color + idx] = color;
990 977
991 /* handle color aliases */ 978 /* handle color aliases */
992 if (isdigit (*color)) 979 if (isdigit (*color))
993 { 980 {
994 i = atoi (color); 981 i = atoi (color);
995 982
996 if (i >= 8 && i <= 15) 983 if (i >= 8 && i <= 15)
997 { /* bright colors */ 984 { /* bright colors */
998 i -= 8; 985 i -= 8;
999# ifndef NO_BRIGHTCOLOR
1000 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i]; 986 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
1001 SET_PIXCOLOR (idx);
1002 goto done; 987 goto done;
1003# endif
1004 } 988 }
1005 989
1006 if (i >= 0 && i <= 7) 990 if (i >= 0 && i <= 7)
1007 { /* normal colors */ 991 { /* normal colors */
1008 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i]; 992 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
1009 SET_PIXCOLOR (idx);
1010 goto done; 993 goto done;
1011 } 994 }
1012 } 995 }
1013 996
1014 if (!rXParseAllocColor (&xcol, color)) 997 set_color (xcol, color);
1015 return;
1016
1017 /* XStoreColor (display->display, display->cmap, XColor*); */
1018 998
1019 /* 999 /*
1020 * FIXME: should free colors here, but no idea how to do it so instead, 1000 * FIXME: should free colors here, but no idea how to do it so instead,
1021 * so just keep gobbling up the colormap 1001 * so just keep gobbling up the colormap
1022 */ 1002 */
1023# if 0
1024 for (i = Color_Black; i <= Color_White; i++)
1025 if (pix_colors[idx] == pix_colors[i])
1026 break;
1027 if (i > Color_White)
1028 {
1029 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1030 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1031 DisplayPlanes (display->display, display->screen));
1032 }
1033# endif
1034 1003
1035 pix_colors_focused[idx] = xcol; 1004 pix_colors_focused[idx] = xcol;
1036 SET_PIXCOLOR (idx);
1037 1005
1038 /* XSetWindowAttributes attr; */ 1006 /* XSetWindowAttributes attr; */
1039 /* Cursor cursor; */ 1007 /* Cursor cursor; */
1040done: 1008done:
1041
1042#if OFF_FOCUS_FADING
1043 if (rs[Rs_fade])
1044 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
1045#endif
1046
1047 /*TODO: handle Color_BD, scrollbar background, etc. */ 1009 /*TODO: handle Color_BD, scrollbar background, etc. */
1048 1010
1011 update_fade_color (idx);
1049 recolour_cursor (); 1012 recolour_cursor ();
1050 scr_recolour (); 1013 scr_recolour ();
1014#endif /* XTERM_COLOR_CHANGE */
1051} 1015}
1052
1053#else
1054# define set_window_color (idx,color) ((void)0)
1055#endif /* XTERM_COLOR_CHANGE */
1056 1016
1057void 1017void
1058rxvt_term::recolour_cursor () 1018rxvt_term::recolour_cursor ()
1059{ 1019{
1060 XColor xcol[2]; 1020 XColor fg, bg;
1061 1021
1062 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) 1022 (ISSET_PIXCOLOR (Color_pointer_fg)
1063 ? pix_colors_focused[Color_pointer_fg] 1023 ? pix_colors_focused[Color_pointer_fg]
1064 : pix_colors_focused[Color_fg]; 1024 : pix_colors_focused[Color_fg]).get (fg);
1025
1065 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) 1026 (ISSET_PIXCOLOR (Color_pointer_bg)
1066 ? pix_colors_focused[Color_pointer_bg] 1027 ? pix_colors_focused[Color_pointer_bg]
1067 : pix_colors_focused[Color_bg]; 1028 : pix_colors_focused[Color_bg]).get (bg);
1068 1029
1069 XQueryColors (display->display, display->cmap, xcol, 2); 1030 XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1070 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1071} 1031}
1072 1032
1073/*----------------------------------------------------------------------*/ 1033/*----------------------------------------------------------------------*/
1074/* 1034/*
1075 * find if fg/bg matches any of the normal (low-intensity) colors 1035 * find if fg/bg matches any of the normal (low-intensity) colors
… …
1079{ 1039{
1080 unsigned int i; 1040 unsigned int i;
1081 const char *xpmb = "\0"; 1041 const char *xpmb = "\0";
1082 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 1042 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1083 1043
1084 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1085 strcpy (fstr, "default"); 1044 strcpy (fstr, "default");
1086 strcpy (bstr, "default"); 1045 strcpy (bstr, "default");
1087 for (i = Color_Black; i <= Color_White; i++) 1046 for (i = Color_Black; i <= Color_White; i++)
1088 if (pix_colors[Color_fg] == pix_colors[i]) 1047 if (pix_colors[Color_fg] == pix_colors[i])
1089 { 1048 {
… …
1093 1052
1094 for (i = Color_Black; i <= Color_White; i++) 1053 for (i = Color_Black; i <= Color_White; i++)
1095 if (pix_colors[Color_bg] == pix_colors[i]) 1054 if (pix_colors[Color_bg] == pix_colors[i])
1096 { 1055 {
1097 sprintf (bstr, "%d", (i - Color_Black)); 1056 sprintf (bstr, "%d", (i - Color_Black));
1098#ifdef XPM_BACKGROUND 1057#ifdef BG_IMAGE_FROM_FILE
1099 xpmb = "default;"; 1058 xpmb = "default;";
1100#endif 1059#endif
1101 break; 1060 break;
1102 } 1061 }
1103 1062
1104 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1063 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1105} 1064}
1106 1065
1107/*----------------------------------------------------------------------*/ 1066/*----------------------------------------------------------------------*/
1108 1067
1109int 1068bool
1110rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1069rxvt_term::set_color (rxvt_color &color, const char *name)
1111{ 1070{
1112 if (!screen_in_out->set (display, colour)) 1071 if (color.set (this, name))
1113 {
1114 rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1115 return false;
1116 }
1117
1118 return true; 1072 return true;
1073
1074 rxvt_warn ("can't get colour '%s', continuing without.\n", name);
1075 return false;
1076}
1077
1078void
1079rxvt_term::alias_color (int dst, int src)
1080{
1081 pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1119} 1082}
1120 1083
1121/* -------------------------------------------------------------------- * 1084/* -------------------------------------------------------------------- *
1122 * - WINDOW RESIZING - * 1085 * - WINDOW RESIZING - *
1123 * -------------------------------------------------------------------- */ 1086 * -------------------------------------------------------------------- */
1124void 1087void
1125rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent) 1088rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1126{ 1089{
1127 int fix_screen; 1090 int fix_screen;
1128 int old_width = szHint.width, old_height = szHint.height; 1091 int old_width = szHint.width;
1129 dDisp; 1092 int old_height = szHint.height;
1130 1093
1131 window_calc (newwidth, newheight); 1094 window_calc (newwidth, newheight);
1095
1096 if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1132 XSetWMNormalHints (disp, parent[0], &szHint); 1097 XSetWMNormalHints (dpy, parent[0], &szHint);
1133 1098
1134 if (!ignoreparent) 1099 if (!ignoreparent)
1135 { 1100 {
1136#ifdef SMART_RESIZE 1101#ifdef SMART_RESIZE
1137 /* 1102 /*
… …
1141 int x, y, x1, y1; 1106 int x, y, x1, y1;
1142 int dx, dy; 1107 int dx, dy;
1143 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 1108 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1144 Window unused_cr; 1109 Window unused_cr;
1145 1110
1146 XTranslateCoordinates (disp, parent[0], display->root, 1111 XTranslateCoordinates (dpy, parent[0], display->root,
1147 0, 0, &x, &y, &unused_cr); 1112 0, 0, &x, &y, &unused_cr);
1148 XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1, 1113 XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1149 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 1114 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
1150 /* 1115 /*
1151 * if display->root isn't the parent window, a WM will probably have offset 1116 * if display->root isn't the parent window, a WM will probably have offset
1152 * our position for handles and decorations. Counter it 1117 * our position for handles and decorations. Counter it
1153 */ 1118 */
… …
1155 { 1120 {
1156 x -= x1; 1121 x -= x1;
1157 y -= y1; 1122 y -= y1;
1158 } 1123 }
1159 1124
1160 x1 = (DisplayWidth (disp, display->screen) - old_width) / 2; 1125 x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1161 y1 = (DisplayHeight (disp, display->screen) - old_height) / 2; 1126 y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1162 dx = old_width - szHint.width; 1127 dx = old_width - szHint.width;
1163 dy = old_height - szHint.height; 1128 dy = old_height - szHint.height;
1164 1129
1165 /* Check position of the center of the window */ 1130 /* Check position of the center of the window */
1166 if (x < x1) /* left half */ 1131 if (x < x1) /* left half */
1167 dx = 0; 1132 dx = 0;
… …
1170 if (y < y1) /* top half */ 1135 if (y < y1) /* top half */
1171 dy = 0; 1136 dy = 0;
1172 else if (y == y1) /* exact center */ 1137 else if (y == y1) /* exact center */
1173 dy /= 2; 1138 dy /= 2;
1174 1139
1175 XMoveResizeWindow (disp, parent[0], x + dx, y + dy, 1140 XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1176 szHint.width, szHint.height); 1141 szHint.width, szHint.height);
1177#else 1142#else
1178 XResizeWindow (disp, parent[0], szHint.width, szHint.height); 1143 XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1179#endif 1144#endif
1180 } 1145 }
1181 1146
1182 fix_screen = ncol != prev_ncol || nrow != prev_nrow; 1147 fix_screen = ncol != prev_ncol || nrow != prev_nrow;
1183 1148
1184 if (fix_screen || newwidth != old_width || newheight != old_height) 1149 if (fix_screen || newwidth != old_width || newheight != old_height)
1185 { 1150 {
1186 if (scrollbar_visible ()) 1151 if (scrollBar.state)
1187 { 1152 {
1188 XMoveResizeWindow (disp, scrollBar.win, 1153 XMoveResizeWindow (dpy, scrollBar.win,
1189 window_sb_x, 0, 1154 window_sb_x, 0,
1190 scrollbar_TotalWidth (), szHint.height); 1155 scrollbar_TotalWidth (), szHint.height);
1191 resize_scrollbar (); 1156 resize_scrollbar ();
1192 } 1157 }
1193 1158
1194 if (menubar_visible ())
1195 XMoveResizeWindow (disp, menuBar.win,
1196 window_vt_x, 0,
1197 TermWin_TotalWidth (), menuBar_TotalHeight ());
1198
1199 XMoveResizeWindow (disp, vt, 1159 XMoveResizeWindow (dpy, vt,
1200 window_vt_x, window_vt_y, 1160 window_vt_x, window_vt_y,
1201 TermWin_TotalWidth (), TermWin_TotalHeight ()); 1161 width, height);
1162
1163#ifdef HAVE_BG_PIXMAP
1164 if (bgPixmap.window_size_sensitive ())
1165 update_background ();
1166#endif
1202 1167
1203 scr_clear (); 1168 scr_clear ();
1204#ifdef XPM_BACKGROUND
1205 resize_pixmap ();
1206#endif
1207 } 1169 }
1208 1170
1209 if (fix_screen || old_height == 0) 1171 if (fix_screen || old_height == 0)
1210 {
1211 int curr_screen = -1;
1212 int old_ncol = prev_ncol;
1213
1214 /* scr_reset only works on the primary screen */
1215 if (old_height) /* this is not the first time through */
1216 {
1217 unsigned int ocol = ncol;
1218 ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1219 curr_screen = scr_change_screen (PRIMARY);
1220 ncol = ocol;
1221 }
1222
1223 scr_reset (); 1172 scr_reset ();
1224 1173
1225 if (curr_screen >= 0) /* this is not the first time through */ 1174 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1226 { 1175 //scr_touch (false);
1227 scr_change_screen (curr_screen);
1228 selection_check (old_ncol != ncol ? 4 : 0);
1229 }
1230 }
1231 1176
1232 old_width = szHint.width; 1177#ifdef HAVE_BG_PIXMAP
1233 old_height = szHint.height; 1178// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1234 1179// if (bgPixmap.pixmap)
1235#ifdef XPM_BACKGROUND
1236 if (pixmap)
1237 scr_touch (false); 1180// scr_touch (false);
1238#endif 1181#endif
1239 1182
1240#ifdef USE_XIM 1183#ifdef USE_XIM
1241 IMSetStatusPosition (); 1184 IMSetPosition ();
1242#endif 1185#endif
1243} 1186}
1244 1187
1245/* 1188/*
1246 * Set the width/height of the vt window in characters. Units are pixels. 1189 * Set the width/height of the vt window in characters. Units are pixels.
… …
1251{ 1194{
1252 XWindowAttributes wattr; 1195 XWindowAttributes wattr;
1253 1196
1254 if (newwidth == 0 || newheight == 0) 1197 if (newwidth == 0 || newheight == 0)
1255 { 1198 {
1256 XGetWindowAttributes (display->display, display->root, &wattr); 1199 XGetWindowAttributes (dpy, display->root, &wattr);
1257 1200
1258 if (newwidth == 0) 1201 if (newwidth == 0)
1259 newwidth = wattr.width - szHint.base_width; 1202 newwidth = wattr.width - szHint.base_width;
1260 if (newheight == 0) 1203 if (newheight == 0)
1261 newheight = wattr.height - szHint.base_height; 1204 newheight = wattr.height - szHint.base_height;
… …
1275#ifdef USE_XIM 1218#ifdef USE_XIM
1276 1219
1277void 1220void
1278rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg) 1221rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1279{ 1222{
1280 fg = pix_colors[Color_fg]; 1223 fg = pix_colors [Color_fg];
1281 bg = pix_colors[Color_bg]; 1224 bg = pix_colors [Color_bg];
1282} 1225}
1283 1226
1284void 1227void
1285rxvt_term::im_set_size (XRectangle &size) 1228rxvt_term::im_set_size (XRectangle &size)
1286{ 1229{
… …
1323 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1266 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1324 1267
1325 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */ 1268 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1326 *p = '\0'; 1269 *p = '\0';
1327 1270
1328 atom = XInternAtom (display->display, server, False); 1271 atom = XInternAtom (dpy, server, False);
1329 win = XGetSelectionOwner (display->display, atom); 1272 win = XGetSelectionOwner (dpy, atom);
1330 1273
1331 if (win != None) 1274 if (win != None)
1332 return True; 1275 return True;
1333 } 1276 }
1334 1277
… …
1341 XPoint nspot; 1284 XPoint nspot;
1342 XVaNestedList preedit_attr; 1285 XVaNestedList preedit_attr;
1343 1286
1344 if (!Input_Context 1287 if (!Input_Context
1345 || !focus 1288 || !focus
1346 || !(input_style & XIMPreeditPosition)) 1289 || !(input_style & (XIMPreeditPosition | XIMPreeditCallbacks)))
1347 return; 1290 return;
1348 1291
1349 im_set_position (nspot); 1292 im_set_position (nspot);
1350 1293
1351 if (nspot.x == spot.x && nspot.y == spot.y) 1294 if (nspot.x == spot.x && nspot.y == spot.y)
… …
1370 input_method = 0; 1313 input_method = 0;
1371 } 1314 }
1372 1315
1373 Input_Context = 0; 1316 Input_Context = 0;
1374} 1317}
1318
1319#ifdef ENABLE_XIM_ONTHESPOT
1320
1321static void
1322xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
1323{
1324 ((rxvt_term *)client_data)->make_current ();
1325 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
1326}
1327
1328static void
1329xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
1330{
1331 ((rxvt_term *)client_data)->make_current ();
1332 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
1333}
1334
1335static void
1336xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
1337{
1338 rxvt_term *term = (rxvt_term *)client_data;
1339 XIMText *text = call_data->text;
1340
1341 term->make_current ();
1342
1343 if (text)
1344 {
1345 void *str;
1346
1347 if (!text->encoding_is_wchar && text->string.multi_byte)
1348 {
1349 // of course, X makes it ugly again
1350 if (term->rs[Rs_imLocale])
1351 SET_LOCALE (term->rs[Rs_imLocale]);
1352
1353 str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
1354 mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
1355
1356 if (term->rs[Rs_imLocale])
1357 SET_LOCALE (term->locale);
1358 }
1359 else
1360 str = (void *)text->string.wide_char;
1361
1362 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1363 DT_INT, call_data->caret,
1364 DT_INT, call_data->chg_first,
1365 DT_INT, call_data->chg_length,
1366 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1367 DT_WCS_LEN, str, str ? (int)text->length : 0,
1368 DT_END));
1369 }
1370 else
1371 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1372 DT_INT, call_data->caret,
1373 DT_INT, call_data->chg_first,
1374 DT_INT, call_data->chg_length,
1375 DT_END));
1376}
1377
1378#if 0
1379static void
1380xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
1381{
1382 ((rxvt_term *)client_data)->make_current ();
1383 HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
1384 DT_INT, call_data->position,
1385 DT_INT, call_data->direction,
1386 DT_INT, call_data->style,
1387 DT_END));
1388}
1389#endif
1390
1391#endif
1375 1392
1376/* 1393/*
1377 * Try to open a XIM with the current modifiers, then see if we can 1394 * Try to open a XIM with the current modifiers, then see if we can
1378 * open a suitable preedit type 1395 * open a suitable preedit type
1379 */ 1396 */
… …
1386 XRectangle rect, status_rect, needed_rect; 1403 XRectangle rect, status_rect, needed_rect;
1387 unsigned long fg, bg; 1404 unsigned long fg, bg;
1388 const char *p; 1405 const char *p;
1389 char **s; 1406 char **s;
1390 XIMStyles *xim_styles; 1407 XIMStyles *xim_styles;
1408#ifdef ENABLE_XIM_ONTHESPOT
1409 XIMCallback xcb[4];
1410#endif
1411
1412 set_environ (envv);
1391 1413
1392 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1414 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1393 return false; 1415 return false;
1394 1416
1395 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1396 input_method = display->get_xim (locale, modifiers); 1417 input_method = display->get_xim (locale, modifiers);
1397 if (input_method == NULL) 1418 if (input_method == NULL)
1398 return false; 1419 return false;
1399 1420
1400 xim = input_method->xim; 1421 xim = input_method->xim;
… …
1420 s = rxvt_splitcommastring (p); 1441 s = rxvt_splitcommastring (p);
1421 1442
1422 for (i = found = 0; !found && s[i]; i++) 1443 for (i = found = 0; !found && s[i]; i++)
1423 { 1444 {
1424 if (!strcmp (s[i], "OverTheSpot")) 1445 if (!strcmp (s[i], "OverTheSpot"))
1425 input_style = (XIMPreeditPosition | XIMStatusNothing); 1446 input_style = XIMPreeditPosition | XIMStatusNothing;
1426 else if (!strcmp (s[i], "OffTheSpot")) 1447 else if (!strcmp (s[i], "OffTheSpot"))
1427 input_style = (XIMPreeditArea | XIMStatusArea); 1448 input_style = XIMPreeditArea | XIMStatusArea;
1428 else if (!strcmp (s[i], "Root")) 1449 else if (!strcmp (s[i], "Root"))
1429 input_style = (XIMPreeditNothing | XIMStatusNothing); 1450 input_style = XIMPreeditNothing | XIMStatusNothing;
1430 else if (!strcmp (s[i], "None")) 1451 else if (!strcmp (s[i], "None"))
1431 input_style = (XIMPreeditNone | XIMStatusNone); 1452 input_style = XIMPreeditNone | XIMStatusNone;
1453#ifdef ENABLE_XIM_ONTHESPOT
1454 else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
1455 input_style = XIMPreeditCallbacks | XIMStatusNothing;
1456#endif
1457 else
1458 input_style = XIMPreeditNothing | XIMStatusNothing;
1432 1459
1433 for (j = 0; j < xim_styles->count_styles; j++) 1460 for (j = 0; j < xim_styles->count_styles; j++)
1434 if (input_style == xim_styles->supported_styles[j]) 1461 if (input_style == xim_styles->supported_styles[j])
1435 { 1462 {
1436 rxvt_freecommastring (s); 1463 rxvt_freecommastring (s);
… …
1474 "*", 1501 "*",
1475 fheight, 1502 fheight,
1476 fheight + 1, fheight - 1, 1503 fheight + 1, fheight - 1,
1477 fheight - 2, fheight + 2); 1504 fheight - 2, fheight + 2);
1478 1505
1479 fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat, 1506 fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1480 &missing_charset_list, &missing_charset_count, &def_string); 1507 &missing_charset_list, &missing_charset_count, &def_string);
1481 1508
1482 if (missing_charset_list) 1509 if (missing_charset_list)
1483 XFreeStringList (missing_charset_list); 1510 XFreeStringList (missing_charset_list);
1484 1511
… …
1525 XNBackground, bg, 1552 XNBackground, bg,
1526 XNArea, &status_rect, 1553 XNArea, &status_rect,
1527 XNFontSet, fs, 1554 XNFontSet, fs,
1528 NULL); 1555 NULL);
1529 } 1556 }
1557#if ENABLE_XIM_ONTHESPOT
1558 else if (input_style & XIMPreeditCallbacks)
1559 {
1560 im_set_position (spot);
1561
1562 xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
1563 xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
1564 xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
1565# if 0
1566 xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
1567# endif
1568
1569 preedit_attr = XVaCreateNestedList (0,
1570 XNSpotLocation, &spot,
1571 XNPreeditStartCallback, &xcb[0],
1572 XNPreeditDoneCallback , &xcb[1],
1573 XNPreeditDrawCallback , &xcb[2],
1574# if 0
1575 XNPreeditCaretCallback, &xcb[3],
1576# endif
1577 NULL);
1578 }
1579#endif
1530 1580
1531 Input_Context = XCreateIC (xim, 1581 Input_Context = XCreateIC (xim,
1532 XNInputStyle, input_style, 1582 XNInputStyle, input_style,
1533 XNClientWindow, vt, 1583 XNClientWindow, vt,
1534 XNFocusWindow, parent[0], 1584 XNFocusWindow, parent[0],
… …
1536 preedit_attr, 1586 preedit_attr,
1537 status_attr ? XNStatusAttributes : NULL, 1587 status_attr ? XNStatusAttributes : NULL,
1538 status_attr, NULL); 1588 status_attr, NULL);
1539 1589
1540 if (preedit_attr) XFree (preedit_attr); 1590 if (preedit_attr) XFree (preedit_attr);
1541 if (status_attr) XFree (status_attr); 1591 if (status_attr) XFree (status_attr);
1542 if (fs) XFreeFontSet (display->display, fs); 1592 if (fs) XFreeFontSet (dpy, fs);
1543 1593
1544 if (Input_Context == NULL) 1594 if (Input_Context == NULL)
1545 { 1595 {
1546 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1596 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1547 im_destroy (); 1597 im_destroy ();
1548 return false; 1598 return false;
1549 } 1599 }
1550 1600
1551 if (input_style & XIMPreeditArea) 1601#if 0
1602 // unfortunately, only the focus window is used by XIM, hard to fix
1603 if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
1604 vt_select_input ();
1605#endif
1606
1552 IMSetStatusPosition (); 1607 IMSetPosition ();
1553 1608
1554 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1555 return true; 1609 return true;
1556} 1610}
1557 1611
1558void 1612void
1559rxvt_term::im_cb () 1613rxvt_term::im_cb ()
… …
1561 int i; 1615 int i;
1562 const char *p; 1616 const char *p;
1563 char **s; 1617 char **s;
1564 char buf[IMBUFSIZ]; 1618 char buf[IMBUFSIZ];
1565 1619
1566 SET_R (this); 1620 make_current ();
1567 1621
1568 im_destroy (); 1622 im_destroy ();
1569 1623
1570 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1571 if (Input_Context) 1624 if (Input_Context)
1572 return; 1625 return;
1573 1626
1574#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1627#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1575 if (rs[Rs_imLocale]) 1628 if (rs[Rs_imLocale])
… …
1617 SET_LOCALE (locale); 1670 SET_LOCALE (locale);
1618#endif 1671#endif
1619} 1672}
1620 1673
1621void 1674void
1622rxvt_term::IMSetStatusPosition () 1675rxvt_term::IMSetPosition ()
1623{ 1676{
1624 XRectangle preedit_rect, status_rect, *needed_rect; 1677 XRectangle preedit_rect, status_rect, *needed_rect;
1625 XVaNestedList preedit_attr, status_attr; 1678 XVaNestedList preedit_attr, status_attr;
1626 1679
1627 if (!Input_Context 1680 if (!Input_Context
1628 || !focus 1681 || !focus
1629 || !(input_style & XIMPreeditArea) 1682 || !(input_style & (XIMPreeditArea | XIMPreeditPosition))
1630 || !IMisRunning ()) 1683 || !IMisRunning ())
1631 return; 1684 return;
1632 1685
1686 if (input_style & XIMPreeditPosition)
1687 {
1688 im_set_size (preedit_rect);
1689 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1690
1691 XSetICValues (Input_Context,
1692 XNPreeditAttributes, preedit_attr, NULL);
1693 }
1694 else
1695 {
1633 /* Getting the necessary width of preedit area */ 1696 /* Getting the necessary width of preedit area */
1634 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1697 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1635 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1698 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1636 XFree (status_attr); 1699 XFree (status_attr);
1637 1700
1638 im_set_preedit_area (preedit_rect, status_rect, *needed_rect); 1701 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1639 XFree (needed_rect); 1702 XFree (needed_rect);
1640 1703
1641 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1704 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1642 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1705 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1643 1706
1644 XSetICValues (Input_Context, 1707 XSetICValues (Input_Context,
1645 XNPreeditAttributes, preedit_attr, 1708 XNPreeditAttributes, preedit_attr,
1646 XNStatusAttributes, status_attr, NULL); 1709 XNStatusAttributes, status_attr,
1710 NULL);
1647 1711
1712 XFree (status_attr);
1713 }
1714
1648 XFree (preedit_attr); 1715 XFree (preedit_attr);
1649 XFree (status_attr);
1650} 1716}
1651#endif /* USE_XIM */ 1717#endif /* USE_XIM */
1652 1718
1653/*----------------------------------------------------------------------*/ 1719void
1654rxvt_t rxvt_current_term; 1720rxvt_term::get_window_origin (int &x, int &y)
1721{
1722 Window cr;
1723 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1724/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1725}
1726
1727Pixmap
1728rxvt_term::get_pixmap_property (int prop_id)
1729{
1730 if (prop_id > 0 && prop_id < NUM_XA)
1731 if (xa[prop_id])
1732 {
1733 int aformat;
1734 unsigned long nitems, bytes_after;
1735 Atom atype;
1736 unsigned char *prop = NULL;
1737 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1738 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1739 &nitems, &bytes_after, &prop);
1740 if (result == Success && prop && atype == XA_PIXMAP)
1741 {
1742 return *(Pixmap *)prop;
1743 }
1744 }
1745 return None;
1746}
1747
1748#ifdef HAVE_BG_PIXMAP
1749# if TRACE_PIXMAPS
1750# undef update_background
1751int rxvt_term::trace_update_background (const char* file, int line)
1752{
1753 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1754 update_background ();
1755}
1756# endif
1757int
1758rxvt_term::update_background ()
1759{
1760 bgPixmap.invalidate ();
1761
1762 /* no chance of real time refresh if we are blurring! */
1763 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1764 bgPixmap.render ();
1765 else
1766 {
1767 update_background_ev.stop ();
1768
1769 if (!bgPixmap.need_client_side_rendering())
1770 update_background_ev.start (.05);
1771 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1772 update_background_ev.start (.20); /* very slow !!! */
1773 else
1774 update_background_ev.start (.07);
1775 }
1776
1777 return 0;
1778}
1779
1780void
1781rxvt_term::update_background_cb (ev::timer &w, int revents)
1782{
1783 bgPixmap.render ();
1784}
1785
1786#endif /* HAVE_BG_PIXMAP */
1655 1787
1656/*----------------------- end-of-file (C source) -----------------------*/ 1788/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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