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

Diff Legend

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