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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.42 by pcg, Sun Feb 22 10:38:11 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*;
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA> 11 * Copyright (c) 1997 mj olesen <olesen@me.QueensU.CA>
12 * - extensive modifications 12 * - extensive modifications
13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 13 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 14 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
15 * - extensive modifications 15 * - extensive modifications
16 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
… …
90 text_blink_ev (this, &rxvt_term::text_blink_cb), 91 text_blink_ev (this, &rxvt_term::text_blink_cb),
91#endif 92#endif
92#ifdef POINTER_BLANK 93#ifdef POINTER_BLANK
93 pointer_ev (this, &rxvt_term::pointer_cb), 94 pointer_ev (this, &rxvt_term::pointer_cb),
94#endif 95#endif
96#ifdef USE_XIM
97 im_ev (this, &rxvt_term::im_cb),
98#endif
95 check_ev (this, &rxvt_term::check_cb), 99 check_ev (this, &rxvt_term::check_cb),
96 destroy_ev (this, &rxvt_term::destroy_cb), 100 destroy_ev (this, &rxvt_term::destroy_cb),
97 pty_ev (this, &rxvt_term::pty_cb), 101 pty_ev (this, &rxvt_term::pty_cb),
98 incr_ev (this, &rxvt_term::incr_cb), 102 incr_ev (this, &rxvt_term::incr_cb)
99#ifdef USE_XIM
100 im_ev (this, &rxvt_term::im_cb)
101#endif
102{ 103{
103 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 104 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
104} 105}
105 106
106rxvt_term::~rxvt_term () 107rxvt_term::~rxvt_term ()
107{ 108{
108 if (cmd_fd >= 0) 109 if (cmd_fd >= 0)
109 close (cmd_fd); 110 close (cmd_fd);
110 111
112#ifndef NO_SETOWNER_TTYDEV
113 privileged_ttydev (RESTORE);
114#endif
115#ifdef UTMP_SUPPORT
116 privileged_utmp (RESTORE);
117#endif
118
119 delete TermWin.fontset;
120
121 if (display)
122 if (TermWin.parent[0])
123 XDestroyWindow (display->display, TermWin.parent[0]);
124
125 // TODO: free pixcolours, colours should become part of rxvt_display
126
127 delete PixColors;
128
129 displays.put (display);
130
111 scr_release (); 131 scr_release ();
112 132
133 free (env_windowid);
134 free (env_display);
135 free (env_term);
136 free (env_colorfgbg);
113 free (locale); 137 free (locale);
114 free (codeset); 138 free (codeset);
115 139
116#ifndef NO_SETOWNER_TTYDEV 140 delete envv;
117 privileged_ttydev (RESTORE); 141 delete argv;
118#endif
119#ifdef UTMP_SUPPORT
120 privileged_utmp (RESTORE);
121#endif
122
123 // TODO: free pixcolours, colours should become part of rxvt_display
124
125 delete PixColors;
126
127 displays.put (display);
128} 142}
129 143
130void 144void
131rxvt_term::destroy () 145rxvt_term::destroy ()
132{ 146{
133 if (display) 147 if (display)
134 { 148 {
135 if (TermWin.parent[0]) 149 rootwin_ev.stop (display);
136 XDestroyWindow (display->display, TermWin.parent[0]);
137
138 termwin_ev.stop (display); 150 termwin_ev.stop (display);
139 vt_ev.stop (display); 151 vt_ev.stop (display);
140
141#ifdef USE_XIM 152#ifdef USE_XIM
142 im_destroy (); 153 im_destroy ();
143 im_ev.stop (display); 154 im_ev.stop (display);
144#endif 155#endif
145#ifdef HAVE_SCROLLBARS 156#ifdef HAVE_SCROLLBARS
… …
172 183
173 delete this; 184 delete this;
174} 185}
175 186
176/*----------------------------------------------------------------------*/ 187/*----------------------------------------------------------------------*/
177/* rxvt_init() */ 188/* rxvt_init () */
178/* LIBPROTO */ 189/* LIBPROTO */
179rxvt_t 190rxvt_t
180rxvt_init (int argc, const char *const *argv) 191rxvt_init (int argc, const char *const *argv)
181{ 192{
182 SET_R (new rxvt_term); 193 SET_R (new rxvt_term);
… …
188 } 199 }
189 200
190 return GET_R; 201 return GET_R;
191} 202}
192 203
193static int (*old_xerror_handler)(Display *dpy, XErrorEvent *event); 204static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
194 205
195void 206void
196rxvt_init_signals () 207rxvt_init_signals ()
197{ 208{
198 /* install exit handler for cleanup */ 209 /* install exit handler for cleanup */
199#if 0 210#if 0
200#ifdef HAVE_ATEXIT 211#ifdef HAVE_ATEXIT
201 atexit(rxvt_clean_exit); 212 atexit (rxvt_clean_exit);
202#else 213#else
203#endif 214#endif
204#endif 215#endif
205 216
206 struct sigaction sa; 217 struct sigaction sa;
… …
251 create_windows (argc, argv); 262 create_windows (argc, argv);
252 263
253 init_xlocale (); 264 init_xlocale ();
254 265
255 scr_reset (); /* initialize screen */ 266 scr_reset (); /* initialize screen */
256#ifdef RXVT_GRAPHICS
257 Gr_reset (); /* reset graphics */
258#endif
259 267
260#if 0 268#if 0
261#ifdef DEBUG_X
262 XSynchronize(display->display, True); 269 XSynchronize (display->display, True);
263#endif
264#endif 270#endif
265 271
266#ifdef HAVE_SCROLLBARS 272#ifdef HAVE_SCROLLBARS
267 if (Options & Opt_scrollBar) 273 if (Options & Opt_scrollBar)
268 resize_scrollbar (); /* create and map scrollbar */ 274 resize_scrollbar (); /* create and map scrollbar */
269#endif 275#endif
270#if (MENUBAR_MAX) 276#if (MENUBAR_MAX)
271 if (menubar_visible(r)) 277 if (menubar_visible (r))
272 XMapWindow (display->display, menuBar.win); 278 XMapWindow (display->display, menuBar.win);
273#endif 279#endif
274#ifdef TRANSPARENT 280#ifdef TRANSPARENT
275 if (Options & Opt_transparent) 281 if (Options & Opt_transparent)
276 { 282 {
… …
282 rootwin_ev.start (display, display->root); 288 rootwin_ev.start (display, display->root);
283 289
284 XMapWindow (display->display, TermWin.vt); 290 XMapWindow (display->display, TermWin.vt);
285 XMapWindow (display->display, TermWin.parent[0]); 291 XMapWindow (display->display, TermWin.parent[0]);
286 292
287 init_env ();
288 init_command (cmd_argv); 293 init_command (cmd_argv);
289 294
290 pty_ev.start (cmd_fd, EVENT_READ); 295 pty_ev.start (cmd_fd, EVENT_READ);
291 296
292 check_ev.start (); 297 check_ev.start ();
… …
301 * Catch a SIGCHLD signal and exit if the direct child has died 306 * Catch a SIGCHLD signal and exit if the direct child has died
302 */ 307 */
303/* ARGSUSED */ 308/* ARGSUSED */
304/* EXTPROTO */ 309/* EXTPROTO */
305RETSIGTYPE 310RETSIGTYPE
306rxvt_Child_signal(int sig __attribute__ ((unused))) 311rxvt_Child_signal (int sig __attribute__ ((unused)))
307{ 312{
308 int pid, save_errno = errno; 313 int pid, save_errno = errno;
309 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 314 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
310 ; 315 ;
311 errno = save_errno; 316 errno = save_errno;
… …
319/* 324/*
320 * Catch a fatal signal and tidy up before quitting 325 * Catch a fatal signal and tidy up before quitting
321 */ 326 */
322/* EXTPROTO */ 327/* EXTPROTO */
323RETSIGTYPE 328RETSIGTYPE
324rxvt_Exit_signal(int sig) 329rxvt_Exit_signal (int sig)
325{ 330{
326 signal(sig, SIG_DFL); 331 signal (sig, SIG_DFL);
327#ifdef DEBUG_CMD 332#ifdef DEBUG_CMD
328 rxvt_print_error("signal %d", sig); 333 rxvt_print_error ("signal %d", sig);
329#endif 334#endif
330 rxvt_clean_exit(); 335 rxvt_clean_exit ();
331 kill(getpid(), sig); 336 kill (getpid (), sig);
332} 337}
333 338
334/* INTPROTO */ 339/* INTPROTO */
335int 340int
336rxvt_xerror_handler (Display *display, XErrorEvent *event) 341rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
353 */ 358 */
354/* EXTPROTO */ 359/* EXTPROTO */
355void 360void
356rxvt_clean_exit () 361rxvt_clean_exit ()
357{ 362{
363 // TODO: rxvtd should clean up all ressources
364 if (GET_R)
358 GET_R->destroy (); 365 GET_R->destroy ();
359} 366}
360 367
361/* ------------------------------------------------------------------------- * 368/* ------------------------------------------------------------------------- *
362 * MEMORY ALLOCATION WRAPPERS * 369 * MEMORY ALLOCATION WRAPPERS *
363 * ------------------------------------------------------------------------- */ 370 * ------------------------------------------------------------------------- */
364/* EXTPROTO */ 371/* EXTPROTO */
365void * 372void *
366rxvt_malloc(size_t size) 373rxvt_malloc (size_t size)
367{ 374{
368 void *p; 375 void *p;
369 376
370 p = malloc(size); 377 p = malloc (size);
371 if (p) 378 if (p)
372 return p; 379 return p;
373 380
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 381 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 382 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 383 exit (EXIT_FAILURE);
377 /* NOTREACHED */ 384 /* NOTREACHED */
378} 385}
379 386
380/* EXTPROTO */ 387/* EXTPROTO */
381void * 388void *
382rxvt_calloc(size_t number, size_t size) 389rxvt_calloc (size_t number, size_t size)
383{ 390{
384 void *p; 391 void *p;
385 392
386 p = calloc(number, size); 393 p = calloc (number, size);
387 if (p) 394 if (p)
388 return p; 395 return p;
389 396
390 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 397 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit(); 398 rxvt_clean_exit ();
392 exit(EXIT_FAILURE); 399 exit (EXIT_FAILURE);
393 /* NOTREACHED */ 400 /* NOTREACHED */
394} 401}
395 402
396/* EXTPROTO */ 403/* EXTPROTO */
397void * 404void *
398rxvt_realloc(void *ptr, size_t size) 405rxvt_realloc (void *ptr, size_t size)
399{ 406{
400 void *p; 407 void *p;
401 408
402 if (ptr) 409 if (ptr)
403 p = realloc(ptr, size); 410 p = realloc (ptr, size);
404 else 411 else
405 p = malloc(size); 412 p = malloc (size);
406 if (p) 413 if (p)
407 return p; 414 return p;
408 415
409 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 416 fprintf (stderr, APL_NAME ": memory allocation failure. Aborting");
410 rxvt_clean_exit(); 417 rxvt_clean_exit ();
411 exit(EXIT_FAILURE); 418 exit (EXIT_FAILURE);
412 /* NOTREACHED */ 419 /* NOTREACHED */
413} 420}
414 421
415/* ------------------------------------------------------------------------- * 422/* ------------------------------------------------------------------------- *
416 * PRIVILEGED OPERATIONS * 423 * PRIVILEGED OPERATIONS *
… …
419void 426void
420rxvt_term::privileges (int mode) 427rxvt_term::privileges (int mode)
421{ 428{
422#if ! defined(__CYGWIN32__) 429#if ! defined(__CYGWIN32__)
423# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 430# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
424 /* setreuid() is the poor man's setuid(), seteuid() */ 431 /* setreuid () is the poor man's setuid (), seteuid () */
425# define seteuid(a) setreuid(-1, (a)) 432# define seteuid(a) setreuid(-1, (a))
426# define setegid(a) setregid(-1, (a)) 433# define setegid(a) setregid(-1, (a))
427# define HAVE_SETEUID 434# define HAVE_SETEUID
428# endif 435# endif
429# ifdef HAVE_SETEUID 436# ifdef HAVE_SETEUID
… …
432 case IGNORE: 439 case IGNORE:
433 /* 440 /*
434 * change effective uid/gid - not real uid/gid - so we can switch 441 * change effective uid/gid - not real uid/gid - so we can switch
435 * back to root later, as required 442 * back to root later, as required
436 */ 443 */
437 seteuid(getuid()); 444 seteuid (getuid ());
438 setegid(getgid()); 445 setegid (getgid ());
439 break; 446 break;
440 case SAVE: 447 case SAVE:
441 euid = geteuid(); 448 euid = geteuid ();
442 egid = getegid(); 449 egid = getegid ();
443 break; 450 break;
444 case RESTORE: 451 case RESTORE:
445 seteuid(euid); 452 seteuid (euid);
446 setegid(egid); 453 setegid (egid);
447 break; 454 break;
448 } 455 }
449# else 456# else
450 switch (mode) 457 switch (mode)
451 { 458 {
452 case IGNORE: 459 case IGNORE:
453 setuid(getuid()); 460 setuid (getuid ());
454 setgid(getgid()); 461 setgid (getgid ());
455 /* FALLTHROUGH */ 462 /* FALLTHROUGH */
456 case SAVE: 463 case SAVE:
457 /* FALLTHROUGH */ 464 /* FALLTHROUGH */
458 case RESTORE: 465 case RESTORE:
459 break; 466 break;
… …
464 471
465#ifdef UTMP_SUPPORT 472#ifdef UTMP_SUPPORT
466void 473void
467rxvt_term::privileged_utmp (char action) 474rxvt_term::privileged_utmp (char action)
468{ 475{
469 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 476 D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
470 action, next_utmp_action, getpid())); 477 action, next_utmp_action, getpid ()));
471 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 478 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
472 || (Options & Opt_utmpInhibit) 479 || (Options & Opt_utmpInhibit)
473 || ttydev == NULL || *ttydev == '\0') 480 || ttydev == NULL || *ttydev == '\0')
474 return; 481 return;
475 482
… …
490 497
491#ifndef NO_SETOWNER_TTYDEV 498#ifndef NO_SETOWNER_TTYDEV
492void 499void
493rxvt_term::privileged_ttydev (char action) 500rxvt_term::privileged_ttydev (char action)
494{ 501{
495 D_MAIN((stderr, 502 D_MAIN ((stderr,
496 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 503 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
497 action, next_tty_action, getpid())); 504 action, next_tty_action, getpid ()));
498 if (next_tty_action != action || (action != SAVE && action != RESTORE) 505 if (next_tty_action != action || (action != SAVE && action != RESTORE)
499 || ttydev == NULL || *ttydev == '\0') 506 || ttydev == NULL || *ttydev == '\0')
500 return; 507 return;
501 508
502 privileges (RESTORE); 509 privileges (RESTORE);
503 510
504 if (action == SAVE) 511 if (action == SAVE)
505 { 512 {
506 next_tty_action = RESTORE; 513 next_tty_action = RESTORE;
507# ifndef RESET_TTY_TO_COMMON_DEFAULTS 514# ifndef RESET_TTY_TO_COMMON_DEFAULTS
508 /* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 515 /* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
509 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 516 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
510 next_tty_action = IGNORE; 517 next_tty_action = IGNORE;
511 else 518 else
512# endif 519# endif
513 520
514 { 521 {
515 chown(ttydev, getuid(), ttygid); /* fail silently */ 522 chown (ttydev, getuid (), ttygid); /* fail silently */
516 chmod(ttydev, ttymode); 523 chmod (ttydev, ttymode);
517# ifdef HAVE_REVOKE 524# ifdef HAVE_REVOKE
518 revoke(ttydev); 525 revoke (ttydev);
519# endif 526# endif
520 527
521 } 528 }
522 } 529 }
523 else 530 else
524 { /* action == RESTORE */ 531 { /* action == RESTORE */
525 next_tty_action = IGNORE; 532 next_tty_action = IGNORE;
526# ifndef RESET_TTY_TO_COMMON_DEFAULTS 533# ifndef RESET_TTY_TO_COMMON_DEFAULTS
527 chmod(ttydev, ttyfd_stat.st_mode); 534 chmod (ttydev, ttyfd_stat.st_mode);
528 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 535 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
529# else 536# else
530 chmod(ttydev, 537 chmod (ttydev,
531 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 538 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
532 chown(ttydev, 0, 0); 539 chown (ttydev, 0, 0);
533# endif 540# endif
534 541
535 } 542 }
536 543
537 privileges (IGNORE); 544 privileges (IGNORE);
538 545
539# ifndef RESET_TTY_TO_COMMON_DEFAULTS 546# ifndef RESET_TTY_TO_COMMON_DEFAULTS
540 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 547 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
541 action == RESTORE ? "Restoring" : (action == 548 action == RESTORE ? "Restoring" : (action ==
542 SAVE ? "Saving" : 549 SAVE ? "Saving" :
543 "UNKNOWN ERROR for"), ttydev, 550 "UNKNOWN ERROR for"), ttydev,
544 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 551 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
545 ttyfd_stat.st_gid)); 552 ttyfd_stat.st_gid));
… …
558 short recalc_x, recalc_y; 565 short recalc_x, recalc_y;
559 int x, y, sb_w, mb_h, flags; 566 int x, y, sb_w, mb_h, flags;
560 unsigned int w, h; 567 unsigned int w, h;
561 unsigned int max_width, max_height; 568 unsigned int max_width, max_height;
562 569
563 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 570 D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
564 TermWin.ncol, TermWin.nrow, szHint.width, 571 TermWin.ncol, TermWin.nrow, szHint.width,
565 szHint.height)); 572 szHint.height));
566 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 573 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
567 szHint.win_gravity = NorthWestGravity; 574 szHint.win_gravity = NorthWestGravity;
568 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 575 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
571 flags = 0; 578 flags = 0;
572 if (!parsed_geometry) 579 if (!parsed_geometry)
573 { 580 {
574 parsed_geometry = 1; 581 parsed_geometry = 1;
575 if (rs[Rs_geometry]) 582 if (rs[Rs_geometry])
576 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 583 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
577 if (flags & WidthValue) 584 if (flags & WidthValue)
578 { 585 {
579 TermWin.ncol = BOUND_POSITIVE_INT16(w); 586 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
580 szHint.flags |= USSize; 587 szHint.flags |= USSize;
581 } 588 }
582 if (flags & HeightValue) 589 if (flags & HeightValue)
583 { 590 {
584 TermWin.nrow = BOUND_POSITIVE_INT16(h); 591 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
585 szHint.flags |= USSize; 592 szHint.flags |= USSize;
586 } 593 }
587 if (flags & XValue) 594 if (flags & XValue)
588 { 595 {
589 szHint.x = x; 596 szHint.x = x;
… …
618 625
619 sb_w = mb_h = 0; 626 sb_w = mb_h = 0;
620 window_vt_x = window_vt_y = 0; 627 window_vt_x = window_vt_y = 0;
621 if (scrollbar_visible ()) 628 if (scrollbar_visible ())
622 { 629 {
623 sb_w = scrollbar_TotalWidth(); 630 sb_w = scrollbar_TotalWidth ();
624 szHint.base_width += sb_w; 631 szHint.base_width += sb_w;
625 if (!(Options & Opt_scrollBar_right)) 632 if (! (Options & Opt_scrollBar_right))
626 window_vt_x = sb_w; 633 window_vt_x = sb_w;
627 } 634 }
628 if (menubar_visible ()) 635 if (menubar_visible ())
629 { 636 {
630 mb_h = menuBar_TotalHeight(); 637 mb_h = menuBar_TotalHeight ();
631 szHint.base_height += mb_h; 638 szHint.base_height += mb_h;
632 window_vt_y = mb_h; 639 window_vt_y = mb_h;
633 } 640 }
634 szHint.width_inc = TermWin.fwidth; 641 szHint.width_inc = TermWin.fwidth;
635 szHint.height_inc = TermWin.fheight; 642 szHint.height_inc = TermWin.fheight;
… …
641 szHint.width = width; 648 szHint.width = width;
642 TermWin.width = width - szHint.base_width; 649 TermWin.width = width - szHint.base_width;
643 } 650 }
644 else 651 else
645 { 652 {
646 MIN_IT(TermWin.width, max_width); 653 MIN_IT (TermWin.width, max_width);
647 szHint.width = szHint.base_width + TermWin.width; 654 szHint.width = szHint.base_width + TermWin.width;
648 } 655 }
649 if (height && height - szHint.base_height < max_height) 656 if (height && height - szHint.base_height < max_height)
650 { 657 {
651 szHint.height = height; 658 szHint.height = height;
652 TermWin.height = height - szHint.base_height; 659 TermWin.height = height - szHint.base_height;
653 } 660 }
654 else 661 else
655 { 662 {
656 MIN_IT(TermWin.height, max_height); 663 MIN_IT (TermWin.height, max_height);
657 szHint.height = szHint.base_height + TermWin.height; 664 szHint.height = szHint.base_height + TermWin.height;
658 } 665 }
659 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 666 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
660 window_sb_x = szHint.width - sb_w; 667 window_sb_x = szHint.width - sb_w;
661 668
… …
666 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 673 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
667 - szHint.height - 2 * TermWin.ext_bwidth); 674 - szHint.height - 2 * TermWin.ext_bwidth);
668 675
669 TermWin.ncol = TermWin.width / TermWin.fwidth; 676 TermWin.ncol = TermWin.width / TermWin.fwidth;
670 TermWin.nrow = TermWin.height / TermWin.fheight; 677 TermWin.nrow = TermWin.height / TermWin.fheight;
671 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 678 D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
672 TermWin.ncol, TermWin.nrow, szHint.width, 679 TermWin.ncol, TermWin.nrow, szHint.width,
673 szHint.height)); 680 szHint.height));
674 return; 681 return;
675} 682}
676 683
… …
692 ws.ws_xpixel = ws.ws_ypixel = 0; 699 ws.ws_xpixel = ws.ws_ypixel = 0;
693#ifndef DEBUG_SIZE 700#ifndef DEBUG_SIZE
694 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 701 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
695#else 702#else
696 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 703 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
697 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 704 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
698# ifdef SIGWINCH 705# ifdef SIGWINCH
699 else if (cmd_pid) /* force through to the command */ 706 else if (cmd_pid) /* force through to the command */
700 kill (cmd_pid, SIGWINCH); 707 kill (cmd_pid, SIGWINCH);
701# endif 708# endif
702#endif 709#endif
703} 710}
704 711
705/*----------------------------------------------------------------------*/ 712/*----------------------------------------------------------------------*/
706/* rxvt_change_font() - Switch to a new font */ 713/* rxvt_change_font () - Switch to a new font */
707/* 714/*
708 * init = 1 - initialize 715 * init = 1 - initialize
709 * 716 *
710 * fontname == FONT_UP - switch to bigger font 717 * fontname == FONT_UP - switch to bigger font
711 * fontname == FONT_DN - switch to smaller font 718 * fontname == FONT_DN - switch to smaller font
712 */ 719 */
713void 720bool
714rxvt_term::change_font (int init, const char *fontname) 721rxvt_term::change_font (const char *fontname)
715{} 722{
723 if (fontname == FONT_UP)
724 {
725 // TODO
726 }
727 else if (fontname == FONT_DN)
728 {
729 // TODO
730 }
731 else
732 {
733 rxvt_fontset *fs = new rxvt_fontset (this);
716 734
717void 735 if (fs && fs->populate (fontname))
736 {
737 delete TermWin.fontset;
738 TermWin.fontset = fs;
739 TermWin.fwidth = fs->base_font ()->width;
740 TermWin.fheight = fs->base_font ()->height;
741 TermWin.fbase = fs->base_font ()->ascent;
742
743 // TODO: screen needs to be told about new fonts
744
745 if (TermWin.parent[0])
746 {
747 resize_all_windows (0, 0, 0);
748 scr_remap_chars ();
749 scr_touch (true);
750 }
751
752 return true;
753 }
754 }
755
756 return false;
757}
758
759bool
718rxvt_term::font_up_down (int n, int direction) 760rxvt_term::font_up_down (int n, int direction)
719{} 761{
762 return false;
763}
720 764
721/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
722/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
723/* xterm sequences - title, iconName, color (exptl) */ 767/* xterm sequences - title, iconName, color (exptl) */
724void 768void
725rxvt_term::set_title (const char *str) 769rxvt_term::set_title (const char *str)
726{ 770{
727#ifndef SMART_WINDOW_TITLE 771#ifndef SMART_WINDOW_TITLE
728 XStoreName(display->display, TermWin.parent[0], str); 772 XStoreName (display->display, TermWin.parent[0], str);
729#else 773#else
730 char *name; 774 char *name;
731 775
732 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 776 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
733 name = NULL; 777 name = NULL;
734 if (name == NULL || STRCMP(name, str)) 778 if (name == NULL || STRCMP (name, str))
735 XStoreName(display->display, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
736 if (name) 780 if (name)
737 XFree(name); 781 XFree (name);
738#endif 782#endif
739} 783}
740 784
741void 785void
742rxvt_term::set_iconName (const char *str) 786rxvt_term::set_iconName (const char *str)
743{ 787{
744#ifndef SMART_WINDOW_TITLE 788#ifndef SMART_WINDOW_TITLE
745 XSetIconName(display->display, TermWin.parent[0], str); 789 XSetIconName (display->display, TermWin.parent[0], str);
746#else 790#else
747 char *name; 791 char *name;
748 792
749 if (XGetIconName(display->display, TermWin.parent[0], &name)) 793 if (XGetIconName (display->display, TermWin.parent[0], &name))
750 name = NULL; 794 name = NULL;
751 if (name == NULL || STRCMP(name, str)) 795 if (name == NULL || STRCMP (name, str))
752 XSetIconName(display->display, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
753 if (name) 797 if (name)
754 XFree(name); 798 XFree (name);
755#endif 799#endif
756} 800}
757 801
758#ifdef XTERM_COLOR_CHANGE 802#ifdef XTERM_COLOR_CHANGE
759void 803void
… …
764 808
765 if (color == NULL || *color == '\0') 809 if (color == NULL || *color == '\0')
766 return; 810 return;
767 811
768 /* handle color aliases */ 812 /* handle color aliases */
769 if (isdigit(*color)) 813 if (isdigit (*color))
770 { 814 {
771 i = atoi(color); 815 i = atoi (color);
772 if (i >= 8 && i <= 15) 816 if (i >= 8 && i <= 15)
773 { /* bright colors */ 817 { /* bright colors */
774 i -= 8; 818 i -= 8;
775# ifndef NO_BRIGHTCOLOR 819# ifndef NO_BRIGHTCOLOR
776 PixColors[idx] = PixColors[minBrightCOLOR + i]; 820 PixColors[idx] = PixColors[minBrightCOLOR + i];
777 SET_PIXCOLOR(idx); 821 SET_PIXCOLOR (idx);
778 goto Done; 822 goto Done;
779# endif 823# endif
780 824
781 } 825 }
782 if (i >= 0 && i <= 7) 826 if (i >= 0 && i <= 7)
783 { /* normal colors */ 827 { /* normal colors */
784 PixColors[idx] = PixColors[minCOLOR + i]; 828 PixColors[idx] = PixColors[minCOLOR + i];
785 SET_PIXCOLOR(idx); 829 SET_PIXCOLOR (idx);
786 goto Done; 830 goto Done;
787 } 831 }
788 } 832 }
789 if (!rXParseAllocColor (& xcol, color)) 833 if (!rXParseAllocColor (& xcol, color))
790 return; 834 return;
… …
799 if (PixColors[idx] == PixColors[i]) 843 if (PixColors[idx] == PixColors[i])
800 break; 844 break;
801 if (i > Color_White) 845 if (i > Color_White)
802 { 846 {
803 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 847 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
804 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 848 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
805 DisplayPlanes(display->display, display->screen)); 849 DisplayPlanes (display->display, display->screen));
806 } 850 }
807# endif 851# endif
808 852
809 PixColors[idx] = xcol; 853 PixColors[idx] = xcol;
810 SET_PIXCOLOR(idx); 854 SET_PIXCOLOR (idx);
811 855
812 /* XSetWindowAttributes attr; */ 856 /* XSetWindowAttributes attr; */
813 /* Cursor cursor; */ 857 /* Cursor cursor; */
814Done: 858Done:
815 if (idx == Color_bg && !(Options & Opt_transparent)) 859 if (idx == Color_bg && ! (Options & Opt_transparent))
816 XSetWindowBackground(display->display, TermWin.vt, 860 XSetWindowBackground (display->display, TermWin.vt,
817 PixColors[Color_bg]); 861 PixColors[Color_bg]);
818 862
819 /* handle Color_BD, scrollbar background, etc. */ 863 /* handle Color_BD, scrollbar background, etc. */
820 864
821 set_colorfgbg (); 865 set_colorfgbg ();
… …
835 rxvt_color xcol[2]; 879 rxvt_color xcol[2];
836 880
837 xcol[0] = PixColors[Color_pointer]; 881 xcol[0] = PixColors[Color_pointer];
838 xcol[1] = PixColors[Color_bg]; 882 xcol[1] = PixColors[Color_bg];
839 XQueryColors (display->display, XCMAP, xcol, 2); 883 XQueryColors (display->display, XCMAP, xcol, 2);
840 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 884 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
841#endif 885#endif
842} 886}
843 887
844/*----------------------------------------------------------------------*/ 888/*----------------------------------------------------------------------*/
845/* 889/*
… …
848void 892void
849rxvt_term::set_colorfgbg () 893rxvt_term::set_colorfgbg ()
850{ 894{
851 unsigned int i; 895 unsigned int i;
852 const char *xpmb = "\0"; 896 const char *xpmb = "\0";
853 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 897 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
854 898
855 env_colorfgbg = 899 env_colorfgbg =
856 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 900 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
857 STRCPY(fstr, "default"); 901 STRCPY (fstr, "default");
858 STRCPY(bstr, "default"); 902 STRCPY (bstr, "default");
859 for (i = Color_Black; i <= Color_White; i++) 903 for (i = Color_Black; i <= Color_White; i++)
860 if (PixColors[Color_fg] == PixColors[i]) 904 if (PixColors[Color_fg] == PixColors[i])
861 { 905 {
862 sprintf(fstr, "%d", (i - Color_Black)); 906 sprintf (fstr, "%d", (i - Color_Black));
863 break; 907 break;
864 } 908 }
865 for (i = Color_Black; i <= Color_White; i++) 909 for (i = Color_Black; i <= Color_White; i++)
866 if (PixColors[Color_bg] == PixColors[i]) 910 if (PixColors[Color_bg] == PixColors[i])
867 { 911 {
868 sprintf(bstr, "%d", (i - Color_Black)); 912 sprintf (bstr, "%d", (i - Color_Black));
869#ifdef XPM_BACKGROUND 913#ifdef XPM_BACKGROUND
870 xpmb = "default;"; 914 xpmb = "default;";
871#endif 915#endif
872 break; 916 break;
873 } 917 }
918
874 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 919 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
875 putenv(env_colorfgbg);
876 920
877#ifndef NO_BRIGHTCOLOR 921#ifndef NO_BRIGHTCOLOR
878 colorfgbg = DEFAULT_RSTYLE; 922 colorfgbg = DEFAULT_RSTYLE;
879 for (i = minCOLOR; i <= maxCOLOR; i++) 923 for (i = minCOLOR; i <= maxCOLOR; i++)
880 { 924 {
881 if (PixColors[Color_fg] == PixColors[i]) 925 if (PixColors[Color_fg] == PixColors[i])
882 colorfgbg = SET_FGCOLOR(colorfgbg, i); 926 colorfgbg = SET_FGCOLOR (colorfgbg, i);
883 if (PixColors[Color_bg] == PixColors[i]) 927 if (PixColors[Color_bg] == PixColors[i])
884 colorfgbg = SET_BGCOLOR(colorfgbg, i); 928 colorfgbg = SET_BGCOLOR (colorfgbg, i);
885 } 929 }
886#endif 930#endif
887} 931}
888 932
889/*----------------------------------------------------------------------*/ 933/*----------------------------------------------------------------------*/
… …
895int 939int
896rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 940rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
897{ 941{
898 if (!screen_in_out->set (display, colour)) 942 if (!screen_in_out->set (display, colour))
899 { 943 {
900 rxvt_print_error("can't allocate colour: %s", colour); 944 rxvt_print_error ("can't allocate colour: %s", colour);
901 return false; 945 return false;
902 } 946 }
903 947
904 return true; 948 return true;
905} 949}
… …
985 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1029 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
986 1030
987 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1031 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
988 window_vt_y, TermWin_TotalWidth (), 1032 window_vt_y, TermWin_TotalWidth (),
989 TermWin_TotalHeight ()); 1033 TermWin_TotalHeight ());
990#ifdef RXVT_GRAPHICS
991 if (old_height)
992 Gr_Resize (old_width - szHint.base_width,
993 old_height - szHint.base_height);
994#endif
995 scr_clear (); 1034 scr_clear ();
996#ifdef XPM_BACKGROUND 1035#ifdef XPM_BACKGROUND
997 resize_pixmap (); 1036 resize_pixmap ();
998#endif 1037#endif
999 1038
… …
1011 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1050 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1012 curr_screen = scr_change_screen (PRIMARY); 1051 curr_screen = scr_change_screen (PRIMARY);
1013 TermWin.ncol = ncol; 1052 TermWin.ncol = ncol;
1014 } 1053 }
1015 1054
1016 scr_reset(); 1055 scr_reset ();
1017 1056
1018 if (curr_screen >= 0) /* this is not the first time through */ 1057 if (curr_screen >= 0) /* this is not the first time through */
1019 { 1058 {
1020 scr_change_screen (curr_screen); 1059 scr_change_screen (curr_screen);
1021 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1060 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1039{ 1078{
1040 XWindowAttributes wattr; 1079 XWindowAttributes wattr;
1041 1080
1042 if (width == 0 || height == 0) 1081 if (width == 0 || height == 0)
1043 { 1082 {
1044 XGetWindowAttributes(display->display, display->root, &wattr); 1083 XGetWindowAttributes (display->display, display->root, &wattr);
1045 if (width == 0) 1084 if (width == 0)
1046 width = wattr.width - szHint.base_width; 1085 width = wattr.width - szHint.base_width;
1047 if (height == 0) 1086 if (height == 0)
1048 height = wattr.height - szHint.base_height; 1087 height = wattr.height - szHint.base_height;
1049 } 1088 }
… …
1063void 1102void
1064rxvt_term::im_set_size (XRectangle *size) 1103rxvt_term::im_set_size (XRectangle *size)
1065{ 1104{
1066 size->x = TermWin.int_bwidth; 1105 size->x = TermWin.int_bwidth;
1067 size->y = TermWin.int_bwidth; 1106 size->y = TermWin.int_bwidth;
1068 size->width = Width2Pixel(TermWin.ncol); 1107 size->width = Width2Pixel (TermWin.ncol);
1069 size->height = Height2Pixel(TermWin.nrow); 1108 size->height = Height2Pixel (TermWin.nrow);
1070} 1109}
1071 1110
1072void 1111void
1073rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1112rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1074{ 1113{
… …
1084 Atom atom; 1123 Atom atom;
1085 Window win; 1124 Window win;
1086 char server[IMBUFSIZ]; 1125 char server[IMBUFSIZ];
1087 1126
1088 /* get current locale modifier */ 1127 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1128 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1090 { 1129 {
1091 STRCPY(server, "@server="); 1130 STRCPY (server, "@server=");
1092 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1131 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1093 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1132 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1094 *p = '\0'; 1133 *p = '\0';
1095 1134
1096 atom = XInternAtom(display->display, server, False); 1135 atom = XInternAtom (display->display, server, False);
1097 win = XGetSelectionOwner(display->display, atom); 1136 win = XGetSelectionOwner (display->display, atom);
1098 if (win != None) 1137 if (win != None)
1099 return True; 1138 return True;
1100 } 1139 }
1101 return False; 1140 return False;
1102} 1141}
… …
1106{ 1145{
1107 XPoint spot; 1146 XPoint spot;
1108 XVaNestedList preedit_attr; 1147 XVaNestedList preedit_attr;
1109 1148
1110 if (Input_Context == NULL 1149 if (Input_Context == NULL
1111 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1150 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1112 || !(event_type == KeyPress 1151 || ! (event_type == KeyPress
1113 || event_type == Expose 1152 || event_type == Expose
1114 || event_type == NoExpose 1153 || event_type == NoExpose
1115 || event_type == SelectionNotify 1154 || event_type == SelectionNotify
1116 || event_type == ButtonRelease || event_type == FocusIn) 1155 || event_type == ButtonRelease || event_type == FocusIn)
1117 || !IMisRunning ()) 1156 || !IMisRunning ())
1118 return; 1157 return;
1119 1158
1120 im_set_position (&spot); 1159 im_set_position (&spot);
1121 1160
1122 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1161 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1123 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1162 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1124 XFree(preedit_attr); 1163 XFree (preedit_attr);
1125} 1164}
1126 1165
1127void 1166void
1128rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1167rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1129 XRectangle * needed_rect) 1168 XRectangle * needed_rect)
1130{ 1169{
1131 int mbh, vtx = 0; 1170 int mbh, vtx = 0;
1132 1171
1133 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1172 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1134 vtx = scrollbar_TotalWidth(); 1173 vtx = scrollbar_TotalWidth ();
1135 1174
1136 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1175 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1137 mbh -= TermWin.lineSpace; 1176 mbh -= TermWin.lineSpace;
1138 1177
1139 preedit_rect->x = needed_rect->width + vtx; 1178 preedit_rect->x = needed_rect->width + vtx;
1140 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1179 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1141 1180
1142 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1181 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1143 preedit_rect->height = Height2Pixel(1); 1182 preedit_rect->height = Height2Pixel (1);
1144 1183
1145 status_rect->x = vtx; 1184 status_rect->x = vtx;
1146 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1185 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1147 1186
1148 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1187 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1149 status_rect->height = Height2Pixel(1); 1188 status_rect->height = Height2Pixel (1);
1150} 1189}
1151 1190
1152void 1191void
1153rxvt_term::im_destroy () 1192rxvt_term::im_destroy ()
1154{ 1193{
… …
1180 const char *p; 1219 const char *p;
1181 char **s; 1220 char **s;
1182 XIMStyles *xim_styles; 1221 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1222 XVaNestedList preedit_attr, status_attr;
1184 1223
1185 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1224 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1186 return false; 1225 return false;
1187 1226
1188 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1227 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1189 input_method = display->get_xim (locale, modifiers); 1228 input_method = display->get_xim (locale, modifiers);
1190 if (input_method == NULL) 1229 if (input_method == NULL)
1191 return false; 1230 return false;
1192 1231
1193 xim = input_method->xim; 1232 xim = input_method->xim;
… …
1199 display->put_xim (input_method); 1238 display->put_xim (input_method);
1200 return false; 1239 return false;
1201 } 1240 }
1202 1241
1203 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1242 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1204 s = rxvt_splitcommastring(p); 1243 s = rxvt_splitcommastring (p);
1205 for (i = found = 0; !found && s[i]; i++) 1244 for (i = found = 0; !found && s[i]; i++)
1206 { 1245 {
1207 if (!STRCMP(s[i], "OverTheSpot")) 1246 if (!STRCMP (s[i], "OverTheSpot"))
1208 input_style = (XIMPreeditPosition | XIMStatusNothing); 1247 input_style = (XIMPreeditPosition | XIMStatusNothing);
1209 else if (!STRCMP(s[i], "OffTheSpot")) 1248 else if (!STRCMP (s[i], "OffTheSpot"))
1210 input_style = (XIMPreeditArea | XIMStatusArea); 1249 input_style = (XIMPreeditArea | XIMStatusArea);
1211 else if (!STRCMP(s[i], "Root")) 1250 else if (!STRCMP (s[i], "Root"))
1212 input_style = (XIMPreeditNothing | XIMStatusNothing); 1251 input_style = (XIMPreeditNothing | XIMStatusNothing);
1213 1252
1214 for (j = 0; j < xim_styles->count_styles; j++) 1253 for (j = 0; j < xim_styles->count_styles; j++)
1215 if (input_style == xim_styles->supported_styles[j]) 1254 if (input_style == xim_styles->supported_styles[j])
1216 { 1255 {
… …
1237 { 1276 {
1238 im_set_size (&rect); 1277 im_set_size (&rect);
1239 im_set_position (&spot); 1278 im_set_position (&spot);
1240 im_set_color (&fg, &bg); 1279 im_set_color (&fg, &bg);
1241 1280
1242 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1281 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1243 XNSpotLocation, &spot, 1282 XNSpotLocation, &spot,
1244 XNForeground, fg, XNBackground, bg, 1283 XNForeground, fg, XNBackground, bg,
1245 //XNFontSet, TermWin.fontset, 1284 //XNFontSet, TermWin.fontset,
1246 NULL); 1285 NULL);
1247 } 1286 }
… …
1255 */ 1294 */
1256 needed_rect.width = 0; 1295 needed_rect.width = 0;
1257 1296
1258 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1297 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1259 1298
1260 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1299 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1261 XNForeground, fg, XNBackground, bg, 1300 XNForeground, fg, XNBackground, bg,
1262 //XNFontSet, TermWin.fontset, 1301 //XNFontSet, TermWin.fontset,
1263 NULL); 1302 NULL);
1264 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1303 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1265 XNForeground, fg, XNBackground, bg, 1304 XNForeground, fg, XNBackground, bg,
1266 //XNFontSet, TermWin.fontset, 1305 //XNFontSet, TermWin.fontset,
1267 NULL); 1306 NULL);
1268 } 1307 }
1269 1308
1270 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1309 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1271 XNClientWindow, TermWin.parent[0], 1310 XNClientWindow, TermWin.parent[0],
1272 XNFocusWindow, TermWin.parent[0], 1311 XNFocusWindow, TermWin.parent[0],
1273 preedit_attr ? XNPreeditAttributes : NULL, 1312 preedit_attr ? XNPreeditAttributes : NULL,
1274 preedit_attr, 1313 preedit_attr,
1275 status_attr ? XNStatusAttributes : NULL, 1314 status_attr ? XNStatusAttributes : NULL,
1276 status_attr, NULL); 1315 status_attr, NULL);
1277 if (preedit_attr) XFree(preedit_attr); 1316 if (preedit_attr) XFree (preedit_attr);
1278 if (status_attr) XFree(status_attr); 1317 if (status_attr) XFree (status_attr);
1279 1318
1280 if (Input_Context == NULL) 1319 if (Input_Context == NULL)
1281 { 1320 {
1282 rxvt_print_error("failed to create input context"); 1321 rxvt_print_error ("failed to create input context");
1283 display->put_xim (input_method); 1322 display->put_xim (input_method);
1284 return false; 1323 return false;
1285 } 1324 }
1286 1325
1287 if (input_style & XIMPreeditArea) 1326 if (input_style & XIMPreeditArea)
1288 IMSetStatusPosition (); 1327 IMSetStatusPosition ();
1289 1328
1290 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1329 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1291 return true; 1330 return true;
1292} 1331}
1293 1332
1294void 1333void
1295rxvt_term::im_cb () 1334rxvt_term::im_cb ()
… …
1299 char **s; 1338 char **s;
1300 char buf[IMBUFSIZ]; 1339 char buf[IMBUFSIZ];
1301 1340
1302 im_destroy (); 1341 im_destroy ();
1303 1342
1304 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1343 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1305 if (Input_Context) 1344 if (Input_Context)
1306 return; 1345 return;
1307 1346
1308#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1347#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1309 if (rs[Rs_imLocale]) 1348 if (rs[Rs_imLocale])
1310 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1349 SET_LOCALE (rs[Rs_imLocale]);
1311#endif 1350#endif
1312 1351
1313 p = rs[Rs_inputMethod]; 1352 p = rs[Rs_inputMethod];
1314 if (p && *p) 1353 if (p && *p)
1315 { 1354 {
… …
1328 break; 1367 break;
1329 } 1368 }
1330 } 1369 }
1331 } 1370 }
1332 for (i = 0; s[i]; i++) 1371 for (i = 0; s[i]; i++)
1333 free(s[i]); 1372 free (s[i]);
1334 free(s); 1373 free (s);
1335 1374
1336 if (found) 1375 if (found)
1337 goto done; 1376 goto done;
1338 } 1377 }
1339 1378
… …
1346 goto done; 1385 goto done;
1347 1386
1348done: 1387done:
1349#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1388#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1350 if (rs[Rs_imLocale]) 1389 if (rs[Rs_imLocale])
1351 setlocale (LC_CTYPE, locale); 1390 SET_LOCALE (locale);
1352#endif 1391#endif
1353} 1392}
1354 1393
1355void 1394void
1356rxvt_term::IMSetStatusPosition () 1395rxvt_term::IMSetStatusPosition ()
1357{ 1396{
1358 XRectangle preedit_rect, status_rect, *needed_rect; 1397 XRectangle preedit_rect, status_rect, *needed_rect;
1359 XVaNestedList preedit_attr, status_attr; 1398 XVaNestedList preedit_attr, status_attr;
1360 1399
1361 if (Input_Context == NULL 1400 if (Input_Context == NULL
1362 || !TermWin.focus || !(input_style & XIMPreeditArea) 1401 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1363 || !IMisRunning ()) 1402 || !IMisRunning ())
1364 return; 1403 return;
1365 1404
1366 /* Getting the necessary width of preedit area */ 1405 /* Getting the necessary width of preedit area */
1367 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1406 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1368 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1407 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1369 XFree(status_attr); 1408 XFree (status_attr);
1370 1409
1371 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1410 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1372 1411
1373 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1412 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1374 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1375 1414
1376 XSetICValues(Input_Context, 1415 XSetICValues (Input_Context,
1377 XNPreeditAttributes, preedit_attr, 1416 XNPreeditAttributes, preedit_attr,
1378 XNStatusAttributes, status_attr, NULL); 1417 XNStatusAttributes, status_attr, NULL);
1379 1418
1380 XFree(preedit_attr); 1419 XFree (preedit_attr);
1381 XFree(status_attr); 1420 XFree (status_attr);
1382} 1421}
1383#endif /* USE_XIM */ 1422#endif /* USE_XIM */
1384 1423
1385/*----------------------------------------------------------------------*/ 1424/*----------------------------------------------------------------------*/
1386rxvt_t rxvt_current_term; 1425rxvt_t rxvt_current_term;

Diff Legend

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