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.54 by pcg, Mon Mar 15 00:08:11 2004 UTC

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

Diff Legend

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