ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/main.C
(Generate patch)

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.5 by pcg, Tue Nov 25 15:44:38 2003 UTC vs.
Revision 1.33 by pcg, Fri Feb 13 13:28:17 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines