ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.80 by root, Fri Aug 13 19:31:23 2004 UTC vs.
Revision 1.140 by root, Thu Feb 17 15:07:48 2005 UTC

…		…
30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	30	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
31	*---------------------------------------------------------------------*/	31	*---------------------------------------------------------------------*/
32		32
33	#include "../config.h" /* NECESSARY */	33	#include "../config.h" /* NECESSARY */
34	#include "rxvt.h" /* NECESSARY */	34	#include "rxvt.h" /* NECESSARY */
35	#include "main.intpro" /* PROTOS for internal routines */
36		35
37	#include <signal.h>	36	#include <csignal>
		37	#include <cstring>
38		38
39	#ifdef TTY_GID_SUPPORT	39	#ifdef TTY_GID_SUPPORT
40	# include <grp.h>	40	# include <grp.h>
41	#endif	41	#endif
42		42
43	#ifdef HAVE_TERMIOS_H	43	#ifdef HAVE_TERMIOS_H
44	# include <termios.h>	44	# include <termios.h>
45	#endif	45	#endif
46		46
47	#include <cstring>	47	#ifdef KEYSYM_RESOURCE
		48	# include "keyboard.h"
		49	#endif
48		50
49	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
50		52
51	static char curlocale[128];	53	static char curlocale[128];
52		54
53	bool	55	bool
54	rxvt_set_locale (const char *locale)	56	rxvt_set_locale (const char *locale)
55	{	57	{
56	if (!locale || !STRNCMP (locale, curlocale, 128))	58	if (!locale || !strncmp (locale, curlocale, 128))
57	return false;	59	return false;
58		60
59	STRNCPY (curlocale, locale, 128);	61	strncpy (curlocale, locale, 128);
60	setlocale (LC_CTYPE, curlocale);	62	setlocale (LC_CTYPE, curlocale);
61	return true;	63	return true;
62	}	64	}
63		65
64	#if ENABLE_COMBINING	66	#if ENABLE_COMBINING
…		…
123	return len;	125	return len;
124		126
125	}	127	}
126	#endif	128	#endif
127		129
128	void *
129	rxvt_term::operator new (size_t s)
130	{
131	void *p = malloc (s);
132
133	MEMSET (p, 0, s);
134	return p;
135	}
136
137	void
138	rxvt_term::operator delete (void *p, size_t s)
139	{
140	free (p);
141	}
142
143	rxvt_term::rxvt_term ()	130	rxvt_term::rxvt_term ()
144	:	131	:
145	#if TRANSPARENT	132	#if TRANSPARENT
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	133	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	134	#endif
…		…
170	pointer_ev (this, &rxvt_term::pointer_cb),	157	pointer_ev (this, &rxvt_term::pointer_cb),
171	#endif	158	#endif
172	#ifdef USE_XIM	159	#ifdef USE_XIM
173	im_ev (this, &rxvt_term::im_cb),	160	im_ev (this, &rxvt_term::im_cb),
174	#endif	161	#endif
		162	sw_term (this, &rxvt_term::sig_term),
		163	sw_int (this, &rxvt_term::sig_term),
		164	sw_chld (this, &rxvt_term::sig_chld),
175	termwin_ev (this, &rxvt_term::x_cb),	165	termwin_ev (this, &rxvt_term::x_cb),
176	vt_ev (this, &rxvt_term::x_cb),	166	vt_ev (this, &rxvt_term::x_cb),
177	check_ev (this, &rxvt_term::check_cb),	167	check_ev (this, &rxvt_term::check_cb),
178	flush_ev (this, &rxvt_term::flush_cb),	168	flush_ev (this, &rxvt_term::flush_cb),
179	destroy_ev (this, &rxvt_term::destroy_cb),	169	destroy_ev (this, &rxvt_term::destroy_cb),
…		…
181	incr_ev (this, &rxvt_term::incr_cb)	171	incr_ev (this, &rxvt_term::incr_cb)
182	{	172	{
183	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;	173	cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
184		174
185	termlist.push_back (this);	175	termlist.push_back (this);
186	}
187		176
188	rxvt_term::~rxvt_term ()	177	#ifdef KEYSYM_RESOURCE
189	{	178	keyboard = new keyboard_manager;
190	termlist.erase (find (termlist.begin (), termlist.end(), this));
191		179
		180	if (!keyboard)
		181	rxvt_fatal ("out of memory, aborting.\n");
		182	#endif
		183	}
		184
		185	// clean up the most important stuff, do *not* call x or free mem etc.
		186	// for use before an emergency exit
		187	void rxvt_term::emergency_cleanup ()
		188	{
192	if (cmd_fd >= 0)	189	if (cmd_pid)
193	close (cmd_fd);	190	kill (-cmd_pid, SIGHUP);
194		191
195	#ifndef NO_SETOWNER_TTYDEV
196	privileged_ttydev (RESTORE);
197	#endif
198	#ifdef UTMP_SUPPORT	192	#ifdef UTMP_SUPPORT
199	privileged_utmp (RESTORE);	193	privileged_utmp (RESTORE);
200	#endif	194	#endif
201		195
		196	pty.put ();
		197	}
		198
		199	rxvt_term::~rxvt_term ()
		200	{
		201	termlist.erase (find (termlist.begin (), termlist.end(), this));
		202
		203	emergency_cleanup ();
		204
		205	#if ENABLE_STYLES
		206	for (int i = RS_styleCount; --i; )
		207	if (TermWin.fontset[i] != TermWin.fontset[0])
		208	delete TermWin.fontset[i];
		209	#endif
202	delete TermWin.fontset;	210	delete TermWin.fontset[0];
203		211
204	if (display)	212	if (display)
205	{	213	{
		214	dDisp;
		215
206	selection_clear ();	216	selection_clear ();
207		217
208	#ifdef USE_XIM	218	#ifdef USE_XIM
209	im_destroy ();	219	im_destroy ();
210	#endif	220	#endif
211	#ifdef MENUBAR	221	#ifdef MENUBAR
212	if (menubarGC) XFreeGC (display->display, menubarGC);	222	if (menubarGC) XFreeGC (disp, menubarGC);
213	#endif	223	#endif
214	#ifdef XTERM_SCROLLBAR	224	#ifdef XTERM_SCROLLBAR
215	if (xscrollbarGC) XFreeGC (display->display, xscrollbarGC);	225	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);
216	if (ShadowGC) XFreeGC (display->display, ShadowGC);	226	if (ShadowGC) XFreeGC (disp, ShadowGC);
217	#endif	227	#endif
218	#ifdef PLAIN_SCROLLBAR	228	#ifdef PLAIN_SCROLLBAR
219	if (pscrollbarGC) XFreeGC (display->display, pscrollbarGC);	229	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);
220	#endif	230	#endif
221	#ifdef NEXT_SCROLLBAR	231	#ifdef NEXT_SCROLLBAR
222	if (blackGC) XFreeGC (display->display, blackGC);	232	if (blackGC) XFreeGC (disp, blackGC);
223	if (whiteGC) XFreeGC (display->display, whiteGC);	233	if (whiteGC) XFreeGC (disp, whiteGC);
224	if (grayGC) XFreeGC (display->display, grayGC);	234	if (grayGC) XFreeGC (disp, grayGC);
225	if (darkGC) XFreeGC (display->display, darkGC);	235	if (darkGC) XFreeGC (disp, darkGC);
226	if (stippleGC) XFreeGC (display->display, stippleGC);	236	if (stippleGC) XFreeGC (disp, stippleGC);
227	if (dimple) XFreePixmap (display->display, dimple);	237	if (dimple) XFreePixmap (disp, dimple);
228	if (upArrow) XFreePixmap (display->display, upArrow);	238	if (upArrow) XFreePixmap (disp, upArrow);
229	if (downArrow) XFreePixmap (display->display, downArrow);	239	if (downArrow) XFreePixmap (disp, downArrow);
230	if (upArrowHi) XFreePixmap (display->display, upArrowHi);	240	if (upArrowHi) XFreePixmap (disp, upArrowHi);
231	if (downArrowHi) XFreePixmap (display->display, downArrowHi);	241	if (downArrowHi) XFreePixmap (disp, downArrowHi);
232	#endif	242	#endif
233	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)	243	#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
234	if (topShadowGC) XFreeGC (display->display, topShadowGC);	244	if (topShadowGC) XFreeGC (disp, topShadowGC);
235	if (botShadowGC) XFreeGC (display->display, botShadowGC);	245	if (botShadowGC) XFreeGC (disp, botShadowGC);
236	if (scrollbarGC) XFreeGC (display->display, scrollbarGC);	246	if (scrollbarGC) XFreeGC (disp, scrollbarGC);
237	#endif	247	#endif
238	if (TermWin.gc) XFreeGC (display->display, TermWin.gc);	248	if (TermWin.gc) XFreeGC (disp, TermWin.gc);
239		249
240	#if defined(MENUBAR) && (MENUBAR_MAX > 1)	250	#if defined(MENUBAR) && (MENUBAR_MAX > 1)
241	delete menuBar.drawable;	251	delete menuBar.drawable;
242	//if (menuBar.win)	252	//if (menuBar.win)
243	// XDestroyWindow (display->display, menuBar.win);	253	// XDestroyWindow (disp, menuBar.win);
244	#endif	254	#endif
245	delete TermWin.drawable;	255	delete TermWin.drawable;
246	// destroy all windows	256	// destroy all windows
247	if (TermWin.parent[0])	257	if (TermWin.parent[0]
		258	#if ENABLE_FRILLS
		259	&& !rs[Rs_embed]
		260	#endif
		261	)
248	XDestroyWindow (display->display, TermWin.parent[0]);	262	XDestroyWindow (disp, TermWin.parent[0]);
249	}	263	}
250		264
251	// TODO: free pixcolours, colours should become part of rxvt_display	265	// TODO: free pixcolours, colours should become part of rxvt_display
252		266
253	delete PixColorsFocused;	267	delete pix_colors_focused;
254	#ifdef OFF_FOCUS_FADING	268	#ifdef OFF_FOCUS_FADING
255	delete PixColorsUnFocused;	269	delete pix_colors_unfocused;
256	#endif	270	#endif
257		271
258	displays.put (display);	272	displays.put (display);
259		273
260	scr_release ();	274	scr_release ();
261		275
262	/* clear all resources */	276	/* clear all resources */
263	for (int i = 0; i < allocated.size (); i++)	277	for (int i = 0; i < allocated.size (); i++)
264	free (allocated[i]);	278	free (allocated [i]);
265		279
266	free (selection.text);	280	free (selection.text);
267	// TODO: manage env vars in child only(!)	281	// TODO: manage env vars in child only(!)
268	free (env_windowid);	282	free (env_windowid);
269	free (env_display);	283	free (env_display);
270	free (env_term);	284	free (env_term);
271	free (env_colorfgbg);	285	free (env_colorfgbg);
272	free (locale);	286	free (locale);
273	#if 0	287	free (v_buffer);
274	free (codeset);	288	free (incr_buf);
275	#endif
276		289
277	delete envv;	290	delete envv;
278	delete argv;	291	delete argv;
		292
		293	#ifdef KEYSYM_RESOURCE
		294	delete keyboard;
		295	#endif
279	}	296	}
280		297
281	void	298	void
282	rxvt_term::destroy ()	299	rxvt_term::destroy ()
283	{	300	{
284	if (destroy_ev.active)	301	if (destroy_ev.active)
285	return;	302	return;
		303
		304	#if ENABLE_OVERLAY
		305	scr_overlay_off ();
		306	#endif
286		307
287	if (display)	308	if (display)
288	{	309	{
289	#if USE_XIM	310	#if USE_XIM
290	im_ev.stop (display);	311	im_ev.stop (display);
…		…
331		352
332	delete this;	353	delete this;
333	}	354	}
334		355
335	/*----------------------------------------------------------------------*/	356	/*----------------------------------------------------------------------*/
		357	/*
		358	* Exit gracefully, clearing the utmp entry and restoring tty attributes
		359	* TODO: if debugging, this should free up any known resources if we can
		360	*/
		361	static XErrorHandler old_xerror_handler;
		362
		363	static void
		364	rxvt_emergency_cleanup ()
		365	{
		366	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
		367	(*t)->emergency_cleanup ();
		368	}
		369
		370	#if ENABLE_FRILLS
		371	static void
		372	print_x_error (Display *dpy, XErrorEvent *event)
		373	{
		374	char buffer[BUFSIZ];
		375	char mesg[BUFSIZ];
		376	char number[32];
		377	char *mtype = "XlibMessage";
		378	XGetErrorText(dpy, event->error_code, buffer, BUFSIZ);
		379	XGetErrorDatabaseText(dpy, mtype, "XError", "X Error", mesg, BUFSIZ);
		380	rxvt_warn ("An X Error occured, trying to continue after report.\n");
		381	rxvt_warn ("%s: %s\n", mesg, buffer);
		382	XGetErrorDatabaseText(dpy, mtype, "MajorCode", "Request Major code %d", mesg, BUFSIZ);
		383	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->request_code);
		384	sprintf(number, "%d", event->request_code);
		385	XGetErrorDatabaseText(dpy, "XRequest", number, "", buffer, BUFSIZ);
		386	rxvt_warn ("(which is %s)\n", buffer);
		387	if (event->request_code >= 128) {
		388	XGetErrorDatabaseText(dpy, mtype, "MinorCode", "Request Minor code %d",
		389	mesg, BUFSIZ);
		390	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->minor_code);
		391	}
		392	if ((event->error_code == BadWindow) ||
		393	(event->error_code == BadPixmap) ||
		394	(event->error_code == BadCursor) ||
		395	(event->error_code == BadFont) ||
		396	(event->error_code == BadDrawable) ||
		397	(event->error_code == BadColor) ||
		398	(event->error_code == BadGC) ||
		399	(event->error_code == BadIDChoice) ||
		400	(event->error_code == BadValue) ||
		401	(event->error_code == BadAtom)) {
		402	if (event->error_code == BadValue)
		403	XGetErrorDatabaseText(dpy, mtype, "Value", "Value 0x%x",
		404	mesg, BUFSIZ);
		405	else if (event->error_code == BadAtom)
		406	XGetErrorDatabaseText(dpy, mtype, "AtomID", "AtomID 0x%x",
		407	mesg, BUFSIZ);
		408	else
		409	XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
		410	mesg, BUFSIZ);
		411	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
		412	}
		413	XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
		414	mesg, BUFSIZ);
		415	rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
		416	}
		417	#endif
		418
		419	int
		420	rxvt_xerror_handler (Display *display, XErrorEvent *event)
		421	{
		422	if (GET_R->allowedxerror == -1)
		423	GET_R->allowedxerror = event->error_code;
		424	else
		425	{
		426	//TODO: GET_R is most likely not the terminal which caused the error
		427	//TODO: maybe just output the error and continue?
		428	#if ENABLE_FRILLS
		429	print_x_error (display, event);
		430	#else
		431	old_xerror_handler (display, event);
		432	#endif
		433	}
		434
		435	return 0;
		436	}
		437
		438	int
		439	rxvt_xioerror_handler (Display *display)
		440	{
		441	rxvt_warn ("X connection to '%s' broken, unable to recover, exiting.\n",
		442	DisplayString (display));
		443	rxvt_emergency_cleanup ();
		444	_exit (EXIT_FAILURE);
		445	}
		446
		447	/*
		448	* Catch a fatal signal and tidy up before quitting
		449	*/
		450	void
		451	rxvt_term::sig_term (sig_watcher &w)
		452	{
		453	#ifdef DEBUG_CMD
		454	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
		455	#endif
		456	rxvt_emergency_cleanup ();
		457	signal (w.signum, SIG_DFL);
		458	kill (getpid (), w.signum);
		459	}
		460
		461	/*----------------------------------------------------------------------*/
336	/* rxvt_init () */	462	/* rxvt_init () */
337	bool	463	bool
338	rxvt_term::init (int argc, const char *const *argv)	464	rxvt_term::init (int argc, const char *const *argv)
339	{	465	{
340	SET_R (this);	466	SET_R (this);
341		467
		468	set_locale ("");
		469
342	if (!init_vars ())	470	if (!init_vars ())
343	return false;	471	return false;
344		472
		473	init_secondary ();
		474
		475	const char **cmd_argv = init_resources (argc, argv);
		476
		477	#ifdef KEYSYM_RESOURCE
		478	keyboard->register_done ();
		479	#endif
		480
		481	#if MENUBAR_MAX
		482	menubar_read (rs[Rs_menu]);
		483	#endif
		484	#ifdef HAVE_SCROLLBARS
		485	if (options & Opt_scrollBar)
		486	scrollBar.setIdle (); /* set existence for size calculations */
		487	#endif
		488
		489	create_windows (argc, argv);
		490
		491	dDisp;
		492
		493	init_xlocale ();
		494
		495	scr_reset (); /* initialize screen */
		496
		497	#if 0
		498	XSynchronize (disp, True);
		499	#endif
		500
		501	#ifdef HAVE_SCROLLBARS
		502	if (options & Opt_scrollBar)
		503	resize_scrollbar (); /* create and map scrollbar */
		504	#endif
		505	#if (MENUBAR_MAX)
		506	if (menubar_visible ())
		507	XMapWindow (disp, menuBar.win);
		508	#endif
		509	#ifdef TRANSPARENT
		510	if (options & Opt_transparent)
		511	{
		512	XSelectInput (disp, display->root, PropertyChangeMask);
		513	check_our_parents ();
		514	rootwin_ev.start (display, display->root);
		515	}
		516	#endif
		517
		518	XMapWindow (disp, TermWin.vt);
		519	XMapWindow (disp, TermWin.parent[0]);
		520
		521	set_colorfgbg ();
		522
		523	init_command (cmd_argv);
		524
		525	free (cmd_argv);
		526
		527	pty_ev.start (pty.pty, EVENT_READ);
		528
		529	check_ev.start ();
		530
		531	return true;
		532	}
		533
		534	void
		535	rxvt_init ()
		536	{
345	/*	537	/*
346	* Save and then give up any super-user privileges	538	* Save and then give up any super-user privileges
347	* If we need privileges in any area then we must specifically request it.	539	* If we need privileges in any area then we must specifically request it.
348	* We should only need to be root in these cases:	540	* We should only need to be root in these cases:
349	* 1. write utmp entries on some systems	541	* 1. write utmp entries on some systems
350	* 2. chown tty on some systems	542	* 2. chown tty on some systems
351	*/	543	*/
352	privileges (SAVE);	544	rxvt_privileges (SAVE);
353	privileges (IGNORE);	545	rxvt_privileges (IGNORE);
354		546
355	init_secondary ();	547	signal (SIGHUP, SIG_IGN);
356		548	signal (SIGPIPE, SIG_IGN);
357	const char **cmd_argv = init_resources (argc, argv);
358
359	set_locale ("");
360
361	#if MENUBAR_MAX
362	menubar_read (rs[Rs_menu]);
363	#endif
364	#ifdef HAVE_SCROLLBARS
365	if (Options & Opt_scrollBar)
366	scrollBar.setIdle (); /* set existence for size calculations */
367	#endif
368
369	create_windows (argc, argv);
370
371	init_xlocale ();
372
373	scr_reset (); /* initialize screen */
374
375	#if 0
376	XSynchronize (display->display, True);
377	#endif
378
379	#ifdef HAVE_SCROLLBARS
380	if (Options & Opt_scrollBar)
381	resize_scrollbar (); /* create and map scrollbar */
382	#endif
383	#if (MENUBAR_MAX)
384	if (menubar_visible ())
385	XMapWindow (display->display, menuBar.win);
386	#endif
387	#ifdef TRANSPARENT
388	if (Options & Opt_transparent)
389	{
390	XSelectInput (display->display, display->root, PropertyChangeMask);
391	check_our_parents ();
392	rootwin_ev.start (display, display->root);
393	}
394	#endif
395
396	XMapWindow (display->display, TermWin.vt);
397	XMapWindow (display->display, TermWin.parent[0]);
398
399	init_command (cmd_argv);
400
401	pty_ev.start (cmd_fd, EVENT_READ);
402
403	check_ev.start ();
404
405	return true;
406	}
407
408	static int (*old_xerror_handler) (Display *dpy, XErrorEvent *event);
409
410	void
411	rxvt_init_signals ()
412	{
413	/* install exit handler for cleanup */
414	#if 0
415	#ifdef HAVE_ATEXIT
416	atexit (rxvt_clean_exit);
417	#else
418	#endif
419	#endif
420
421	struct sigaction sa;
422
423	sigfillset (&sa.sa_mask);
424	sa.sa_flags = SA_NOCLDSTOP | SA_RESTART;
425	sa.sa_handler = SIG_IGN; sigaction (SIGHUP , &sa, 0);
426	sa.sa_handler = SIG_IGN; sigaction (SIGPIPE, &sa, 0);
427	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGINT , &sa, 0);
428	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGQUIT, &sa, 0);
429	sa.sa_handler = rxvt_Exit_signal; sigaction (SIGTERM, &sa, 0);
430	sa.sa_handler = rxvt_Child_signal; sigaction (SIGCHLD, &sa, 0);
431		549
432	/* need to trap SIGURG for SVR4 (Unixware) rlogin */	550	/* need to trap SIGURG for SVR4 (Unixware) rlogin */
433	/* signal (SIGURG, SIG_DFL); */	551	/* signal (SIGURG, SIG_DFL); */
434		552
435	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);	553	old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
		554	// TODO: handle this with exceptions and tolerate the memory loss
436	//XSetIOErrorHandler ((XErrorHandler) rxvt_xioerror_handler);	555	XSetIOErrorHandler (rxvt_xioerror_handler);
437	}	556	}
438		557
439	/* ------------------------------------------------------------------------- *	558	/* ------------------------------------------------------------------------- *
440	* SIGNAL HANDLING & EXIT HANDLER *	559	* SIGNAL HANDLING & EXIT HANDLER *
441	* ------------------------------------------------------------------------- */	560	* ------------------------------------------------------------------------- */
442	/*	561	/*
443	* Catch a SIGCHLD signal and exit if the direct child has died	562	* Catch a SIGCHLD signal and exit if the direct child has died
444	*/	563	*/
445		564
446	void rxvt_term::child_exited (int pid)	565	void
		566	rxvt_term::sig_chld (sig_watcher &w)
447	{	567	{
448	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)	568	// we are being called for every SIGCHLD, not just ours
449	if (pid == (*t)->cmd_pid)	569	int pid;
450	{
451	(*t)->destroy ();
452	break;
453	}
454	}
455
456	/* ARGSUSED */
457	/* EXTPROTO */
458	RETSIGTYPE
459	rxvt_Child_signal (int sig __attribute__ ((unused)))
460	{
461	int pid, save_errno = errno;
462		570
463	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)	571	while ((pid = waitpid (-1, NULL, WNOHANG)) > 0)
464	rxvt_term::child_exited (pid);	572	for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
465		573	if (pid == (*t)->cmd_pid)
466	errno = save_errno;	574	{
467	}	575	(*t)->destroy ();
468		576	break;
469	/*	577	}
470	* Catch a fatal signal and tidy up before quitting
471	*/
472	/* EXTPROTO */
473	RETSIGTYPE
474	rxvt_Exit_signal (int sig)
475	{
476	signal (sig, SIG_DFL);
477	#ifdef DEBUG_CMD
478	rxvt_warn ("caught signal %d, exiting.\n", sig);
479	#endif
480	rxvt_clean_exit ();
481	kill (getpid (), sig);
482	}
483
484	/* INTPROTO */
485	int
486	rxvt_xerror_handler (Display *display, XErrorEvent *event)
487	{
488	if (GET_R->allowedxerror == -1)
489	GET_R->allowedxerror = event->error_code;
490	else
491	{
492	old_xerror_handler (display, event);
493	GET_R->destroy ();
494	}
495
496	return 0;
497	}
498
499	/*----------------------------------------------------------------------*/
500	/*
501	* Exit gracefully, clearing the utmp entry and restoring tty attributes
502	* TODO: if debugging, this should free up any known resources if we can
503	*/
504	/* EXTPROTO */
505	void
506	rxvt_clean_exit ()
507	{
508	// TODO: rxvtd should clean up all ressources
509	if (GET_R)
510	GET_R->destroy ();
511	}	578	}
512		579
513	/* ------------------------------------------------------------------------- *	580	/* ------------------------------------------------------------------------- *
514	* MEMORY ALLOCATION WRAPPERS *	581	* MEMORY ALLOCATION WRAPPERS *
515	* ------------------------------------------------------------------------- */	582	* ------------------------------------------------------------------------- */
516	/* EXTPROTO */	583	void *
517	void *
518	rxvt_malloc (size_t size)	584	rxvt_malloc (size_t size)
519	{	585	{
520	void *p;
521
522	p = malloc (size);	586	void *p = malloc (size);
		587
523	if (p)	588	if (!p)
		589	rxvt_fatal ("memory allocation failure. aborting.\n");
		590
524	return p;	591	return p;
525
526	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
527	rxvt_clean_exit ();
528	exit (EXIT_FAILURE);
529	/* NOTREACHED */
530	}	592	}
531		593
532	/* EXTPROTO */
533	void *	594	void *
534	rxvt_calloc (size_t number, size_t size)	595	rxvt_calloc (size_t number, size_t size)
535	{	596	{
536	void *p;
537
538	p = calloc (number, size);	597	void *p = calloc (number, size);
		598
539	if (p)	599	if (!p)
		600	rxvt_fatal ("memory allocation failure. aborting.\n");
		601
540	return p;	602	return p;
541
542	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
543	rxvt_clean_exit ();
544	exit (EXIT_FAILURE);
545	/* NOTREACHED */
546	}	603	}
547		604
548	/* EXTPROTO */
549	void *	605	void *
550	rxvt_realloc (void *ptr, size_t size)	606	rxvt_realloc (void *ptr, size_t size)
551	{	607	{
552	void *p;
553
554	if (ptr)
555	p = realloc (ptr, size);	608	void *p = realloc (ptr, size);
556	else	609
557	p = malloc (size);
558	if (p)	610	if (!p)
		611	rxvt_fatal ("memory allocation failure. aborting.\n");
		612
559	return p;	613	return p;
560
561	fprintf (stderr, RESNAME ": memory allocation failure. Aborting");
562	rxvt_clean_exit ();
563	exit (EXIT_FAILURE);
564	/* NOTREACHED */
565	}	614	}
566		615
567	/* ------------------------------------------------------------------------- *	616	/* ------------------------------------------------------------------------- *
568	* PRIVILEGED OPERATIONS *	617	* PRIVILEGED OPERATIONS *
569	* ------------------------------------------------------------------------- */	618	* ------------------------------------------------------------------------- */
570	/* take care of suid/sgid super-user (root) privileges */	619	/* take care of suid/sgid super-user (root) privileges */
571	void	620	void
572	rxvt_term::privileges (int mode)	621	rxvt_privileges (rxvt_privaction action)
573	{	622	{
		623	#if (defined(HAVE_SETEUID) || defined(HAVE_SETREUID)) && !defined(__CYGWIN32__)
		624	static uid_t euid;
		625	static gid_t egid;
		626	#endif
		627
574	#if ! defined(__CYGWIN32__)	628	#if ! defined(__CYGWIN32__)
575	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)	629	# if !defined(HAVE_SETEUID) && defined(HAVE_SETREUID)
576	/* setreuid () is the poor man's setuid (), seteuid () */	630	/* setreuid () is the poor man's setuid (), seteuid () */
577	# define seteuid(a) setreuid(-1, (a))	631	# define seteuid(a) setreuid(-1, (a))
578	# define setegid(a) setregid(-1, (a))	632	# define setegid(a) setregid(-1, (a))
579	# define HAVE_SETEUID	633	# define HAVE_SETEUID
580	# endif	634	# endif
581	# ifdef HAVE_SETEUID	635	# ifdef HAVE_SETEUID
582	switch (mode)	636	switch (action)
583	{	637	{
584	case IGNORE:	638	case IGNORE:
585	/*	639	/*
586	* change effective uid/gid - not real uid/gid - so we can switch	640	* change effective uid/gid - not real uid/gid - so we can switch
587	* back to root later, as required	641	* back to root later, as required
…		…
597	seteuid (euid);	651	seteuid (euid);
598	setegid (egid);	652	setegid (egid);
599	break;	653	break;
600	}	654	}
601	# else	655	# else
602	switch (mode)	656	switch (action)
603	{	657	{
604	case IGNORE:	658	case IGNORE:
605	setuid (getuid ());	659	setuid (getuid ());
606	setgid (getgid ());	660	setgid (getgid ());
607	/* FALLTHROUGH */	661	/* FALLTHROUGH */
…		…
614	#endif	668	#endif
615	}	669	}
616		670
617	#ifdef UTMP_SUPPORT	671	#ifdef UTMP_SUPPORT
618	void	672	void
619	rxvt_term::privileged_utmp (char action)	673	rxvt_term::privileged_utmp (rxvt_privaction action)
620	{	674	{
621	D_MAIN ((stderr, "rxvt_privileged_utmp (%c); waiting for: %c (pid: %d)",
622	action, next_utmp_action, getpid ()));
623	if (next_utmp_action != action || (action != SAVE && action != RESTORE)
624	|| (Options & Opt_utmpInhibit)	675	if ((options & Opt_utmpInhibit)
625	|| ttydev == NULL || *ttydev == '\0')	676	|| !pty.name || !*pty.name)
626	return;	677	return;
627		678
628	privileges (RESTORE);	679	rxvt_privileges (RESTORE);
		680
629	if (action == SAVE)	681	if (action == SAVE)
630	{
631	next_utmp_action = RESTORE;
632	makeutent (ttydev, rs[Rs_display_name]);	682	makeutent (pty.name, rs[Rs_display_name]);
633	}
634	else	683	else
635	{ /* action == RESTORE */
636	next_utmp_action = IGNORE;
637	cleanutent ();	684	cleanutent ();
638	}	685
639	privileges (IGNORE);	686	rxvt_privileges (IGNORE);
640	}
641	#endif
642
643	#ifndef NO_SETOWNER_TTYDEV
644	void
645	rxvt_term::privileged_ttydev (char action)
646	{
647	D_MAIN ((stderr,
648	"privileged_ttydev (%c); waiting for: %c (pid: %d)",
649	action, next_tty_action, getpid ()));
650	if (next_tty_action != action || (action != SAVE && action != RESTORE)
651	|| ttydev == NULL || *ttydev == '\0')
652	return;
653
654	privileges (RESTORE);
655
656	if (action == SAVE)
657	{
658	next_tty_action = RESTORE;
659	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
660	/* store original tty status for restoration rxvt_clean_exit () -- rgg 04/12/95 */
661	if (lstat (ttydev, &ttyfd_stat) < 0) /* you lose out */
662	next_tty_action = IGNORE;
663	else
664	# endif
665
666	{
667	chown (ttydev, getuid (), ttygid); /* fail silently */
668	chmod (ttydev, ttymode);
669	# ifdef HAVE_REVOKE
670	revoke (ttydev);
671	# endif
672
673	}
674	}
675	else
676	{ /* action == RESTORE */
677	next_tty_action = IGNORE;
678	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
679	chmod (ttydev, ttyfd_stat.st_mode);
680	chown (ttydev, ttyfd_stat.st_uid, ttyfd_stat.st_gid);
681	# else
682	chmod (ttydev,
683	(S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH));
684	chown (ttydev, 0, 0);
685	# endif
686
687	}
688
689	privileges (IGNORE);
690
691	# ifndef RESET_TTY_TO_COMMON_DEFAULTS
692	D_MAIN ((stderr, "%s \"%s\": mode %03o, uid %d, gid %d",
693	action == RESTORE ? "Restoring" : (action ==
694	SAVE ? "Saving" :
695	"UNKNOWN ERROR for"), ttydev,
696	ttyfd_stat.st_mode, ttyfd_stat.st_uid,
697	ttyfd_stat.st_gid));
698	# endif
699	}	687	}
700	#endif	688	#endif
701		689
702	/*----------------------------------------------------------------------*/	690	/*----------------------------------------------------------------------*/
703	/*	691	/*
…		…
705	* if width/height are non-zero then override calculated width/height	693	* if width/height are non-zero then override calculated width/height
706	*/	694	*/
707	void	695	void
708	rxvt_term::window_calc (unsigned int width, unsigned int height)	696	rxvt_term::window_calc (unsigned int width, unsigned int height)
709	{	697	{
710	short recalc_x, recalc_y;	698	short recalc_x, recalc_y;
711	int x, y, sb_w, mb_h, flags;	699	int x, y, sb_w, mb_h, flags;
712	unsigned int w, h;	700	unsigned int w, h;
713	unsigned int max_width, max_height;	701	unsigned int max_width, max_height;
		702	dDisp;
714		703
715	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	704	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
716	TermWin.ncol, TermWin.nrow, szHint.width,	705	TermWin.ncol, TermWin.nrow, szHint.width,
717	szHint.height));	706	szHint.height));
718	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;	707	szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity;
…		…
724	if (!parsed_geometry)	713	if (!parsed_geometry)
725	{	714	{
726	parsed_geometry = 1;	715	parsed_geometry = 1;
727	if (rs[Rs_geometry])	716	if (rs[Rs_geometry])
728	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);	717	flags = XParseGeometry (rs[Rs_geometry], &x, &y, &w, &h);
		718
729	if (flags & WidthValue)	719	if (flags & WidthValue)
730	{	720	{
731	TermWin.ncol = BOUND_POSITIVE_INT16 (w);	721	TermWin.ncol = BOUND_POSITIVE_INT16 (w);
732	szHint.flags |= USSize;	722	szHint.flags |= USSize;
733	}	723	}
		724
734	if (flags & HeightValue)	725	if (flags & HeightValue)
735	{	726	{
736	TermWin.nrow = BOUND_POSITIVE_INT16 (h);	727	TermWin.nrow = BOUND_POSITIVE_INT16 (h);
737	szHint.flags |= USSize;	728	szHint.flags |= USSize;
738	}	729	}
		730
739	if (flags & XValue)	731	if (flags & XValue)
740	{	732	{
741	szHint.x = x;	733	szHint.x = x;
742	szHint.flags |= USPosition;	734	szHint.flags |= USPosition;
743	if (flags & XNegative)	735	if (flags & XNegative)
744	{	736	{
745	recalc_x = 1;	737	recalc_x = 1;
746	szHint.win_gravity = NorthEastGravity;	738	szHint.win_gravity = NorthEastGravity;
747	}	739	}
748	}	740	}
		741
749	if (flags & YValue)	742	if (flags & YValue)
750	{	743	{
751	szHint.y = y;	744	szHint.y = y;
752	szHint.flags |= USPosition;	745	szHint.flags |= USPosition;
753	if (flags & YNegative)	746	if (flags & YNegative)
…		…
774		767
775	if (scrollbar_visible ())	768	if (scrollbar_visible ())
776	{	769	{
777	sb_w = scrollbar_TotalWidth ();	770	sb_w = scrollbar_TotalWidth ();
778	szHint.base_width += sb_w;	771	szHint.base_width += sb_w;
779	if (!(Options & Opt_scrollBar_right))	772	if (!(options & Opt_scrollBar_right))
780	window_vt_x += sb_w;	773	window_vt_x += sb_w;
781	}	774	}
782		775
783	if (menubar_visible ())	776	if (menubar_visible ())
784	{	777	{
…		…
812	{	805	{
813	MIN_IT (TermWin.height, max_height);	806	MIN_IT (TermWin.height, max_height);
814	szHint.height = szHint.base_height + TermWin.height;	807	szHint.height = szHint.base_height + TermWin.height;
815	}	808	}
816		809
817	if (scrollbar_visible () && (Options & Opt_scrollBar_right))	810	if (scrollbar_visible () && (options & Opt_scrollBar_right))
818	window_sb_x = szHint.width - sb_w;	811	window_sb_x = szHint.width - sb_w;
819		812
820	if (recalc_x)	813	if (recalc_x)
821	szHint.x += (DisplayWidth (display->display, DefaultScreen (display->display))	814	szHint.x += (DisplayWidth (disp, display->screen)
822	- szHint.width - 2 * TermWin.ext_bwidth);	815	- szHint.width - 2 * TermWin.ext_bwidth);
823	if (recalc_y)	816	if (recalc_y)
824	szHint.y += (DisplayHeight (display->display, DefaultScreen (display->display))	817	szHint.y += (DisplayHeight (disp, display->screen)
825	- szHint.height - 2 * TermWin.ext_bwidth);	818	- szHint.height - 2 * TermWin.ext_bwidth);
826		819
827	TermWin.ncol = TermWin.width / TermWin.fwidth;	820	TermWin.ncol = TermWin.width / TermWin.fwidth;
828	TermWin.nrow = TermWin.height / TermWin.fheight;	821	TermWin.nrow = TermWin.height / TermWin.fheight;
829	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",	822	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
…		…
838	* Called after a window size change.	831	* Called after a window size change.
839	*/	832	*/
840	void	833	void
841	rxvt_term::tt_winch ()	834	rxvt_term::tt_winch ()
842	{	835	{
		836	if (pty.pty < 0)
		837	return;
		838
843	struct winsize ws;	839	struct winsize ws;
844
845	if (cmd_fd < 0)
846	return;
847		840
848	ws.ws_col = TermWin.ncol;	841	ws.ws_col = TermWin.ncol;
849	ws.ws_row = TermWin.nrow;	842	ws.ws_row = TermWin.nrow;
850	ws.ws_xpixel = ws.ws_ypixel = 0;	843	ws.ws_xpixel = TermWin.width;
851	#ifndef DEBUG_SIZE	844	ws.ws_ypixel = TermWin.height;
852	(void)ioctl (cmd_fd, TIOCSWINSZ, &ws);	845	(void)ioctl (pty.pty, TIOCSWINSZ, &ws);
853	#else	846
854	if (ioctl (cmd_fd, TIOCSWINSZ, &ws) < 0)	847	#if 0
855	D_SIZE ((stderr, "Failed to send TIOCSWINSZ to fd %d", fd));	848	// TIOCSWINSZ⎈ is supposed to do this automatically and correctly
856	# ifdef SIGWINCH
857	else if (cmd_pid) /* force through to the command */	849	if (cmd_pid) /* force through to the command */
858	kill (cmd_pid, SIGWINCH);	850	kill (-cmd_pid, SIGWINCH);
859	# endif
860	#endif	851	#endif
861	}	852	}
862		853
863	/*----------------------------------------------------------------------*/	854	/*----------------------------------------------------------------------*/
864	/* rxvt_change_font () - Switch to a new font */	855	/* set_fonts () - load and set the various fonts
865	/*	856	/*
866	* init = 1 - initialize	857	* init = 1 - initialize
867	*	858	*
868	* fontname == FONT_UP - switch to bigger font	859	* fontname == FONT_UP - switch to bigger font
869	* fontname == FONT_DN - switch to smaller font	860	* fontname == FONT_DN - switch to smaller font
870	*/	861	*/
871	bool	862	bool
872	rxvt_term::change_font (const char *fontname)	863	rxvt_term::set_fonts ()
873	{	864	{
874	if (fontname == FONT_UP)
875	{
876	// TODO
877	}
878	else if (fontname == FONT_DN)
879	{
880	// TODO
881	}
882	else
883	{
884	rxvt_fontset *fs = new rxvt_fontset (this);	865	rxvt_fontset *fs = new rxvt_fontset (this);
		866	rxvt_fontprop prop;
885		867
886	if (fs && fs->populate (fontname ? fontname : "fixed"))	868	if (!fs
		869	|| !fs->populate (rs[Rs_font] ? rs[Rs_font] : "fixed")
		870	|| !fs->realize_font (1))
		871	{
		872	delete fs;
		873	return false;
		874	}
		875
		876	#if ENABLE_STYLES
		877	for (int i = RS_styleCount; --i; )
		878	if (TermWin.fontset[i] != TermWin.fontset[0])
		879	delete TermWin.fontset[i];
		880	#endif
		881
		882	delete TermWin.fontset[0];
		883	TermWin.fontset[0] = fs;
		884
		885	prop = (*fs)[1]->properties ();
		886	prop.height += TermWin.lineSpace;
		887	fs->set_prop (prop);
		888
		889	TermWin.fwidth = prop.width;
		890	TermWin.fheight = prop.height;
		891	TermWin.fweight = prop.weight;
		892	TermWin.fslant = prop.slant;
		893	TermWin.fbase = (*fs)[1]->ascent;
		894
		895	for (int style = 1; style < 4; style++)
		896	{
		897	#if ENABLE_STYLES
		898	const char *res = rs[Rs_font + style];
		899
		900	if (res && !*res)
		901	TermWin.fontset[style] = TermWin.fontset[0];
		902	else
887	{	903	{
888	delete TermWin.fontset;	904	TermWin.fontset[style] = fs = new rxvt_fontset (this);
889	TermWin.fontset = fs;	905	rxvt_fontprop prop2 = prop;
890	TermWin.fwidth = fs->base_font ()->width;
891	TermWin.fheight = fs->base_font ()->height;
892	TermWin.fbase = fs->base_font ()->ascent;
893		906
894	if (TermWin.parent[0])	907	if (res)
		908	prop2.weight = prop2.slant = rxvt_fontprop::unset;
		909	else
895	{	910	{
896	resize_all_windows (0, 0, 0);	911	res = TermWin.fontset[0]->fontdesc;
897	scr_remap_chars ();	912
898	scr_touch (true);	913	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
		914	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
899	}	915	}
900		916
901	for (unicode_t ch = 0x20; ch <= 0x7f; ch++)	917	fs->populate (res);
902	TermWin.ascii_map [ch - 0x20] = fs->find_font (ch);	918	fs->set_prop (prop2);
903
904	return true;
905	}	919	}
		920	#else
		921	TermWin.fontset[style] = TermWin.fontset[0];
		922	#endif
		923	}
		924
		925	if (TermWin.parent[0])
906	}	926	{
		927	resize_all_windows (0, 0, 0);
		928	scr_remap_chars ();
		929	scr_touch (true);
		930	}
907		931
908	return false;	932	return true;
909	}	933	}
910		934
911	bool	935	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
912	rxvt_term::font_up_down (int n, int direction)
913	{	936	{
914	return false;	937	// TODO: SMART_WINDOW_TITLE
		938	XChangeProperty (display->display, TermWin.parent[0],
		939	prop, XA_STRING, 8, PropModeReplace,
		940	(const unsigned char *)str, len >= 0 ? len : strlen (str));
		941	}
		942
		943	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
		944	{
		945	// TODO: SMART_WINDOW_TITLE
		946	wchar_t *ws = rxvt_mbstowcs (str, len);
		947	char *s = rxvt_wcstoutf8 (ws);
		948
		949	XChangeProperty (display->display, TermWin.parent[0],
		950	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
		951	(const unsigned char *)s, strlen (s));
		952
		953	free (s);
		954	free (ws);
915	}	955	}
916		956
917	/*----------------------------------------------------------------------*/	957	/*----------------------------------------------------------------------*/
918	/*----------------------------------------------------------------------*/	958	/*----------------------------------------------------------------------*/
919	/* xterm sequences - title, iconName, color (exptl) */	959	/* xterm sequences - title, iconName, color (exptl) */
920	void	960	void
921	rxvt_term::set_title (const char *str)	961	rxvt_term::set_title (const char *str)
922	{	962	{
923	#ifdef SMART_WINDOW_TITLE	963	set_string_property (XA_WM_NAME, str);
924	char *name;	964	#if ENABLE_FRILLS
925		965	set_utf8_property (xa[XA_NET_WM_NAME], str);
926	if (!XFetchName (display->display, TermWin.parent[0], &name))
927	name = NULL;
928
929	if (name == NULL || STRCMP (name, str))
930	#endif
931	XStoreName (display->display, TermWin.parent[0], str);
932
933	#ifdef SMART_WINDOW_TITLE
934	if (name)
935	XFree (name);
936	#endif	966	#endif
937	}	967	}
938		968
939	void	969	void
940	rxvt_term::set_icon_name (const char *str)	970	rxvt_term::set_icon_name (const char *str)
941	{	971	{
942	#ifdef SMART_WINDOW_TITLE	972	set_string_property (XA_WM_ICON_NAME, str);
943	char *name;	973	#if ENABLE_FRILLS
944		974	set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
945	if (!XGetIconName (display->display, TermWin.parent[0], &name))
946	name = NULL;
947
948	if (name == NULL || STRCMP (name, str))
949	#endif
950	XSetIconName (display->display, TermWin.parent[0], str);
951
952	#ifdef SMART_WINDOW_TITLE
953	if (name)
954	XFree (name);
955	#endif	975	#endif
956	}	976	}
957		977
958	#ifdef XTERM_COLOR_CHANGE	978	#ifdef XTERM_COLOR_CHANGE
959	void	979	void
…		…
967		987
968	/* handle color aliases */	988	/* handle color aliases */
969	if (isdigit (*color))	989	if (isdigit (*color))
970	{	990	{
971	i = atoi (color);	991	i = atoi (color);
		992
972	if (i >= 8 && i <= 15)	993	if (i >= 8 && i <= 15)
973	{ /* bright colors */	994	{ /* bright colors */
974	i -= 8;	995	i -= 8;
975	# ifndef NO_BRIGHTCOLOR	996	# ifndef NO_BRIGHTCOLOR
976	PixColorsFocused[idx] = PixColorsFocused[minBrightCOLOR + i];	997	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
977	SET_PIXCOLOR (idx);	998	SET_PIXCOLOR (idx);
978	goto Done;	999	goto Done;
979	# endif	1000	# endif
980
981	}	1001	}
		1002
982	if (i >= 0 && i <= 7)	1003	if (i >= 0 && i <= 7)
983	{ /* normal colors */	1004	{ /* normal colors */
984	PixColorsFocused[idx] = PixColorsFocused[minCOLOR + i];	1005	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
985	SET_PIXCOLOR (idx);	1006	SET_PIXCOLOR (idx);
986	goto Done;	1007	goto Done;
987	}	1008	}
988	}	1009	}
989		1010
990	if (!rXParseAllocColor (& xcol, color))	1011	if (!rXParseAllocColor (&xcol, color))
991	return;	1012	return;
992		1013
993	/* XStoreColor (display->display, display->cmap, XColor*); */	1014	/* XStoreColor (display->display, display->cmap, XColor*); */
994		1015
995	/*	1016	/*
996	* FIXME: should free colors here, but no idea how to do it so instead,	1017	* FIXME: should free colors here, but no idea how to do it so instead,
997	* so just keep gobbling up the colormap	1018	* so just keep gobbling up the colormap
998	*/	1019	*/
999	# if 0	1020	# if 0
1000	for (i = Color_Black; i <= Color_White; i++)	1021	for (i = Color_Black; i <= Color_White; i++)
1001	if (PixColors[idx] == PixColors[i])	1022	if (pix_colors[idx] == pix_colors[i])
1002	break;	1023	break;
1003	if (i > Color_White)	1024	if (i > Color_White)
1004	{	1025	{
1005	/* fprintf (stderr, "XFreeColors: PixColors [%d] = %lu\n", idx, PixColors [idx]); */	1026	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
1006	XFreeColors (display->display, display->cmap, (PixColors + idx), 1,	1027	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
1007	DisplayPlanes (display->display, display->screen));	1028	DisplayPlanes (display->display, display->screen));
1008	}	1029	}
1009	# endif	1030	# endif
1010		1031
1011	PixColorsFocused[idx] = xcol;	1032	pix_colors_focused[idx] = xcol;
1012	SET_PIXCOLOR (idx);	1033	SET_PIXCOLOR (idx);
1013		1034
1014	/* XSetWindowAttributes attr; */	1035	/* XSetWindowAttributes attr; */
1015	/* Cursor cursor; */	1036	/* Cursor cursor; */
1016	Done:	1037	Done:
1017	#ifdef OFF_FOCUS_FADING	1038	#ifdef OFF_FOCUS_FADING
		1039	if (rs[Rs_fade])
1018	PixColorsUnFocused[idx] = PixColorsFocused[idx].fade (display, atoi (rs[Rs_fade]));	1040	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]));
1019	#endif	1041	#endif
1020	if (idx == Color_bg && ! (Options & Opt_transparent))
1021	XSetWindowBackground (display->display, TermWin.vt, PixColors[Color_bg]);
1022		1042
1023	/* handle Color_BD, scrollbar background, etc. */	1043	/*TODO: handle Color_BD, scrollbar background, etc. */
1024		1044
1025	set_colorfgbg ();
1026	recolour_cursor ();	1045	recolour_cursor ();
1027	scr_touch (true);	1046	scr_recolour ();
1028	}	1047	}
1029		1048
1030	#else	1049	#else
1031	# define set_window_color (idx,color) ((void)0)	1050	# define set_window_color (idx,color) ((void)0)
1032	#endif /* XTERM_COLOR_CHANGE */	1051	#endif /* XTERM_COLOR_CHANGE */
…		…
1034	void	1053	void
1035	rxvt_term::recolour_cursor ()	1054	rxvt_term::recolour_cursor ()
1036	{	1055	{
1037	XColor xcol[2];	1056	XColor xcol[2];
1038		1057
1039	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg) ? PixColorsFocused[Color_pointer_fg] : PixColorsFocused[Color_fg];	1058	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)
1040	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg) ? PixColorsFocused[Color_pointer_bg] : PixColorsFocused[Color_bg];	1059	? pix_colors_focused[Color_pointer_fg]
		1060	: pix_colors_focused[Color_fg];
		1061	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)
		1062	? pix_colors_focused[Color_pointer_bg]
		1063	: pix_colors_focused[Color_bg];
		1064
1041	XQueryColors (display->display, display->cmap, xcol, 2);	1065	XQueryColors (display->display, display->cmap, xcol, 2);
1042	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);	1066	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1043	}	1067	}
1044		1068
1045	/*----------------------------------------------------------------------*/	1069	/*----------------------------------------------------------------------*/
…		…
1047	* find if fg/bg matches any of the normal (low-intensity) colors	1071	* find if fg/bg matches any of the normal (low-intensity) colors
1048	*/	1072	*/
1049	void	1073	void
1050	rxvt_term::set_colorfgbg ()	1074	rxvt_term::set_colorfgbg ()
1051	{	1075	{
1052	unsigned int i;	1076	unsigned int i;
1053	const char *xpmb = "\0";	1077	const char *xpmb = "\0";
1054	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	1078	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1055		1079
1056	env_colorfgbg =
1057	(char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);	1080	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1058	STRCPY (fstr, "default");	1081	strcpy (fstr, "default");
1059	STRCPY (bstr, "default");	1082	strcpy (bstr, "default");
1060	for (i = Color_Black; i <= Color_White; i++)	1083	for (i = Color_Black; i <= Color_White; i++)
1061	if (PixColors[Color_fg] == PixColors[i])	1084	if (pix_colors[Color_fg] == pix_colors[i])
1062	{	1085	{
1063	sprintf (fstr, "%d", (i - Color_Black));	1086	sprintf (fstr, "%d", (i - Color_Black));
1064	break;	1087	break;
1065	}	1088	}
		1089
1066	for (i = Color_Black; i <= Color_White; i++)	1090	for (i = Color_Black; i <= Color_White; i++)
1067	if (PixColors[Color_bg] == PixColors[i])	1091	if (pix_colors[Color_bg] == pix_colors[i])
1068	{	1092	{
1069	sprintf (bstr, "%d", (i - Color_Black));	1093	sprintf (bstr, "%d", (i - Color_Black));
1070	#ifdef XPM_BACKGROUND	1094	#ifdef XPM_BACKGROUND
1071	xpmb = "default;";	1095	xpmb = "default;";
1072	#endif	1096	#endif
1073	break;	1097	break;
1074	}	1098	}
1075		1099
1076	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1100	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1077
1078	#ifndef NO_BRIGHTCOLOR
1079	colorfgbg = DEFAULT_RSTYLE;
1080	for (i = minCOLOR; i <= maxCOLOR; i++)
1081	{
1082	if (PixColors[Color_fg] == PixColors[i])
1083	colorfgbg = SET_FGCOLOR (colorfgbg, i);
1084	if (PixColors[Color_bg] == PixColors[i])
1085	colorfgbg = SET_BGCOLOR (colorfgbg, i);
1086	}
1087	#endif
1088	}	1101	}
1089		1102
1090	/*----------------------------------------------------------------------*/	1103	/*----------------------------------------------------------------------*/
1091	/*
1092	* Colour determination for low colour displays, routine from
1093	* Hans de Goede <hans@highrise.nl>
1094	*/
1095		1104
1096	int	1105	int
1097	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)	1106	rxvt_term::rXParseAllocColor (rxvt_color *screen_in_out, const char *colour)
1098	{	1107	{
1099	if (!screen_in_out->set (display, colour))	1108	if (!screen_in_out->set (display, colour))
…		…
1110	* -------------------------------------------------------------------- */	1119	* -------------------------------------------------------------------- */
1111	void	1120	void
1112	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)	1121	rxvt_term::resize_all_windows (unsigned int width, unsigned int height, int ignoreparent)
1113	{	1122	{
1114	int fix_screen;	1123	int fix_screen;
1115
1116	#ifdef SMART_RESIZE	1124	#ifdef SMART_RESIZE
1117	int old_width = szHint.width, old_height = szHint.height;	1125	int old_width = szHint.width, old_height = szHint.height;
1118	#endif	1126	#endif
		1127	dDisp;
1119		1128
1120	window_calc (width, height);	1129	window_calc (width, height);
1121	XSetWMNormalHints (display->display, TermWin.parent[0], &szHint);	1130	XSetWMNormalHints (disp, TermWin.parent[0], &szHint);
1122		1131
1123	if (!ignoreparent)	1132	if (!ignoreparent)
1124	{	1133	{
1125	#ifdef SMART_RESIZE	1134	#ifdef SMART_RESIZE
1126	/*	1135	/*
…		…
1130	int x, y, x1, y1;	1139	int x, y, x1, y1;
1131	int dx, dy;	1140	int dx, dy;
1132	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1141	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1133	Window unused_cr;	1142	Window unused_cr;
1134		1143
1135	XTranslateCoordinates (display->display, TermWin.parent[0], display->root,	1144	XTranslateCoordinates (disp, TermWin.parent[0], display->root,
1136	0, 0, &x, &y, &unused_cr);	1145	0, 0, &x, &y, &unused_cr);
1137	XGetGeometry (display->display, TermWin.parent[0], &unused_cr, &x1, &y1,	1146	XGetGeometry (disp, TermWin.parent[0], &unused_cr, &x1, &y1,
1138	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1147	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1139	/*	1148	/*
1140	* if display->root isn't the parent window, a WM will probably have offset	1149	* if display->root isn't the parent window, a WM will probably have offset
1141	* our position for handles and decorations. Counter it	1150	* our position for handles and decorations. Counter it
1142	*/	1151	*/
…		…
1144	{	1153	{
1145	x -= x1;	1154	x -= x1;
1146	y -= y1;	1155	y -= y1;
1147	}	1156	}
1148		1157
1149	x1 = (DisplayWidth (display->display, display->screen) - old_width) / 2;	1158	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;
1150	y1 = (DisplayHeight (display->display, display->screen) - old_height) / 2;	1159	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;
1151	dx = old_width - szHint.width;	1160	dx = old_width - szHint.width;
1152	dy = old_height - szHint.height;	1161	dy = old_height - szHint.height;
1153		1162
1154	/* Check position of the center of the window */	1163	/* Check position of the center of the window */
1155	if (x < x1) /* left half */	1164	if (x < x1) /* left half */
…		…
1159	if (y < y1) /* top half */	1168	if (y < y1) /* top half */
1160	dy = 0;	1169	dy = 0;
1161	else if (y == y1) /* exact center */	1170	else if (y == y1) /* exact center */
1162	dy /= 2;	1171	dy /= 2;
1163		1172
1164	XMoveResizeWindow (display->display, TermWin.parent[0], x + dx, y + dy,	1173	XMoveResizeWindow (disp, TermWin.parent[0], x + dx, y + dy,
1165	szHint.width, szHint.height);	1174	szHint.width, szHint.height);
1166	#else	1175	#else
1167	XResizeWindow (display->display, TermWin.parent[0], szHint.width, szHint.height);	1176	XResizeWindow (disp, TermWin.parent[0], szHint.width, szHint.height);
1168	#endif	1177	#endif
1169	}	1178	}
1170		1179
1171	fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;	1180	fix_screen = TermWin.ncol != prev_ncol || TermWin.nrow != prev_nrow;
1172		1181
1173	if (fix_screen || width != old_width || height != old_height)	1182	if (fix_screen || width != old_width || height != old_height)
1174	{	1183	{
1175	if (scrollbar_visible ())	1184	if (scrollbar_visible ())
1176	{	1185	{
1177	XMoveResizeWindow (display->display, scrollBar.win,	1186	XMoveResizeWindow (disp, scrollBar.win,
1178	window_sb_x, 0,	1187	window_sb_x, 0,
1179	scrollbar_TotalWidth (), szHint.height);	1188	scrollbar_TotalWidth (), szHint.height);
1180	resize_scrollbar ();	1189	resize_scrollbar ();
1181	}	1190	}
1182		1191
1183	if (menubar_visible ())	1192	if (menubar_visible ())
1184	XMoveResizeWindow (display->display, menuBar.win,	1193	XMoveResizeWindow (disp, menuBar.win,
1185	window_vt_x, 0,	1194	window_vt_x, 0,
1186	TermWin_TotalWidth (), menuBar_TotalHeight ());	1195	TermWin_TotalWidth (), menuBar_TotalHeight ());
1187		1196
1188	XMoveResizeWindow (display->display, TermWin.vt,	1197	XMoveResizeWindow (disp, TermWin.vt,
1189	window_vt_x, window_vt_y,	1198	window_vt_x, window_vt_y,
1190	TermWin_TotalWidth (), TermWin_TotalHeight ());	1199	TermWin_TotalWidth (), TermWin_TotalHeight ());
		1200
1191	scr_clear ();	1201	scr_clear ();
1192	#ifdef XPM_BACKGROUND	1202	#ifdef XPM_BACKGROUND
1193	resize_pixmap ();	1203	resize_pixmap ();
1194	#endif	1204	#endif
1195	}	1205	}
…		…
1218	}	1228	}
1219		1229
1220	old_width = szHint.width;	1230	old_width = szHint.width;
1221	old_height = szHint.height;	1231	old_height = szHint.height;
1222		1232
		1233	#ifdef XPM_BACKGROUND
		1234	if (TermWin.pixmap)
		1235	scr_touch (false);
		1236	#endif
		1237
1223	#ifdef USE_XIM	1238	#ifdef USE_XIM
1224	IMSetStatusPosition ();	1239	IMSetStatusPosition ();
1225	#endif	1240	#endif
1226	}	1241	}
1227		1242
…		…
1255	* - X INPUT METHOD ROUTINES - *	1270	* - X INPUT METHOD ROUTINES - *
1256	* -------------------------------------------------------------------- */	1271	* -------------------------------------------------------------------- */
1257	#ifdef USE_XIM	1272	#ifdef USE_XIM
1258		1273
1259	void	1274	void
		1275	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
		1276	{
		1277	fg = pix_colors[Color_fg];
		1278	bg = pix_colors[Color_bg];
		1279	}
		1280
		1281	void
1260	rxvt_term::im_set_size (XRectangle *size)	1282	rxvt_term::im_set_size (XRectangle &size)
1261	{	1283	{
		1284	// the int_bwidth terms make no sense to me
1262	size->x = TermWin.int_bwidth;	1285	size.x = TermWin.int_bwidth;
1263	size->y = TermWin.int_bwidth;	1286	size.y = TermWin.int_bwidth;
1264	size->width = Width2Pixel (TermWin.ncol);	1287	size.width = Width2Pixel (TermWin.ncol) + TermWin.int_bwidth;
1265	size->height = Height2Pixel (TermWin.nrow);	1288	size.height = Height2Pixel (TermWin.nrow) + TermWin.int_bwidth;
1266	}	1289	}
1267		1290
1268	void	1291	void
1269	rxvt_term::im_set_color (unsigned long *fg, unsigned long *bg)	1292	rxvt_term::im_set_preedit_area (XRectangle &preedit_rect,
		1293	XRectangle &status_rect,
		1294	const XRectangle &needed_rect)
1270	{	1295	{
1271	*fg = PixColors[Color_fg];	1296	preedit_rect.x = needed_rect.width;
1272	*bg = PixColors[Color_bg];	1297	preedit_rect.y = 0;
		1298	preedit_rect.width = Width2Pixel (TermWin.ncol) - needed_rect.width + 1;
		1299	preedit_rect.height = TermWin.fheight;
		1300
		1301	status_rect.x = 0;
		1302	status_rect.y = 0;
		1303	status_rect.width = needed_rect.width ? needed_rect.width : Width2Pixel (TermWin.ncol) + 1;
		1304	status_rect.height = TermWin.fheight;
1273	}	1305	}
1274		1306
1275	/* Checking whether input method is running. */	1307	/* Checking whether input method is running. */
1276	bool	1308	bool
1277	rxvt_term::IMisRunning ()	1309	rxvt_term::IMisRunning ()
1278	{	1310	{
1279	char *p;	1311	char *p;
1280	Atom atom;	1312	Atom atom;
1281	Window win;	1313	Window win;
1282	char server[IMBUFSIZ];	1314	char server[IMBUFSIZ];
1283		1315
1284	/* get current locale modifier */	1316	/* get current locale modifier */
1285	if ((p = XSetLocaleModifiers (NULL)) != NULL)	1317	if ((p = XSetLocaleModifiers (NULL)) != NULL)
1286	{	1318	{
1287	STRCPY (server, "@server=");	1319	strcpy (server, "@server=");
1288	STRNCAT (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1320	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
		1321
1289	if ((p = STRCHR (server + 1, '@')) != NULL) /* first one only */	1322	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1290	*p = '\0';	1323	*p = '\0';
1291		1324
1292	atom = XInternAtom (display->display, server, False);	1325	atom = XInternAtom (display->display, server, False);
1293	win = XGetSelectionOwner (display->display, atom);	1326	win = XGetSelectionOwner (display->display, atom);
		1327
1294	if (win != None)	1328	if (win != None)
1295	return True;	1329	return True;
1296	}	1330	}
		1331
1297	return False;	1332	return False;
1298	}	1333	}
1299		1334
1300	void	1335	void
1301	rxvt_term::IMSendSpot ()	1336	rxvt_term::IMSendSpot ()
1302	{	1337	{
1303	XPoint spot;	1338	XPoint nspot;
1304	XVaNestedList preedit_attr;	1339	XVaNestedList preedit_attr;
1305		1340
1306	if (Input_Context == NULL	1341	if (!Input_Context
		1342	|| !TermWin.focus
1307	|| !TermWin.focus || ! (input_style & XIMPreeditPosition)	1343	|| !(input_style & XIMPreeditPosition))
1308	|| ! (event_type == KeyPress
1309	|| event_type == Expose
1310	|| event_type == NoExpose
1311	|| event_type == SelectionNotify
1312	|| event_type == ButtonRelease || event_type == FocusIn)
1313	|| !IMisRunning ())
1314	return;	1344	return;
1315		1345
1316	im_set_position (&spot);	1346	im_set_position (nspot);
		1347
		1348	if (nspot.x == spot.x && nspot.y == spot.y)
		1349	return;
		1350
		1351	spot = nspot;
1317		1352
1318	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);	1353	preedit_attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
1319	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);	1354	XSetICValues (Input_Context, XNPreeditAttributes, preedit_attr, NULL);
1320	XFree (preedit_attr);	1355	XFree (preedit_attr);
1321	}	1356	}
1322		1357
1323	void	1358	void
1324	rxvt_term::im_set_preedit_area (XRectangle * preedit_rect, XRectangle * status_rect,
1325	XRectangle * needed_rect)
1326	{
1327	int mbh, vtx = 0;
1328
1329	if (scrollbar_visible () && ! (Options & Opt_scrollBar_right))
1330	vtx = scrollbar_TotalWidth ();
1331
1332	mbh = menubar_visible () ? menuBar_TotalHeight () : 0;
1333	mbh -= TermWin.lineSpace;
1334
1335	preedit_rect->x = needed_rect->width + vtx;
1336	preedit_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1337
1338	preedit_rect->width = Width2Pixel (TermWin.ncol + 1) - needed_rect->width + vtx;
1339	preedit_rect->height = Height2Pixel (1);
1340
1341	status_rect->x = vtx;
1342	status_rect->y = Height2Pixel (TermWin.nrow - 1) + mbh;
1343
1344	status_rect->width = needed_rect->width ? needed_rect->width : Width2Pixel (TermWin.ncol + 1);
1345	status_rect->height = Height2Pixel (1);
1346	}
1347
1348	void
1349	rxvt_term::im_destroy ()	1359	rxvt_term::im_destroy ()
1350	{	1360	{
1351	if (Input_Context)
1352	{
1353	XDestroyIC (Input_Context);
1354	Input_Context = NULL;
1355	}
1356
1357	if (input_method)	1361	if (input_method)
1358	{	1362	{
		1363	if (Input_Context && input_method->xim)
		1364	XDestroyIC (Input_Context);
		1365
1359	display->put_xim (input_method);	1366	display->put_xim (input_method);
1360	input_method = 0;	1367	input_method = 0;
1361	}	1368	}
		1369
		1370	Input_Context = 0;
1362	}	1371	}
1363		1372
1364	/*	1373	/*
1365	* Try to open a XIM with the current modifiers, then see if we can	1374	* Try to open a XIM with the current modifiers, then see if we can
1366	* open a suitable preedit type	1375	* open a suitable preedit type
1367	*/	1376	*/
1368	bool	1377	bool
1369	rxvt_term::IM_get_IC (const char *modifiers)	1378	rxvt_term::IM_get_IC (const char *modifiers)
1370	{	1379	{
1371	int i, j, found;	1380	int i, j, found;
1372	XIM xim;	1381	XIM xim;
1373	XPoint spot;	1382	XPoint spot;
1374	XRectangle rect, status_rect, needed_rect;	1383	XRectangle rect, status_rect, needed_rect;
1375	unsigned long fg, bg;	1384	unsigned long fg, bg;
1376	const char *p;	1385	const char *p;
1377	char **s;	1386	char **s;
1378	XIMStyles *xim_styles;	1387	XIMStyles *xim_styles;
1379	XVaNestedList preedit_attr, status_attr;
1380		1388
1381	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1389	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1382	return false;	1390	return false;
1383		1391
1384	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));	1392	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1385	input_method = display->get_xim (locale, modifiers);	1393	input_method = display->get_xim (locale, modifiers);
1386	if (input_method == NULL)	1394	if (input_method == NULL)
1387	return false;	1395	return false;
1388		1396
1389	xim = input_method->xim;	1397	xim = input_method->xim;
		1398	spot.x = spot.y = -1;
1390		1399
1391	xim_styles = NULL;	1400	xim_styles = NULL;
1392	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)	1401	if (XGetIMValues (xim, XNQueryInputStyle, &xim_styles, NULL)
1393	|| !xim_styles || !xim_styles->count_styles)	1402	|| !xim_styles || !xim_styles->count_styles)
1394	{	1403	{
1395	display->put_xim (input_method);	1404	im_destroy ();
1396	return false;	1405	return false;
1397	}	1406	}
1398		1407
1399	p = rs[Rs_preeditType] ? rs[Rs_preeditType] : "OverTheSpot,OffTheSpot,Root";	1408	const char *pet[] = { rs[Rs_preeditType], "OverTheSpot,OffTheSpot,Root,None" };
		1409
		1410	for (int pi = 0; pi < 2; pi++)
		1411	{
		1412	p = pet[pi];
		1413
		1414	if (!p)
		1415	continue;
		1416
1400	s = rxvt_splitcommastring (p);	1417	s = rxvt_splitcommastring (p);
		1418
1401	for (i = found = 0; !found && s[i]; i++)	1419	for (i = found = 0; !found && s[i]; i++)
1402	{	1420	{
1403	if (!STRCMP (s[i], "OverTheSpot"))	1421	if (!strcmp (s[i], "OverTheSpot"))
1404	input_style = (XIMPreeditPosition | XIMStatusNothing);	1422	input_style = (XIMPreeditPosition | XIMStatusNothing);
1405	else if (!STRCMP (s[i], "OffTheSpot"))	1423	else if (!strcmp (s[i], "OffTheSpot"))
1406	input_style = (XIMPreeditArea | XIMStatusArea);	1424	input_style = (XIMPreeditArea | XIMStatusArea);
1407	else if (!STRCMP (s[i], "Root"))	1425	else if (!strcmp (s[i], "Root"))
1408	input_style = (XIMPreeditNothing | XIMStatusNothing);	1426	input_style = (XIMPreeditNothing | XIMStatusNothing);
		1427	else if (!strcmp (s[i], "None"))
		1428	input_style = (XIMPreeditNone | XIMStatusNone);
1409		1429
1410	for (j = 0; j < xim_styles->count_styles; j++)	1430	for (j = 0; j < xim_styles->count_styles; j++)
1411	if (input_style == xim_styles->supported_styles[j])	1431	if (input_style == xim_styles->supported_styles[j])
1412	{	1432	{
		1433	rxvt_freecommastring (s);
		1434
1413	found = 1;	1435	found = 1;
1414	break;	1436	goto foundpet;
		1437	}
		1438
1415	}	1439	}
1416	}
1417		1440
1418	for (i = 0; s[i]; i++)	1441	rxvt_freecommastring (s);
1419	free (s[i]);	1442	}
1420		1443
1421	free (s);	1444	foundpet:
		1445
1422	XFree (xim_styles);	1446	XFree (xim_styles);
1423		1447
1424	if (!found)	1448	if (!found)
1425	{	1449	{
1426	display->put_xim (input_method);	1450	im_destroy ();
1427	return false;	1451	return false;
1428	}	1452	}
1429		1453
1430	preedit_attr = status_attr = NULL;	1454	XFontSet fs = 0;
		1455	XVaNestedList preedit_attr = 0, status_attr = 0;
		1456
		1457	if (input_style & (XIMPreeditPosition | XIMPreeditArea))
		1458	{
		1459	// fake us a font-set, please
		1460	char **missing_charset_list;
		1461	int missing_charset_count;
		1462	char *def_string;
		1463	char pat[512];
		1464
		1465	sprintf (pat,
		1466	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1467	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1468	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1469	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1470	"-*-*-*-R-*-*-%d-*-*-*-*-*-*,"
		1471	"*",
		1472	TermWin.fheight,
		1473	TermWin.fheight + 1, TermWin.fheight - 1,
		1474	TermWin.fheight - 2, TermWin.fheight + 2);
		1475
		1476	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
		1477	&missing_charset_list, &missing_charset_count, &def_string);
		1478
		1479	if (missing_charset_list)
		1480	XFreeStringList (missing_charset_list);
		1481
		1482	if (!fs)
		1483	{
		1484	input_style &= ~(XIMPreeditPosition | XIMPreeditArea);
		1485	rxvt_warn ("unable to create fontset for input method, try \"-pt Root\". Continuing.\n");
		1486	}
		1487	}
1431		1488
1432	if (input_style & XIMPreeditPosition)	1489	if (input_style & XIMPreeditPosition)
1433	{	1490	{
1434	im_set_size (&rect);	1491	im_set_size (rect);
1435	im_set_position (&spot);	1492	im_set_position (spot);
1436	im_set_color (&fg, &bg);	1493	im_set_color (fg, bg);
1437		1494
1438	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1495	preedit_attr = XVaCreateNestedList (0,
		1496	XNForeground, fg,
		1497	XNBackground, bg,
		1498	XNArea, &rect,
1439	XNSpotLocation, &spot,	1499	XNSpotLocation, &spot,
1440	XNForeground, fg, XNBackground, bg,
1441	//XNFontSet, TermWin.fontset,	1500	XNFontSet, fs,
1442	NULL);	1501	NULL);
1443	}	1502	}
1444	else if (input_style & XIMPreeditArea)	1503	else if (input_style & XIMPreeditArea)
1445	{	1504	{
1446	im_set_color (&fg, &bg);	1505	im_set_color (fg, bg);
1447		1506
1448	/*	1507	/*
1449	* The necessary width of preedit area is unknown	1508	* The necessary width of preedit area is unknown
1450	* until create input context.	1509	* until create input context.
1451	*/	1510	*/
1452	needed_rect.width = 0;	1511	needed_rect.width = 0;
1453
1454	im_set_preedit_area (&rect, &status_rect, &needed_rect);	1512	im_set_preedit_area (rect, status_rect, needed_rect);
1455		1513
1456	preedit_attr = XVaCreateNestedList (0, XNArea, &rect,	1514	preedit_attr = XVaCreateNestedList (0,
		1515	XNForeground, fg,
1457	XNForeground, fg, XNBackground, bg,	1516	XNBackground, bg,
		1517	XNArea, &rect,
		1518	XNFontSet, fs,
		1519	NULL);
		1520	status_attr = XVaCreateNestedList (0,
		1521	XNForeground, fg,
		1522	XNBackground, bg,
		1523	XNArea, &status_rect,
1458	//XNFontSet, TermWin.fontset,	1524	XNFontSet, fs,
1459	NULL);	1525	NULL);
1460	status_attr = XVaCreateNestedList (0, XNArea, &status_rect,
1461	XNForeground, fg, XNBackground, bg,
1462	//XNFontSet, TermWin.fontset,
1463	NULL);
1464	}	1526	}
1465		1527
1466	Input_Context = XCreateIC (xim, XNInputStyle, input_style,	1528	Input_Context = XCreateIC (xim,
		1529	XNInputStyle, input_style,
1467	XNClientWindow, TermWin.parent[0],	1530	XNClientWindow, TermWin.vt,
1468	XNFocusWindow, TermWin.parent[0],	1531	XNFocusWindow, TermWin.parent[0],
1469	preedit_attr ? XNPreeditAttributes : NULL,	1532	preedit_attr ? XNPreeditAttributes : NULL,
1470	preedit_attr,	1533	preedit_attr,
1471	status_attr ? XNStatusAttributes : NULL,	1534	status_attr ? XNStatusAttributes : NULL,
1472	status_attr, NULL);	1535	status_attr, NULL);
		1536
1473	if (preedit_attr) XFree (preedit_attr);	1537	if (preedit_attr) XFree (preedit_attr);
1474	if (status_attr) XFree (status_attr);	1538	if (status_attr) XFree (status_attr);
		1539	if (fs) XFreeFontSet (display->display, fs);
1475		1540
1476	if (Input_Context == NULL)	1541	if (Input_Context == NULL)
1477	{	1542	{
1478	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1543	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1479	display->put_xim (input_method);	1544	im_destroy ();
1480	return false;	1545	return false;
1481	}	1546	}
1482		1547
1483	if (input_style & XIMPreeditArea)	1548	if (input_style & XIMPreeditArea)
1484	IMSetStatusPosition ();	1549	IMSetStatusPosition ();
…		…
1493	int i, found, had_im;	1558	int i, found, had_im;
1494	const char *p;	1559	const char *p;
1495	char **s;	1560	char **s;
1496	char buf[IMBUFSIZ];	1561	char buf[IMBUFSIZ];
1497		1562
		1563	SET_R (this);
		1564
1498	im_destroy ();	1565	im_destroy ();
1499		1566
1500	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));	1567	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1501	if (Input_Context)	1568	if (Input_Context)
1502	return;	1569	return;
…		…
1510	if (p && *p)	1577	if (p && *p)
1511	{	1578	{
1512	bool found = false;	1579	bool found = false;
1513		1580
1514	s = rxvt_splitcommastring (p);	1581	s = rxvt_splitcommastring (p);
		1582
1515	for (i = 0; s[i]; i++)	1583	for (i = 0; s[i]; i++)
1516	{	1584	{
1517	if (*s[i])	1585	if (*s[i])
1518	{	1586	{
1519	STRCPY (buf, "@im=");	1587	strcpy (buf, "@im=");
1520	STRNCAT (buf, s[i], IMBUFSIZ - 5);	1588	strncat (buf, s[i], IMBUFSIZ - 5);
1521	if (IM_get_IC (buf))	1589	if (IM_get_IC (buf))
1522	{	1590	{
1523	found = true;	1591	found = true;
1524	break;	1592	break;
1525	}	1593	}
1526	}	1594	}
1527	}	1595	}
1528	for (i = 0; s[i]; i++)	1596
1529	free (s[i]);	1597	rxvt_freecommastring (s);
1530	free (s);
1531		1598
1532	if (found)	1599	if (found)
1533	goto done;	1600	goto done;
1534	}	1601	}
1535		1602
…		…
1549	}	1616	}
1550		1617
1551	void	1618	void
1552	rxvt_term::IMSetStatusPosition ()	1619	rxvt_term::IMSetStatusPosition ()
1553	{	1620	{
1554	XRectangle preedit_rect, status_rect, *needed_rect;	1621	XRectangle preedit_rect, status_rect, *needed_rect;
1555	XVaNestedList preedit_attr, status_attr;	1622	XVaNestedList preedit_attr, status_attr;
1556		1623
1557	if (Input_Context == NULL	1624	if (!Input_Context
		1625	|| !TermWin.focus
1558	|| !TermWin.focus || ! (input_style & XIMPreeditArea)	1626	|| !(input_style & XIMPreeditArea)
1559	|| !IMisRunning ())	1627	|| !IMisRunning ())
1560	return;	1628	return;
1561		1629
1562	/* Getting the necessary width of preedit area */	1630	/* Getting the necessary width of preedit area */
1563	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1631	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1564	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1632	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1565	XFree (status_attr);	1633	XFree (status_attr);
1566		1634
1567	im_set_preedit_area (&preedit_rect, &status_rect, needed_rect);	1635	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
		1636	XFree (needed_rect);
1568		1637
1569	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1638	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1570	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1639	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1571		1640
1572	XSetICValues (Input_Context,	1641	XSetICValues (Input_Context,
1573	XNPreeditAttributes, preedit_attr,	1642	XNPreeditAttributes, preedit_attr,
1574	XNStatusAttributes, status_attr, NULL);	1643	XNStatusAttributes, status_attr, NULL);
1575		1644
1576	XFree (preedit_attr);	1645	XFree (preedit_attr);
1577	XFree (status_attr);	1646	XFree (status_attr);
1578	}	1647	}
1579	#endif /* USE_XIM */	1648	#endif /* USE_XIM */

Diff Legend

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