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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines