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.8 by pcg, Thu Nov 27 10:12:10 2003 UTC vs.
Revision 1.25 by pcg, Sat Jan 31 03:27:45 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: main.c 2 * File: main.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: main.C,v 1.8 2003/11/27 10:12:10 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
42 41
43#ifdef HAVE_TERMIOS_H 42#ifdef HAVE_TERMIOS_H
44# include <termios.h> 43# include <termios.h>
45#endif 44#endif
46 45
46#include <cstring>
47
48static char curlocale[128];
49
50void
51rxvt_set_locale (const char *locale)
52{
53 if (locale && STRNCMP (locale, curlocale, 128))
54 {
55 STRNCPY (curlocale, locale, 128);
56 setlocale (LC_CTYPE, curlocale);
57 }
58}
59
47void * 60void *
48rxvt_term::operator new (size_t s) 61rxvt_term::operator new (size_t s)
49{ 62{
50 void *p = malloc (s); 63 void *p = malloc (s);
51 64
… …
58{ 71{
59 free (p); 72 free (p);
60} 73}
61 74
62rxvt_term::rxvt_term () 75rxvt_term::rxvt_term ()
63: pty_ev (this, &rxvt_term::pty_cb), 76:
64#ifdef CURSOR_BLINK 77#ifdef CURSOR_BLINK
78 cursor_blink_ev (this, &rxvt_term::cursor_blink_cb),
79#endif
80#ifdef TEXT_BLINK
65 blink_ev (this, &rxvt_term::blink_cb), 81 text_blink_ev (this, &rxvt_term::text_blink_cb),
66#endif 82#endif
67#ifdef POINTER_BLANK 83#ifdef POINTER_BLANK
68 pointer_ev (this, &rxvt_term::pointer_cb), 84 pointer_ev (this, &rxvt_term::pointer_cb),
69#endif 85#endif
70 x_ev (this, &rxvt_term::x_cb), 86 check_ev (this, &rxvt_term::check_cb),
71 destroy_ev (this, &rxvt_term::destroy_cb) 87 destroy_ev (this, &rxvt_term::destroy_cb),
88 pty_ev (this, &rxvt_term::pty_cb),
89 x_ev (this, &rxvt_term::x_cb),
90 incr_ev (this, &rxvt_term::incr_cb)
72{ 91{
73 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 92 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
74} 93}
75 94
76rxvt_term::~rxvt_term () 95rxvt_term::~rxvt_term ()
77{ 96{
78 rxvt_scr_release (this); 97 scr_release ();
98
99 free (locale);
100 free (codeset);
79 101
80#ifndef NO_SETOWNER_TTYDEV 102#ifndef NO_SETOWNER_TTYDEV
81 rxvt_privileged_ttydev (this, RESTORE); 103 privileged_ttydev (RESTORE);
82#endif 104#endif
83#ifdef UTMP_SUPPORT 105#ifdef UTMP_SUPPORT
84 rxvt_privileged_utmp (this, RESTORE); 106 privileged_utmp (RESTORE);
85#endif 107#endif
86#ifdef USE_XIM 108#ifdef USE_XIM
87 if (Input_Context != NULL) 109 if (Input_Context != NULL)
88 { 110 {
89 XDestroyIC (Input_Context); 111 XDestroyIC (Input_Context);
… …
101} 123}
102 124
103void 125void
104rxvt_term::destroy () 126rxvt_term::destroy ()
105{ 127{
128 check_ev.stop ();
106 pty_ev.stop (); 129 pty_ev.stop ();
107 x_ev.stop (); 130 x_ev.stop ();
108#ifdef CURSOR_BLINK 131#ifdef CURSOR_BLINK
132 cursor_blink_ev.stop ();
133#endif
134#ifdef TEXT_BLINK
109 blink_ev.stop (); 135 text_blink_ev.stop ();
110#endif 136#endif
111#ifdef POINTER_BLANK 137#ifdef POINTER_BLANK
112 pointer_ev.stop (); 138 pointer_ev.stop ();
113#endif 139#endif
114 140
… …
125 151
126/*----------------------------------------------------------------------*/ 152/*----------------------------------------------------------------------*/
127/* rxvt_init() */ 153/* rxvt_init() */
128/* LIBPROTO */ 154/* LIBPROTO */
129rxvt_t 155rxvt_t
130rxvt_init(int argc, const char *const *argv) 156rxvt_init (int argc, const char *const *argv)
131{ 157{
132 SET_R(new rxvt_term); 158 SET_R (new rxvt_term);
133 dR;
134 159
135 if (!R->init_vars () || !R->init (argc, argv)) 160 if (!GET_R->init_vars () || !GET_R->init (argc, argv))
136 { 161 {
137 delete R; 162 delete GET_R;
138 return NULL; 163 SET_R (0);
139 } 164 }
140 165
141 return R; 166 return GET_R;
142} 167}
143 168
144/* EXTPROTO */
145void 169void
146rxvt_init_signals () 170rxvt_init_signals ()
147{ 171{
148/* install exit handler for cleanup */ 172/* install exit handler for cleanup */
149#if 0 173#if 0
150#ifdef HAVE_ATEXIT 174#ifdef HAVE_ATEXIT
151 atexit(rxvt_clean_exit); 175 atexit(rxvt_clean_exit);
152#else 176#else
153# ifdef HAVE_ON_EXIT
154 on_exit(rxvt_clean_exit, NULL); /* non-ANSI exit handler */
155# endif
156#endif 177#endif
157#endif 178#endif
158 179
159 struct sigaction sa; 180 struct sigaction sa;
160 181
161 sigfillset (&sa.sa_mask); 182 sigfillset (&sa.sa_mask);
162 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART; 183 sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
163 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGHUP , &sa, 0); //TODO, also: SIGPIPE 184 sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
185 sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
164 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0); 186 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
165 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0); 187 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
166 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0); 188 sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
167 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0); 189 sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
168 190
… …
174} 196}
175 197
176bool 198bool
177rxvt_term::init (int argc, const char *const *argv) 199rxvt_term::init (int argc, const char *const *argv)
178{ 200{
179 dR;//TODO (scrollbar, setidle)
180
181 /* 201 /*
182 * Save and then give up any super-user privileges 202 * Save and then give up any super-user privileges
183 * If we need privileges in any area then we must specifically request it. 203 * If we need privileges in any area then we must specifically request it.
184 * We should only need to be root in these cases: 204 * We should only need to be root in these cases:
185 * 1. write utmp entries on some systems 205 * 1. write utmp entries on some systems
186 * 2. chown tty on some systems 206 * 2. chown tty on some systems
187 */ 207 */
188 rxvt_privileges (this, SAVE); 208 privileges (SAVE);
189 rxvt_privileges (this, IGNORE); 209 privileges (IGNORE);
190 210
191 rxvt_init_secondary (this); 211 init_secondary ();
192 212
193 const char **cmd_argv = rxvt_init_resources (this, argc, argv); 213 const char **cmd_argv = init_resources (argc, argv);
214
215 set_locale ("");
194 216
195#if (MENUBAR_MAX) 217#if (MENUBAR_MAX)
196 rxvt_menubar_read (this, rs[Rs_menu]); 218 menubar_read (rs[Rs_menu]);
197#endif 219#endif
198#ifdef HAVE_SCROLLBARS 220#ifdef HAVE_SCROLLBARS
199 if (Options & Opt_scrollBar) 221 if (Options & Opt_scrollBar)
200 scrollbar_setIdle (); /* set existence for size calculations */ 222 scrollBar.setIdle (); /* set existence for size calculations */
201#endif 223#endif
202 224
203 rxvt_Create_Windows (this, argc, argv); 225 create_windows (argc, argv);
204 226
205 rxvt_init_xlocale (this); 227 init_xlocale ();
206 228
207 rxvt_scr_reset (this); /* initialize screen */ 229 scr_reset (); /* initialize screen */
208#ifdef RXVT_GRAPHICS 230#ifdef RXVT_GRAPHICS
209 rxvt_Gr_reset (this); /* reset graphics */ 231 Gr_reset (); /* reset graphics */
210#endif 232#endif
211 233
212#if 0 234#if 0
213#ifdef DEBUG_X 235#ifdef DEBUG_X
214 XSynchronize(Xdisplay, True); 236 XSynchronize(Xdisplay, True);
215#endif 237#endif
216#endif 238#endif
217 239
218#ifdef HAVE_SCROLLBARS 240#ifdef HAVE_SCROLLBARS
219 if (Options & Opt_scrollBar) 241 if (Options & Opt_scrollBar)
220 rxvt_Resize_scrollBar (this); /* create and map scrollbar */ 242 resize_scrollbar (); /* create and map scrollbar */
221#endif 243#endif
222#if (MENUBAR_MAX) 244#if (MENUBAR_MAX)
223 if (menubar_visible(r)) 245 if (menubar_visible(r))
224 XMapWindow (Xdisplay, menuBar.win); 246 XMapWindow (Xdisplay, menuBar.win);
225#endif 247#endif
226#ifdef TRANSPARENT 248#ifdef TRANSPARENT
227 if (Options & Opt_transparent) 249 if (Options & Opt_transparent)
228 { 250 {
229 XSelectInput (Xdisplay, Xroot, PropertyChangeMask); 251 XSelectInput (Xdisplay, Xroot, PropertyChangeMask);
230 rxvt_check_our_parents (this); 252 check_our_parents ();
231 } 253 }
232#endif 254#endif
233 XMapWindow (Xdisplay, TermWin.vt); 255 XMapWindow (Xdisplay, TermWin.vt);
234 XMapWindow (Xdisplay, TermWin.parent[0]); 256 XMapWindow (Xdisplay, TermWin.parent[0]);
235 257
236 rxvt_init_env (this); 258 init_env ();
237 rxvt_init_command (this, cmd_argv); 259 init_command (cmd_argv);
238 260
239 x_ev.start (Xfd, EVENT_READ); 261 x_ev.start (Xfd, EVENT_READ);
240 pty_ev.start (cmd_fd, EVENT_READ); 262 pty_ev.start (cmd_fd, EVENT_READ);
241 263
242 flush (); 264 check_ev.start ();
265
266 process_x_events ();
243 267
244 return true; 268 return true;
245} 269}
246 270
247/* ------------------------------------------------------------------------- * 271/* ------------------------------------------------------------------------- *
… …
259 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR) 283 while ((pid = waitpid (-1, NULL, WNOHANG)) == -1 && errno == EINTR)
260 ; 284 ;
261 errno = save_errno; 285 errno = save_errno;
262 286
263#if 0 287#if 0
264 if (pid == R->cmd_pid) 288 if (pid == cmd_pid)
265 exit (EXIT_SUCCESS); 289 exit (EXIT_SUCCESS);
266#endif 290#endif
267} 291}
268 292
269/* 293/*
… …
280 rxvt_clean_exit(); 304 rxvt_clean_exit();
281 kill(getpid(), sig); 305 kill(getpid(), sig);
282} 306}
283 307
284/* ARGSUSED */ 308/* ARGSUSED */
285/* INTPROTO */ 309/* EXTPROTO */
286int 310int
287rxvt_xerror_handler(const Display * display 311rxvt_xerror_handler(const Display * display
288 __attribute__ ((unused)), const XErrorEvent * event) 312 __attribute__ ((unused)), const XErrorEvent * event)
289{ 313{
290 dR;
291
292 if (R->allowedxerror == -1) 314 if (GET_R->allowedxerror == -1)
293 R->allowedxerror = event->error_code; 315 GET_R->allowedxerror = event->error_code;
294 else 316 else
295 { 317 {
296 rxvt_print_error("XError: Request: %d . %d, Error: %d", 318 rxvt_print_error("XError: Request: %d . %d, Error: %d",
297 event->request_code, event->minor_code, 319 event->request_code, event->minor_code,
298 event->error_code); 320 event->error_code);
299 321
300 R->destroy (); 322 GET_R->destroy ();
301 } 323 }
302 324
303 return 0; 325 return 0;
304} 326}
305 327
… …
310 */ 332 */
311/* EXTPROTO */ 333/* EXTPROTO */
312void 334void
313rxvt_clean_exit () 335rxvt_clean_exit ()
314{ 336{
315 dR;
316
317 R->destroy (); 337 GET_R->destroy ();
318} 338}
319 339
320/* ------------------------------------------------------------------------- * 340/* ------------------------------------------------------------------------- *
321 * MEMORY ALLOCATION WRAPPERS * 341 * MEMORY ALLOCATION WRAPPERS *
322 * ------------------------------------------------------------------------- */ 342 * ------------------------------------------------------------------------- */
… …
373 393
374/* ------------------------------------------------------------------------- * 394/* ------------------------------------------------------------------------- *
375 * PRIVILEGED OPERATIONS * 395 * PRIVILEGED OPERATIONS *
376 * ------------------------------------------------------------------------- */ 396 * ------------------------------------------------------------------------- */
377/* take care of suid/sgid super-user (root) privileges */ 397/* take care of suid/sgid super-user (root) privileges */
378/* INTPROTO */
379void 398void
380rxvt_privileges(pR_ int mode) 399rxvt_term::privileges (int mode)
381{ 400{
382#if ! defined(__CYGWIN32__) 401#if ! defined(__CYGWIN32__)
383# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID) 402# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
384/* setreuid() is the poor man's setuid(), seteuid() */ 403/* setreuid() is the poor man's setuid(), seteuid() */
385# define seteuid(a) setreuid(-1, (a)) 404# define seteuid(a) setreuid(-1, (a))
… …
395 */ 414 */
396 seteuid(getuid()); 415 seteuid(getuid());
397 setegid(getgid()); 416 setegid(getgid());
398 break; 417 break;
399 case SAVE: 418 case SAVE:
400 R->euid = geteuid(); 419 euid = geteuid();
401 R->egid = getegid(); 420 egid = getegid();
402 break; 421 break;
403 case RESTORE: 422 case RESTORE:
404 seteuid(R->euid); 423 seteuid(euid);
405 setegid(R->egid); 424 setegid(egid);
406 break; 425 break;
407 } 426 }
408# else 427# else
409 switch (mode) { 428 switch (mode) {
410 case IGNORE: 429 case IGNORE:
… …
419# endif 438# endif
420#endif 439#endif
421} 440}
422 441
423#ifdef UTMP_SUPPORT 442#ifdef UTMP_SUPPORT
424/* EXTPROTO */
425void 443void
426rxvt_privileged_utmp(pR_ char action) 444rxvt_term::privileged_utmp (char action)
427{ 445{
428 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)", 446 D_MAIN((stderr, "rxvt_privileged_utmp(%c); waiting for: %c (pid: %d)",
429 action, R->next_utmp_action, getpid())); 447 action, next_utmp_action, getpid()));
430 if (R->next_utmp_action != action || (action != SAVE && action != RESTORE) 448 if (next_utmp_action != action || (action != SAVE && action != RESTORE)
431 || (R->Options & Opt_utmpInhibit) 449 || (Options & Opt_utmpInhibit)
432 || R->ttydev == NULL || *R->ttydev == '\0') 450 || ttydev == NULL || *ttydev == '\0')
433 return; 451 return;
434 452
435 rxvt_privileges(aR_ RESTORE); 453 privileges (RESTORE);
436 if (action == SAVE) { 454 if (action == SAVE) {
437 R->next_utmp_action = RESTORE; 455 next_utmp_action = RESTORE;
438 rxvt_makeutent(aR_ R->ttydev, R->rs[Rs_display_name]); 456 makeutent (ttydev, rs[Rs_display_name]);
439 } else { /* action == RESTORE */ 457 } else { /* action == RESTORE */
440 R->next_utmp_action = IGNORE; 458 next_utmp_action = IGNORE;
441 rxvt_cleanutent(aR); 459 cleanutent ();
442 } 460 }
443 rxvt_privileges(aR_ IGNORE); 461 privileges (IGNORE);
444} 462}
445#endif 463#endif
446 464
447#ifndef NO_SETOWNER_TTYDEV 465#ifndef NO_SETOWNER_TTYDEV
448/* EXTPROTO */
449void 466void
450rxvt_privileged_ttydev(pR_ char action) 467rxvt_term::privileged_ttydev (char action)
451{ 468{
452 D_MAIN((stderr, 469 D_MAIN((stderr,
453 "rxvt_privileged_ttydev(aR_ %c); waiting for: %c (pid: %d)", 470 "privileged_ttydev (%c); waiting for: %c (pid: %d)",
454 action, R->next_tty_action, getpid())); 471 action, next_tty_action, getpid()));
455 if (R->next_tty_action != action || (action != SAVE && action != RESTORE) 472 if (next_tty_action != action || (action != SAVE && action != RESTORE)
456 || R->ttydev == NULL || *R->ttydev == '\0') 473 || ttydev == NULL || *ttydev == '\0')
457 return; 474 return;
458 475
459 rxvt_privileges(aR_ RESTORE); 476 privileges (RESTORE);
460 477
461 if (action == SAVE) { 478 if (action == SAVE) {
462 R->next_tty_action = RESTORE; 479 next_tty_action = RESTORE;
463# ifndef RESET_TTY_TO_COMMON_DEFAULTS 480# ifndef RESET_TTY_TO_COMMON_DEFAULTS
464/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */ 481/* store original tty status for restoration rxvt_clean_exit() -- rgg 04/12/95 */
465 if (lstat(R->ttydev, &R->ttyfd_stat) < 0) /* you lose out */ 482 if (lstat(ttydev, &ttyfd_stat) < 0) /* you lose out */
466 R->next_tty_action = IGNORE; 483 next_tty_action = IGNORE;
467 else 484 else
468# endif 485# endif
469 { 486 {
470 chown(R->ttydev, getuid(), R->ttygid); /* fail silently */ 487 chown(ttydev, getuid(), ttygid); /* fail silently */
471 chmod(R->ttydev, R->ttymode); 488 chmod(ttydev, ttymode);
472# ifdef HAVE_REVOKE 489# ifdef HAVE_REVOKE
473 revoke(R->ttydev); 490 revoke(ttydev);
474# endif 491# endif
475 } 492 }
476 } else { /* action == RESTORE */ 493 } else { /* action == RESTORE */
477 R->next_tty_action = IGNORE; 494 next_tty_action = IGNORE;
478# ifndef RESET_TTY_TO_COMMON_DEFAULTS 495# ifndef RESET_TTY_TO_COMMON_DEFAULTS
479 chmod(R->ttydev, R->ttyfd_stat.st_mode); 496 chmod(ttydev, ttyfd_stat.st_mode);
480 chown(R->ttydev, R->ttyfd_stat.st_uid, R->ttyfd_stat.st_gid); 497 chown(ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
481# else 498# else
482 chmod(R->ttydev, 499 chmod(ttydev,
483 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH)); 500 (S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
484 chown(R->ttydev, 0, 0); 501 chown(ttydev, 0, 0);
485# endif 502# endif
486 } 503 }
487 504
488 rxvt_privileges(aR_ IGNORE); 505 privileges (IGNORE);
489 506
490# ifndef RESET_TTY_TO_COMMON_DEFAULTS 507# ifndef RESET_TTY_TO_COMMON_DEFAULTS
491 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d", 508 D_MAIN((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
492 action == RESTORE ? "Restoring" : (action == 509 action == RESTORE ? "Restoring" : (action ==
493 SAVE ? "Saving" : 510 SAVE ? "Saving" :
494 "UNKNOWN ERROR for"), R->ttydev, 511 "UNKNOWN ERROR for"), ttydev,
495 R->ttyfd_stat.st_mode, R->ttyfd_stat.st_uid, 512 ttyfd_stat.st_mode, ttyfd_stat.st_uid,
496 R->ttyfd_stat.st_gid)); 513 ttyfd_stat.st_gid));
497# endif 514# endif
498} 515}
499#endif 516#endif
500 517
501/*----------------------------------------------------------------------*/ 518/*----------------------------------------------------------------------*/
502/* 519/*
503 * window size/position calculcations for XSizeHint and other storage. 520 * window size/position calculcations for XSizeHint and other storage.
504 * if width/height are non-zero then override calculated width/height 521 * if width/height are non-zero then override calculated width/height
505 */ 522 */
506/* EXTPROTO */
507void 523void
508rxvt_window_calc(pR_ unsigned int width, unsigned int height) 524rxvt_term::window_calc (unsigned int width, unsigned int height)
509{ 525{
510 short recalc_x, recalc_y; 526 short recalc_x, recalc_y;
511 int x, y, sb_w, mb_h, flags; 527 int x, y, sb_w, mb_h, flags;
512 unsigned int w, h; 528 unsigned int w, h;
513 unsigned int max_width, max_height; 529 unsigned int max_width, max_height;
514 530
515 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 531 D_SIZE((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
516 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 532 TermWin.ncol, TermWin.nrow, szHint.width,
517 R->szHint.height)); 533 szHint.height));
518 R->szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; 534 szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
519 R->szHint.win_gravity = NorthWestGravity; 535 szHint.win_gravity = NorthWestGravity;
520/* R->szHint.min_aspect.x = R->szHint.min_aspect.y = 1; */ 536/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
521 537
522 recalc_x = recalc_y = 0; 538 recalc_x = recalc_y = 0;
523 flags = 0; 539 flags = 0;
524 if (!R->parsed_geometry) { 540 if (!parsed_geometry) {
525 R->parsed_geometry = 1; 541 parsed_geometry = 1;
526 if (R->rs[Rs_geometry]) 542 if (rs[Rs_geometry])
527 flags = XParseGeometry(R->rs[Rs_geometry], &x, &y, &w, &h); 543 flags = XParseGeometry(rs[Rs_geometry], &x, &y, &w, &h);
528 if (flags & WidthValue) { 544 if (flags & WidthValue) {
529 R->TermWin.ncol = BOUND_POSITIVE_INT16(w); 545 TermWin.ncol = BOUND_POSITIVE_INT16(w);
530 R->szHint.flags |= USSize; 546 szHint.flags |= USSize;
531 } 547 }
532 if (flags & HeightValue) { 548 if (flags & HeightValue) {
533 R->TermWin.nrow = BOUND_POSITIVE_INT16(h); 549 TermWin.nrow = BOUND_POSITIVE_INT16(h);
534 R->szHint.flags |= USSize; 550 szHint.flags |= USSize;
535 } 551 }
536 if (flags & XValue) { 552 if (flags & XValue) {
537 R->szHint.x = x; 553 szHint.x = x;
538 R->szHint.flags |= USPosition; 554 szHint.flags |= USPosition;
539 if (flags & XNegative) { 555 if (flags & XNegative) {
540 recalc_x = 1; 556 recalc_x = 1;
541 R->szHint.win_gravity = NorthEastGravity; 557 szHint.win_gravity = NorthEastGravity;
542 } 558 }
543 } 559 }
544 if (flags & YValue) { 560 if (flags & YValue) {
545 R->szHint.y = y; 561 szHint.y = y;
546 R->szHint.flags |= USPosition; 562 szHint.flags |= USPosition;
547 if (flags & YNegative) { 563 if (flags & YNegative) {
548 recalc_y = 1; 564 recalc_y = 1;
549 if (R->szHint.win_gravity == NorthEastGravity) 565 if (szHint.win_gravity == NorthEastGravity)
550 R->szHint.win_gravity = SouthEastGravity; 566 szHint.win_gravity = SouthEastGravity;
551 else 567 else
552 R->szHint.win_gravity = SouthWestGravity; 568 szHint.win_gravity = SouthWestGravity;
553 } 569 }
554 } 570 }
555 } 571 }
556/* TODO: BOUNDS */ 572/* TODO: BOUNDS */
557 R->TermWin.width = R->TermWin.ncol * R->TermWin.fwidth; 573 TermWin.width = TermWin.ncol * TermWin.fwidth;
558 R->TermWin.height = R->TermWin.nrow * R->TermWin.fheight; 574 TermWin.height = TermWin.nrow * TermWin.fheight;
559 max_width = MAX_COLS * R->TermWin.fwidth; 575 max_width = MAX_COLS * TermWin.fwidth;
560 max_height = MAX_ROWS * R->TermWin.fheight; 576 max_height = MAX_ROWS * TermWin.fheight;
561 577
562 R->szHint.base_width = R->szHint.base_height = 2 * R->TermWin.int_bwidth; 578 szHint.base_width = szHint.base_height = 2 * TermWin.int_bwidth;
563 579
564 sb_w = mb_h = 0; 580 sb_w = mb_h = 0;
565 R->window_vt_x = R->window_vt_y = 0; 581 window_vt_x = window_vt_y = 0;
566 if (scrollbar_visible(R)) { 582 if (scrollbar_visible ()) {
567 sb_w = scrollbar_TotalWidth(); 583 sb_w = scrollbar_TotalWidth();
568 R->szHint.base_width += sb_w; 584 szHint.base_width += sb_w;
569 if (!(R->Options & Opt_scrollBar_right)) 585 if (!(Options & Opt_scrollBar_right))
570 R->window_vt_x = sb_w; 586 window_vt_x = sb_w;
571 } 587 }
572 if (menubar_visible(R)) { 588 if (menubar_visible ()) {
573 mb_h = menuBar_TotalHeight(); 589 mb_h = menuBar_TotalHeight();
574 R->szHint.base_height += mb_h; 590 szHint.base_height += mb_h;
575 R->window_vt_y = mb_h; 591 window_vt_y = mb_h;
576 } 592 }
577 R->szHint.width_inc = R->TermWin.fwidth; 593 szHint.width_inc = TermWin.fwidth;
578 R->szHint.height_inc = R->TermWin.fheight; 594 szHint.height_inc = TermWin.fheight;
579 R->szHint.min_width = R->szHint.base_width + R->szHint.width_inc; 595 szHint.min_width = szHint.base_width + szHint.width_inc;
580 R->szHint.min_height = R->szHint.base_height + R->szHint.height_inc; 596 szHint.min_height = szHint.base_height + szHint.height_inc;
581 597
582 if (width && width - R->szHint.base_width < max_width) { 598 if (width && width - szHint.base_width < max_width) {
583 R->szHint.width = width; 599 szHint.width = width;
584 R->TermWin.width = width - R->szHint.base_width; 600 TermWin.width = width - szHint.base_width;
585 } else { 601 } else {
586 MIN_IT(R->TermWin.width, max_width); 602 MIN_IT(TermWin.width, max_width);
587 R->szHint.width = R->szHint.base_width + R->TermWin.width; 603 szHint.width = szHint.base_width + TermWin.width;
588 } 604 }
589 if (height && height - R->szHint.base_height < max_height) { 605 if (height && height - szHint.base_height < max_height) {
590 R->szHint.height = height; 606 szHint.height = height;
591 R->TermWin.height = height - R->szHint.base_height; 607 TermWin.height = height - szHint.base_height;
592 } else { 608 } else {
593 MIN_IT(R->TermWin.height, max_height); 609 MIN_IT(TermWin.height, max_height);
594 R->szHint.height = R->szHint.base_height + R->TermWin.height; 610 szHint.height = szHint.base_height + TermWin.height;
595 } 611 }
596 if (scrollbar_visible(R) && (R->Options & Opt_scrollBar_right)) 612 if (scrollbar_visible () && (Options & Opt_scrollBar_right))
597 R->window_sb_x = R->szHint.width - sb_w; 613 window_sb_x = szHint.width - sb_w;
598 614
599 if (recalc_x) 615 if (recalc_x)
600 R->szHint.x += (DisplayWidth(R->Xdisplay, Xscreen) 616 szHint.x += (DisplayWidth (Xdisplay, DefaultScreen (Xdisplay))
601 - R->szHint.width - 2 * R->TermWin.ext_bwidth); 617 - szHint.width - 2 * TermWin.ext_bwidth);
602 if (recalc_y) 618 if (recalc_y)
603 R->szHint.y += (DisplayHeight(R->Xdisplay, Xscreen) 619 szHint.y += (DisplayHeight (Xdisplay, DefaultScreen (Xdisplay))
604 - R->szHint.height - 2 * R->TermWin.ext_bwidth); 620 - szHint.height - 2 * TermWin.ext_bwidth);
605 621
606 R->TermWin.ncol = R->TermWin.width / R->TermWin.fwidth; 622 TermWin.ncol = TermWin.width / TermWin.fwidth;
607 R->TermWin.nrow = R->TermWin.height / R->TermWin.fheight; 623 TermWin.nrow = TermWin.height / TermWin.fheight;
608 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d", 624 D_SIZE((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
609 R->TermWin.ncol, R->TermWin.nrow, R->szHint.width, 625 TermWin.ncol, TermWin.nrow, szHint.width,
610 R->szHint.height)); 626 szHint.height));
611 return; 627 return;
612} 628}
613 629
614/*----------------------------------------------------------------------*/ 630/*----------------------------------------------------------------------*/
615/* 631/*
616 * Tell the teletype handler what size the window is. 632 * Tell the teletype handler what size the window is.
617 * Called after a window size change. 633 * Called after a window size change.
618 */ 634 */
619/* EXTPROTO */
620void 635void
621rxvt_tt_winsize(int fd, unsigned short col, unsigned short row, int pid) 636rxvt_term::tt_winch ()
622{ 637{
623 struct winsize ws; 638 struct winsize ws;
624 639
625 if (fd < 0) 640 if (cmd_fd < 0)
626 return; 641 return;
642
627 ws.ws_col = col; 643 ws.ws_col = TermWin.ncol;
628 ws.ws_row = row; 644 ws.ws_row = TermWin.nrow;
629 ws.ws_xpixel = ws.ws_ypixel = 0; 645 ws.ws_xpixel = ws.ws_ypixel = 0;
630#ifndef DEBUG_SIZE 646#ifndef DEBUG_SIZE
631 (void)ioctl(fd, TIOCSWINSZ, &ws); 647 (void)ioctl (cmd_fd, TIOCSWINSZ, &ws);
632#else 648#else
633 if (ioctl(fd, TIOCSWINSZ, &ws) < 0) { 649 if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)
634 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd)); 650 D_SIZE((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));
635 }
636# ifdef SIGWINCH 651# ifdef SIGWINCH
637 else if (pid) /* force through to the command */ 652 else if (cmd_pid) /* force through to the command */
638 kill(pid, SIGWINCH); 653 kill (cmd_pid, SIGWINCH);
639# endif 654# endif
640#endif 655#endif
641} 656}
642 657
643/*----------------------------------------------------------------------*/ 658/*----------------------------------------------------------------------*/
… …
646 * init = 1 - initialize 661 * init = 1 - initialize
647 * 662 *
648 * fontname == FONT_UP - switch to bigger font 663 * fontname == FONT_UP - switch to bigger font
649 * fontname == FONT_DN - switch to smaller font 664 * fontname == FONT_DN - switch to smaller font
650 */ 665 */
651/* EXTPROTO */
652void 666void
653rxvt_change_font(pR_ int init, const char *fontname) 667rxvt_term::change_font (int init, const char *fontname)
654{ 668{
655} 669}
656 670
657/* INTPROTO */
658void 671void
659rxvt_font_up_down(pR_ int n, int direction) 672rxvt_term::font_up_down (int n, int direction)
660{ 673{
661} 674}
662 675
663/*----------------------------------------------------------------------*/ 676/*----------------------------------------------------------------------*/
664/*----------------------------------------------------------------------*/ 677/*----------------------------------------------------------------------*/
665/* xterm sequences - title, iconName, color (exptl) */ 678/* xterm sequences - title, iconName, color (exptl) */
666/* EXTPROTO */
667void 679void
668rxvt_set_title(pR_ const char *str) 680rxvt_term::set_title (const char *str)
669{ 681{
670#ifndef SMART_WINDOW_TITLE 682#ifndef SMART_WINDOW_TITLE
671 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 683 XStoreName(Xdisplay, TermWin.parent[0], str);
672#else 684#else
673 char *name; 685 char *name;
674 686
675 if (XFetchName(R->Xdisplay, R->TermWin.parent[0], &name) == 0) 687 if (XFetchName(Xdisplay, TermWin.parent[0], &name) == 0)
676 name = NULL; 688 name = NULL;
677 if (name == NULL || STRCMP(name, str)) 689 if (name == NULL || STRCMP(name, str))
678 XStoreName(R->Xdisplay, R->TermWin.parent[0], str); 690 XStoreName(Xdisplay, TermWin.parent[0], str);
679 if (name) 691 if (name)
680 XFree(name); 692 XFree(name);
681#endif 693#endif
682} 694}
683 695
684/* EXTPROTO */
685void 696void
686rxvt_set_iconName(pR_ const char *str) 697rxvt_term::set_iconName (const char *str)
687{ 698{
688#ifndef SMART_WINDOW_TITLE 699#ifndef SMART_WINDOW_TITLE
689 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 700 XSetIconName(Xdisplay, TermWin.parent[0], str);
690#else 701#else
691 char *name; 702 char *name;
692 703
693 if (XGetIconName(R->Xdisplay, R->TermWin.parent[0], &name)) 704 if (XGetIconName(Xdisplay, TermWin.parent[0], &name))
694 name = NULL; 705 name = NULL;
695 if (name == NULL || STRCMP(name, str)) 706 if (name == NULL || STRCMP(name, str))
696 XSetIconName(R->Xdisplay, R->TermWin.parent[0], str); 707 XSetIconName(Xdisplay, TermWin.parent[0], str);
697 if (name) 708 if (name)
698 XFree(name); 709 XFree(name);
699#endif 710#endif
700} 711}
701 712
702#ifdef XTERM_COLOR_CHANGE 713#ifdef XTERM_COLOR_CHANGE
703/* EXTPROTO */
704void 714void
705rxvt_set_window_color(pR_ int idx, const char *color) 715rxvt_term::set_window_color (int idx, const char *color)
706{ 716{
707 rxvt_color xcol; 717 rxvt_color xcol;
708 int i; 718 int i;
709 719
710 if (color == NULL || *color == '\0') 720 if (color == NULL || *color == '\0')
… …
714 if (isdigit(*color)) { 724 if (isdigit(*color)) {
715 i = atoi(color); 725 i = atoi(color);
716 if (i >= 8 && i <= 15) { /* bright colors */ 726 if (i >= 8 && i <= 15) { /* bright colors */
717 i -= 8; 727 i -= 8;
718# ifndef NO_BRIGHTCOLOR 728# ifndef NO_BRIGHTCOLOR
719 R->PixColors[idx] = R->PixColors[minBrightCOLOR + i]; 729 PixColors[idx] = PixColors[minBrightCOLOR + i];
720 SET_PIXCOLOR(R, idx); 730 SET_PIXCOLOR(idx);
721 goto Done; 731 goto Done;
722# endif 732# endif
723 } 733 }
724 if (i >= 0 && i <= 7) { /* normal colors */ 734 if (i >= 0 && i <= 7) { /* normal colors */
725 R->PixColors[idx] = R->PixColors[minCOLOR + i]; 735 PixColors[idx] = PixColors[minCOLOR + i];
726 SET_PIXCOLOR(R, idx); 736 SET_PIXCOLOR(idx);
727 goto Done; 737 goto Done;
728 } 738 }
729 } 739 }
730 if (!rxvt_rXParseAllocColor(aR_ & xcol, color)) 740 if (!rXParseAllocColor (& xcol, color))
731 return; 741 return;
732/* XStoreColor (R->Xdisplay, XCMAP, XColor*); */ 742/* XStoreColor (Xdisplay, XCMAP, XColor*); */
733 743
734/* 744/*
735 * FIXME: should free colors here, but no idea how to do it so instead, 745 * FIXME: should free colors here, but no idea how to do it so instead,
736 * so just keep gobbling up the colormap 746 * so just keep gobbling up the colormap
737 */ 747 */
738# if 0 748# if 0
739 for (i = Color_Black; i <= Color_White; i++) 749 for (i = Color_Black; i <= Color_White; i++)
740 if (R->PixColors[idx] == R->PixColors[i]) 750 if (PixColors[idx] == PixColors[i])
741 break; 751 break;
742 if (i > Color_White) { 752 if (i > Color_White) {
743 /* fprintf (stderr, "XFreeColors: R->PixColors [%d] = %lu\n", idx, R->PixColors [idx]); */ 753 /* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */
744 XFreeColors(R->Xdisplay, XCMAP, (R->PixColors + idx), 1, 754 XFreeColors(Xdisplay, XCMAP, (PixColors + idx), 1,
745 DisplayPlanes(R->Xdisplay, Xscreen)); 755 DisplayPlanes(Xdisplay, Xscreen));
746 } 756 }
747# endif 757# endif
748 758
749 R->PixColors[idx] = xcol; 759 PixColors[idx] = xcol;
750 SET_PIXCOLOR(R, idx); 760 SET_PIXCOLOR(idx);
751 761
752/* XSetWindowAttributes attr; */ 762/* XSetWindowAttributes attr; */
753/* Cursor cursor; */ 763/* Cursor cursor; */
754 Done: 764 Done:
755 if (idx == Color_bg && !(R->Options & Opt_transparent)) 765 if (idx == Color_bg && !(Options & Opt_transparent))
756 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, 766 XSetWindowBackground(Xdisplay, TermWin.vt,
757 R->PixColors[Color_bg]); 767 PixColors[Color_bg]);
758 768
759/* handle Color_BD, scrollbar background, etc. */ 769/* handle Color_BD, scrollbar background, etc. */
760 770
761 rxvt_set_colorfgbg(aR); 771 set_colorfgbg ();
762 rxvt_recolour_cursor(aR); 772 recolour_cursor ();
763/* the only reasonable way to enforce a clean update */ 773/* the only reasonable way to enforce a clean update */
764 rxvt_scr_poweron(aR); 774 scr_poweron ();
765} 775}
766 776
767#else 777#else
768# define rxvt_set_window_color(aR_ idx,color) ((void)0) 778# define set_window_color (idx,color) ((void)0)
769#endif /* XTERM_COLOR_CHANGE */ 779#endif /* XTERM_COLOR_CHANGE */
770 780
771/* EXTPROTO */
772void 781void
773rxvt_recolour_cursor(pR) 782rxvt_term::recolour_cursor ()
774{ 783{
775 rxvt_color xcol[2];
776
777#if TODO 784#if TODO
785 rxvt_color xcol[2];
786
778 xcol[0] = R->PixColors[Color_pointer]; 787 xcol[0] = PixColors[Color_pointer];
779 xcol[1] = R->PixColors[Color_bg]; 788 xcol[1] = PixColors[Color_bg];
780 XQueryColors(R->Xdisplay, XCMAP, xcol, 2); 789 XQueryColors (Xdisplay, XCMAP, xcol, 2);
781 XRecolorCursor(R->Xdisplay, R->TermWin_cursor, &(xcol[0]), &(xcol[1])); 790 XRecolorCursor (Xdisplay, TermWin_cursor, &(xcol[0]), &(xcol[1]));
782#endif 791#endif
783} 792}
784 793
785/*----------------------------------------------------------------------*/ 794/*----------------------------------------------------------------------*/
786/* 795/*
787 * find if fg/bg matches any of the normal (low-intensity) colors 796 * find if fg/bg matches any of the normal (low-intensity) colors
788 */ 797 */
789/* INTPROTO */
790void 798void
791rxvt_set_colorfgbg(pR) 799rxvt_term::set_colorfgbg ()
792{ 800{
793 unsigned int i; 801 unsigned int i;
794 const char *xpmb = "\0"; 802 const char *xpmb = "\0";
795 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1]; 803 char fstr[sizeof("default") + 1], bstr[sizeof("default") + 1];
796 804
797 R->env_colorfgbg = 805 env_colorfgbg =
798 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1); 806 (char *)rxvt_malloc(sizeof("COLORFGBG=default;default;bg") + 1);
799 STRCPY(fstr, "default"); 807 STRCPY(fstr, "default");
800 STRCPY(bstr, "default"); 808 STRCPY(bstr, "default");
801 for (i = Color_Black; i <= Color_White; i++) 809 for (i = Color_Black; i <= Color_White; i++)
802 if (R->PixColors[Color_fg] == R->PixColors[i]) { 810 if (PixColors[Color_fg] == PixColors[i]) {
803 sprintf(fstr, "%d", (i - Color_Black)); 811 sprintf(fstr, "%d", (i - Color_Black));
804 break; 812 break;
805 } 813 }
806 for (i = Color_Black; i <= Color_White; i++) 814 for (i = Color_Black; i <= Color_White; i++)
807 if (R->PixColors[Color_bg] == R->PixColors[i]) { 815 if (PixColors[Color_bg] == PixColors[i]) {
808 sprintf(bstr, "%d", (i - Color_Black)); 816 sprintf(bstr, "%d", (i - Color_Black));
809#ifdef XPM_BACKGROUND 817#ifdef XPM_BACKGROUND
810 xpmb = "default;"; 818 xpmb = "default;";
811#endif 819#endif
812 break; 820 break;
813 } 821 }
814 sprintf(R->env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr); 822 sprintf(env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
815 putenv(R->env_colorfgbg); 823 putenv(env_colorfgbg);
816 824
817#ifndef NO_BRIGHTCOLOR 825#ifndef NO_BRIGHTCOLOR
818 R->colorfgbg = DEFAULT_RSTYLE; 826 colorfgbg = DEFAULT_RSTYLE;
819 for (i = minCOLOR; i <= maxCOLOR; i++) { 827 for (i = minCOLOR; i <= maxCOLOR; i++) {
820 if (R->PixColors[Color_fg] == R->PixColors[i]) 828 if (PixColors[Color_fg] == PixColors[i])
821 R->colorfgbg = SET_FGCOLOR(R->colorfgbg, i); 829 colorfgbg = SET_FGCOLOR(colorfgbg, i);
822 if (R->PixColors[Color_bg] == R->PixColors[i]) 830 if (PixColors[Color_bg] == PixColors[i])
823 R->colorfgbg = SET_BGCOLOR(R->colorfgbg, i); 831 colorfgbg = SET_BGCOLOR(colorfgbg, i);
824 } 832 }
825#endif 833#endif
826} 834}
827 835
828/*----------------------------------------------------------------------*/ 836/*----------------------------------------------------------------------*/
829/* 837/*
830 * Colour determination for low colour displays, routine from 838 * Colour determination for low colour displays, routine from
831 * Hans de Goede <hans@highrise.nl> 839 * Hans de Goede <hans@highrise.nl>
832 */ 840 */
833 841
834/* EXTPROTO */
835int 842int
836rxvt_rXParseAllocColor(pR_ rxvt_color * screen_in_out, const char *colour) 843rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
837{ 844{
838 screen_in_out->set(aR_ colour);
839
840 if (!screen_in_out->set(aR_ colour)) { 845 if (!screen_in_out->set (this, colour)) {
841 rxvt_print_error("can't allocate colour: %s", colour); 846 rxvt_print_error("can't allocate colour: %s", colour);
842 return false; 847 return false;
843 } 848 }
844 849
845 return true; 850 return true;
846} 851}
847 852
848/* -------------------------------------------------------------------- * 853/* -------------------------------------------------------------------- *
849 * - WINDOW RESIZING - * 854 * - WINDOW RESIZING - *
850 * -------------------------------------------------------------------- */ 855 * -------------------------------------------------------------------- */
851/* EXTPROTO */
852void 856void
853rxvt_resize_all_windows(pR_ unsigned int width, unsigned int height, 857rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
854 int ignoreparent)
855{ 858{
856 int fix_screen; 859 int fix_screen;
857 860
858#ifdef SMART_RESIZE 861#ifdef SMART_RESIZE
859 int old_width = R->szHint.width, old_height = R->szHint.height; 862 int old_width = szHint.width, old_height = szHint.height;
860#endif 863#endif
861 864
862 rxvt_window_calc(aR_ width, height); 865 window_calc (width, height);
863 XSetWMNormalHints(R->Xdisplay, R->TermWin.parent[0], &R->szHint); 866 XSetWMNormalHints (Xdisplay, TermWin.parent[0], &szHint);
864 if (!ignoreparent) { 867 if (!ignoreparent)
868 {
865#ifdef SMART_RESIZE 869#ifdef SMART_RESIZE
866/* 870 /*
867 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt> 871 * resize by Marius Gedminas <marius.gedminas@uosis.mif.vu.lt>
868 * reposition window on resize depending on placement on screen 872 * reposition window on resize depending on placement on screen
869 */ 873 */
870 int x, y, x1, y1; 874 int x, y, x1, y1;
871 int dx, dy; 875 int dx, dy;
872 unsigned int unused_w1, unused_h1, unused_b1, unused_d1; 876 unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
873 Window unused_cr; 877 Window unused_cr;
874 878
875 XTranslateCoordinates(R->Xdisplay, R->TermWin.parent[0], Xroot, 879 XTranslateCoordinates (Xdisplay, TermWin.parent[0], Xroot,
876 0, 0, &x, &y, &unused_cr); 880 0, 0, &x, &y, &unused_cr);
877 XGetGeometry(R->Xdisplay, R->TermWin.parent[0], &unused_cr, &x1, &y1, 881 XGetGeometry (Xdisplay, TermWin.parent[0], &unused_cr, &x1, &y1,
878 &unused_w1, &unused_h1, &unused_b1, &unused_d1); 882 &unused_w1, &unused_h1, &unused_b1, &unused_d1);
879 /* 883 /*
880 * if Xroot isn't the parent window, a WM will probably have offset 884 * if Xroot isn't the parent window, a WM will probably have offset
881 * our position for handles and decorations. Counter it 885 * our position for handles and decorations. Counter it
882 */ 886 */
883 if (x1 != x || y1 != y) { 887 if (x1 != x || y1 != y) {
884 x -= x1; 888 x -= x1;
885 y -= y1; 889 y -= y1;
890 }
891
892 x1 = (DisplayWidth (Xdisplay, Xscreen) - old_width) / 2;
893 y1 = (DisplayHeight (Xdisplay, Xscreen) - old_height) / 2;
894 dx = old_width - szHint.width;
895 dy = old_height - szHint.height;
896
897 /* Check position of the center of the window */
898 if (x < x1) /* left half */
899 dx = 0;
900 else if (x == x1) /* exact center */
901 dx /= 2;
902 if (y < y1) /* top half */
903 dy = 0;
904 else if (y == y1) /* exact center */
905 dy /= 2;
906
907 XMoveResizeWindow (Xdisplay, TermWin.parent[0], x + dx, y + dy,
908 szHint.width, szHint.height);
909#else
910 XResizeWindow (Xdisplay, TermWin.parent[0], szHint.width,
911 szHint.height);
912#endif
913 }
914
915 fix_screen = (TermWin.ncol != prev_ncol
916 || TermWin.nrow != prev_nrow);
917
918 if (fix_screen || width != old_width || height != old_height)
919 {
920 if (scrollbar_visible ())
921 {
922 XMoveResizeWindow (Xdisplay, scrollBar.win, window_sb_x,
923 0, scrollbar_TotalWidth (), szHint.height);
924 resize_scrollbar ();
886 } 925 }
887 926
888 x1 = (DisplayWidth(R->Xdisplay, Xscreen) - old_width) / 2; 927 if (menubar_visible ())
889 y1 = (DisplayHeight(R->Xdisplay, Xscreen) - old_height) / 2; 928 XMoveResizeWindow (Xdisplay, menuBar.win, window_vt_x,
890 dx = old_width - R->szHint.width; 929 0, TermWin_TotalWidth (), menuBar_TotalHeight ());
891 dy = old_height - R->szHint.height;
892 930
893 /* Check position of the center of the window */ 931 XMoveResizeWindow (Xdisplay, TermWin.vt, window_vt_x,
894 if (x < x1) /* left half */ 932 window_vt_y, TermWin_TotalWidth (),
895 dx = 0; 933 TermWin_TotalHeight ());
896 else if (x == x1) /* exact center */ 934#ifdef RXVT_GRAPHICS
897 dx /= 2; 935 if (old_height)
898 if (y < y1) /* top half */ 936 Gr_Resize (old_width - szHint.base_width,
899 dy = 0;
900 else if (y == y1) /* exact center */
901 dy /= 2;
902
903 XMoveResizeWindow(R->Xdisplay, R->TermWin.parent[0], x + dx, y + dy,
904 R->szHint.width, R->szHint.height);
905#else
906 XResizeWindow(R->Xdisplay, R->TermWin.parent[0], R->szHint.width,
907 R->szHint.height); 937 old_height - szHint.base_height);
908#endif 938#endif
939 scr_clear ();
940#ifdef XPM_BACKGROUND
941 resize_pixmap ();
942#endif
943 }
944
945 if (fix_screen || old_height == 0)
909 } 946 {
947 int curr_screen = -1;
948 int old_ncol = prev_ncol;
910 949
911 fix_screen = (R->TermWin.ncol != R->prev_ncol 950 /* scr_reset only works on the primary screen */
912 || R->TermWin.nrow != R->prev_nrow); 951 if (old_height) /* this is not the first time through */
913 if (fix_screen || width != R->old_width || height != R->old_height) { 952 {
914 if (scrollbar_visible(R)) { 953 unsigned int ncol = TermWin.ncol;
915 XMoveResizeWindow(R->Xdisplay, R->scrollBar.win, R->window_sb_x, 954 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
916 0, scrollbar_TotalWidth(), R->szHint.height); 955 curr_screen = scr_change_screen (PRIMARY);
917 rxvt_Resize_scrollBar(aR); 956 TermWin.ncol = ncol;
918 } 957 }
919 if (menubar_visible(R))
920 XMoveResizeWindow(R->Xdisplay, R->menuBar.win, R->window_vt_x,
921 0, TermWin_TotalWidth(), menuBar_TotalHeight());
922 XMoveResizeWindow(R->Xdisplay, R->TermWin.vt, R->window_vt_x,
923 R->window_vt_y, TermWin_TotalWidth(),
924 TermWin_TotalHeight());
925#ifdef RXVT_GRAPHICS
926 if (R->old_height)
927 rxvt_Gr_Resize(aR_ R->old_width - R->szHint.base_width,
928 R->old_height - R->szHint.base_height);
929#endif
930 rxvt_scr_clear(aR);
931#ifdef XPM_BACKGROUND
932 rxvt_resize_pixmap(aR);
933#endif
934 }
935 958
936 if (fix_screen || R->old_height == 0) {
937 int curr_screen = -1;
938 uint16_t old_ncol = R->prev_ncol;
939
940 /* scr_reset only works on the primary screen */
941 if (R->old_height) /* this is not the first time through */
942 curr_screen = rxvt_scr_change_screen(aR_ PRIMARY);
943 rxvt_scr_reset(aR); 959 scr_reset();
960
944 if (curr_screen >= 0) { /* this is not the first time through */ 961 if (curr_screen >= 0) /* this is not the first time through */
962 {
945 rxvt_scr_change_screen(aR_ curr_screen); 963 scr_change_screen (curr_screen);
946 rxvt_selection_check(aR_(old_ncol != R->TermWin.ncol ? 4 : 0)); 964 selection_check (old_ncol != TermWin.ncol ? 4 : 0);
947 } 965 }
948 } 966 }
949 967
950 R->old_width = R->szHint.width; 968 old_width = szHint.width;
951 R->old_height = R->szHint.height; 969 old_height = szHint.height;
952 970
953#ifdef USE_XIM 971#ifdef USE_XIM
954 rxvt_IMSetStatusPosition(aR); 972 IMSetStatusPosition ();
955#endif 973#endif
956} 974}
957 975
958/* 976/*
959 * Set the width/height of the vt window in characters. Units are pixels. 977 * Set the width/height of the vt window in characters. Units are pixels.
960 * good for toggling 80/132 columns 978 * good for toggling 80/132 columns
961 */ 979 */
962/* EXTPROTO */
963void 980void
964rxvt_set_widthheight(pR_ unsigned int width, unsigned int height) 981rxvt_term::set_widthheight (unsigned int width, unsigned int height)
965{ 982{
966 XWindowAttributes wattr; 983 XWindowAttributes wattr;
967 984
968 if (width == 0 || height == 0) { 985 if (width == 0 || height == 0) {
969 XGetWindowAttributes(R->Xdisplay, Xroot, &wattr); 986 XGetWindowAttributes(Xdisplay, Xroot, &wattr);
970 if (width == 0) 987 if (width == 0)
971 width = wattr.width - R->szHint.base_width; 988 width = wattr.width - szHint.base_width;
972 if (height == 0) 989 if (height == 0)
973 height = wattr.height - R->szHint.base_height; 990 height = wattr.height - szHint.base_height;
974 } 991 }
975 if (width != R->TermWin.width || height != R->TermWin.height) { 992 if (width != TermWin.width || height != TermWin.height) {
976 width += R->szHint.base_width; 993 width += szHint.base_width;
977 height += R->szHint.base_height; 994 height += szHint.base_height;
978 rxvt_resize_all_windows(aR_ width, height, 0); 995 resize_all_windows (width, height, 0);
979 } 996 }
980} 997}
981 998
982/* -------------------------------------------------------------------- * 999/* -------------------------------------------------------------------- *
983 * - X INPUT METHOD ROUTINES - * 1000 * - X INPUT METHOD ROUTINES - *
984 * -------------------------------------------------------------------- */ 1001 * -------------------------------------------------------------------- */
985#ifdef USE_XIM 1002#ifdef USE_XIM
986/* INTPROTO */
987void 1003void
988rxvt_setSize(pR_ XRectangle * size) 1004rxvt_term::set_size (XRectangle *size)
989{ 1005{
990 size->x = R->TermWin.int_bwidth; 1006 size->x = TermWin.int_bwidth;
991 size->y = R->TermWin.int_bwidth; 1007 size->y = TermWin.int_bwidth;
992 size->width = Width2Pixel(R->TermWin.ncol); 1008 size->width = Width2Pixel(TermWin.ncol);
993 size->height = Height2Pixel(R->TermWin.nrow); 1009 size->height = Height2Pixel(TermWin.nrow);
994} 1010}
995 1011
996/* INTPROTO */
997void 1012void
998rxvt_setColor(pR_ unsigned long *fg, unsigned long *bg) 1013rxvt_term::set_color (unsigned long *fg, unsigned long *bg)
999{ 1014{
1000 *fg = R->PixColors[Color_fg]; 1015 *fg = PixColors[Color_fg];
1001 *bg = R->PixColors[Color_bg]; 1016 *bg = PixColors[Color_bg];
1002} 1017}
1003 1018
1004/* Checking whether input method is running. */ 1019/* Checking whether input method is running. */
1005/* INTPROTO */
1006Bool 1020bool
1007rxvt_IMisRunning(pR) 1021rxvt_term::IMisRunning ()
1008{ 1022{
1009 char *p; 1023 char *p;
1010 Atom atom; 1024 Atom atom;
1011 Window win; 1025 Window win;
1012 char server[IMBUFSIZ]; 1026 char server[IMBUFSIZ];
… …
1016 STRCPY(server, "@server="); 1030 STRCPY(server, "@server=");
1017 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */ 1031 STRNCAT(server, &(p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1018 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */ 1032 if ((p = STRCHR(server + 1, '@')) != NULL) /* first one only */
1019 *p = '\0'; 1033 *p = '\0';
1020 1034
1021 atom = XInternAtom(R->Xdisplay, server, False); 1035 atom = XInternAtom(Xdisplay, server, False);
1022 win = XGetSelectionOwner(R->Xdisplay, atom); 1036 win = XGetSelectionOwner(Xdisplay, atom);
1023 if (win != None) 1037 if (win != None)
1024 return True; 1038 return True;
1025 } 1039 }
1026 return False; 1040 return False;
1027} 1041}
1028 1042
1029/* EXTPROTO */
1030void 1043void
1031rxvt_IMSendSpot(pR) 1044rxvt_term::IMSendSpot ()
1032{ 1045{
1033 XPoint spot; 1046 XPoint spot;
1034 XVaNestedList preedit_attr; 1047 XVaNestedList preedit_attr;
1035 1048
1036 if (R->Input_Context == NULL 1049 if (Input_Context == NULL
1037 || !R->TermWin.focus || !(R->input_style & XIMPreeditPosition) 1050 || !TermWin.focus || !(input_style & XIMPreeditPosition)
1038 || !(R->event_type == KeyPress 1051 || !(event_type == KeyPress
1039 || R->event_type == Expose 1052 || event_type == Expose
1040 || R->event_type == NoExpose 1053 || event_type == NoExpose
1041 || R->event_type == SelectionNotify 1054 || event_type == SelectionNotify
1042 || R->event_type == ButtonRelease || R->event_type == FocusIn) 1055 || event_type == ButtonRelease || event_type == FocusIn)
1043 || !rxvt_IMisRunning(aR)) 1056 || !IMisRunning ())
1044 return; 1057 return;
1045 1058
1046 rxvt_setPosition(aR_ & spot); 1059 set_position (&spot);
1047 1060
1048 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); 1061 preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL);
1049 XSetICValues(R->Input_Context, XNPreeditAttributes, preedit_attr, NULL); 1062 XSetICValues(Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1050 XFree(preedit_attr); 1063 XFree(preedit_attr);
1051} 1064}
1052 1065
1066void
1067rxvt_term::set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect)
1069{
1070 int mbh, vtx = 0;
1071
1072 if (scrollbar_visible () && !(Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth();
1074
1075 mbh = menubar_visible () ? menuBar_TotalHeight() : 0;
1076 mbh -= TermWin.lineSpace;
1077
1078 preedit_rect->x = needed_rect->width + vtx;
1079 preedit_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1080
1081 preedit_rect->width = Width2Pixel(TermWin.ncol + 1) - needed_rect->width + vtx;
1082 preedit_rect->height = Height2Pixel(1);
1083
1084 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(TermWin.nrow - 1) + mbh;
1086
1087 status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel(TermWin.ncol + 1);
1088 status_rect->height = Height2Pixel(1);
1089}
1090
1091/* ARGSUSED */
1053/* EXTPROTO */ 1092/* EXTPROTO */
1054void
1055rxvt_setTermFontSet(pR_ int idx)
1056{
1057 char *string;
1058 long length;
1059 int success = 0;
1060
1061 if (idx < 0 || idx >= MAX_NFONTS)
1062 return;
1063}
1064
1065/* INTPROTO */
1066void
1067rxvt_setPreeditArea(pR_ XRectangle * preedit_rect, XRectangle * status_rect,
1068 XRectangle * needed_rect)
1069{
1070 int mbh, vtx = 0;
1071
1072 if (scrollbar_visible(R) && !(R->Options & Opt_scrollBar_right))
1073 vtx = scrollbar_TotalWidth();
1074 mbh = menubar_visible(R) ? menuBar_TotalHeight() : 0;
1075 mbh -= R->TermWin.lineSpace;
1076
1077 preedit_rect->x = needed_rect->width + vtx;
1078 preedit_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1079
1080 preedit_rect->width = Width2Pixel(R->TermWin.ncol + 1) - needed_rect->width
1081 + vtx;
1082 preedit_rect->height = Height2Pixel(1);
1083
1084 status_rect->x = vtx;
1085 status_rect->y = Height2Pixel(R->TermWin.nrow - 1) + mbh;
1086
1087 status_rect->width = needed_rect->width ? needed_rect->width
1088 : Width2Pixel(R->TermWin.ncol + 1);
1089 status_rect->height = Height2Pixel(1);
1090}
1091
1092/* ARGSUSED */
1093/* INTPROTO */
1094void 1093void
1095rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data 1094rxvt_IMDestroyCallback(XIM xim __attribute__ ((unused)), XPointer client_data
1096 __attribute__ ((unused)), XPointer call_data 1095 __attribute__ ((unused)), XPointer call_data
1097 __attribute__ ((unused))) 1096 __attribute__ ((unused)))
1098{ 1097{
1099 dR;
1100
1101 R->Input_Context = NULL; 1098 GET_R->Input_Context = NULL;
1102/* To avoid Segmentation Fault in C locale: Solaris only? */ 1099/* To avoid Segmentation Fault in C locale: Solaris only? */
1103 if (STRCMP(R->locale, "C")) 1100 if (STRCMP (GET_R->locale, "C"))
1104 XRegisterIMInstantiateCallback(R->Xdisplay, NULL, NULL, NULL, 1101 XRegisterIMInstantiateCallback(GET_R->Xdisplay, NULL, NULL, NULL,
1105 rxvt_IMInstantiateCallback, NULL); 1102 rxvt_IMInstantiateCallback, NULL);
1106}
1107
1108/*
1109 * X manual pages and include files don't match on some systems:
1110 * some think this is an XIDProc and others an XIMProc so we can't
1111 * use the first argument - need to update this to be nice for
1112 * both types via some sort of configure detection
1113 */
1114/* ARGSUSED */
1115/* EXTPROTO */
1116void
1117rxvt_IMInstantiateCallback(Display * unused
1118 __attribute__ ((unused)), XPointer client_data
1119 __attribute__ ((unused)), XPointer call_data
1120 __attribute__ ((unused)))
1121{
1122 dR;
1123 int i, found, had_im;
1124 const char *p;
1125 char **s;
1126 char buf[IMBUFSIZ];
1127
1128 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1129 if (R->Input_Context)
1130 return;
1131
1132 found = had_im = 0;
1133 p = R->rs[Rs_inputMethod];
1134 if (p && *p) {
1135 had_im = 1;
1136 s = rxvt_splitcommastring(p);
1137 for (i = 0; s[i]; i++) {
1138 if (*s[i]) {
1139 STRCPY(buf, "@im=");
1140 STRNCAT(buf, s[i], IMBUFSIZ - 5);
1141 if ((p = XSetLocaleModifiers(buf)) != NULL && *p
1142 && (rxvt_IM_get_IC(aR) == True)) {
1143 found = 1;
1144 break;
1145 }
1146 }
1147 }
1148 for (i = 0; s[i]; i++)
1149 free(s[i]);
1150 free(s);
1151 }
1152 if (found)
1153 return;
1154
1155/* try with XMODIFIERS env. var. */
1156 if ((p = XSetLocaleModifiers("")) != NULL && *p) {
1157 rxvt_IM_get_IC(aR);
1158 return;
1159 }
1160
1161/* try with no modifiers base IF the user didn't specify an IM */
1162 if (!had_im && (p = XSetLocaleModifiers("@im=none")) != NULL && *p
1163 && rxvt_IM_get_IC(aR) == True)
1164 return;
1165} 1103}
1166 1104
1167/* 1105/*
1168 * Try to open a XIM with the current modifiers, then see if we can 1106 * Try to open a XIM with the current modifiers, then see if we can
1169 * open a suitable preedit type 1107 * open a suitable preedit type
1170 */ 1108 */
1171/* INTPROTO */
1172Bool 1109bool
1173rxvt_IM_get_IC(pR) 1110rxvt_term::IM_get_IC ()
1174{ 1111{
1175 int i, j, found; 1112 int i, j, found;
1176 XIM xim; 1113 XIM xim;
1177 XPoint spot; 1114 XPoint spot;
1178 XRectangle rect, status_rect, needed_rect; 1115 XRectangle rect, status_rect, needed_rect;
… …
1182 XIMStyles *xim_styles; 1119 XIMStyles *xim_styles;
1183 XVaNestedList preedit_attr, status_attr; 1120 XVaNestedList preedit_attr, status_attr;
1184 XIMCallback ximcallback; 1121 XIMCallback ximcallback;
1185 1122
1186 D_MAIN((stderr, "rxvt_IM_get_IC()")); 1123 D_MAIN((stderr, "rxvt_IM_get_IC()"));
1187 xim = XOpenIM(R->Xdisplay, NULL, NULL, NULL); 1124 xim = XOpenIM (Xdisplay, NULL, NULL, NULL);
1188 if (xim == NULL) 1125 if (xim == NULL)
1189 return False; 1126 return False;
1190 1127
1191 xim_styles = NULL; 1128 xim_styles = NULL;
1192 if (XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL) 1129 if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1193 || !xim_styles || !xim_styles->count_styles) { 1130 || !xim_styles || !xim_styles->count_styles) {
1194 XCloseIM(xim); 1131 XCloseIM(xim);
1195 return False; 1132 return False;
1196 } 1133 }
1197 1134
1198 p = R->rs[Rs_preeditType] ? R->rs[Rs_preeditType] 1135 p = rs[Rs_preeditType] ? rs[Rs_preeditType]
1199 : "OverTheSpot,OffTheSpot,Root"; 1136 : "OverTheSpot,OffTheSpot,Root";
1200 s = rxvt_splitcommastring(p); 1137 s = rxvt_splitcommastring(p);
1201 for (i = found = 0; !found && s[i]; i++) { 1138 for (i = found = 0; !found && s[i]; i++) {
1202 if (!STRCMP(s[i], "OverTheSpot")) 1139 if (!STRCMP(s[i], "OverTheSpot"))
1203 R->input_style = (XIMPreeditPosition | XIMStatusNothing); 1140 input_style = (XIMPreeditPosition | XIMStatusNothing);
1204 else if (!STRCMP(s[i], "OffTheSpot")) 1141 else if (!STRCMP(s[i], "OffTheSpot"))
1205 R->input_style = (XIMPreeditArea | XIMStatusArea); 1142 input_style = (XIMPreeditArea | XIMStatusArea);
1206 else if (!STRCMP(s[i], "Root")) 1143 else if (!STRCMP(s[i], "Root"))
1207 R->input_style = (XIMPreeditNothing | XIMStatusNothing); 1144 input_style = (XIMPreeditNothing | XIMStatusNothing);
1208 1145
1209 for (j = 0; j < xim_styles->count_styles; j++) 1146 for (j = 0; j < xim_styles->count_styles; j++)
1210 if (R->input_style == xim_styles->supported_styles[j]) { 1147 if (input_style == xim_styles->supported_styles[j]) {
1211 found = 1; 1148 found = 1;
1212 break; 1149 break;
1213 } 1150 }
1214 } 1151 }
1215 for (i = 0; s[i]; i++) 1152 for (i = 0; s[i]; i++)
… …
1222 return False; 1159 return False;
1223 } 1160 }
1224 1161
1225 ximcallback.callback = rxvt_IMDestroyCallback; 1162 ximcallback.callback = rxvt_IMDestroyCallback;
1226 1163
1227/* XXX: not sure why we need this (as well as IC one below) */ 1164 /* XXX: not sure why we need this (as well as IC one below) */
1228 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL); 1165 XSetIMValues(xim, XNDestroyCallback, &ximcallback, NULL);
1229 1166
1230 preedit_attr = status_attr = NULL; 1167 preedit_attr = status_attr = NULL;
1231 1168
1232 if (R->input_style & XIMPreeditPosition) { 1169 if (input_style & XIMPreeditPosition) {
1233 rxvt_setSize(aR_ & rect); 1170 set_size (&rect);
1234 rxvt_setPosition(aR_ & spot); 1171 set_position (&spot);
1235 rxvt_setColor(aR_ & fg, &bg); 1172 set_color (&fg, &bg);
1236 1173
1237 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1174 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1238 XNSpotLocation, &spot, 1175 XNSpotLocation, &spot,
1239 XNForeground, fg, XNBackground, bg, 1176 XNForeground, fg, XNBackground, bg,
1240 //XNFontSet, R->TermWin.fontset, 1177 //XNFontSet, TermWin.fontset,
1241 NULL); 1178 NULL);
1242 } else if (R->input_style & XIMPreeditArea) { 1179 } else if (input_style & XIMPreeditArea) {
1243 rxvt_setColor(aR_ & fg, &bg); 1180 set_color (&fg, &bg);
1244 1181
1245 /* 1182 /*
1246 * The necessary width of preedit area is unknown 1183 * The necessary width of preedit area is unknown
1247 * until create input context. 1184 * until create input context.
1248 */ 1185 */
1249 needed_rect.width = 0; 1186 needed_rect.width = 0;
1250 1187
1251 rxvt_setPreeditArea(aR_ & rect, &status_rect, &needed_rect); 1188 set_preedit_area(&rect, &status_rect, &needed_rect);
1252 1189
1253 preedit_attr = XVaCreateNestedList(0, XNArea, &rect, 1190 preedit_attr = XVaCreateNestedList(0, XNArea, &rect,
1254 XNForeground, fg, XNBackground, bg, 1191 XNForeground, fg, XNBackground, bg,
1255 //XNFontSet, R->TermWin.fontset, 1192 //XNFontSet, TermWin.fontset,
1256 NULL); 1193 NULL);
1257 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, 1194 status_attr = XVaCreateNestedList(0, XNArea, &status_rect,
1258 XNForeground, fg, XNBackground, bg, 1195 XNForeground, fg, XNBackground, bg,
1259 //XNFontSet, R->TermWin.fontset, 1196 //XNFontSet, TermWin.fontset,
1260 NULL); 1197 NULL);
1261 } 1198 }
1262 R->Input_Context = XCreateIC(xim, XNInputStyle, R->input_style, 1199 Input_Context = XCreateIC(xim, XNInputStyle, input_style,
1263 XNClientWindow, R->TermWin.parent[0], 1200 XNClientWindow, TermWin.parent[0],
1264 XNFocusWindow, R->TermWin.parent[0], 1201 XNFocusWindow, TermWin.parent[0],
1265 XNDestroyCallback, &ximcallback, 1202 XNDestroyCallback, &ximcallback,
1266 preedit_attr ? XNPreeditAttributes : NULL, 1203 preedit_attr ? XNPreeditAttributes : NULL,
1267 preedit_attr, 1204 preedit_attr,
1268 status_attr ? XNStatusAttributes : NULL, 1205 status_attr ? XNStatusAttributes : NULL,
1269 status_attr, NULL); 1206 status_attr, NULL);
1270 if (preedit_attr) 1207 if (preedit_attr)
1271 XFree(preedit_attr); 1208 XFree(preedit_attr);
1272 if (status_attr) 1209 if (status_attr)
1273 XFree(status_attr); 1210 XFree(status_attr);
1274 if (R->Input_Context == NULL) { 1211 if (Input_Context == NULL) {
1275 rxvt_print_error("failed to create input context"); 1212 rxvt_print_error("failed to create input context");
1276 XCloseIM(xim); 1213 XCloseIM(xim);
1277 return False; 1214 return False;
1278 } 1215 }
1279 if (R->input_style & XIMPreeditArea) 1216 if (input_style & XIMPreeditArea)
1280 rxvt_IMSetStatusPosition(aR); 1217 IMSetStatusPosition ();
1281 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection")); 1218 D_MAIN((stderr, "rxvt_IM_get_IC() - successful connection"));
1282 return True; 1219 return True;
1283} 1220}
1284 1221
1222/*
1223 * X manual pages and include files don't match on some systems:
1224 * some think this is an XIDProc and others an XIMProc so we can't
1225 * use the first argument - need to update this to be nice for
1226 * both types via some sort of configure detection
1227 */
1228/* ARGSUSED */
1285/* EXTPROTO */ 1229/* EXTPROTO */
1286void 1230void
1231rxvt_IMInstantiateCallback(Display * unused
1232 __attribute__ ((unused)), XPointer client_data
1233 __attribute__ ((unused)), XPointer call_data
1234 __attribute__ ((unused)))
1235{
1236 int i, found, had_im;
1237 const char *p;
1238 char **s;
1239 char buf[IMBUFSIZ];
1240
1241 D_MAIN((stderr, "rxvt_IMInstantiateCallback()"));
1242 if (GET_R->Input_Context)
1243 return;
1244
1245#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1246 if (GET_R->rs[Rs_imLocale])
1247 setlocale (LC_CTYPE, GET_R->rs[Rs_imLocale]);
1248#endif
1249
1250 p = GET_R->rs[Rs_inputMethod];
1251 if (p && *p)
1252 {
1253 bool found = false;
1254
1255 s = rxvt_splitcommastring (p);
1256 for (i = 0; s[i]; i++)
1257 {
1258 if (*s[i])
1259 {
1260 STRCPY (buf, "@im=");
1261 STRNCAT (buf, s[i], IMBUFSIZ - 5);
1262 if ((p = XSetLocaleModifiers (buf)) && *p && GET_R->IM_get_IC ())
1263 {
1264 found = true;
1265 break;
1266 }
1267 }
1268 }
1269 for (i = 0; s[i]; i++)
1270 free(s[i]);
1271 free(s);
1272
1273 if (found)
1274 goto done;
1275 }
1276
1277/* try with XMODIFIERS env. var. */
1278 if ((p = XSetLocaleModifiers ("")) && *p
1279 && GET_R->IM_get_IC ())
1280 goto done;
1281
1282/* try with no modifiers base IF the user didn't specify an IM */
1283 if ((p = XSetLocaleModifiers ("@im=none")) && *p
1284 && GET_R->IM_get_IC () == True)
1285 goto done;
1286
1287done:
1288#if defined(HAVE_XSETLOCALE) || defined(HAVE_SETLOCALE)
1289 if (GET_R->rs[Rs_imLocale])
1290 setlocale (LC_CTYPE, GET_R->locale);
1291#endif
1292}
1293
1294void
1287rxvt_IMSetStatusPosition(pR) 1295rxvt_term::IMSetStatusPosition ()
1288{ 1296{
1289 XRectangle preedit_rect, status_rect, *needed_rect; 1297 XRectangle preedit_rect, status_rect, *needed_rect;
1290 XVaNestedList preedit_attr, status_attr; 1298 XVaNestedList preedit_attr, status_attr;
1291 1299
1292 if (R->Input_Context == NULL 1300 if (Input_Context == NULL
1293 || !R->TermWin.focus || !(R->input_style & XIMPreeditArea) 1301 || !TermWin.focus || !(input_style & XIMPreeditArea)
1294 || !rxvt_IMisRunning(aR)) 1302 || !IMisRunning ())
1295 return; 1303 return;
1296 1304
1297/* Getting the necessary width of preedit area */ 1305/* Getting the necessary width of preedit area */
1298 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL); 1306 status_attr = XVaCreateNestedList(0, XNAreaNeeded, &needed_rect, NULL);
1299 XGetICValues(R->Input_Context, XNStatusAttributes, status_attr, NULL); 1307 XGetICValues(Input_Context, XNStatusAttributes, status_attr, NULL);
1300 XFree(status_attr); 1308 XFree(status_attr);
1301 1309
1302 rxvt_setPreeditArea(aR_ & preedit_rect, &status_rect, needed_rect); 1310 set_preedit_area(&preedit_rect, &status_rect, needed_rect);
1303 1311
1304 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL); 1312 preedit_attr = XVaCreateNestedList(0, XNArea, &preedit_rect, NULL);
1305 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL); 1313 status_attr = XVaCreateNestedList(0, XNArea, &status_rect, NULL);
1306 1314
1307 XSetICValues(R->Input_Context, 1315 XSetICValues(Input_Context,
1308 XNPreeditAttributes, preedit_attr, 1316 XNPreeditAttributes, preedit_attr,
1309 XNStatusAttributes, status_attr, NULL); 1317 XNStatusAttributes, status_attr, NULL);
1310 1318
1311 XFree(preedit_attr); 1319 XFree(preedit_attr);
1312 XFree(status_attr); 1320 XFree(status_attr);

Diff Legend

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