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.76 by root, Wed Aug 4 03:29:28 2004 UTC vs.
Revision 1.128 by root, Mon Jan 17 00:59:23 2005 UTC

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 "main.intpro" /* PROTOS for internal routines */
36 36
37#include <signal.h> 37#include <csignal>
38#include <cstring>
38 39
39#ifdef TTY_GID_SUPPORT 40#ifdef TTY_GID_SUPPORT
40# include <grp.h> 41# include <grp.h>
41#endif 42#endif
42 43
43#ifdef HAVE_TERMIOS_H 44#ifdef HAVE_TERMIOS_H
44# include <termios.h> 45# include <termios.h>
45#endif 46#endif
46 47
47#include <cstring> 48#ifdef KEYSYM_RESOURCE
49# include "keyboard.h"
50#endif
48 51
49vector<rxvt_term *> rxvt_term::termlist; 52vector<rxvt_term *> rxvt_term::termlist;
50 53
51static char curlocale[128]; 54static char curlocale[128];
52 55
53bool 56bool
54rxvt_set_locale (const char *locale) 57rxvt_set_locale (const char *locale)
55{ 58{
56 if (!locale || !STRNCMP (locale, curlocale, 128)) 59 if (!locale || !strncmp (locale, curlocale, 128))
57 return false; 60 return false;
58 61
59 STRNCPY (curlocale, locale, 128); 62 strncpy (curlocale, locale, 128);
60 setlocale (LC_CTYPE, curlocale); 63 setlocale (LC_CTYPE, curlocale);
61 return true; 64 return true;
62} 65}
63 66
64#if ENABLE_COMBINING 67#if ENABLE_COMBINING
123 return len; 126 return len;
124 127
125} 128}
126#endif 129#endif
127 130
128void *
129rxvt_term::operator new (size_t s)
130{
131 void *p = malloc (s);
132
133 MEMSET (p, 0, s);
134 return p;
135}
136
137void
138rxvt_term::operator delete (void *p, size_t s)
139{
140 free (p);
141}
142
143rxvt_term::rxvt_term () 131rxvt_term::rxvt_term ()
144 : 132 :
133#if TRANSPARENT
145 rootwin_ev (this, &rxvt_term::rootwin_cb), 134 rootwin_ev (this, &rxvt_term::rootwin_cb),
135#endif
136#ifdef HAVE_SCROLLBARS
137 scrollbar_ev (this, &rxvt_term::x_cb),
138#endif
139#ifdef MENUBAR
140 menubar_ev (this, &rxvt_term::x_cb),
141#endif
142#ifdef CURSOR_BLINK
143 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
144#endif
145#ifdef TEXT_BLINK
146 text_blink_ev (this, &rxvt_term::text_blink_cb),
147#endif
148#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
149 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
150#endif
151#ifdef SELECTION_SCROLLING
152 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
153#endif
154#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
155 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
156#endif
157#ifdef POINTER_BLANK
158 pointer_ev (this, &rxvt_term::pointer_cb),
159#endif
160#ifdef USE_XIM
161 im_ev (this, &rxvt_term::im_cb),
162#endif
163 sw_term (this, &rxvt_term::sig_term),
164 sw_chld (this, &rxvt_term::sig_chld),
146 termwin_ev (this, &rxvt_term::x_cb), 165 termwin_ev (this, &rxvt_term::x_cb),
147 vt_ev (this, &rxvt_term::x_cb), 166 vt_ev (this, &rxvt_term::x_cb),
148#ifdef HAVE_SCROLLBARS
149 scrollbar_ev (this, &rxvt_term::x_cb),
150#endif
151#ifdef MENUBAR
152 menubar_ev (this, &rxvt_term::x_cb),
153#endif
154#ifdef CURSOR_BLINK
155 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
156#endif
157#ifdef TEXT_BLINK
158 text_blink_ev (this, &rxvt_term::text_blink_cb),
159#endif
160#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
161 cont_scroll_ev (this, &rxvt_term::cont_scroll_cb),
162#endif
163#ifdef SELECTION_SCROLLING
164 sel_scroll_ev (this, &rxvt_term::sel_scroll_cb),
165#endif
166#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
167 slip_wheel_ev (this, &rxvt_term::slip_wheel_cb),
168#endif
169#ifdef POINTER_BLANK
170 pointer_ev (this, &rxvt_term::pointer_cb),
171#endif
172#ifdef USE_XIM
173 im_ev (this, &rxvt_term::im_cb),
174#endif
175 check_ev (this, &rxvt_term::check_cb), 167 check_ev (this, &rxvt_term::check_cb),
176 flush_ev (this, &rxvt_term::flush_cb), 168 flush_ev (this, &rxvt_term::flush_cb),
177 destroy_ev (this, &rxvt_term::destroy_cb), 169 destroy_ev (this, &rxvt_term::destroy_cb),
178 pty_ev (this, &rxvt_term::pty_cb), 170 pty_ev (this, &rxvt_term::pty_cb),
179 incr_ev (this, &rxvt_term::incr_cb) 171 incr_ev (this, &rxvt_term::incr_cb)
180{ 172{
181 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 173 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
182 174
183 termlist.push_back (this); 175 termlist.push_back (this);
176
177#ifdef KEYSYM_RESOURCE
178 keyboard = new keyboard_manager;
179
180 if (!keyboard)
181 rxvt_fatal ("out of memory, aborting.\n");
182#endif
184} 183}
185 184
186rxvt_term::~rxvt_term () 185rxvt_term::~rxvt_term ()
187{ 186{
188 termlist.erase (find (termlist.begin (), termlist.end(), this)); 187 termlist.erase (find (termlist.begin (), termlist.end(), this));
189 188
190 if (cmd_fd >= 0) 189 if (cmd_pid)
191 close (cmd_fd); 190 kill (-cmd_pid, SIGHUP);
192 191
193#ifndef NO_SETOWNER_TTYDEV 192 pty.put ();
194 privileged_ttydev (RESTORE); 193
195#endif
196#ifdef UTMP_SUPPORT 194#ifdef UTMP_SUPPORT
197 privileged_utmp (RESTORE); 195 privileged_utmp (RESTORE);
198#endif 196#endif
199 197
198#if ENABLE_STYLES
199 for (int i = RS_styleCount; --i; )
200 if (TermWin.fontset[i] != TermWin.fontset[0])
201 delete TermWin.fontset[i];
202#endif
200 delete TermWin.fontset; 203 delete TermWin.fontset[0];
201 204
202 if (display) 205 if (display)
203 { 206 {
204 selection_clear (); 207 selection_clear ();
205 208
209#ifdef USE_XIM
210 im_destroy ();
211#endif
206#ifdef MENUBAR 212#ifdef MENUBAR
207 if (menubarGC) XFreeGC (display->display, menubarGC); 213 if (menubarGC) XFreeGC (display->display, menubarGC);
208#endif 214#endif
209#ifdef XTERM_SCROLLBAR 215#ifdef XTERM_SCROLLBAR
210 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC); 216 if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);
211 if (ShadowGC) XFreeGC (display->display, ShadowGC); 217 if (ShadowGC) XFreeGC (display->display, ShadowGC);
212#endif 218#endif
243 XDestroyWindow (display->display, TermWin.parent[0]); 249 XDestroyWindow (display->display, TermWin.parent[0]);
244 } 250 }
245 251
246 // TODO: free pixcolours, colours should become part of rxvt_display 252 // TODO: free pixcolours, colours should become part of rxvt_display
247 253
248 delete PixColorsFocused; 254 delete pix_colors_focused;
249#ifdef OFF_FOCUS_FADING 255#ifdef OFF_FOCUS_FADING
250 delete PixColorsUnFocused; 256 delete pix_colors_unfocused;
251#endif 257#endif
252 258
253 displays.put (display); 259 displays.put (display);
254 260
255 scr_release (); 261 scr_release ();
263 free (env_windowid); 269 free (env_windowid);
264 free (env_display); 270 free (env_display);
265 free (env_term); 271 free (env_term);
266 free (env_colorfgbg); 272 free (env_colorfgbg);
267 free (locale); 273 free (locale);
268#if 0 274 free (v_buffer);
269 free (codeset); 275 free (incr_buf);
270#endif
271 276
272 delete envv; 277 delete envv;
273 delete argv; 278 delete argv;
279
280#ifdef KEYSYM_RESOURCE
281 delete keyboard;
282#endif
274} 283}
275 284
276void 285void
277rxvt_term::destroy () 286rxvt_term::destroy ()
278{ 287{
288 if (destroy_ev.active)
289 return;
290
291#if ENABLE_OVERLAY
292 scr_overlay_off ();
293#endif
294
279 if (display) 295 if (display)
280 { 296 {
297#if USE_XIM
298 im_ev.stop (display);
299#endif
300#if HAVE_SCROLLBARS
301 scrollbar_ev.stop (display);
302#endif
303#if MENUBAR
304 menubar_ev.stop (display);
305#endif
306#if TRANSPARENT
281 rootwin_ev.stop (display); 307 rootwin_ev.stop (display);
308#endif
309 incr_ev.stop ();
282 termwin_ev.stop (display); 310 termwin_ev.stop (display);
283 vt_ev.stop (display); 311 vt_ev.stop (display);
284#ifdef USE_XIM
285 im_destroy ();
286 im_ev.stop (display);
287#endif
288#ifdef HAVE_SCROLLBARS
289 scrollbar_ev.stop (display);
290#endif
291#ifdef MENUBAR
292 menubar_ev.stop (display);
293#endif
294 } 312 }
295 313
296 check_ev.stop (); 314 check_ev.stop ();
297 pty_ev.stop (); 315 pty_ev.stop ();
298#ifdef CURSOR_BLINK 316#ifdef CURSOR_BLINK
327bool 345bool
328rxvt_term::init (int argc, const char *const *argv) 346rxvt_term::init (int argc, const char *const *argv)
329{ 347{
330 SET_R (this); 348 SET_R (this);
331 349
350 set_locale ("");
351
332 if (!init_vars ()) 352 if (!init_vars ())
333 return false; 353 return false;
334 354
355 init_secondary ();
356
357 const char **cmd_argv = init_resources (argc, argv);
358
359#ifdef KEYSYM_RESOURCE
360 keyboard->register_done ();
361#endif
362
363#if MENUBAR_MAX
364 menubar_read (rs[Rs_menu]);
365#endif
366#ifdef HAVE_SCROLLBARS
367 if (options & Opt_scrollBar)
368 scrollBar.setIdle (); /* set existence for size calculations */
369#endif
370
371 create_windows (argc, argv);
372
373 init_xlocale ();
374
375 scr_reset (); /* initialize screen */
376
377#if 0
378 XSynchronize (display->display, True);
379#endif
380
381#ifdef HAVE_SCROLLBARS
382 if (options & Opt_scrollBar)
383 resize_scrollbar (); /* create and map scrollbar */
384#endif
385#if (MENUBAR_MAX)
386 if (menubar_visible ())
387 XMapWindow (display->display, menuBar.win);
388#endif
389#ifdef TRANSPARENT
390 if (options & Opt_transparent)
391 {
392 XSelectInput (display->display, display->root, PropertyChangeMask);
393 check_our_parents ();
394 rootwin_ev.start (display, display->root);
395 }
396#endif
397
398 XMapWindow (display->display, TermWin.vt);
399 XMapWindow (display->display, TermWin.parent[0]);
400
401 set_colorfgbg ();
402
403 init_command (cmd_argv);
404
405 free (cmd_argv);
406
407 pty_ev.start (pty.pty, EVENT_READ);
408
409 check_ev.start ();
410
411 return true;
412}
413
414static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
415
416void
417rxvt_init ()
418{
335 /* 419 /*
336 * Save and then give up any super-user privileges 420 * Save and then give up any super-user privileges
337 * If we need privileges in any area then we must specifically request it. 421 * If we need privileges in any area then we must specifically request it.
338 * We should only need to be root in these cases: 422 * We should only need to be root in these cases:
339 * 1. write utmp entries on some systems 423 * 1. write utmp entries on some systems
340 * 2. chown tty on some systems 424 * 2. chown tty on some systems
341 */ 425 */
342 privileges (SAVE); 426 rxvt_privileges (SAVE);
343 privileges (IGNORE); 427 rxvt_privileges (IGNORE);
344 428
345 init_secondary (); 429 signal (SIGHUP, SIG_IGN);
346 430 signal (SIGPIPE, SIG_IGN);
347 const char **cmd_argv = init_resources (argc, argv);
348
349 set_locale ("");
350
351#if MENUBAR_MAX
352 menubar_read (rs[Rs_menu]);
353#endif
354#ifdef HAVE_SCROLLBARS
355 if (Options & Opt_scrollBar)
356 scrollBar.setIdle (); /* set existence for size calculations */
357#endif
358
359 create_windows (argc, argv);
360
361 init_xlocale ();
362
363 scr_reset (); /* initialize screen */
364
365#if 0
366 XSynchronize (display->display, True);
367#endif
368
369#ifdef HAVE_SCROLLBARS
370 if (Options & Opt_scrollBar)
371 resize_scrollbar (); /* create and map scrollbar */
372#endif
373#if (MENUBAR_MAX)
374 if (menubar_visible ())
375 XMapWindow (display->display, menuBar.win);
376#endif
377#ifdef TRANSPARENT
378 if (Options & Opt_transparent)
379 {
380 XSelectInput (display->display, display->root, PropertyChangeMask);
381 check_our_parents ();
382 }
383#endif
384
385 rootwin_ev.start (display, display->root);
386
387 XMapWindow (display->display, TermWin.vt);
388 XMapWindow (display->display, TermWin.parent[0]);
389
390 init_command (cmd_argv);
391
392 pty_ev.start (cmd_fd, EVENT_READ);
393
394 check_ev.start ();
395
396 return true;
397}
398
399static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
400
401void
402rxvt_init_signals ()
403{
404 /* install exit handler for cleanup */
405#if 0
406#ifdef HAVE_ATEXIT
407 atexit (rxvt_clean_exit);
408#else
409#endif
410#endif
411
412 struct sigaction sa;
413
414 sigfillset (&sa.sa_mask);
415 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
416 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
417 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
418 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
419 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
420 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
421 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
422 431
423 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 432 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
424 /* signal (SIGURG, SIG_DFL); */ 433 /* signal (SIGURG, SIG_DFL); */
425 434
426 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 435 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
436 // TODO: handle this with exceptions and tolerate the memory loss
427 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 437 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
428} 438}
429 439
430/* ------------------------------------------------------------------------- * 440/* ------------------------------------------------------------------------- *
431 * SIGNAL HANDLING & EXIT HANDLER * 441 * SIGNAL HANDLING & EXIT HANDLER *
432 * ------------------------------------------------------------------------- */ 442 * ------------------------------------------------------------------------- */
433/* 443/*
434 * Catch a SIGCHLD signal and exit if the direct child has died 444 * Catch a SIGCHLD signal and exit if the direct child has died
435 */ 445 */
436 446
437void rxvt_term::child_exited (int pid) 447void
448rxvt_term::sig_chld (sig_watcher &w)
438{ 449{
439 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 450 // we are being called for every SIGCHLD, not just ours
440 if (pid == (*t)->cmd_pid) 451 int pid;
441 {
442 (*t)->destroy ();
443 break;
444 }
445}
446
447/* ARGSUSED */
448/* EXTPROTO */
449RETSIGTYPE
450rxvt_Child_signal (int sig __attribute__ ((unused)))
451{
452 int pid, save_errno = errno;
453 452
454 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0) 453 while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
455 rxvt_term::child_exited (pid); 454 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
456 455 if (pid == (*t)->cmd_pid)
457 errno = save_errno; 456 {
458} 457 (*t)->destroy ();
459 458 break;
460/* 459 }
461 * Catch a fatal signal and tidy up before quitting
462 */
463/* EXTPROTO */
464RETSIGTYPE
465rxvt_Exit_signal (int sig)
466{
467 signal (sig, SIG_DFL);
468#ifdef DEBUG_CMD
469 rxvt_warn ("caught signal %d, exiting.\n", sig);
470#endif
471 rxvt_clean_exit ();
472 kill (getpid (), sig);
473}
474
475/* INTPROTO */
476int
477rxvt_xerror_handler (Display *display, XErrorEvent *event)
478{
479 if (GET_R->allowedxerror == -1)
480 GET_R->allowedxerror = event->error_code;
481 else
482 {
483 old_xerror_handler (display, event);
484 GET_R->destroy ();
485 }
486
487 return 0;
488} 460}
489 461
490/*----------------------------------------------------------------------*/ 462/*----------------------------------------------------------------------*/
491/* 463/*
492 * Exit gracefully, clearing the utmp entry and restoring tty attributes 464 * Exit gracefully, clearing the utmp entry and restoring tty attributes
493 * TODO: if debugging, this should free up any known resources if we can 465 * TODO: if debugging, this should free up any known resources if we can
494 */ 466 */
495/* EXTPROTO */
496void 467void
497rxvt_clean_exit () 468rxvt_destroy_all ()
498{ 469{
499 // TODO: rxvtd should clean up all ressources 470 // TODO: rxvtd should clean up all ressources
500 if (GET_R) 471 for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
472 (*t)->destroy ();
473}
474
475/*
476 * Catch a fatal signal and tidy up before quitting
477 */
478void
479rxvt_term::sig_term (sig_watcher &w)
480{
481#ifdef DEBUG_CMD
482 rxvt_warn ("caught signal %d, exiting.\n", w.signum);
483#endif
484 rxvt_destroy_all ();
485 signal (w.signum, SIG_DFL);
486 kill (getpid (), w.signum);
487}
488
489/* INTPROTO */
490int
491rxvt_xerror_handler (Display *display, XErrorEvent *event)
492{
493 if (GET_R->allowedxerror == -1)
494 GET_R->allowedxerror = event->error_code;
495 else
496 {
497 old_xerror_handler (display, event);
501 GET_R->destroy (); 498 GET_R->destroy ();
499 }
500
501 return 0;
502} 502}
503 503
504/* ------------------------------------------------------------------------- * 504/* ------------------------------------------------------------------------- *
505 * MEMORY ALLOCATION WRAPPERS * 505 * MEMORY ALLOCATION WRAPPERS *
506 * ------------------------------------------------------------------------- */ 506 * ------------------------------------------------------------------------- */
507/* EXTPROTO */ 507void *
508void *
509rxvt_malloc (size_t size) 508rxvt_malloc (size_t size)
510{ 509{
511 void *p;
512
513 p = malloc (size); 510 void *p = malloc (size);
511
514 if (p) 512 if (!p)
513 rxvt_fatal ("memory allocation failure. aborting.\n");
514
515 return p; 515 return p;
516
517 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
518 rxvt_clean_exit ();
519 exit (EXIT_FAILURE);
520 /* NOTREACHED */
521} 516}
522 517
523/* EXTPROTO */ 518/* INTPROTO */
524void * 519void *
525rxvt_calloc (size_t number, size_t size) 520rxvt_calloc (size_t number, size_t size)
526{ 521{
527 void *p;
528
529 p = calloc (number, size); 522 void *p = calloc (number, size);
523
530 if (p) 524 if (!p)
525 rxvt_fatal ("memory allocation failure. aborting.\n");
526
531 return p; 527 return p;
532
533 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
534 rxvt_clean_exit ();
535 exit (EXIT_FAILURE);
536 /* NOTREACHED */
537} 528}
538 529
539/* EXTPROTO */ 530/* INTPROTO */
540void * 531void *
541rxvt_realloc (void *ptr, size_t size) 532rxvt_realloc (void *ptr, size_t size)
542{ 533{
543 void *p;
544
545 if (ptr)
546 p = realloc (ptr, size); 534 void *p = realloc (ptr, size);
547 else 535
548 p = malloc (size);
549 if (p) 536 if (!p)
537 rxvt_fatal ("memory allocation failure. aborting.\n");
538
550 return p; 539 return p;
551
552 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
553 rxvt_clean_exit ();
554 exit (EXIT_FAILURE);
555 /* NOTREACHED */
556} 540}
557 541
558/* ------------------------------------------------------------------------- * 542/* ------------------------------------------------------------------------- *
559 * PRIVILEGED OPERATIONS * 543 * PRIVILEGED OPERATIONS *
560 * ------------------------------------------------------------------------- */ 544 * ------------------------------------------------------------------------- */
561/* take care of suid/sgid super-user (root) privileges */ 545/* take care of suid/sgid super-user (root) privileges */
562void 546void
563rxvt_term::privileges (int mode) 547rxvt_privileges (rxvt_privaction action)
564{ 548{
549#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
550 static uid_t euid;
551 static gid_t egid;
552#endif
553
565#if ! defined(__CYGWIN32__) 554#if ! defined(__CYGWIN32__)
566# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 555# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
567 /* setreuid () is the poor man's setuid (), seteuid () */ 556 /* setreuid () is the poor man's setuid (), seteuid () */
568# define seteuid(a) setreuid(-1, (a)) 557# define seteuid(a) setreuid(-1, (a))
569# define setegid(a) setregid(-1, (a)) 558# define setegid(a) setregid(-1, (a))
570# define HAVE_SETEUID 559# define HAVE_SETEUID
571# endif 560# endif
572# ifdef HAVE_SETEUID 561# ifdef HAVE_SETEUID
573 switch (mode) 562 switch (action)
574 { 563 {
575 case IGNORE: 564 case IGNORE:
576 /* 565 /*
577 * change effective uid/gid - not real uid/gid - so we can switch 566 * change effective uid/gid - not real uid/gid - so we can switch
578 * back to root later, as required 567 * back to root later, as required
588 seteuid (euid); 577 seteuid (euid);
589 setegid (egid); 578 setegid (egid);
590 break; 579 break;
591 } 580 }
592# else 581# else
593 switch (mode) 582 switch (action)
594 { 583 {
595 case IGNORE: 584 case IGNORE:
596 setuid (getuid ()); 585 setuid (getuid ());
597 setgid (getgid ()); 586 setgid (getgid ());
598 /* FALLTHROUGH */ 587 /* FALLTHROUGH */
605#endif 594#endif
606} 595}
607 596
608#ifdef UTMP_SUPPORT 597#ifdef UTMP_SUPPORT
609void 598void
610rxvt_term::privileged_utmp (char action) 599rxvt_term::privileged_utmp (rxvt_privaction action)
611{ 600{
612 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
613 action, next_utmp_action, getpid ()));
614 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
615 || (Options & Opt_utmpInhibit) 601 if ((options & Opt_utmpInhibit)
616 || ttydev == NULL || *ttydev == '\0') 602 || !pty.name || !*pty.name)
617 return; 603 return;
618 604
619 privileges (RESTORE); 605 rxvt_privileges (RESTORE);
606
620 if (action == SAVE) 607 if (action == SAVE)
621 {
622 next_utmp_action = RESTORE;
623 makeutent (ttydev, rs[Rs_display_name]); 608 makeutent (pty.name, rs[Rs_display_name]);
624 }
625 else 609 else
626 { /* action == RESTORE */
627 next_utmp_action = IGNORE;
628 cleanutent (); 610 cleanutent ();
629 } 611
630 privileges (IGNORE); 612 rxvt_privileges (IGNORE);
631}
632#endif
633
634#ifndef NO_SETOWNER_TTYDEV
635void
636rxvt_term::privileged_ttydev (char action)
637{
638 D_MAIN ((stderr,
639 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
640 action, next_tty_action, getpid ()));
641 if (next_tty_action != action || (action != SAVE && action != RESTORE)
642 || ttydev == NULL || *ttydev == '\0')
643 return;
644
645 privileges (RESTORE);
646
647 if (action == SAVE)
648 {
649 next_tty_action = RESTORE;
650# ifndef RESET_TTY_TO_COMMON_DEFAULTS
651 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
652 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
653 next_tty_action = IGNORE;
654 else
655# endif
656
657 {
658 chown (ttydev, getuid (), ttygid); /* fail silently */
659 chmod (ttydev, ttymode);
660# ifdef HAVE_REVOKE
661 revoke (ttydev);
662# endif
663
664 }
665 }
666 else
667 { /* action == RESTORE */
668 next_tty_action = IGNORE;
669# ifndef RESET_TTY_TO_COMMON_DEFAULTS
670 chmod (ttydev, ttyfd_stat.st_mode);
671 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
672# else
673 chmod (ttydev,
674 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
675 chown (ttydev, 0, 0);
676# endif
677
678 }
679
680 privileges (IGNORE);
681
682# ifndef RESET_TTY_TO_COMMON_DEFAULTS
683 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
684 action == RESTORE ? "Restoring" : (action ==
685 SAVE ? "Saving" :
686 "UNKNOWN ERROR for"), ttydev,
687 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
688 ttyfd_stat.st_gid));
689# endif
690} 613}
691#endif 614#endif
692 615
693/*----------------------------------------------------------------------*/ 616/*----------------------------------------------------------------------*/
694/* 617/*
765 688
766 if (scrollbar_visible ()) 689 if (scrollbar_visible ())
767 { 690 {
768 sb_w = scrollbar_TotalWidth (); 691 sb_w = scrollbar_TotalWidth ();
769 szHint.base_width += sb_w; 692 szHint.base_width += sb_w;
770 if (!(Options & Opt_scrollBar_right)) 693 if (!(options & Opt_scrollBar_right))
771 window_vt_x += sb_w; 694 window_vt_x += sb_w;
772 } 695 }
773 696
774 if (menubar_visible ()) 697 if (menubar_visible ())
775 { 698 {
803 { 726 {
804 MIN_IT (TermWin.height, max_height); 727 MIN_IT (TermWin.height, max_height);
805 szHint.height = szHint.base_height + TermWin.height; 728 szHint.height = szHint.base_height + TermWin.height;
806 } 729 }
807 730
808 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 731 if (scrollbar_visible () && (options & Opt_scrollBar_right))
809 window_sb_x = szHint.width - sb_w; 732 window_sb_x = szHint.width - sb_w;
810 733
811 if (recalc_x) 734 if (recalc_x)
812 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display)) 735 szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))
813 - szHint.width - 2 * TermWin.ext_bwidth); 736 - szHint.width - 2 * TermWin.ext_bwidth);
829 * Called after a window size change. 752 * Called after a window size change.
830 */ 753 */
831void 754void
832rxvt_term::tt_winch () 755rxvt_term::tt_winch ()
833{ 756{
757 if (pty.pty < 0)
758 return;
759
834 struct winsize ws; 760 struct winsize ws;
835
836 if (cmd_fd < 0)
837 return;
838 761
839 ws.ws_col = TermWin.ncol; 762 ws.ws_col = TermWin.ncol;
840 ws.ws_row = TermWin.nrow; 763 ws.ws_row = TermWin.nrow;
841 ws.ws_xpixel = ws.ws_ypixel = 0; 764 ws.ws_xpixel = TermWin.width;
842#ifndef DEBUG_SIZE 765 ws.ws_ypixel = TermWin.height;
843 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 766 (void)ioctl (pty.pty, TIOCSWINSZ, &ws);
844#else 767
845 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 768#if 0
846 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 769 // TIOCSWINSZ⎈ is supposed to do this automatically and correctly
847# ifdef SIGWINCH
848 else if (cmd_pid) /* force through to the command */ 770 if (cmd_pid) /* force through to the command */
849 kill (cmd_pid, SIGWINCH); 771 kill (cmd_pid, SIGWINCH);
850# endif
851#endif 772#endif
852} 773}
853 774
854/*----------------------------------------------------------------------*/ 775/*----------------------------------------------------------------------*/
855/* rxvt_change_font () - Switch to a new font */ 776/* set_fonts () - load and set the various fonts
856/* 777/*
857 * init = 1 - initialize 778 * init = 1 - initialize
858 * 779 *
859 * fontname == FONT_UP - switch to bigger font 780 * fontname == FONT_UP - switch to bigger font
860 * fontname == FONT_DN - switch to smaller font 781 * fontname == FONT_DN - switch to smaller font
861 */ 782 */
862bool 783bool
863rxvt_term::change_font (const char *fontname) 784rxvt_term::set_fonts ()
864{ 785{
865 if (fontname == FONT_UP)
866 {
867 // TODO
868 }
869 else if (fontname == FONT_DN)
870 {
871 // TODO
872 }
873 else
874 {
875 rxvt_fontset *fs = new rxvt_fontset (this); 786 rxvt_fontset *fs = new rxvt_fontset (this);
787 rxvt_fontprop prop;
876 788
877 if (fs && fs->populate (fontname ? fontname : "fixed")) 789 if (!fs
790 || !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
791 || !fs->realize_font (1))
792 {
793 delete fs;
794 return false;
795 }
796
797#if ENABLE_STYLES
798 for (int i = RS_styleCount; --i; )
799 if (TermWin.fontset[i] != TermWin.fontset[0])
800 delete TermWin.fontset[i];
801#endif
802
803 delete TermWin.fontset[0];
804 TermWin.fontset[0] = fs;
805
806 prop = (*fs)[1]->properties ();
807 prop.height += TermWin.lineSpace;
808 fs->set_prop (prop);
809
810 TermWin.fwidth = prop.width;
811 TermWin.fheight = prop.height;
812 TermWin.fweight = prop.weight;
813 TermWin.fslant = prop.slant;
814 TermWin.fbase = (*fs)[1]->ascent;
815
816 for (int style = 1; style < 4; style++)
817 {
818#if ENABLE_STYLES
819 const char *res = rs[Rs_font + style];
820
821 if (res && !*res)
822 TermWin.fontset[style] = TermWin.fontset[0];
823 else
878 { 824 {
879 delete TermWin.fontset; 825 TermWin.fontset[style] = fs = new rxvt_fontset (this);
880 TermWin.fontset = fs; 826 rxvt_fontprop prop2 = prop;
881 TermWin.fwidth = fs->base_font ()->width;
882 TermWin.fheight = fs->base_font ()->height;
883 TermWin.fbase = fs->base_font ()->ascent;
884 827
885 if (TermWin.parent[0]) 828 if (res)
829 prop2.weight = prop2.slant = rxvt_fontprop::unset;
830 else
886 { 831 {
887 resize_all_windows (0, 0, 0); 832 res = TermWin.fontset[0]->fontdesc;
888 scr_remap_chars (); 833
889 scr_touch (true); 834 if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
835 if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
890 } 836 }
891 837
892 for (unicode_t ch = 0x20; ch <= 0x7f; ch++) 838 fs->populate (res);
893 TermWin.ascii_map [ch - 0x20] = fs->find_font (ch); 839 fs->set_prop (prop2);
894
895 return true;
896 } 840 }
841#else
842 TermWin.fontset[style] = TermWin.fontset[0];
843#endif
844 }
845
846 if (TermWin.parent[0])
897 } 847 {
848 resize_all_windows (0, 0, 0);
849 scr_remap_chars ();
850 scr_touch (true);
851 }
898 852
899 return false; 853 return true;
900} 854}
901 855
902bool 856void rxvt_term::set_string_property (Atom prop, const char *str, int len)
903rxvt_term::font_up_down (int n, int direction)
904{ 857{
905 return false; 858 // TODO: SMART_WINDOW_TITLE
859 XChangeProperty (display->display, TermWin.parent[0],
860 prop, XA_STRING, 8, PropModeReplace,
861 (const unsigned char *)str, len >= 0 ? len : strlen (str));
862}
863
864void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
865{
866 // TODO: SMART_WINDOW_TITLE
867 wchar_t *ws = rxvt_mbstowcs (str, len);
868 char *s = rxvt_wcstoutf8 (ws);
869
870 XChangeProperty (display->display, TermWin.parent[0],
871 prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
872 (const unsigned char *)s, strlen (s));
873
874 free (s);
875 free (ws);
906} 876}
907 877
908/*----------------------------------------------------------------------*/ 878/*----------------------------------------------------------------------*/
909/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
910/* xterm sequences - title, iconName, color (exptl) */ 880/* xterm sequences - title, iconName, color (exptl) */
911void 881void
912rxvt_term::set_title (const char *str) 882rxvt_term::set_title (const char *str)
913{ 883{
914#ifdef SMART_WINDOW_TITLE 884 set_string_property (XA_WM_NAME, str);
915 char *name; 885#if ENABLE_FRILLS
916 886 set_utf8_property (xa[XA_NET_WM_NAME], str);
917 if (!XFetchName (display->display, TermWin.parent[0], &name))
918 name = NULL;
919
920 if (name == NULL || STRCMP (name, str))
921#endif
922 XStoreName (display->display, TermWin.parent[0], str);
923
924#ifdef SMART_WINDOW_TITLE
925 if (name)
926 XFree (name);
927#endif 887#endif
928} 888}
929 889
930void 890void
931rxvt_term::set_icon_name (const char *str) 891rxvt_term::set_icon_name (const char *str)
932{ 892{
933#ifdef SMART_WINDOW_TITLE 893 set_string_property (XA_WM_ICON_NAME, str);
934 char *name; 894#if ENABLE_FRILLS
935 895 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
936 if (!XGetIconName (display->display, TermWin.parent[0], &name))
937 name = NULL;
938
939 if (name == NULL || STRCMP (name, str))
940#endif
941 XSetIconName (display->display, TermWin.parent[0], str);
942
943#ifdef SMART_WINDOW_TITLE
944 if (name)
945 XFree (name);
946#endif 896#endif
947} 897}
948 898
949#ifdef XTERM_COLOR_CHANGE 899#ifdef XTERM_COLOR_CHANGE
950void 900void
962 i = atoi (color); 912 i = atoi (color);
963 if (i >= 8 && i <= 15) 913 if (i >= 8 && i <= 15)
964 { /* bright colors */ 914 { /* bright colors */
965 i -= 8; 915 i -= 8;
966# ifndef NO_BRIGHTCOLOR 916# ifndef NO_BRIGHTCOLOR
967 PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i]; 917 pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
968 SET_PIXCOLOR (idx); 918 SET_PIXCOLOR (idx);
969 goto Done; 919 goto Done;
970# endif 920# endif
971 921
972 } 922 }
973 if (i >= 0 && i <= 7) 923 if (i >= 0 && i <= 7)
974 { /* normal colors */ 924 { /* normal colors */
975 PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i]; 925 pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
976 SET_PIXCOLOR (idx); 926 SET_PIXCOLOR (idx);
977 goto Done; 927 goto Done;
978 } 928 }
979 } 929 }
980 930
987 * FIXME: should free colors here, but no idea how to do it so instead, 937 * FIXME: should free colors here, but no idea how to do it so instead,
988 * so just keep gobbling up the colormap 938 * so just keep gobbling up the colormap
989 */ 939 */
990# if 0 940# if 0
991 for (i = Color_Black; i <= Color_White; i++) 941 for (i = Color_Black; i <= Color_White; i++)
992 if (PixColors[idx] == PixColors[i]) 942 if (pix_colors[idx] == pix_colors[i])
993 break; 943 break;
994 if (i > Color_White) 944 if (i > Color_White)
995 { 945 {
996 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 946 /* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
997 XFreeColors (display->display, display->cmap, (PixColors + idx), 1, 947 XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
998 DisplayPlanes (display->display, display->screen)); 948 DisplayPlanes (display->display, display->screen));
999 } 949 }
1000# endif 950# endif
1001 951
1002 PixColorsFocused[idx] = xcol; 952 pix_colors_focused[idx] = xcol;
1003 SET_PIXCOLOR (idx); 953 SET_PIXCOLOR (idx);
1004 954
1005 /* XSetWindowAttributes attr; */ 955 /* XSetWindowAttributes attr; */
1006 /* Cursor cursor; */ 956 /* Cursor cursor; */
1007Done: 957Done:
1008#ifdef OFF_FOCUS_FADING 958#ifdef OFF_FOCUS_FADING
959 if (rs[Rs_fade])
1009 PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade])); 960 pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1010#endif 961#endif
1011 if (idx == Color_bg && ! (Options & Opt_transparent))
1012 XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1013 962
1014 /* handle Color_BD, scrollbar background, etc. */ 963 /*TODO: handle Color_BD, scrollbar background, etc. */
1015 964
1016 set_colorfgbg ();
1017 recolour_cursor (); 965 recolour_cursor ();
1018 scr_touch (true); 966 scr_recolour ();
1019} 967}
1020 968
1021#else 969#else
1022# define set_window_color (idx,color) ((void)0) 970# define set_window_color (idx,color) ((void)0)
1023#endif /* XTERM_COLOR_CHANGE */ 971#endif /* XTERM_COLOR_CHANGE */
1025void 973void
1026rxvt_term::recolour_cursor () 974rxvt_term::recolour_cursor ()
1027{ 975{
1028 XColor xcol[2]; 976 XColor xcol[2];
1029 977
1030 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg]; 978 xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1031 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg]; 979 ? pix_colors_focused[Color_pointer_fg]
980 : pix_colors_focused[Color_fg];
981 xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
982 ? pix_colors_focused[Color_pointer_bg]
983 : pix_colors_focused[Color_bg];
984
1032 XQueryColors (display->display, display->cmap, xcol, 2); 985 XQueryColors (display->display, display->cmap, xcol, 2);
1033 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1); 986 XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1034} 987}
1035 988
1036/*----------------------------------------------------------------------*/ 989/*----------------------------------------------------------------------*/
1038 * find if fg/bg matches any of the normal (low-intensity) colors 991 * find if fg/bg matches any of the normal (low-intensity) colors
1039 */ 992 */
1040void 993void
1041rxvt_term::set_colorfgbg () 994rxvt_term::set_colorfgbg ()
1042{ 995{
1043 unsigned int i; 996 unsigned int i;
1044 const char *xpmb = "\0"; 997 const char *xpmb = "\0";
1045 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1]; 998 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1046 999
1047 env_colorfgbg =
1048 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1); 1000 env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1049 STRCPY (fstr, "default"); 1001 strcpy (fstr, "default");
1050 STRCPY (bstr, "default"); 1002 strcpy (bstr, "default");
1051 for (i = Color_Black; i <= Color_White; i++) 1003 for (i = Color_Black; i <= Color_White; i++)
1052 if (PixColors[Color_fg] == PixColors[i]) 1004 if (pix_colors[Color_fg] == pix_colors[i])
1053 { 1005 {
1054 sprintf (fstr, "%d", (i - Color_Black)); 1006 sprintf (fstr, "%d", (i - Color_Black));
1055 break; 1007 break;
1056 } 1008 }
1009
1057 for (i = Color_Black; i <= Color_White; i++) 1010 for (i = Color_Black; i <= Color_White; i++)
1058 if (PixColors[Color_bg] == PixColors[i]) 1011 if (pix_colors[Color_bg] == pix_colors[i])
1059 { 1012 {
1060 sprintf (bstr, "%d", (i - Color_Black)); 1013 sprintf (bstr, "%d", (i - Color_Black));
1061#ifdef XPM_BACKGROUND 1014#ifdef XPM_BACKGROUND
1062 xpmb = "default;"; 1015 xpmb = "default;";
1063#endif 1016#endif
1064 break; 1017 break;
1065 } 1018 }
1066 1019
1067 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 1020 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1068
1069#ifndef NO_BRIGHTCOLOR
1070 colorfgbg = DEFAULT_RSTYLE;
1071 for (i = minCOLOR; i <= maxCOLOR; i++)
1072 {
1073 if (PixColors[Color_fg] == PixColors[i])
1074 colorfgbg = SET_FGCOLOR (colorfgbg, i);
1075 if (PixColors[Color_bg] == PixColors[i])
1076 colorfgbg = SET_BGCOLOR (colorfgbg, i);
1077 }
1078#endif
1079} 1021}
1080 1022
1081/*----------------------------------------------------------------------*/ 1023/*----------------------------------------------------------------------*/
1082/*
1083 * Colour determination for low colour displays, routine from
1084 * Hans de Goede <hans@highrise.nl>
1085 */
1086 1024
1087int 1025int
1088rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 1026rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1089{ 1027{
1090 if (!screen_in_out->set (display, colour)) 1028 if (!screen_in_out->set (display, colour))
1231 if (width == 0) 1169 if (width == 0)
1232 width = wattr.width - szHint.base_width; 1170 width = wattr.width - szHint.base_width;
1233 if (height == 0) 1171 if (height == 0)
1234 height = wattr.height - szHint.base_height; 1172 height = wattr.height - szHint.base_height;
1235 } 1173 }
1174
1236 if (width != TermWin.width || height != TermWin.height) 1175 if (width != TermWin.width || height != TermWin.height)
1237 { 1176 {
1238 width += szHint.base_width; 1177 width += szHint.base_width;
1239 height += szHint.base_height; 1178 height += szHint.base_height;
1240 resize_all_windows (width, height, 0); 1179 resize_all_windows (width, height, 0);
1245 * - X INPUT METHOD ROUTINES - * 1184 * - X INPUT METHOD ROUTINES - *
1246 * -------------------------------------------------------------------- */ 1185 * -------------------------------------------------------------------- */
1247#ifdef USE_XIM 1186#ifdef USE_XIM
1248 1187
1249void 1188void
1189rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1190{
1191 fg = pix_colors[Color_fg];
1192 bg = pix_colors[Color_bg];
1193}
1194
1195void
1250rxvt_term::im_set_size (XRectangle *size) 1196rxvt_term::im_set_size (XRectangle &size)
1251{ 1197{
1198 // the int_bwidth terms make no sense to me
1252 size->x = TermWin.int_bwidth; 1199 size.x = TermWin.int_bwidth;
1253 size->y = TermWin.int_bwidth; 1200 size.y = TermWin.int_bwidth;
1254 size->width = Width2Pixel (TermWin.ncol); 1201 size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1255 size->height = Height2Pixel (TermWin.nrow); 1202 size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1256} 1203}
1257 1204
1258void 1205void
1259rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1206rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
1207 XRectangle &status_rect,
1208 const XRectangle &needed_rect)
1260{ 1209{
1261 *fg = PixColors[Color_fg]; 1210 preedit_rect.x = needed_rect.width;
1262 *bg = PixColors[Color_bg]; 1211 preedit_rect.y = 0;
1212 preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
1213 preedit_rect.height = TermWin.fheight;
1214
1215 status_rect.x = 0;
1216 status_rect.y = 0;
1217 status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
1218 status_rect.height = TermWin.fheight;
1263} 1219}
1264 1220
1265/* Checking whether input method is running. */ 1221/* Checking whether input method is running. */
1266bool 1222bool
1267rxvt_term::IMisRunning () 1223rxvt_term::IMisRunning ()
1268{ 1224{
1269 char *p; 1225 char *p;
1270 Atom atom; 1226 Atom atom;
1271 Window win; 1227 Window win;
1272 char server[IMBUFSIZ]; 1228 char server[IMBUFSIZ];
1273 1229
1274 /* get current locale modifier */ 1230 /* get current locale modifier */
1275 if ((p = XSetLocaleModifiers (NULL)) != NULL) 1231 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1276 { 1232 {
1277 STRCPY (server, "@server="); 1233 strcpy (server, "@server=");
1278 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1234 strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1235
1279 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */ 1236 if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1280 *p = '\0'; 1237 *p = '\0';
1281 1238
1282 atom = XInternAtom (display->display, server, False); 1239 atom = XInternAtom (display->display, server, False);
1283 win = XGetSelectionOwner (display->display, atom); 1240 win = XGetSelectionOwner (display->display, atom);
1241
1284 if (win != None) 1242 if (win != None)
1285 return True; 1243 return True;
1286 } 1244 }
1245
1287 return False; 1246 return False;
1288} 1247}
1289 1248
1290void 1249void
1291rxvt_term::IMSendSpot () 1250rxvt_term::IMSendSpot ()
1292{ 1251{
1293 XPoint spot; 1252 XPoint nspot;
1294 XVaNestedList preedit_attr; 1253 XVaNestedList preedit_attr;
1295 1254
1296 if (Input_Context == NULL 1255 if (!Input_Context
1256 || !TermWin.focus
1297 || !TermWin.focus || ! (input_style & XIMPreeditPosition) 1257 || !(input_style & XIMPreeditPosition))
1298 || ! (event_type == KeyPress
1299 || event_type == Expose
1300 || event_type == NoExpose
1301 || event_type == SelectionNotify
1302 || event_type == ButtonRelease || event_type == FocusIn)
1303 || !IMisRunning ())
1304 return; 1258 return;
1305 1259
1306 im_set_position (&spot); 1260 im_set_position (nspot);
1261
1262 if (nspot.x == spot.x && nspot.y == spot.y)
1263 return;
1264
1265 spot = nspot;
1307 1266
1308 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL); 1267 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1309 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1268 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1310 XFree (preedit_attr); 1269 XFree (preedit_attr);
1311} 1270}
1312 1271
1313void 1272void
1314rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1315 XRectangle * needed_rect)
1316{
1317 int mbh, vtx = 0;
1318
1319 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1320 vtx = scrollbar_TotalWidth ();
1321
1322 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1323 mbh -= TermWin.lineSpace;
1324
1325 preedit_rect->x = needed_rect->width + vtx;
1326 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1327
1328 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1329 preedit_rect->height = Height2Pixel (1);
1330
1331 status_rect->x = vtx;
1332 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1333
1334 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1335 status_rect->height = Height2Pixel (1);
1336}
1337
1338void
1339rxvt_term::im_destroy () 1273rxvt_term::im_destroy ()
1340{ 1274{
1341 if (Input_Context)
1342 {
1343 XDestroyIC (Input_Context);
1344 Input_Context = NULL;
1345 }
1346
1347 if (input_method) 1275 if (input_method)
1348 { 1276 {
1277 if (Input_Context && input_method->xim)
1278 XDestroyIC (Input_Context);
1279
1349 display->put_xim (input_method); 1280 display->put_xim (input_method);
1350 input_method = 0; 1281 input_method = 0;
1351 } 1282 }
1283
1284 Input_Context = 0;
1352} 1285}
1353 1286
1354/* 1287/*
1355 * Try to open a XIM with the current modifiers, then see if we can 1288 * Try to open a XIM with the current modifiers, then see if we can
1356 * open a suitable preedit type 1289 * open a suitable preedit type
1357 */ 1290 */
1358bool 1291bool
1359rxvt_term::IM_get_IC (const char *modifiers) 1292rxvt_term::IM_get_IC (const char *modifiers)
1360{ 1293{
1361 int i, j, found; 1294 int i, j, found;
1362 XIM xim; 1295 XIM xim;
1363 XPoint spot; 1296 XPoint spot;
1364 XRectangle rect, status_rect, needed_rect; 1297 XRectangle rect, status_rect, needed_rect;
1365 unsigned long fg, bg; 1298 unsigned long fg, bg;
1366 const char *p; 1299 const char *p;
1367 char **s; 1300 char **s;
1368 XIMStyles *xim_styles; 1301 XIMStyles *xim_styles;
1369 XVaNestedList preedit_attr, status_attr;
1370 1302
1371 if (! ((p = XSetLocaleModifiers (modifiers)) && *p)) 1303 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1372 return false; 1304 return false;
1373 1305
1374 D_MAIN ((stderr, "rxvt_IM_get_IC ()")); 1306 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1375 input_method = display->get_xim (locale, modifiers); 1307 input_method = display->get_xim (locale, modifiers);
1376 if (input_method == NULL) 1308 if (input_method == NULL)
1377 return false; 1309 return false;
1378 1310
1379 xim = input_method->xim; 1311 xim = input_method->xim;
1312 spot.x = spot.y = -1;
1380 1313
1381 xim_styles = NULL; 1314 xim_styles = NULL;
1382 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1315 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1383 || !xim_styles || !xim_styles->count_styles) 1316 || !xim_styles || !xim_styles->count_styles)
1384 { 1317 {
1385 display->put_xim (input_method); 1318 im_destroy ();
1386 return false; 1319 return false;
1387 } 1320 }
1388 1321
1389 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1322 const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
1323
1324 for (int pi = 0; pi < 2; pi++)
1325 {
1326 p = pet[pi];
1327
1328 if (!p)
1329 continue;
1330
1390 s = rxvt_splitcommastring (p); 1331 s = rxvt_splitcommastring (p);
1332
1391 for (i = found = 0; !found && s[i]; i++) 1333 for (i = found = 0; !found && s[i]; i++)
1392 { 1334 {
1393 if (!STRCMP (s[i], "OverTheSpot")) 1335 if (!strcmp (s[i], "OverTheSpot"))
1394 input_style = (XIMPreeditPosition | XIMStatusNothing); 1336 input_style = (XIMPreeditPosition | XIMStatusNothing);
1395 else if (!STRCMP (s[i], "OffTheSpot")) 1337 else if (!strcmp (s[i], "OffTheSpot"))
1396 input_style = (XIMPreeditArea | XIMStatusArea); 1338 input_style = (XIMPreeditArea | XIMStatusArea);
1397 else if (!STRCMP (s[i], "Root")) 1339 else if (!strcmp (s[i], "Root"))
1398 input_style = (XIMPreeditNothing | XIMStatusNothing); 1340 input_style = (XIMPreeditNothing | XIMStatusNothing);
1341 else if (!strcmp (s[i], "None"))
1342 input_style = (XIMPreeditNone | XIMStatusNone);
1399 1343
1400 for (j = 0; j < xim_styles->count_styles; j++) 1344 for (j = 0; j < xim_styles->count_styles; j++)
1401 if (input_style == xim_styles->supported_styles[j]) 1345 if (input_style == xim_styles->supported_styles[j])
1402 { 1346 {
1347 rxvt_freecommastring (s);
1348
1403 found = 1; 1349 found = 1;
1404 break; 1350 goto foundpet;
1351 }
1352
1405 } 1353 }
1406 }
1407 1354
1408 for (i = 0; s[i]; i++) 1355 rxvt_freecommastring (s);
1409 free (s[i]); 1356 }
1410 1357
1411 free (s); 1358foundpet:
1359
1412 XFree (xim_styles); 1360 XFree (xim_styles);
1413 1361
1414 if (!found) 1362 if (!found)
1415 { 1363 {
1416 display->put_xim (input_method); 1364 im_destroy ();
1417 return false; 1365 return false;
1418 } 1366 }
1419 1367
1420 preedit_attr = status_attr = NULL; 1368 XFontSet fs = 0;
1369 XVaNestedList preedit_attr = 0, status_attr = 0;
1370
1371 if (input_style & (XIMPreeditPosition | XIMPreeditArea))
1372 {
1373 // fake us a font-set, please
1374 char **missing_charset_list;
1375 int missing_charset_count;
1376 char *def_string;
1377 char pat[512];
1378
1379 sprintf (pat,
1380 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1381 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1382 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1383 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1384 "-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
1385 "*",
1386 TermWin.fheight,
1387 TermWin.fheight + 1, TermWin.fheight - 1,
1388 TermWin.fheight - 2, TermWin.fheight + 2);
1389
1390 fs = XCreateFontSet (display->display, pat,
1391 &missing_charset_list, &missing_charset_count, &def_string);
1392
1393 if (missing_charset_list)
1394 XFreeStringList (missing_charset_list);
1395
1396 if (!fs)
1397 {
1398 input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
1399 rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
1400 }
1401 }
1421 1402
1422 if (input_style & XIMPreeditPosition) 1403 if (input_style & XIMPreeditPosition)
1423 { 1404 {
1424 im_set_size (&rect); 1405 im_set_size (rect);
1425 im_set_position (&spot); 1406 im_set_position (spot);
1426 im_set_color (&fg, &bg); 1407 im_set_color (fg, bg);
1427 1408
1428 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1409 preedit_attr = XVaCreateNestedList (0,
1410 XNForeground, fg,
1411 XNBackground, bg,
1412 XNArea, &rect,
1429 XNSpotLocation, &spot, 1413 XNSpotLocation, &spot,
1430 XNForeground, fg, XNBackground, bg,
1431 //XNFontSet, TermWin.fontset, 1414 XNFontSet, fs,
1432 NULL); 1415 NULL);
1433 } 1416 }
1434 else if (input_style & XIMPreeditArea) 1417 else if (input_style & XIMPreeditArea)
1435 { 1418 {
1436 im_set_color (&fg, &bg); 1419 im_set_color (fg, bg);
1437 1420
1438 /* 1421 /*
1439 * The necessary width of preedit area is unknown 1422 * The necessary width of preedit area is unknown
1440 * until create input context. 1423 * until create input context.
1441 */ 1424 */
1442 needed_rect.width = 0; 1425 needed_rect.width = 0;
1443
1444 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1426 im_set_preedit_area (rect, status_rect, needed_rect);
1445 1427
1446 preedit_attr = XVaCreateNestedList (0, XNArea, &rect, 1428 preedit_attr = XVaCreateNestedList (0,
1429 XNForeground, fg,
1447 XNForeground, fg, XNBackground, bg, 1430 XNBackground, bg,
1431 XNArea, &rect,
1432 XNFontSet, fs,
1433 NULL);
1434 status_attr = XVaCreateNestedList (0,
1435 XNForeground, fg,
1436 XNBackground, bg,
1437 XNArea, &status_rect,
1448 //XNFontSet, TermWin.fontset, 1438 XNFontSet, fs,
1449 NULL); 1439 NULL);
1450 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1451 XNForeground, fg, XNBackground, bg,
1452 //XNFontSet, TermWin.fontset,
1453 NULL);
1454 } 1440 }
1455 1441
1456 Input_Context = XCreateIC (xim, XNInputStyle, input_style, 1442 Input_Context = XCreateIC (xim,
1443 XNInputStyle, input_style,
1457 XNClientWindow, TermWin.parent[0], 1444 XNClientWindow, TermWin.vt,
1458 XNFocusWindow, TermWin.parent[0], 1445 XNFocusWindow, TermWin.parent[0],
1459 preedit_attr ? XNPreeditAttributes : NULL, 1446 preedit_attr ? XNPreeditAttributes : NULL,
1460 preedit_attr, 1447 preedit_attr,
1461 status_attr ? XNStatusAttributes : NULL, 1448 status_attr ? XNStatusAttributes : NULL,
1462 status_attr, NULL); 1449 status_attr, NULL);
1450
1463 if (preedit_attr) XFree (preedit_attr); 1451 if (preedit_attr) XFree (preedit_attr);
1464 if (status_attr) XFree (status_attr); 1452 if (status_attr) XFree (status_attr);
1453 if (fs) XFreeFontSet (display->display, fs);
1465 1454
1466 if (Input_Context == NULL) 1455 if (Input_Context == NULL)
1467 { 1456 {
1468 rxvt_warn ("failed to create input context, continuing without XIM.\n"); 1457 rxvt_warn ("failed to create input context, continuing without XIM.\n");
1469 display->put_xim (input_method); 1458 im_destroy ();
1470 return false; 1459 return false;
1471 } 1460 }
1472 1461
1473 if (input_style & XIMPreeditArea) 1462 if (input_style & XIMPreeditArea)
1474 IMSetStatusPosition (); 1463 IMSetStatusPosition ();
1500 if (p && *p) 1489 if (p && *p)
1501 { 1490 {
1502 bool found = false; 1491 bool found = false;
1503 1492
1504 s = rxvt_splitcommastring (p); 1493 s = rxvt_splitcommastring (p);
1494
1505 for (i = 0; s[i]; i++) 1495 for (i = 0; s[i]; i++)
1506 { 1496 {
1507 if (*s[i]) 1497 if (*s[i])
1508 { 1498 {
1509 STRCPY (buf, "@im="); 1499 strcpy (buf, "@im=");
1510 STRNCAT (buf, s[i], IMBUFSIZ - 5); 1500 strncat (buf, s[i], IMBUFSIZ - 5);
1511 if (IM_get_IC (buf)) 1501 if (IM_get_IC (buf))
1512 { 1502 {
1513 found = true; 1503 found = true;
1514 break; 1504 break;
1515 } 1505 }
1516 } 1506 }
1517 } 1507 }
1518 for (i = 0; s[i]; i++) 1508
1519 free (s[i]); 1509 rxvt_freecommastring (s);
1520 free (s);
1521 1510
1522 if (found) 1511 if (found)
1523 goto done; 1512 goto done;
1524 } 1513 }
1525 1514
1539} 1528}
1540 1529
1541void 1530void
1542rxvt_term::IMSetStatusPosition () 1531rxvt_term::IMSetStatusPosition ()
1543{ 1532{
1544 XRectangle preedit_rect, status_rect, *needed_rect; 1533 XRectangle preedit_rect, status_rect, *needed_rect;
1545 XVaNestedList preedit_attr, status_attr; 1534 XVaNestedList preedit_attr, status_attr;
1546 1535
1547 if (Input_Context == NULL 1536 if (!Input_Context
1537 || !TermWin.focus
1548 || !TermWin.focus || ! (input_style & XIMPreeditArea) 1538 || !(input_style & XIMPreeditArea)
1549 || !IMisRunning ()) 1539 || !IMisRunning ())
1550 return; 1540 return;
1551 1541
1552 /* Getting the necessary width of preedit area */ 1542 /* Getting the necessary width of preedit area */
1553 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL); 1543 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1554 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL); 1544 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1555 XFree (status_attr); 1545 XFree (status_attr);
1556 1546
1557 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1547 im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1548 XFree (needed_rect);
1558 1549
1559 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1550 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1560 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL); 1551 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1561 1552
1562 XSetICValues (Input_Context, 1553 XSetICValues (Input_Context,
1563 XNPreeditAttributes, preedit_attr, 1554 XNPreeditAttributes, preedit_attr,
1564 XNStatusAttributes, status_attr, NULL); 1555 XNStatusAttributes, status_attr, NULL);
1565 1556
1566 XFree (preedit_attr); 1557 XFree (preedit_attr);
1567 XFree (status_attr); 1558 XFree (status_attr);
1568} 1559}
1569#endif /* USE_XIM */ 1560#endif /* USE_XIM */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines