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.17 by pcg, Thu Dec 18 13:33:02 2003 UTC vs.
Revision 1.44 by pcg, Tue Feb 24 16:25:44 2004 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines