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

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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines