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.3 by pcg, Tue Nov 25 11:52:42 2003 UTC vs.
Revision 1.37 by pcg, Sat Feb 21 20:35:33 2004 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines