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.67 by pcg, Sun May 9 18:19:49 2004 UTC vs.
Revision 1.119 by root, Mon Dec 13 01:29:03 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines