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.48 by pcg, Wed Mar 3 04:07:52 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
336rxvt_xerror_handler (Display *display, XErrorEvent *event) 350rxvt_xerror_handler (Display *display, XErrorEvent *event)
… …
353 */ 367 */
354/* EXTPROTO */ 368/* EXTPROTO */
355void 369void
356rxvt_clean_exit () 370rxvt_clean_exit ()
357{ 371{
372 // TODO: rxvtd should clean up all ressources
373 if (GET_R)
358 GET_R->destroy (); 374 GET_R->destroy ();
359} 375}
360 376
361/* ------------------------------------------------------------------------- * 377/* ------------------------------------------------------------------------- *
362 * MEMORY ALLOCATION WRAPPERS * 378 * MEMORY ALLOCATION WRAPPERS *
363 * ------------------------------------------------------------------------- */ 379 * ------------------------------------------------------------------------- */
364/* EXTPROTO */ 380/* EXTPROTO */
365void * 381void *
366rxvt_malloc(size_t size) 382rxvt_malloc (size_t size)
367{ 383{
368 void *p; 384 void *p;
369 385
370 p = malloc(size); 386 p = malloc (size);
371 if (p) 387 if (p)
372 return p; 388 return p;
373 389
374 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 390 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
375 rxvt_clean_exit(); 391 rxvt_clean_exit ();
376 exit(EXIT_FAILURE); 392 exit (EXIT_FAILURE);
377 /* NOTREACHED */ 393 /* NOTREACHED */
378} 394}
379 395
380/* EXTPROTO */ 396/* EXTPROTO */
381void * 397void *
382rxvt_calloc(size_t number, size_t size) 398rxvt_calloc (size_t number, size_t size)
383{ 399{
384 void *p; 400 void *p;
385 401
386 p = calloc(number, size); 402 p = calloc (number, size);
387 if (p) 403 if (p)
388 return p; 404 return p;
389 405
390 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 406 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
391 rxvt_clean_exit(); 407 rxvt_clean_exit ();
392 exit(EXIT_FAILURE); 408 exit (EXIT_FAILURE);
393 /* NOTREACHED */ 409 /* NOTREACHED */
394} 410}
395 411
396/* EXTPROTO */ 412/* EXTPROTO */
397void * 413void *
398rxvt_realloc(void *ptr, size_t size) 414rxvt_realloc (void *ptr, size_t size)
399{ 415{
400 void *p; 416 void *p;
401 417
402 if (ptr) 418 if (ptr)
403 p = realloc(ptr, size); 419 p = realloc (ptr, size);
404 else 420 else
405 p = malloc(size); 421 p = malloc (size);
406 if (p) 422 if (p)
407 return p; 423 return p;
408 424
409 fprintf(stderr, APL_NAME ": memory allocation failure. Aborting"); 425 fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
410 rxvt_clean_exit(); 426 rxvt_clean_exit ();
411 exit(EXIT_FAILURE); 427 exit (EXIT_FAILURE);
412 /* NOTREACHED */ 428 /* NOTREACHED */
413} 429}
414 430
415/* ------------------------------------------------------------------------- * 431/* ------------------------------------------------------------------------- *
416 * PRIVILEGED OPERATIONS * 432 * PRIVILEGED OPERATIONS *
… …
419void 435void
420rxvt_term::privileges (int mode) 436rxvt_term::privileges (int mode)
421{ 437{
422#if ! defined(__CYGWIN32__) 438#if ! defined(__CYGWIN32__)
423# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 439# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
424 /* setreuid() is the poor man's setuid(), seteuid() */ 440 /* setreuid () is the poor man's setuid (), seteuid () */
425# define seteuid(a) setreuid(-1, (a)) 441# define seteuid(a) setreuid(-1, (a))
426# define setegid(a) setregid(-1, (a)) 442# define setegid(a) setregid(-1, (a))
427# define HAVE_SETEUID 443# define HAVE_SETEUID
428# endif 444# endif
429# ifdef HAVE_SETEUID 445# ifdef HAVE_SETEUID
… …
432 case IGNORE: 448 case IGNORE:
433 /* 449 /*
434 * 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
435 * back to root later, as required 451 * back to root later, as required
436 */ 452 */
437 seteuid(getuid()); 453 seteuid (getuid ());
438 setegid(getgid()); 454 setegid (getgid ());
439 break; 455 break;
440 case SAVE: 456 case SAVE:
441 euid = geteuid(); 457 euid = geteuid ();
442 egid = getegid(); 458 egid = getegid ();
443 break; 459 break;
444 case RESTORE: 460 case RESTORE:
445 seteuid(euid); 461 seteuid (euid);
446 setegid(egid); 462 setegid (egid);
447 break; 463 break;
448 } 464 }
449# else 465# else
450 switch (mode) 466 switch (mode)
451 { 467 {
452 case IGNORE: 468 case IGNORE:
453 setuid(getuid()); 469 setuid (getuid ());
454 setgid(getgid()); 470 setgid (getgid ());
455 /* FALLTHROUGH */ 471 /* FALLTHROUGH */
456 case SAVE: 472 case SAVE:
457 /* FALLTHROUGH */ 473 /* FALLTHROUGH */
458 case RESTORE: 474 case RESTORE:
459 break; 475 break;
… …
464 480
465#ifdef UTMP_SUPPORT 481#ifdef UTMP_SUPPORT
466void 482void
467rxvt_term::privileged_utmp (char action) 483rxvt_term::privileged_utmp (char action)
468{ 484{
469 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)",
470 action, next_utmp_action, getpid())); 486 action, next_utmp_action, getpid ()));
471 if (next_utmp_action != action || (action != SAVE && action != RESTORE) 487 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
472 || (Options & Opt_utmpInhibit) 488 || (Options & Opt_utmpInhibit)
473 || ttydev == NULL || *ttydev == '\0') 489 || ttydev == NULL || *ttydev == '\0')
474 return; 490 return;
475 491
… …
490 506
491#ifndef NO_SETOWNER_TTYDEV 507#ifndef NO_SETOWNER_TTYDEV
492void 508void
493rxvt_term::privileged_ttydev (char action) 509rxvt_term::privileged_ttydev (char action)
494{ 510{
495 D_MAIN((stderr, 511 D_MAIN ((stderr,
496 "privileged_ttydev (%c); waiting for: %c (pid: %d)", 512 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
497 action, next_tty_action, getpid())); 513 action, next_tty_action, getpid ()));
498 if (next_tty_action != action || (action != SAVE && action != RESTORE) 514 if (next_tty_action != action || (action != SAVE && action != RESTORE)
499 || ttydev == NULL || *ttydev == '\0') 515 || ttydev == NULL || *ttydev == '\0')
500 return; 516 return;
501 517
502 privileges (RESTORE); 518 privileges (RESTORE);
503 519
504 if (action == SAVE) 520 if (action == SAVE)
505 { 521 {
506 next_tty_action = RESTORE; 522 next_tty_action = RESTORE;
507# ifndef RESET_TTY_TO_COMMON_DEFAULTS 523# ifndef RESET_TTY_TO_COMMON_DEFAULTS
508 /* 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 */
509 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */ 525 if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
510 next_tty_action = IGNORE; 526 next_tty_action = IGNORE;
511 else 527 else
512# endif 528# endif
513 529
514 { 530 {
515 chown(ttydev, getuid(), ttygid); /* fail silently */ 531 chown (ttydev, getuid (), ttygid); /* fail silently */
516 chmod(ttydev, ttymode); 532 chmod (ttydev, ttymode);
517# ifdef HAVE_REVOKE 533# ifdef HAVE_REVOKE
518 revoke(ttydev); 534 revoke (ttydev);
519# endif 535# endif
520 536
521 } 537 }
522 } 538 }
523 else 539 else
524 { /* action == RESTORE */ 540 { /* action == RESTORE */
525 next_tty_action = IGNORE; 541 next_tty_action = IGNORE;
526# ifndef RESET_TTY_TO_COMMON_DEFAULTS 542# ifndef RESET_TTY_TO_COMMON_DEFAULTS
527 chmod(ttydev, ttyfd_stat.st_mode); 543 chmod (ttydev, ttyfd_stat.st_mode);
528 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid); 544 chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
529# else 545# else
530 chmod(ttydev, 546 chmod (ttydev,
531 (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));
532 chown(ttydev, 0, 0); 548 chown (ttydev, 0, 0);
533# endif 549# endif
534 550
535 } 551 }
536 552
537 privileges (IGNORE); 553 privileges (IGNORE);
538 554
539# ifndef RESET_TTY_TO_COMMON_DEFAULTS 555# ifndef RESET_TTY_TO_COMMON_DEFAULTS
540 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 556 D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
541 action == RESTORE ? "Restoring" : (action == 557 action == RESTORE ? "Restoring" : (action ==
542 SAVE ? "Saving" : 558 SAVE ? "Saving" :
543 "UNKNOWN ERROR for"), ttydev, 559 "UNKNOWN ERROR for"), ttydev,
544 ttyfd_stat.st_mode, ttyfd_stat.st_uid, 560 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
545 ttyfd_stat.st_gid)); 561 ttyfd_stat.st_gid));
… …
558 short recalc_x, recalc_y; 574 short recalc_x, recalc_y;
559 int x, y, sb_w, mb_h, flags; 575 int x, y, sb_w, mb_h, flags;
560 unsigned int w, h; 576 unsigned int w, h;
561 unsigned int max_width, max_height; 577 unsigned int max_width, max_height;
562 578
563 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",
564 TermWin.ncol, TermWin.nrow, szHint.width, 580 TermWin.ncol, TermWin.nrow, szHint.width,
565 szHint.height)); 581 szHint.height));
566 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 582 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
567 szHint.win_gravity = NorthWestGravity; 583 szHint.win_gravity = NorthWestGravity;
568 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */ 584 /* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
… …
571 flags = 0; 587 flags = 0;
572 if (!parsed_geometry) 588 if (!parsed_geometry)
573 { 589 {
574 parsed_geometry = 1; 590 parsed_geometry = 1;
575 if (rs[Rs_geometry]) 591 if (rs[Rs_geometry])
576 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h); 592 flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
577 if (flags & WidthValue) 593 if (flags & WidthValue)
578 { 594 {
579 TermWin.ncol = BOUND_POSITIVE_INT16(w); 595 TermWin.ncol = BOUND_POSITIVE_INT16 (w);
580 szHint.flags |= USSize; 596 szHint.flags |= USSize;
581 } 597 }
582 if (flags & HeightValue) 598 if (flags & HeightValue)
583 { 599 {
584 TermWin.nrow = BOUND_POSITIVE_INT16(h); 600 TermWin.nrow = BOUND_POSITIVE_INT16 (h);
585 szHint.flags |= USSize; 601 szHint.flags |= USSize;
586 } 602 }
587 if (flags & XValue) 603 if (flags & XValue)
588 { 604 {
589 szHint.x = x; 605 szHint.x = x;
… …
618 634
619 sb_w = mb_h = 0; 635 sb_w = mb_h = 0;
620 window_vt_x = window_vt_y = 0; 636 window_vt_x = window_vt_y = 0;
621 if (scrollbar_visible ()) 637 if (scrollbar_visible ())
622 { 638 {
623 sb_w = scrollbar_TotalWidth(); 639 sb_w = scrollbar_TotalWidth ();
624 szHint.base_width += sb_w; 640 szHint.base_width += sb_w;
625 if (!(Options & Opt_scrollBar_right)) 641 if (! (Options & Opt_scrollBar_right))
626 window_vt_x = sb_w; 642 window_vt_x = sb_w;
627 } 643 }
628 if (menubar_visible ()) 644 if (menubar_visible ())
629 { 645 {
630 mb_h = menuBar_TotalHeight(); 646 mb_h = menuBar_TotalHeight ();
631 szHint.base_height += mb_h; 647 szHint.base_height += mb_h;
632 window_vt_y = mb_h; 648 window_vt_y = mb_h;
633 } 649 }
634 szHint.width_inc = TermWin.fwidth; 650 szHint.width_inc = TermWin.fwidth;
635 szHint.height_inc = TermWin.fheight; 651 szHint.height_inc = TermWin.fheight;
… …
641 szHint.width = width; 657 szHint.width = width;
642 TermWin.width = width - szHint.base_width; 658 TermWin.width = width - szHint.base_width;
643 } 659 }
644 else 660 else
645 { 661 {
646 MIN_IT(TermWin.width, max_width); 662 MIN_IT (TermWin.width, max_width);
647 szHint.width = szHint.base_width + TermWin.width; 663 szHint.width = szHint.base_width + TermWin.width;
648 } 664 }
649 if (height && height - szHint.base_height < max_height) 665 if (height && height - szHint.base_height < max_height)
650 { 666 {
651 szHint.height = height; 667 szHint.height = height;
652 TermWin.height = height - szHint.base_height; 668 TermWin.height = height - szHint.base_height;
653 } 669 }
654 else 670 else
655 { 671 {
656 MIN_IT(TermWin.height, max_height); 672 MIN_IT (TermWin.height, max_height);
657 szHint.height = szHint.base_height + TermWin.height; 673 szHint.height = szHint.base_height + TermWin.height;
658 } 674 }
659 if (scrollbar_visible () && (Options & Opt_scrollBar_right)) 675 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
660 window_sb_x = szHint.width - sb_w; 676 window_sb_x = szHint.width - sb_w;
661 677
… …
666 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display)) 682 szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))
667 - szHint.height - 2 * TermWin.ext_bwidth); 683 - szHint.height - 2 * TermWin.ext_bwidth);
668 684
669 TermWin.ncol = TermWin.width / TermWin.fwidth; 685 TermWin.ncol = TermWin.width / TermWin.fwidth;
670 TermWin.nrow = TermWin.height / TermWin.fheight; 686 TermWin.nrow = TermWin.height / TermWin.fheight;
671 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",
672 TermWin.ncol, TermWin.nrow, szHint.width, 688 TermWin.ncol, TermWin.nrow, szHint.width,
673 szHint.height)); 689 szHint.height));
674 return; 690 return;
675} 691}
676 692
… …
692 ws.ws_xpixel = ws.ws_ypixel = 0; 708 ws.ws_xpixel = ws.ws_ypixel = 0;
693#ifndef DEBUG_SIZE 709#ifndef DEBUG_SIZE
694 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws); 710 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
695#else 711#else
696 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0) 712 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
697 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 713 D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
698# ifdef SIGWINCH 714# ifdef SIGWINCH
699 else if (cmd_pid) /* force through to the command */ 715 else if (cmd_pid) /* force through to the command */
700 kill (cmd_pid, SIGWINCH); 716 kill (cmd_pid, SIGWINCH);
701# endif 717# endif
702#endif 718#endif
703} 719}
704 720
705/*----------------------------------------------------------------------*/ 721/*----------------------------------------------------------------------*/
706/* rxvt_change_font() - Switch to a new font */ 722/* rxvt_change_font () - Switch to a new font */
707/* 723/*
708 * init = 1 - initialize 724 * init = 1 - initialize
709 * 725 *
710 * fontname == FONT_UP - switch to bigger font 726 * fontname == FONT_UP - switch to bigger font
711 * fontname == FONT_DN - switch to smaller font 727 * fontname == FONT_DN - switch to smaller font
712 */ 728 */
713void 729bool
714rxvt_term::change_font (int init, const char *fontname) 730rxvt_term::change_font (const char *fontname)
715{} 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);
716 743
717void 744 if (fs && fs->populate (fontname ? fontname : "fixed"))
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 if (TermWin.parent[0])
753 {
754 resize_all_windows (0, 0, 0);
755 scr_remap_chars ();
756 scr_touch (true);
757 }
758
759 return true;
760 }
761 }
762
763 return false;
764}
765
766bool
718rxvt_term::font_up_down (int n, int direction) 767rxvt_term::font_up_down (int n, int direction)
719{} 768{
769 return false;
770}
720 771
721/*----------------------------------------------------------------------*/ 772/*----------------------------------------------------------------------*/
722/*----------------------------------------------------------------------*/ 773/*----------------------------------------------------------------------*/
723/* xterm sequences - title, iconName, color (exptl) */ 774/* xterm sequences - title, iconName, color (exptl) */
724void 775void
725rxvt_term::set_title (const char *str) 776rxvt_term::set_title (const char *str)
726{ 777{
727#ifndef SMART_WINDOW_TITLE 778#ifndef SMART_WINDOW_TITLE
728 XStoreName(display->display, TermWin.parent[0], str); 779 XStoreName (display->display, TermWin.parent[0], str);
729#else 780#else
730 char *name; 781 char *name;
731 782
732 if (XFetchName(display->display, TermWin.parent[0], &name) == 0) 783 if (XFetchName (display->display, TermWin.parent[0], &name) == 0)
733 name = NULL; 784 name = NULL;
734 if (name == NULL || STRCMP(name, str)) 785 if (name == NULL || STRCMP (name, str))
735 XStoreName(display->display, TermWin.parent[0], str); 786 XStoreName (display->display, TermWin.parent[0], str);
736 if (name) 787 if (name)
737 XFree(name); 788 XFree (name);
738#endif 789#endif
739} 790}
740 791
741void 792void
742rxvt_term::set_iconName (const char *str) 793rxvt_term::set_iconName (const char *str)
743{ 794{
744#ifndef SMART_WINDOW_TITLE 795#ifndef SMART_WINDOW_TITLE
745 XSetIconName(display->display, TermWin.parent[0], str); 796 XSetIconName (display->display, TermWin.parent[0], str);
746#else 797#else
747 char *name; 798 char *name;
748 799
749 if (XGetIconName(display->display, TermWin.parent[0], &name)) 800 if (XGetIconName (display->display, TermWin.parent[0], &name))
750 name = NULL; 801 name = NULL;
751 if (name == NULL || STRCMP(name, str)) 802 if (name == NULL || STRCMP (name, str))
752 XSetIconName(display->display, TermWin.parent[0], str); 803 XSetIconName (display->display, TermWin.parent[0], str);
753 if (name) 804 if (name)
754 XFree(name); 805 XFree (name);
755#endif 806#endif
756} 807}
757 808
758#ifdef XTERM_COLOR_CHANGE 809#ifdef XTERM_COLOR_CHANGE
759void 810void
760rxvt_term::set_window_color (int idx, const char *color) 811rxvt_term::set_window_color (int idx, const char *color)
761{ 812{
762 rxvt_color xcol; 813 rxvt_color xcol;
763 int i; 814 int i;
764 815
765 if (color == NULL || *color == '\0') 816 if (color == NULL || *color == '\0')
766 return; 817 return;
767 818
768 /* handle color aliases */ 819 /* handle color aliases */
769 if (isdigit(*color)) 820 if (isdigit (*color))
770 { 821 {
771 i = atoi(color); 822 i = atoi (color);
772 if (i >= 8 && i <= 15) 823 if (i >= 8 && i <= 15)
773 { /* bright colors */ 824 { /* bright colors */
774 i -= 8; 825 i -= 8;
775# ifndef NO_BRIGHTCOLOR 826# ifndef NO_BRIGHTCOLOR
776 PixColors[idx] = PixColors[minBrightCOLOR + i]; 827 PixColors[idx] = PixColors[minBrightCOLOR + i];
777 SET_PIXCOLOR(idx); 828 SET_PIXCOLOR (idx);
778 goto Done; 829 goto Done;
779# endif 830# endif
780 831
781 } 832 }
782 if (i >= 0 && i <= 7) 833 if (i >= 0 && i <= 7)
783 { /* normal colors */ 834 { /* normal colors */
784 PixColors[idx] = PixColors[minCOLOR + i]; 835 PixColors[idx] = PixColors[minCOLOR + i];
785 SET_PIXCOLOR(idx); 836 SET_PIXCOLOR (idx);
786 goto Done; 837 goto Done;
787 } 838 }
788 } 839 }
789 if (!rXParseAllocColor (& xcol, color)) 840 if (!rXParseAllocColor (& xcol, color))
790 return; 841 return;
… …
799 if (PixColors[idx] == PixColors[i]) 850 if (PixColors[idx] == PixColors[i])
800 break; 851 break;
801 if (i > Color_White) 852 if (i > Color_White)
802 { 853 {
803 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */ 854 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
804 XFreeColors(display->display, XCMAP, (PixColors + idx), 1, 855 XFreeColors (display->display, XCMAP, (PixColors + idx), 1,
805 DisplayPlanes(display->display, display->screen)); 856 DisplayPlanes (display->display, display->screen));
806 } 857 }
807# endif 858# endif
808 859
809 PixColors[idx] = xcol; 860 PixColors[idx] = xcol;
810 SET_PIXCOLOR(idx); 861 SET_PIXCOLOR (idx);
811 862
812 /* XSetWindowAttributes attr; */ 863 /* XSetWindowAttributes attr; */
813 /* Cursor cursor; */ 864 /* Cursor cursor; */
814Done: 865Done:
815 if (idx == Color_bg && !(Options & Opt_transparent)) 866 if (idx == Color_bg && ! (Options & Opt_transparent))
816 XSetWindowBackground(display->display, TermWin.vt, 867 XSetWindowBackground (display->display, TermWin.vt,
817 PixColors[Color_bg]); 868 PixColors[Color_bg]);
818 869
819 /* handle Color_BD, scrollbar background, etc. */ 870 /* handle Color_BD, scrollbar background, etc. */
820 871
821 set_colorfgbg (); 872 set_colorfgbg ();
… …
835 rxvt_color xcol[2]; 886 rxvt_color xcol[2];
836 887
837 xcol[0] = PixColors[Color_pointer]; 888 xcol[0] = PixColors[Color_pointer];
838 xcol[1] = PixColors[Color_bg]; 889 xcol[1] = PixColors[Color_bg];
839 XQueryColors (display->display, XCMAP, xcol, 2); 890 XQueryColors (display->display, XCMAP, xcol, 2);
840 XRecolorCursor (display->display, TermWin_cursor, &(xcol[0]), &(xcol[1])); 891 XRecolorCursor (display->display, TermWin_cursor, & (xcol[0]), & (xcol[1]));
841#endif 892#endif
842} 893}
843 894
844/*----------------------------------------------------------------------*/ 895/*----------------------------------------------------------------------*/
845/* 896/*
… …
848void 899void
849rxvt_term::set_colorfgbg () 900rxvt_term::set_colorfgbg ()
850{ 901{
851 unsigned int i; 902 unsigned int i;
852 const char *xpmb = "\0"; 903 const char *xpmb = "\0";
853 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 904 char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
854 905
855 env_colorfgbg = 906 env_colorfgbg =
856 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 907 (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
857 STRCPY(fstr, "default"); 908 STRCPY (fstr, "default");
858 STRCPY(bstr, "default"); 909 STRCPY (bstr, "default");
859 for (i = Color_Black; i <= Color_White; i++) 910 for (i = Color_Black; i <= Color_White; i++)
860 if (PixColors[Color_fg] == PixColors[i]) 911 if (PixColors[Color_fg] == PixColors[i])
861 { 912 {
862 sprintf(fstr, "%d", (i - Color_Black)); 913 sprintf (fstr, "%d", (i - Color_Black));
863 break; 914 break;
864 } 915 }
865 for (i = Color_Black; i <= Color_White; i++) 916 for (i = Color_Black; i <= Color_White; i++)
866 if (PixColors[Color_bg] == PixColors[i]) 917 if (PixColors[Color_bg] == PixColors[i])
867 { 918 {
868 sprintf(bstr, "%d", (i - Color_Black)); 919 sprintf (bstr, "%d", (i - Color_Black));
869#ifdef XPM_BACKGROUND 920#ifdef XPM_BACKGROUND
870 xpmb = "default;"; 921 xpmb = "default;";
871#endif 922#endif
872 break; 923 break;
873 } 924 }
925
874 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 926 sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
875 putenv(env_colorfgbg);
876 927
877#ifndef NO_BRIGHTCOLOR 928#ifndef NO_BRIGHTCOLOR
878 colorfgbg = DEFAULT_RSTYLE; 929 colorfgbg = DEFAULT_RSTYLE;
879 for (i = minCOLOR; i <= maxCOLOR; i++) 930 for (i = minCOLOR; i <= maxCOLOR; i++)
880 { 931 {
881 if (PixColors[Color_fg] == PixColors[i]) 932 if (PixColors[Color_fg] == PixColors[i])
882 colorfgbg = SET_FGCOLOR(colorfgbg, i); 933 colorfgbg = SET_FGCOLOR (colorfgbg, i);
883 if (PixColors[Color_bg] == PixColors[i]) 934 if (PixColors[Color_bg] == PixColors[i])
884 colorfgbg = SET_BGCOLOR(colorfgbg, i); 935 colorfgbg = SET_BGCOLOR (colorfgbg, i);
885 } 936 }
886#endif 937#endif
887} 938}
888 939
889/*----------------------------------------------------------------------*/ 940/*----------------------------------------------------------------------*/
… …
895int 946int
896rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour) 947rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
897{ 948{
898 if (!screen_in_out->set (display, colour)) 949 if (!screen_in_out->set (display, colour))
899 { 950 {
900 rxvt_print_error("can't allocate colour: %s", colour); 951 rxvt_print_error ("can't allocate colour: %s", colour);
901 return false; 952 return false;
902 } 953 }
903 954
904 return true; 955 return true;
905} 956}
… …
985 0, TermWin_TotalWidth (), menuBar_TotalHeight ()); 1036 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
986 1037
987 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x, 1038 XMoveResizeWindow (display->display, TermWin.vt, window_vt_x,
988 window_vt_y, TermWin_TotalWidth (), 1039 window_vt_y, TermWin_TotalWidth (),
989 TermWin_TotalHeight ()); 1040 TermWin_TotalHeight ());
990#ifdef RXVT_GRAPHICS 1041 scr_clear (height != old_height);
991 if (old_height)
992 Gr_Resize (old_width - szHint.base_width,
993 old_height - szHint.base_height);
994#endif
995 scr_clear ();
996#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
997 resize_pixmap (); 1043 resize_pixmap ();
998#endif 1044#endif
999 1045
1000 } 1046 }
… …
1011 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 1057 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1012 curr_screen = scr_change_screen (PRIMARY); 1058 curr_screen = scr_change_screen (PRIMARY);
1013 TermWin.ncol = ncol; 1059 TermWin.ncol = ncol;
1014 } 1060 }
1015 1061
1016 scr_reset(); 1062 scr_reset ();
1017 1063
1018 if (curr_screen >= 0) /* this is not the first time through */ 1064 if (curr_screen >= 0) /* this is not the first time through */
1019 { 1065 {
1020 scr_change_screen (curr_screen); 1066 scr_change_screen (curr_screen);
1021 selection_check (old_ncol != TermWin.ncol ? 4 : 0); 1067 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
… …
1039{ 1085{
1040 XWindowAttributes wattr; 1086 XWindowAttributes wattr;
1041 1087
1042 if (width == 0 || height == 0) 1088 if (width == 0 || height == 0)
1043 { 1089 {
1044 XGetWindowAttributes(display->display, display->root, &wattr); 1090 XGetWindowAttributes (display->display, display->root, &wattr);
1045 if (width == 0) 1091 if (width == 0)
1046 width = wattr.width - szHint.base_width; 1092 width = wattr.width - szHint.base_width;
1047 if (height == 0) 1093 if (height == 0)
1048 height = wattr.height - szHint.base_height; 1094 height = wattr.height - szHint.base_height;
1049 } 1095 }
… …
1063void 1109void
1064rxvt_term::im_set_size (XRectangle *size) 1110rxvt_term::im_set_size (XRectangle *size)
1065{ 1111{
1066 size->x = TermWin.int_bwidth; 1112 size->x = TermWin.int_bwidth;
1067 size->y = TermWin.int_bwidth; 1113 size->y = TermWin.int_bwidth;
1068 size->width = Width2Pixel(TermWin.ncol); 1114 size->width = Width2Pixel (TermWin.ncol);
1069 size->height = Height2Pixel(TermWin.nrow); 1115 size->height = Height2Pixel (TermWin.nrow);
1070} 1116}
1071 1117
1072void 1118void
1073rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg) 1119rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)
1074{ 1120{
… …
1084 Atom atom; 1130 Atom atom;
1085 Window win; 1131 Window win;
1086 char server[IMBUFSIZ]; 1132 char server[IMBUFSIZ];
1087 1133
1088 /* get current locale modifier */ 1134 /* get current locale modifier */
1089 if ((p = XSetLocaleModifiers(NULL)) != NULL) 1135 if ((p = XSetLocaleModifiers (NULL)) != NULL)
1090 { 1136 {
1091 STRCPY(server, "@server="); 1137 STRCPY (server, "@server=");
1092 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1138 STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1093 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1139 if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */
1094 *p = '\0'; 1140 *p = '\0';
1095 1141
1096 atom = XInternAtom(display->display, server, False); 1142 atom = XInternAtom (display->display, server, False);
1097 win = XGetSelectionOwner(display->display, atom); 1143 win = XGetSelectionOwner (display->display, atom);
1098 if (win != None) 1144 if (win != None)
1099 return True; 1145 return True;
1100 } 1146 }
1101 return False; 1147 return False;
1102} 1148}
… …
1106{ 1152{
1107 XPoint spot; 1153 XPoint spot;
1108 XVaNestedList preedit_attr; 1154 XVaNestedList preedit_attr;
1109 1155
1110 if (Input_Context == NULL 1156 if (Input_Context == NULL
1111 || !TermWin.focus || !(input_style & XIMPreeditPosition) 1157 || !TermWin.focus || ! (input_style & XIMPreeditPosition)
1112 || !(event_type == KeyPress 1158 || ! (event_type == KeyPress
1113 || event_type == Expose 1159 || event_type == Expose
1114 || event_type == NoExpose 1160 || event_type == NoExpose
1115 || event_type == SelectionNotify 1161 || event_type == SelectionNotify
1116 || event_type == ButtonRelease || event_type == FocusIn) 1162 || event_type == ButtonRelease || event_type == FocusIn)
1117 || !IMisRunning ()) 1163 || !IMisRunning ())
1118 return; 1164 return;
1119 1165
1120 im_set_position (&spot); 1166 im_set_position (&spot);
1121 1167
1122 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1168 preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1123 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1169 XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1124 XFree(preedit_attr); 1170 XFree (preedit_attr);
1125} 1171}
1126 1172
1127void 1173void
1128rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect, 1174rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1129 XRectangle * needed_rect) 1175 XRectangle * needed_rect)
1130{ 1176{
1131 int mbh, vtx = 0; 1177 int mbh, vtx = 0;
1132 1178
1133 if (scrollbar_visible () && !(Options & Opt_scrollBar_right)) 1179 if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1134 vtx = scrollbar_TotalWidth(); 1180 vtx = scrollbar_TotalWidth ();
1135 1181
1136 mbh = menubar_visible () ? menuBar_TotalHeight() : 0; 1182 mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1137 mbh -= TermWin.lineSpace; 1183 mbh -= TermWin.lineSpace;
1138 1184
1139 preedit_rect->x = needed_rect->width + vtx; 1185 preedit_rect->x = needed_rect->width + vtx;
1140 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1186 preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1141 1187
1142 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx; 1188 preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1143 preedit_rect->height = Height2Pixel(1); 1189 preedit_rect->height = Height2Pixel (1);
1144 1190
1145 status_rect->x = vtx; 1191 status_rect->x = vtx;
1146 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh; 1192 status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1147 1193
1148 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1); 1194 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1149 status_rect->height = Height2Pixel(1); 1195 status_rect->height = Height2Pixel (1);
1150} 1196}
1151 1197
1152void 1198void
1153rxvt_term::im_destroy () 1199rxvt_term::im_destroy ()
1154{ 1200{
… …
1180 const char *p; 1226 const char *p;
1181 char **s; 1227 char **s;
1182 XIMStyles *xim_styles; 1228 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1229 XVaNestedList preedit_attr, status_attr;
1184 1230
1185 if (!((p = XSetLocaleModifiers (modifiers)) && *p)) 1231 if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1186 return false; 1232 return false;
1187 1233
1188 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1234 D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1189 input_method = display->get_xim (locale, modifiers); 1235 input_method = display->get_xim (locale, modifiers);
1190 if (input_method == NULL) 1236 if (input_method == NULL)
1191 return false; 1237 return false;
1192 1238
1193 xim = input_method->xim; 1239 xim = input_method->xim;
… …
1199 display->put_xim (input_method); 1245 display->put_xim (input_method);
1200 return false; 1246 return false;
1201 } 1247 }
1202 1248
1203 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root"; 1249 p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";
1204 s = rxvt_splitcommastring(p); 1250 s = rxvt_splitcommastring (p);
1205 for (i = found = 0; !found && s[i]; i++) 1251 for (i = found = 0; !found && s[i]; i++)
1206 { 1252 {
1207 if (!STRCMP(s[i], "OverTheSpot")) 1253 if (!STRCMP (s[i], "OverTheSpot"))
1208 input_style = (XIMPreeditPosition | XIMStatusNothing); 1254 input_style = (XIMPreeditPosition | XIMStatusNothing);
1209 else if (!STRCMP(s[i], "OffTheSpot")) 1255 else if (!STRCMP (s[i], "OffTheSpot"))
1210 input_style = (XIMPreeditArea | XIMStatusArea); 1256 input_style = (XIMPreeditArea | XIMStatusArea);
1211 else if (!STRCMP(s[i], "Root")) 1257 else if (!STRCMP (s[i], "Root"))
1212 input_style = (XIMPreeditNothing | XIMStatusNothing); 1258 input_style = (XIMPreeditNothing | XIMStatusNothing);
1213 1259
1214 for (j = 0; j < xim_styles->count_styles; j++) 1260 for (j = 0; j < xim_styles->count_styles; j++)
1215 if (input_style == xim_styles->supported_styles[j]) 1261 if (input_style == xim_styles->supported_styles[j])
1216 { 1262 {
… …
1237 { 1283 {
1238 im_set_size (&rect); 1284 im_set_size (&rect);
1239 im_set_position (&spot); 1285 im_set_position (&spot);
1240 im_set_color (&fg, &bg); 1286 im_set_color (&fg, &bg);
1241 1287
1242 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1288 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1243 XNSpotLocation, &spot, 1289 XNSpotLocation, &spot,
1244 XNForeground, fg, XNBackground, bg, 1290 XNForeground, fg, XNBackground, bg,
1245 //XNFontSet, TermWin.fontset, 1291 //XNFontSet, TermWin.fontset,
1246 NULL); 1292 NULL);
1247 } 1293 }
… …
1255 */ 1301 */
1256 needed_rect.width = 0; 1302 needed_rect.width = 0;
1257 1303
1258 im_set_preedit_area (&rect, &status_rect, &needed_rect); 1304 im_set_preedit_area (&rect, &status_rect, &needed_rect);
1259 1305
1260 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1306 preedit_attr = XVaCreateNestedList (0, XNArea, &rect,
1261 XNForeground, fg, XNBackground, bg, 1307 XNForeground, fg, XNBackground, bg,
1262 //XNFontSet, TermWin.fontset, 1308 //XNFontSet, TermWin.fontset,
1263 NULL); 1309 NULL);
1264 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1310 status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1265 XNForeground, fg, XNBackground, bg, 1311 XNForeground, fg, XNBackground, bg,
1266 //XNFontSet, TermWin.fontset, 1312 //XNFontSet, TermWin.fontset,
1267 NULL); 1313 NULL);
1268 } 1314 }
1269 1315
1270 Input_Context = XCreateIC(xim, XNInputStyle, input_style, 1316 Input_Context = XCreateIC (xim, XNInputStyle, input_style,
1271 XNClientWindow, TermWin.parent[0], 1317 XNClientWindow, TermWin.parent[0],
1272 XNFocusWindow, TermWin.parent[0], 1318 XNFocusWindow, TermWin.parent[0],
1273 preedit_attr ? XNPreeditAttributes : NULL, 1319 preedit_attr ? XNPreeditAttributes : NULL,
1274 preedit_attr, 1320 preedit_attr,
1275 status_attr ? XNStatusAttributes : NULL, 1321 status_attr ? XNStatusAttributes : NULL,
1276 status_attr, NULL); 1322 status_attr, NULL);
1277 if (preedit_attr) XFree(preedit_attr); 1323 if (preedit_attr) XFree (preedit_attr);
1278 if (status_attr) XFree(status_attr); 1324 if (status_attr) XFree (status_attr);
1279 1325
1280 if (Input_Context == NULL) 1326 if (Input_Context == NULL)
1281 { 1327 {
1282 rxvt_print_error("failed to create input context"); 1328 rxvt_print_error ("failed to create input context");
1283 display->put_xim (input_method); 1329 display->put_xim (input_method);
1284 return false; 1330 return false;
1285 } 1331 }
1286 1332
1287 if (input_style & XIMPreeditArea) 1333 if (input_style & XIMPreeditArea)
1288 IMSetStatusPosition (); 1334 IMSetStatusPosition ();
1289 1335
1290 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1336 D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1291 return true; 1337 return true;
1292} 1338}
1293 1339
1294void 1340void
1295rxvt_term::im_cb () 1341rxvt_term::im_cb ()
… …
1299 char **s; 1345 char **s;
1300 char buf[IMBUFSIZ]; 1346 char buf[IMBUFSIZ];
1301 1347
1302 im_destroy (); 1348 im_destroy ();
1303 1349
1304 D_MAIN((stderr, "rxvt_IMInstantiateCallback()")); 1350 D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1305 if (Input_Context) 1351 if (Input_Context)
1306 return; 1352 return;
1307 1353
1308#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1354#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1309 if (rs[Rs_imLocale]) 1355 if (rs[Rs_imLocale])
1310 setlocale (LC_CTYPE, rs[Rs_imLocale]); 1356 SET_LOCALE (rs[Rs_imLocale]);
1311#endif 1357#endif
1312 1358
1313 p = rs[Rs_inputMethod]; 1359 p = rs[Rs_inputMethod];
1314 if (p && *p) 1360 if (p && *p)
1315 { 1361 {
… …
1328 break; 1374 break;
1329 } 1375 }
1330 } 1376 }
1331 } 1377 }
1332 for (i = 0; s[i]; i++) 1378 for (i = 0; s[i]; i++)
1333 free(s[i]); 1379 free (s[i]);
1334 free(s); 1380 free (s);
1335 1381
1336 if (found) 1382 if (found)
1337 goto done; 1383 goto done;
1338 } 1384 }
1339 1385
… …
1346 goto done; 1392 goto done;
1347 1393
1348done: 1394done:
1349#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE) 1395#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1350 if (rs[Rs_imLocale]) 1396 if (rs[Rs_imLocale])
1351 setlocale (LC_CTYPE, locale); 1397 SET_LOCALE (locale);
1352#endif 1398#endif
1353} 1399}
1354 1400
1355void 1401void
1356rxvt_term::IMSetStatusPosition () 1402rxvt_term::IMSetStatusPosition ()
1357{ 1403{
1358 XRectangle preedit_rect, status_rect, *needed_rect; 1404 XRectangle preedit_rect, status_rect, *needed_rect;
1359 XVaNestedList preedit_attr, status_attr; 1405 XVaNestedList preedit_attr, status_attr;
1360 1406
1361 if (Input_Context == NULL 1407 if (Input_Context == NULL
1362 || !TermWin.focus || !(input_style & XIMPreeditArea) 1408 || !TermWin.focus || ! (input_style & XIMPreeditArea)
1363 || !IMisRunning ()) 1409 || !IMisRunning ())
1364 return; 1410 return;
1365 1411
1366 /* Getting the necessary width of preedit area */ 1412 /* Getting the necessary width of preedit area */
1367 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1413 status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1368 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL); 1414 XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1369 XFree(status_attr); 1415 XFree (status_attr);
1370 1416
1371 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect); 1417 im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);
1372 1418
1373 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1419 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1374 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1420 status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1375 1421
1376 XSetICValues(Input_Context, 1422 XSetICValues (Input_Context,
1377 XNPreeditAttributes, preedit_attr, 1423 XNPreeditAttributes, preedit_attr,
1378 XNStatusAttributes, status_attr, NULL); 1424 XNStatusAttributes, status_attr, NULL);
1379 1425
1380 XFree(preedit_attr); 1426 XFree (preedit_attr);
1381 XFree(status_attr); 1427 XFree (status_attr);
1382} 1428}
1383#endif /* USE_XIM */ 1429#endif /* USE_XIM */
1384 1430
1385/*----------------------------------------------------------------------*/ 1431/*----------------------------------------------------------------------*/
1386rxvt_t rxvt_current_term; 1432rxvt_t rxvt_current_term;

Diff Legend

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