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

Diff Legend

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