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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines