ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

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

Diff Legend

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