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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines