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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines