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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines