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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines