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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines