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.22 by pcg, Sat Jan 31 00:20:21 2004 UTC vs.
Revision 1.26 by pcg, Sun Feb 1 01:34:41 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.22 2004/01/31 00:20:21 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
72{ 71{
73 free (p); 72 free (p);
74} 73}
75 74
76rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
77: 76 :
78#ifdef CURSOR_BLINK 77#ifdef CURSOR_BLINK
79 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb), 78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
80#endif 79#endif
81#ifdef TEXT_BLINK 80#ifdef TEXT_BLINK
82 text_blink_ev (this, &rxvt_term::text_blink_cb), 81 text_blink_ev (this, &rxvt_term::text_blink_cb),
83#endif 82#endif
84#ifdef POINTER_BLANK 83#ifdef POINTER_BLANK
85 pointer_ev (this, &rxvt_term::pointer_cb), 84 pointer_ev (this, &rxvt_term::pointer_cb),
86#endif 85#endif
87 check_ev (this, &rxvt_term::check_cb), 86 check_ev (this, &rxvt_term::check_cb),
88 destroy_ev (this, &rxvt_term::destroy_cb), 87 destroy_ev (this, &rxvt_term::destroy_cb),
89 pty_ev (this, &rxvt_term::pty_cb), 88 pty_ev (this, &rxvt_term::pty_cb),
90 x_ev (this, &rxvt_term::x_cb), 89 x_ev (this, &rxvt_term::x_cb),
91 incr_ev (this, &rxvt_term::incr_cb) 90 incr_ev (this, &rxvt_term::incr_cb)
92{ 91{
93 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
94} 93}
95 94
96rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
… …
168} 167}
169 168
170void 169void
171rxvt_init_signals () 170rxvt_init_signals ()
172{ 171{
173/* install exit handler for cleanup */ 172 /* install exit handler for cleanup */
174#if 0 173#if 0
175#ifdef HAVE_ATEXIT 174#ifdef HAVE_ATEXIT
176 atexit(rxvt_clean_exit); 175 atexit(rxvt_clean_exit);
177#else 176#else
178#endif 177#endif
… …
187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 186 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
189 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
190 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 189 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
191 190
192/* need to trap SIGURG for SVR4 (Unixware) rlogin */ 191 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
193/* signal (SIGURG, SIG_DFL); */ 192 /* signal (SIGURG, SIG_DFL); */
194 193
195 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 194 XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
196 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler); 195 //XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);
197} 196}
198 197
… …
278/* ARGSUSED */ 277/* ARGSUSED */
279/* EXTPROTO */ 278/* EXTPROTO */
280RETSIGTYPE 279RETSIGTYPE
281rxvt_Child_signal(int sig __attribute__ ((unused))) 280rxvt_Child_signal(int sig __attribute__ ((unused)))
282{ 281{
283 int pid, save_errno = errno; 282 int pid, save_errno = errno;
284 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
285 ; 284 ;
286 errno = save_errno; 285 errno = save_errno;
287 286
288#if 0 287#if 0
289 if (pid == cmd_pid) 288 if (pid == cmd_pid)
290 exit (EXIT_SUCCESS); 289 exit (EXIT_SUCCESS);
291#endif 290#endif
292} 291}
293 292
294/* 293/*
295 * Catch a fatal signal and tidy up before quitting 294 * Catch a fatal signal and tidy up before quitting
296 */ 295 */
297/* EXTPROTO */ 296/* EXTPROTO */
298RETSIGTYPE 297RETSIGTYPE
299rxvt_Exit_signal(int sig) 298rxvt_Exit_signal(int sig)
300{ 299{
301 signal(sig, SIG_DFL); 300 signal(sig, SIG_DFL);
302#ifdef DEBUG_CMD 301#ifdef DEBUG_CMD
303 rxvt_print_error("signal %d", sig); 302 rxvt_print_error("signal %d", sig);
304#endif 303#endif
305 rxvt_clean_exit(); 304 rxvt_clean_exit();
306 kill(getpid(), sig); 305 kill(getpid(), sig);
307} 306}
308 307
309/* ARGSUSED */ 308/* ARGSUSED */
310/* EXTPROTO */ 309/* EXTPROTO */
311int 310int
… …
343 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
344/* EXTPROTO */ 343/* EXTPROTO */
345void * 344void *
346rxvt_malloc(size_t size) 345rxvt_malloc(size_t size)
347{ 346{
348 void *p; 347 void *p;
349 348
350 p = malloc(size); 349 p = malloc(size);
351 if (p) 350 if (p)
352 return p; 351 return p;
353 352
354 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 353 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
355 rxvt_clean_exit(); 354 rxvt_clean_exit();
356 exit(EXIT_FAILURE); 355 exit(EXIT_FAILURE);
357/* NOTREACHED */ 356 /* NOTREACHED */
358} 357}
359 358
360/* EXTPROTO */ 359/* EXTPROTO */
361void * 360void *
362rxvt_calloc(size_t number, size_t size) 361rxvt_calloc(size_t number, size_t size)
363{ 362{
364 void *p; 363 void *p;
365 364
366 p = calloc(number, size); 365 p = calloc(number, size);
367 if (p) 366 if (p)
368 return p; 367 return p;
369 368
370 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 369 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
371 rxvt_clean_exit(); 370 rxvt_clean_exit();
372 exit(EXIT_FAILURE); 371 exit(EXIT_FAILURE);
373/* NOTREACHED */ 372 /* NOTREACHED */
374} 373}
375 374
376/* EXTPROTO */ 375/* EXTPROTO */
377void * 376void *
378rxvt_realloc(void *ptr, size_t size) 377rxvt_realloc(void *ptr, size_t size)
379{ 378{
380 void *p; 379 void *p;
381 380
382 if (ptr) 381 if (ptr)
383 p = realloc(ptr, size); 382 p = realloc(ptr, size);
384 else 383 else
385 p = malloc(size); 384 p = malloc(size);
386 if (p) 385 if (p)
387 return p; 386 return p;
388 387
389 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 388 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting");
390 rxvt_clean_exit(); 389 rxvt_clean_exit();
391 exit(EXIT_FAILURE); 390 exit(EXIT_FAILURE);
392/* NOTREACHED */ 391 /* NOTREACHED */
393} 392}
394 393
395/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
396 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
397 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
… …
399void 398void
400rxvt_term::privileges (int mode) 399rxvt_term::privileges (int mode)
401{ 400{
402#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
403# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
404/* setreuid() is the poor man's setuid(), seteuid() */ 403 /* setreuid() is the poor man's setuid(), seteuid() */
405# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
406# define setegid(a) setregid(-1, (a)) 405# define setegid(a) setregid(-1, (a))
407# define HAVE_SETEUID 406# define HAVE_SETEUID
408# endif 407# endif
409# ifdef HAVE_SETEUID 408# ifdef HAVE_SETEUID
410 switch (mode) { 409 switch (mode)
410 {
411 case IGNORE: 411 case IGNORE:
412 /* 412 /*
413 * change effective uid/gid - not real uid/gid - so we can switch 413 * change effective uid/gid - not real uid/gid - so we can switch
414 * back to root later, as required 414 * back to root later, as required
415 */ 415 */
416 seteuid(getuid()); 416 seteuid(getuid());
417 setegid(getgid()); 417 setegid(getgid());
418 break; 418 break;
419 case SAVE: 419 case SAVE:
420 euid = geteuid(); 420 euid = geteuid();
421 egid = getegid(); 421 egid = getegid();
422 break; 422 break;
423 case RESTORE: 423 case RESTORE:
424 seteuid(euid); 424 seteuid(euid);
425 setegid(egid); 425 setegid(egid);
426 break; 426 break;
427 } 427 }
428# else 428# else
429 switch (mode) { 429 switch (mode)
430 {
430 case IGNORE: 431 case IGNORE:
431 setuid(getuid()); 432 setuid(getuid());
432 setgid(getgid()); 433 setgid(getgid());
433 /* FALLTHROUGH */ 434 /* FALLTHROUGH */
434 case SAVE: 435 case SAVE:
435 /* FALLTHROUGH */ 436 /* FALLTHROUGH */
436 case RESTORE: 437 case RESTORE:
437 break; 438 break;
438 } 439 }
439# endif 440# endif
440#endif 441#endif
441} 442}
442 443
443#ifdef UTMP_SUPPORT 444#ifdef UTMP_SUPPORT
444void 445void
445rxvt_term::privileged_utmp (char action) 446rxvt_term::privileged_utmp (char action)
446{ 447{
447 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 448 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
448 action, next_utmp_action, getpid())); 449 action, next_utmp_action, getpid()));
449 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 450 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
450 || (Options & Opt_utmpInhibit) 451 || (Options & Opt_utmpInhibit)
451 || ttydev == NULL || *ttydev == '\0') 452 || ttydev == NULL || *ttydev == '\0')
452 return; 453 return;
453 454
454 privileges (RESTORE); 455 privileges (RESTORE);
455 if (action == SAVE) { 456 if (action == SAVE)
457 {
456 next_utmp_action = RESTORE; 458 next_utmp_action = RESTORE;
457 makeutent (ttydev, rs[Rs_display_name]); 459 makeutent (ttydev, rs[Rs_display_name]);
460 }
461 else
458 } else { /* action == RESTORE */ 462 { /* action == RESTORE */
459 next_utmp_action = IGNORE; 463 next_utmp_action = IGNORE;
460 cleanutent (); 464 cleanutent ();
461 } 465 }
462 privileges (IGNORE); 466 privileges (IGNORE);
463} 467}
464#endif 468#endif
465 469
466#ifndef NO_SETOWNER_TTYDEV 470#ifndef NO_SETOWNER_TTYDEV
467void 471void
468rxvt_term::privileged_ttydev (char action) 472rxvt_term::privileged_ttydev (char action)
469{ 473{
470 D_MAIN((stderr, 474 D_MAIN((stderr,
471 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 475 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
472 action, next_tty_action, getpid())); 476 action, next_tty_action, getpid()));
473 if (next_tty_action != action || (action != SAVE && action != RESTORE) 477 if (next_tty_action != action || (action != SAVE && action != RESTORE)
474 || ttydev == NULL || *ttydev == '\0') 478 || ttydev == NULL || *ttydev == '\0')
475 return; 479 return;
476 480
477 privileges (RESTORE); 481 privileges (RESTORE);
478 482
479 if (action == SAVE) { 483 if (action == SAVE)
484 {
480 next_tty_action = RESTORE; 485 next_tty_action = RESTORE;
481# ifndef RESET_TTY_TO_COMMON_DEFAULTS 486# ifndef RESET_TTY_TO_COMMON_DEFAULTS
482/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 487 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
483 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 488 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
484 next_tty_action = IGNORE; 489 next_tty_action = IGNORE;
485 else 490 else
486# endif 491# endif
492
487 { 493 {
488 chown(ttydev, getuid(), ttygid); /* fail silently */ 494 chown(ttydev, getuid(), ttygid); /* fail silently */
489 chmod(ttydev, ttymode); 495 chmod(ttydev, ttymode);
490# ifdef HAVE_REVOKE 496# ifdef HAVE_REVOKE
491 revoke(ttydev); 497 revoke(ttydev);
492# endif 498# endif
499
493 } 500 }
501 }
502 else
494 } else { /* action == RESTORE */ 503 { /* action == RESTORE */
495 next_tty_action = IGNORE; 504 next_tty_action = IGNORE;
496# ifndef RESET_TTY_TO_COMMON_DEFAULTS 505# ifndef RESET_TTY_TO_COMMON_DEFAULTS
497 chmod(ttydev, ttyfd_stat.st_mode); 506 chmod(ttydev, ttyfd_stat.st_mode);
498 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 507 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
499# else 508# else
500 chmod(ttydev, 509 chmod(ttydev,
501 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 510 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
502 chown(ttydev, 0, 0); 511 chown(ttydev, 0, 0);
503# endif 512# endif
504 }
505 513
514 }
515
506 privileges (IGNORE); 516 privileges (IGNORE);
507 517
508# ifndef RESET_TTY_TO_COMMON_DEFAULTS 518# ifndef RESET_TTY_TO_COMMON_DEFAULTS
509 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 519 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
510 action == RESTORE ? "Restoring" : (action == 520 action == RESTORE ? "Restoring" : (action ==
511 SAVE ? "Saving" : 521 SAVE ? "Saving" :
512 "UNKNOWN ERROR for"), ttydev, 522 "UNKNOWN ERROR for"), ttydev,
513 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 523 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
514 ttyfd_stat.st_gid)); 524 ttyfd_stat.st_gid));
515# endif 525# endif
516} 526}
517#endif 527#endif
518 528
519/*----------------------------------------------------------------------*/ 529/*----------------------------------------------------------------------*/
… …
522 * if width/height are non-zero then override calculated width/height 532 * if width/height are non-zero then override calculated width/height
523 */ 533 */
524void 534void
525rxvt_term::window_calc (unsigned int width, unsigned int height) 535rxvt_term::window_calc (unsigned int width, unsigned int height)
526{ 536{
527 short recalc_x, recalc_y; 537 short recalc_x, recalc_y;
528 int x, y, sb_w, mb_h, flags; 538 int x, y, sb_w, mb_h, flags;
529 unsigned int w, h; 539 unsigned int w, h;
530 unsigned int max_width, max_height; 540 unsigned int max_width, max_height;
531 541
532 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 542 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
533 TermWin.ncol, TermWin.nrow, szHint.width, 543 TermWin.ncol, TermWin.nrow, szHint.width,
534 szHint.height)); 544 szHint.height));
535 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 545 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
536 szHint.win_gravity = NorthWestGravity; 546 szHint.win_gravity = NorthWestGravity;
537/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 547 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
538 548
539 recalc_x = recalc_y = 0; 549 recalc_x = recalc_y = 0;
540 flags = 0; 550 flags = 0;
541 if (!parsed_geometry) { 551 if (!parsed_geometry)
552 {
542 parsed_geometry = 1; 553 parsed_geometry = 1;
543 if (rs[Rs_geometry]) 554 if (rs[Rs_geometry])
544 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 555 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
545 if (flags & WidthValue) { 556 if (flags & WidthValue)
557 {
546 TermWin.ncol = BOUND_POSITIVE_INT16(w); 558 TermWin.ncol = BOUND_POSITIVE_INT16(w);
547 szHint.flags |= USSize; 559 szHint.flags |= USSize;
548 } 560 }
549 if (flags & HeightValue) { 561 if (flags & HeightValue)
562 {
550 TermWin.nrow = BOUND_POSITIVE_INT16(h); 563 TermWin.nrow = BOUND_POSITIVE_INT16(h);
551 szHint.flags |= USSize; 564 szHint.flags |= USSize;
552 } 565 }
553 if (flags & XValue) { 566 if (flags & XValue)
567 {
554 szHint.x = x; 568 szHint.x = x;
555 szHint.flags |= USPosition; 569 szHint.flags |= USPosition;
556 if (flags & XNegative) { 570 if (flags & XNegative)
571 {
557 recalc_x = 1; 572 recalc_x = 1;
558 szHint.win_gravity = NorthEastGravity; 573 szHint.win_gravity = NorthEastGravity;
559 } 574 }
560 } 575 }
561 if (flags & YValue) { 576 if (flags & YValue)
577 {
562 szHint.y = y; 578 szHint.y = y;
563 szHint.flags |= USPosition; 579 szHint.flags |= USPosition;
564 if (flags & YNegative) { 580 if (flags & YNegative)
581 {
565 recalc_y = 1; 582 recalc_y = 1;
566 if (szHint.win_gravity == NorthEastGravity) 583 if (szHint.win_gravity == NorthEastGravity)
567 szHint.win_gravity = SouthEastGravity; 584 szHint.win_gravity = SouthEastGravity;
568 else 585 else
569 szHint.win_gravity = SouthWestGravity; 586 szHint.win_gravity = SouthWestGravity;
570 } 587 }
571 } 588 }
572 } 589 }
573/* TODO: BOUNDS */ 590 /* TODO: BOUNDS */
574 TermWin.width = TermWin.ncol * TermWin.fwidth; 591 TermWin.width = TermWin.ncol * TermWin.fwidth;
575 TermWin.height = TermWin.nrow * TermWin.fheight; 592 TermWin.height = TermWin.nrow * TermWin.fheight;
576 max_width = MAX_COLS * TermWin.fwidth; 593 max_width = MAX_COLS * TermWin.fwidth;
577 max_height = MAX_ROWS * TermWin.fheight; 594 max_height = MAX_ROWS * TermWin.fheight;
578 595
579 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth; 596 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
580 597
581 sb_w = mb_h = 0; 598 sb_w = mb_h = 0;
582 window_vt_x = window_vt_y = 0; 599 window_vt_x = window_vt_y = 0;
583 if (scrollbar_visible ()) { 600 if (scrollbar_visible ())
601 {
584 sb_w = scrollbar_TotalWidth(); 602 sb_w = scrollbar_TotalWidth();
585 szHint.base_width += sb_w; 603 szHint.base_width += sb_w;
586 if (!(Options & Opt_scrollBar_right)) 604 if (!(Options & Opt_scrollBar_right))
587 window_vt_x = sb_w; 605 window_vt_x = sb_w;
588 } 606 }
589 if (menubar_visible ()) { 607 if (menubar_visible ())
608 {
590 mb_h = menuBar_TotalHeight(); 609 mb_h = menuBar_TotalHeight();
591 szHint.base_height += mb_h; 610 szHint.base_height += mb_h;
592 window_vt_y = mb_h; 611 window_vt_y = mb_h;
593 } 612 }
594 szHint.width_inc = TermWin.fwidth; 613 szHint.width_inc = TermWin.fwidth;
595 szHint.height_inc = TermWin.fheight; 614 szHint.height_inc = TermWin.fheight;
596 szHint.min_width = szHint.base_width + szHint.width_inc; 615 szHint.min_width = szHint.base_width + szHint.width_inc;
597 szHint.min_height = szHint.base_height + szHint.height_inc; 616 szHint.min_height = szHint.base_height + szHint.height_inc;
598 617
599 if (width && width - szHint.base_width < max_width) { 618 if (width && width - szHint.base_width < max_width)
619 {
600 szHint.width = width; 620 szHint.width = width;
601 TermWin.width = width - szHint.base_width; 621 TermWin.width = width - szHint.base_width;
602 } else { 622 }
623 else
624 {
603 MIN_IT(TermWin.width, max_width); 625 MIN_IT(TermWin.width, max_width);
604 szHint.width = szHint.base_width + TermWin.width; 626 szHint.width = szHint.base_width + TermWin.width;
605 } 627 }
606 if (height && height - szHint.base_height < max_height) { 628 if (height && height - szHint.base_height < max_height)
629 {
607 szHint.height = height; 630 szHint.height = height;
608 TermWin.height = height - szHint.base_height; 631 TermWin.height = height - szHint.base_height;
609 } else { 632 }
633 else
634 {
610 MIN_IT(TermWin.height, max_height); 635 MIN_IT(TermWin.height, max_height);
611 szHint.height = szHint.base_height + TermWin.height; 636 szHint.height = szHint.base_height + TermWin.height;
612 } 637 }
613 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 638 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
614 window_sb_x = szHint.width - sb_w; 639 window_sb_x = szHint.width - sb_w;
615 640
616 if (recalc_x) 641 if (recalc_x)
617 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay)) 642 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
618 - szHint.width - 2 * TermWin.ext_bwidth); 643 - szHint.width - 2 * TermWin.ext_bwidth);
619 if (recalc_y) 644 if (recalc_y)
620 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay)) 645 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
621 - szHint.height - 2 * TermWin.ext_bwidth); 646 - szHint.height - 2 * TermWin.ext_bwidth);
622 647
623 TermWin.ncol = TermWin.width / TermWin.fwidth; 648 TermWin.ncol = TermWin.width / TermWin.fwidth;
624 TermWin.nrow = TermWin.height / TermWin.fheight; 649 TermWin.nrow = TermWin.height / TermWin.fheight;
625 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 650 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
626 TermWin.ncol, TermWin.nrow, szHint.width, 651 TermWin.ncol, TermWin.nrow, szHint.width,
627 szHint.height)); 652 szHint.height));
628 return; 653 return;
629} 654}
630 655
631/*----------------------------------------------------------------------*/ 656/*----------------------------------------------------------------------*/
632/* 657/*
633 * Tell the teletype handler what size the window is. 658 * Tell the teletype handler what size the window is.
… …
664 * fontname == FONT_UP - switch to bigger font 689 * fontname == FONT_UP - switch to bigger font
665 * fontname == FONT_DN - switch to smaller font 690 * fontname == FONT_DN - switch to smaller font
666 */ 691 */
667void 692void
668rxvt_term::change_font (int init, const char *fontname) 693rxvt_term::change_font (int init, const char *fontname)
669{ 694{}
670}
671 695
672void 696void
673rxvt_term::font_up_down (int n, int direction) 697rxvt_term::font_up_down (int n, int direction)
674{ 698{}
675}
676 699
677/*----------------------------------------------------------------------*/ 700/*----------------------------------------------------------------------*/
678/*----------------------------------------------------------------------*/ 701/*----------------------------------------------------------------------*/
679/* xterm sequences - title, iconName, color (exptl) */ 702/* xterm sequences - title, iconName, color (exptl) */
680void 703void
681rxvt_term::set_title (const char *str) 704rxvt_term::set_title (const char *str)
682{ 705{
683#ifndef SMART_WINDOW_TITLE 706#ifndef SMART_WINDOW_TITLE
707 XStoreName(Xdisplay, TermWin.parent[0], str);
708#else
709 char *name;
710
711 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
712 name = NULL;
713 if (name == NULL || STRCMP(name, str))
684 XStoreName(Xdisplay, TermWin.parent[0], str); 714 XStoreName(Xdisplay, TermWin.parent[0], str);
715 if (name)
716 XFree(name);
717#endif
718}
719
720void
721rxvt_term::set_iconName (const char *str)
722{
723#ifndef SMART_WINDOW_TITLE
724 XSetIconName(Xdisplay, TermWin.parent[0], str);
685#else 725#else
686 char *name; 726 char *name;
687 727
688 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0) 728 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
689 name = NULL; 729 name = NULL;
690 if (name == NULL || STRCMP(name, str)) 730 if (name == NULL || STRCMP(name, str))
691 XStoreName(Xdisplay, TermWin.parent[0], str);
692 if (name)
693 XFree(name);
694#endif
695}
696
697void
698rxvt_term::set_iconName (const char *str)
699{
700#ifndef SMART_WINDOW_TITLE
701 XSetIconName(Xdisplay, TermWin.parent[0], str); 731 XSetIconName(Xdisplay, TermWin.parent[0], str);
702#else
703 char *name;
704
705 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
706 name = NULL;
707 if (name == NULL || STRCMP(name, str))
708 XSetIconName(Xdisplay, TermWin.parent[0], str);
709 if (name) 732 if (name)
710 XFree(name); 733 XFree(name);
711#endif 734#endif
712} 735}
713 736
714#ifdef XTERM_COLOR_CHANGE 737#ifdef XTERM_COLOR_CHANGE
715void 738void
716rxvt_term::set_window_color (int idx, const char *color) 739rxvt_term::set_window_color (int idx, const char *color)
717{ 740{
718 rxvt_color xcol; 741 rxvt_color xcol;
719 int i; 742 int i;
720 743
721 if (color == NULL || *color == '\0') 744 if (color == NULL || *color == '\0')
722 return; 745 return;
723 746
724/* handle color aliases */ 747 /* handle color aliases */
725 if (isdigit(*color)) { 748 if (isdigit(*color))
749 {
726 i = atoi(color); 750 i = atoi(color);
751 if (i >= 8 && i <= 15)
727 if (i >= 8 && i <= 15) { /* bright colors */ 752 { /* bright colors */
728 i -= 8; 753 i -= 8;
729# ifndef NO_BRIGHTCOLOR 754# ifndef NO_BRIGHTCOLOR
730 PixColors[idx] = PixColors[minBrightCOLOR + i]; 755 PixColors[idx] = PixColors[minBrightCOLOR + i];
731 SET_PIXCOLOR(idx); 756 SET_PIXCOLOR(idx);
732 goto Done; 757 goto Done;
733# endif 758# endif
759
734 } 760 }
735 if (i >= 0 && i <= 7) { /* normal colors */ 761 if (i >= 0 && i <= 7)
762 { /* normal colors */
736 PixColors[idx] = PixColors[minCOLOR + i]; 763 PixColors[idx] = PixColors[minCOLOR + i];
737 SET_PIXCOLOR(idx); 764 SET_PIXCOLOR(idx);
738 goto Done; 765 goto Done;
739 } 766 }
740 } 767 }
741 if (!rXParseAllocColor (& xcol, color)) 768 if (!rXParseAllocColor (& xcol, color))
742 return; 769 return;
743/* XStoreColor (Xdisplay, XCMAP, XColor*); */ 770 /* XStoreColor (Xdisplay, XCMAP, XColor*); */
744 771
745/* 772 /*
746 * FIXME: should free colors here, but no idea how to do it so instead, 773 * FIXME: should free colors here, but no idea how to do it so instead,
747 * so just keep gobbling up the colormap 774 * so just keep gobbling up the colormap
748 */ 775 */
749# if 0 776# if 0
750 for (i = Color_Black; i <= Color_White; i++) 777 for (i = Color_Black; i <= Color_White; i++)
751 if (PixColors[idx] == PixColors[i]) 778 if (PixColors[idx] == PixColors[i])
752 break; 779 break;
753 if (i > Color_White) { 780 if (i > Color_White)
781 {
754 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 782 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
755 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1, 783 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
756 DisplayPlanes(Xdisplay, Xscreen)); 784 DisplayPlanes(Xdisplay, Xscreen));
757 } 785 }
758# endif 786# endif
759 787
760 PixColors[idx] = xcol; 788 PixColors[idx] = xcol;
761 SET_PIXCOLOR(idx); 789 SET_PIXCOLOR(idx);
762 790
763/* XSetWindowAttributes attr; */ 791 /* XSetWindowAttributes attr; */
764/* Cursor cursor; */ 792 /* Cursor cursor; */
765 Done: 793Done:
766 if (idx == Color_bg && !(Options & Opt_transparent)) 794 if (idx == Color_bg && !(Options & Opt_transparent))
767 XSetWindowBackground(Xdisplay, TermWin.vt, 795 XSetWindowBackground(Xdisplay, TermWin.vt,
768 PixColors[Color_bg]); 796 PixColors[Color_bg]);
769 797
770/* handle Color_BD, scrollbar background, etc. */ 798 /* handle Color_BD, scrollbar background, etc. */
771 799
772 set_colorfgbg (); 800 set_colorfgbg ();
773 recolour_cursor (); 801 recolour_cursor ();
774/* the only reasonable way to enforce a clean update */ 802 /* the only reasonable way to enforce a clean update */
775 scr_poweron (); 803 scr_poweron ();
776} 804}
777 805
778#else 806#else
779# define set_window_color (idx,color) ((void)0) 807# define set_window_color (idx,color) ((void)0)
780#endif /* XTERM_COLOR_CHANGE */ 808#endif /* XTERM_COLOR_CHANGE */
781 809
782void 810void
783rxvt_term::recolour_cursor () 811rxvt_term::recolour_cursor ()
784{ 812{
785#if TODO 813#if TODO
786 rxvt_color xcol[2]; 814 rxvt_color xcol[2];
787 815
788 xcol[0] = PixColors[Color_pointer]; 816 xcol[0] = PixColors[Color_pointer];
789 xcol[1] = PixColors[Color_bg]; 817 xcol[1] = PixColors[Color_bg];
790 XQueryColors (Xdisplay, XCMAP, xcol, 2); 818 XQueryColors (Xdisplay, XCMAP, xcol, 2);
791 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1])); 819 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
792#endif 820#endif
793} 821}
794 822
795/*----------------------------------------------------------------------*/ 823/*----------------------------------------------------------------------*/
796/* 824/*
797 * find if fg/bg matches any of the normal (low-intensity) colors 825 * find if fg/bg matches any of the normal (low-intensity) colors
798 */ 826 */
799void 827void
800rxvt_term::set_colorfgbg () 828rxvt_term::set_colorfgbg ()
801{ 829{
802 unsigned int i; 830 unsigned int i;
803 const char *xpmb = "\0"; 831 const char *xpmb = "\0";
804 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 832 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
805 833
806 env_colorfgbg = 834 env_colorfgbg =
807 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 835 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
808 STRCPY(fstr, "default"); 836 STRCPY(fstr, "default");
809 STRCPY(bstr, "default"); 837 STRCPY(bstr, "default");
810 for (i = Color_Black; i <= Color_White; i++) 838 for (i = Color_Black; i <= Color_White; i++)
811 if (PixColors[Color_fg] == PixColors[i]) { 839 if (PixColors[Color_fg] == PixColors[i])
840 {
812 sprintf(fstr, "%d", (i - Color_Black)); 841 sprintf(fstr, "%d", (i - Color_Black));
813 break; 842 break;
814 } 843 }
815 for (i = Color_Black; i <= Color_White; i++) 844 for (i = Color_Black; i <= Color_White; i++)
816 if (PixColors[Color_bg] == PixColors[i]) { 845 if (PixColors[Color_bg] == PixColors[i])
846 {
817 sprintf(bstr, "%d", (i - Color_Black)); 847 sprintf(bstr, "%d", (i - Color_Black));
818#ifdef XPM_BACKGROUND 848#ifdef XPM_BACKGROUND
819 xpmb = "default;"; 849 xpmb = "default;";
820#endif 850#endif
821 break; 851 break;
822 } 852 }
823 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 853 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
824 putenv(env_colorfgbg); 854 putenv(env_colorfgbg);
825 855
826#ifndef NO_BRIGHTCOLOR 856#ifndef NO_BRIGHTCOLOR
827 colorfgbg = DEFAULT_RSTYLE; 857 colorfgbg = DEFAULT_RSTYLE;
828 for (i = minCOLOR; i <= maxCOLOR; i++) { 858 for (i = minCOLOR; i <= maxCOLOR; i++)
859 {
829 if (PixColors[Color_fg] == PixColors[i]) 860 if (PixColors[Color_fg] == PixColors[i])
830 colorfgbg = SET_FGCOLOR(colorfgbg, i); 861 colorfgbg = SET_FGCOLOR(colorfgbg, i);
831 if (PixColors[Color_bg] == PixColors[i]) 862 if (PixColors[Color_bg] == PixColors[i])
832 colorfgbg = SET_BGCOLOR(colorfgbg, i); 863 colorfgbg = SET_BGCOLOR(colorfgbg, i);
833 } 864 }
834#endif 865#endif
835} 866}
836 867
837/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
… …
841 */ 872 */
842 873
843int 874int
844rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 875rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
845{ 876{
846 if (!screen_in_out->set (this, colour)) { 877 if (!screen_in_out->set (this, colour))
878 {
847 rxvt_print_error("can't allocate colour: %s", colour); 879 rxvt_print_error("can't allocate colour: %s", colour);
848 return false; 880 return false;
849 } 881 }
850 882
851 return true; 883 return true;
852} 884}
853 885
854/* -------------------------------------------------------------------- * 886/* -------------------------------------------------------------------- *
855 * - WINDOW RESIZING - * 887 * - WINDOW RESIZING - *
856 * -------------------------------------------------------------------- */ 888 * -------------------------------------------------------------------- */
… …
883 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 915 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
884 /* 916 /*
885 * if Xroot isn't the parent window, a WM will probably have offset 917 * if Xroot isn't the parent window, a WM will probably have offset
886 * our position for handles and decorations. Counter it 918 * our position for handles and decorations. Counter it
887 */ 919 */
888 if (x1 != x || y1 != y) { 920 if (x1 != x || y1 != y)
921 {
889 x -= x1; 922 x -= x1;
890 y -= y1; 923 y -= y1;
891 } 924 }
892 925
893 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2; 926 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
894 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2; 927 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
895 dx = old_width - szHint.width; 928 dx = old_width - szHint.width;
896 dy = old_height - szHint.height; 929 dy = old_height - szHint.height;
897 930
898 /* Check position of the center of the window */ 931 /* Check position of the center of the window */
899 if (x < x1) /* left half */ 932 if (x < x1) /* left half */
900 dx = 0; 933 dx = 0;
901 else if (x == x1) /* exact center */ 934 else if (x == x1) /* exact center */
902 dx /= 2; 935 dx /= 2;
903 if (y < y1) /* top half */ 936 if (y < y1) /* top half */
904 dy = 0; 937 dy = 0;
905 else if (y == y1) /* exact center */ 938 else if (y == y1) /* exact center */
906 dy /= 2; 939 dy /= 2;
907 940
908 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy, 941 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
909 szHint.width, szHint.height); 942 szHint.width, szHint.height);
910#else 943#else
911 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width, 944 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
912 szHint.height); 945 szHint.height);
913#endif 946#endif
947
914 } 948 }
915 949
916 fix_screen = (TermWin.ncol != prev_ncol 950 fix_screen = (TermWin.ncol != prev_ncol
917 || TermWin.nrow != prev_nrow); 951 || TermWin.nrow != prev_nrow);
918 952
… …
933 window_vt_y, TermWin_TotalWidth (), 967 window_vt_y, TermWin_TotalWidth (),
934 TermWin_TotalHeight ()); 968 TermWin_TotalHeight ());
935#ifdef RXVT_GRAPHICS 969#ifdef RXVT_GRAPHICS
936 if (old_height) 970 if (old_height)
937 Gr_Resize (old_width - szHint.base_width, 971 Gr_Resize (old_width - szHint.base_width,
938 old_height - szHint.base_height); 972 old_height - szHint.base_height);
939#endif 973#endif
940 scr_clear (); 974 scr_clear ();
941#ifdef XPM_BACKGROUND 975#ifdef XPM_BACKGROUND
942 resize_pixmap (); 976 resize_pixmap ();
943#endif 977#endif
978
944 } 979 }
945 980
946 if (fix_screen || old_height == 0) 981 if (fix_screen || old_height == 0)
947 { 982 {
948 int curr_screen = -1; 983 int curr_screen = -1;
… …
979 * good for toggling 80/132 columns 1014 * good for toggling 80/132 columns
980 */ 1015 */
981void 1016void
982rxvt_term::set_widthheight (unsigned int width, unsigned int height) 1017rxvt_term::set_widthheight (unsigned int width, unsigned int height)
983{ 1018{
984 XWindowAttributes wattr; 1019 XWindowAttributes wattr;
985 1020
986 if (width == 0 || height == 0) { 1021 if (width == 0 || height == 0)
1022 {
987 XGetWindowAttributes(Xdisplay, Xroot, &wattr); 1023 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
988 if (width == 0) 1024 if (width == 0)
989 width = wattr.width - szHint.base_width; 1025 width = wattr.width - szHint.base_width;
990 if (height == 0) 1026 if (height == 0)
991 height = wattr.height - szHint.base_height; 1027 height = wattr.height - szHint.base_height;
992 } 1028 }
993 if (width != TermWin.width || height != TermWin.height) { 1029 if (width != TermWin.width || height != TermWin.height)
1030 {
994 width += szHint.base_width; 1031 width += szHint.base_width;
995 height += szHint.base_height; 1032 height += szHint.base_height;
996 resize_all_windows (width, height, 0); 1033 resize_all_windows (width, height, 0);
997 } 1034 }
998} 1035}
999 1036
1000/* -------------------------------------------------------------------- * 1037/* -------------------------------------------------------------------- *
1001 * - X INPUT METHOD ROUTINES - * 1038 * - X INPUT METHOD ROUTINES - *
… …
1019 1056
1020/* Checking whether input method is running. */ 1057/* Checking whether input method is running. */
1021bool 1058bool
1022rxvt_term::IMisRunning () 1059rxvt_term::IMisRunning ()
1023{ 1060{
1024 char *p; 1061 char *p;
1025 Atom atom; 1062 Atom atom;
1026 Window win; 1063 Window win;
1027 char server[IMBUFSIZ]; 1064 char server[IMBUFSIZ];
1028 1065
1029/* get current locale modifier */ 1066 /* get current locale modifier */
1030 if ((p = XSetLocaleModifiers(NULL)) != NULL) { 1067 if ((p = XSetLocaleModifiers(NULL)) != NULL)
1068 {
1031 STRCPY(server, "@server="); 1069 STRCPY(server, "@server=");
1032 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1070 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1033 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1071 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1034 *p = '\0'; 1072 *p = '\0';
1035 1073
1036 atom = XInternAtom(Xdisplay, server, False); 1074 atom = XInternAtom(Xdisplay, server, False);
1037 win = XGetSelectionOwner(Xdisplay, atom); 1075 win = XGetSelectionOwner(Xdisplay, atom);
1038 if (win != None) 1076 if (win != None)
1039 return True; 1077 return True;
1040 } 1078 }
1041 return False; 1079 return False;
1042} 1080}
1043 1081
1044void 1082void
1045rxvt_term::IMSendSpot () 1083rxvt_term::IMSendSpot ()
1046{ 1084{
1047 XPoint spot; 1085 XPoint spot;
1048 XVaNestedList preedit_attr; 1086 XVaNestedList preedit_attr;
1049 1087
1050 if (Input_Context == NULL 1088 if (Input_Context == NULL
1051 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1089 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1052 || !(event_type == KeyPress 1090 || !(event_type == KeyPress
1053 || event_type == Expose 1091 || event_type == Expose
1054 || event_type == NoExpose 1092 || event_type == NoExpose
1055 || event_type == SelectionNotify 1093 || event_type == SelectionNotify
1056 || event_type == ButtonRelease || event_type == FocusIn) 1094 || event_type == ButtonRelease || event_type == FocusIn)
1057 || !IMisRunning ()) 1095 || !IMisRunning ())
1058 return; 1096 return;
1059 1097
1060 set_position (&spot); 1098 set_position (&spot);
1061 1099
1062 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1100 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1063 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1101 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1064 XFree(preedit_attr); 1102 XFree(preedit_attr);
1065} 1103}
1066 1104
1067void 1105void
1068rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1106rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1069 XRectangle * needed_rect) 1107 XRectangle * needed_rect)
… …
1094void 1132void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1133rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1096 __attribute__ ((unused)), XPointer call_data 1134 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused))) 1135 __attribute__ ((unused)))
1098{ 1136{
1099 GET_R->Input_Context = NULL; 1137 GET_R->Input_Context = NULL;
1100/* To avoid Segmentation Fault in C locale: Solaris only? */ 1138 /* To avoid Segmentation Fault in C locale: Solaris only? */
1101 if (STRCMP (GET_R->locale, "C")) 1139 if (STRCMP (GET_R->locale, "C"))
1102 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL, 1140 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1103 rxvt_IMInstantiateCallback, NULL); 1141 rxvt_IMInstantiateCallback, NULL);
1104} 1142}
1105 1143
1106/* 1144/*
1107 * Try to open a XIM with the current modifiers, then see if we can 1145 * Try to open a XIM with the current modifiers, then see if we can
1108 * open a suitable preedit type 1146 * open a suitable preedit type
1109 */ 1147 */
1110bool 1148bool
1111rxvt_term::IM_get_IC () 1149rxvt_term::IM_get_IC ()
1112{ 1150{
1113 int i, j, found; 1151 int i, j, found;
1114 XIM xim; 1152 XIM xim;
1115 XPoint spot; 1153 XPoint spot;
1116 XRectangle rect, status_rect, needed_rect; 1154 XRectangle rect, status_rect, needed_rect;
1117 unsigned long fg, bg; 1155 unsigned long fg, bg;
1118 const char *p; 1156 const char *p;
1119 char **s; 1157 char **s;
1120 XIMStyles *xim_styles; 1158 XIMStyles *xim_styles;
1121 XVaNestedList preedit_attr, status_attr; 1159 XVaNestedList preedit_attr, status_attr;
1122 XIMCallback ximcallback; 1160 XIMCallback ximcallback;
1123 1161
1124 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1162 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1125 xim = XOpenIM (Xdisplay, NULL, NULL, NULL); 1163 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1126 if (xim == NULL) 1164 if (xim == NULL)
1127 return False; 1165 return False;
1128 1166
1129 xim_styles = NULL; 1167 xim_styles = NULL;
1130 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL) 1168 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1131 || !xim_styles || !xim_styles->count_styles) { 1169 || !xim_styles || !xim_styles->count_styles)
1170 {
1132 XCloseIM(xim); 1171 XCloseIM(xim);
1133 return False; 1172 return False;
1134 } 1173 }
1135 1174
1136 p = rs[Rs_preeditType] ? rs[Rs_preeditType] 1175 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1137 : "OverTheSpot,OffTheSpot,Root"; 1176 : "OverTheSpot,OffTheSpot,Root";
1138 s = rxvt_splitcommastring(p); 1177 s = rxvt_splitcommastring(p);
1139 for (i = found = 0; !found && s[i]; i++) { 1178 for (i = found = 0; !found && s[i]; i++)
1179 {
1140 if (!STRCMP(s[i], "OverTheSpot")) 1180 if (!STRCMP(s[i], "OverTheSpot"))
1141 input_style = (XIMPreeditPosition | XIMStatusNothing); 1181 input_style = (XIMPreeditPosition | XIMStatusNothing);
1142 else if (!STRCMP(s[i], "OffTheSpot")) 1182 else if (!STRCMP(s[i], "OffTheSpot"))
1143 input_style = (XIMPreeditArea | XIMStatusArea); 1183 input_style = (XIMPreeditArea | XIMStatusArea);
1144 else if (!STRCMP(s[i], "Root")) 1184 else if (!STRCMP(s[i], "Root"))
1145 input_style = (XIMPreeditNothing | XIMStatusNothing); 1185 input_style = (XIMPreeditNothing | XIMStatusNothing);
1146 1186
1147 for (j = 0; j < xim_styles->count_styles; j++) 1187 for (j = 0; j < xim_styles->count_styles; j++)
1148 if (input_style == xim_styles->supported_styles[j]) { 1188 if (input_style == xim_styles->supported_styles[j])
1189 {
1149 found = 1; 1190 found = 1;
1150 break; 1191 break;
1151 } 1192 }
1152 } 1193 }
1153 for (i = 0; s[i]; i++) 1194 for (i = 0; s[i]; i++)
1154 free(s[i]); 1195 free(s[i]);
1155 free(s); 1196 free(s);
1156 XFree(xim_styles); 1197 XFree(xim_styles);
1157 1198
1158 if (!found) { 1199 if (!found)
1200 {
1159 XCloseIM(xim); 1201 XCloseIM(xim);
1160 return False; 1202 return False;
1161 } 1203 }
1162 1204
1163 ximcallback.callback = rxvt_IMDestroyCallback; 1205 ximcallback.callback = rxvt_IMDestroyCallback;
1164 1206
1165 /* XXX: not sure why we need this (as well as IC one below) */ 1207 /* XXX: not sure why we need this (as well as IC one below) */
1166 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1208 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1167 1209
1168 preedit_attr = status_attr = NULL; 1210 preedit_attr = status_attr = NULL;
1169 1211
1170 if (input_style & XIMPreeditPosition) { 1212 if (input_style & XIMPreeditPosition)
1213 {
1171 set_size (&rect); 1214 set_size (&rect);
1172 set_position (&spot); 1215 set_position (&spot);
1173 set_color (&fg, &bg); 1216 set_color (&fg, &bg);
1174 1217
1175 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1218 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1176 XNSpotLocation, &spot, 1219 XNSpotLocation, &spot,
1177 XNForeground, fg, XNBackground, bg,
1178 //XNFontSet, TermWin.fontset,
1179 NULL);
1180 } else if (input_style & XIMPreeditArea) {
1181 set_color (&fg, &bg);
1182
1183 /*
1184 * The necessary width of preedit area is unknown
1185 * until create input context.
1186 */
1187 needed_rect.width = 0;
1188
1189 set_preedit_area(&rect, &status_rect, &needed_rect);
1190
1191 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1192 XNForeground, fg, XNBackground, bg,
1193 //XNFontSet, TermWin.fontset,
1194 NULL);
1195 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1196 XNForeground, fg, XNBackground, bg, 1220 XNForeground, fg, XNBackground, bg,
1197 //XNFontSet, TermWin.fontset, 1221 //XNFontSet, TermWin.fontset,
1198 NULL); 1222 NULL);
1223 }
1224 else if (input_style & XIMPreeditArea)
1199 } 1225 {
1226 set_color (&fg, &bg);
1227
1228 /*
1229 * The necessary width of preedit area is unknown
1230 * until create input context.
1231 */
1232 needed_rect.width = 0;
1233
1234 set_preedit_area(&rect, &status_rect, &needed_rect);
1235
1236 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1237 XNForeground, fg, XNBackground, bg,
1238 //XNFontSet, TermWin.fontset,
1239 NULL);
1240 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1241 XNForeground, fg, XNBackground, bg,
1242 //XNFontSet, TermWin.fontset,
1243 NULL);
1244 }
1200 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1245 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1201 XNClientWindow, TermWin.parent[0], 1246 XNClientWindow, TermWin.parent[0],
1202 XNFocusWindow, TermWin.parent[0], 1247 XNFocusWindow, TermWin.parent[0],
1203 XNDestroyCallback, &ximcallback, 1248 XNDestroyCallback, &ximcallback,
1204 preedit_attr ? XNPreeditAttributes : NULL, 1249 preedit_attr ? XNPreeditAttributes : NULL,
1205 preedit_attr, 1250 preedit_attr,
1206 status_attr ? XNStatusAttributes : NULL, 1251 status_attr ? XNStatusAttributes : NULL,
1207 status_attr, NULL); 1252 status_attr, NULL);
1208 if (preedit_attr) 1253 if (preedit_attr)
1209 XFree(preedit_attr); 1254 XFree(preedit_attr);
1210 if (status_attr) 1255 if (status_attr)
1211 XFree(status_attr); 1256 XFree(status_attr);
1212 if (Input_Context == NULL) { 1257 if (Input_Context == NULL)
1258 {
1213 rxvt_print_error("failed to create input context"); 1259 rxvt_print_error("failed to create input context");
1214 XCloseIM(xim); 1260 XCloseIM(xim);
1215 return False; 1261 return False;
1216 } 1262 }
1217 if (input_style & XIMPreeditArea) 1263 if (input_style & XIMPreeditArea)
1218 IMSetStatusPosition (); 1264 IMSetStatusPosition ();
1219 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1265 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1220 return True; 1266 return True;
1221} 1267}
1222 1268
1223/* 1269/*
1224 * X manual pages and include files don't match on some systems: 1270 * X manual pages and include files don't match on some systems:
1225 * some think this is an XIDProc and others an XIMProc so we can't 1271 * some think this is an XIDProc and others an XIMProc so we can't
… …
1266 break; 1312 break;
1267 } 1313 }
1268 } 1314 }
1269 } 1315 }
1270 for (i = 0; s[i]; i++) 1316 for (i = 0; s[i]; i++)
1271 free(s[i]); 1317 free(s[i]);
1272 free(s); 1318 free(s);
1273 1319
1274 if (found) 1320 if (found)
1275 goto done; 1321 goto done;
1276 } 1322 }
1277 1323
1278/* try with XMODIFIERS env. var. */ 1324 /* try with XMODIFIERS env. var. */
1279 if ((p = XSetLocaleModifiers ("")) && *p 1325 if ((p = XSetLocaleModifiers ("")) && *p
1280 && GET_R->IM_get_IC ()) 1326 && GET_R->IM_get_IC ())
1281 goto done; 1327 goto done;
1282 1328
1283/* try with no modifiers base IF the user didn't specify an IM */ 1329 /* try with no modifiers base IF the user didn't specify an IM */
1284 if ((p = XSetLocaleModifiers ("@im=none")) && *p 1330 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1285 && GET_R->IM_get_IC () == True) 1331 && GET_R->IM_get_IC () == True)
1286 goto done; 1332 goto done;
1287 1333
1288done: 1334done:
… …
1293} 1339}
1294 1340
1295void 1341void
1296rxvt_term::IMSetStatusPosition () 1342rxvt_term::IMSetStatusPosition ()
1297{ 1343{
1298 XRectangle preedit_rect, status_rect, *needed_rect; 1344 XRectangle preedit_rect, status_rect, *needed_rect;
1299 XVaNestedList preedit_attr, status_attr; 1345 XVaNestedList preedit_attr, status_attr;
1300 1346
1301 if (Input_Context == NULL 1347 if (Input_Context == NULL
1302 || !TermWin.focus || !(input_style & XIMPreeditArea) 1348 || !TermWin.focus || !(input_style & XIMPreeditArea)
1303 || !IMisRunning ()) 1349 || !IMisRunning ())
1304 return; 1350 return;
1305 1351
1306/* Getting the necessary width of preedit area */ 1352 /* Getting the necessary width of preedit area */
1307 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1353 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1308 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1354 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1309 XFree(status_attr); 1355 XFree(status_attr);
1310 1356
1311 set_preedit_area(&preedit_rect, &status_rect, needed_rect); 1357 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1312 1358
1313 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1359 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1314 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1360 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1315 1361
1316 XSetICValues(Input_Context, 1362 XSetICValues(Input_Context,
1317 XNPreeditAttributes, preedit_attr, 1363 XNPreeditAttributes, preedit_attr,
1318 XNStatusAttributes, status_attr, NULL); 1364 XNStatusAttributes, status_attr, NULL);
1319 1365
1320 XFree(preedit_attr); 1366 XFree(preedit_attr);
1321 XFree(status_attr); 1367 XFree(status_attr);
1322} 1368}
1323#endif /* USE_XIM */ 1369#endif /* USE_XIM */
1324 1370
1325/*----------------------------------------------------------------------*/ 1371/*----------------------------------------------------------------------*/
1326rxvt_t rxvt_current_term; 1372rxvt_t rxvt_current_term;

Diff Legend

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