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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines