[ViewVC] Diff of: cvs/rxvt-unicode/src/main.C

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC

…		…
1	/---------------------------------C----------------------------------	1	/----------------------------------------------------------------------
2	* File: main.C	2	* File: main.C
3	----------------------------------------------------------------------	3	----------------------------------------------------------------------
4	*	4	*
5	* All portions of code are copyright by their respective author/s.	5	* All portions of code are copyright by their respective author/s.
6	* 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>
48	# include <termios.h>	48	# include <termios.h>
49	#endif	49	#endif
50		50
51	vector<rxvt_term *> rxvt_term::termlist;	51	vector<rxvt_term *> rxvt_term::termlist;
52		52
		53	// used to tell global functions which terminal instance is "active"
		54	rxvt_t rxvt_current_term;
		55
53	static char curlocale[128], savelocale[128];	56	static char curlocale[128], savelocale[128];
54		57
55	bool	58	bool
56	rxvt_set_locale (const char *locale)	59	rxvt_set_locale (const char *locale) NOTHROW
57	{	60	{
		61	int size = strlen (locale) + 1;
		62
		63	if (size > sizeof (curlocale))
		64	rxvt_fatal ("locale string too long, aborting.\n");
		65
58	if (!locale \|\| !strncmp (locale, curlocale, 128))	66	if (!locale \|\| !memcmp (locale, curlocale, size))
59	return false;	67	return false;
60		68
61	strncpy (curlocale, locale, 128);	69	memcpy (curlocale, locale, size);
62	setlocale (LC_CTYPE, curlocale);	70	setlocale (LC_CTYPE, curlocale);
63	return true;	71	return true;
64	}	72	}
65		73
66	void	74	void
67	rxvt_push_locale (const char *locale)	75	rxvt_push_locale (const char *locale) NOTHROW
68	{	76	{
69	strcpy (savelocale, curlocale);	77	strcpy (savelocale, curlocale);
70	rxvt_set_locale (locale);	78	rxvt_set_locale (locale);
71	}	79	}
72		80
73	void	81	void
74	rxvt_pop_locale ()	82	rxvt_pop_locale () NOTHROW
75	{	83	{
76	rxvt_set_locale (savelocale);	84	rxvt_set_locale (savelocale);
77	}	85	}
78		86
79	#if ENABLE_COMBINING	87	#if ENABLE_COMBINING
…		…
140	}	148	}
141	#endif	149	#endif
142		150
143	rxvt_term::rxvt_term ()	151	rxvt_term::rxvt_term ()
144	:	152	:
145	#if TRANSPARENT	153	#if TRANSPARENT \|\| ENABLE_PERL
146	rootwin_ev (this, &rxvt_term::rootwin_cb),	154	rootwin_ev (this, &rxvt_term::rootwin_cb),
147	#endif	155	#endif
148	#ifdef HAVE_SCROLLBARS	156	#ifdef HAVE_SCROLLBARS
149	scrollbar_ev (this, &rxvt_term::x_cb),	157	scrollbar_ev (this, &rxvt_term::x_cb),
150	#endif	158	#endif
…		…
166	#ifdef POINTER_BLANK	174	#ifdef POINTER_BLANK
167	pointer_ev (this, &rxvt_term::pointer_cb),	175	pointer_ev (this, &rxvt_term::pointer_cb),
168	#endif	176	#endif
169	#ifdef USE_XIM	177	#ifdef USE_XIM
170	im_ev (this, &rxvt_term::im_cb),	178	im_ev (this, &rxvt_term::im_cb),
		179	#endif
		180	#ifndef NO_BELL
		181	bell_ev (this, &rxvt_term::bell_cb),
171	#endif	182	#endif
172	termwin_ev (this, &rxvt_term::x_cb),	183	termwin_ev (this, &rxvt_term::x_cb),
173	vt_ev (this, &rxvt_term::x_cb),	184	vt_ev (this, &rxvt_term::x_cb),
174	child_ev (this, &rxvt_term::child_cb),	185	child_ev (this, &rxvt_term::child_cb),
175	check_ev (this, &rxvt_term::check_cb),	186	check_ev (this, &rxvt_term::check_cb),
…		…
182		193
183	termlist.push_back (this);	194	termlist.push_back (this);
184		195
185	#ifdef KEYSYM_RESOURCE	196	#ifdef KEYSYM_RESOURCE
186	keyboard = new keyboard_manager;	197	keyboard = new keyboard_manager;
187
188	if (!keyboard)
189	rxvt_fatal ("out of memory, aborting.\n");
190	#endif	198	#endif
191	}	199	}
192		200
193	// clean up the most important stuff, do not call x or free mem etc.	201	// clean up the most important stuff, do not call x or free mem etc.
194	// for use before an emergency exit	202	// for use before an emergency exit
195	void rxvt_term::emergency_cleanup ()	203	void rxvt_term::emergency_cleanup ()
196	{	204	{
197	if (cmd_pid)	205	if (cmd_pid)
198	kill (-cmd_pid, SIGHUP);	206	kill (-cmd_pid, SIGHUP);
199		207
		208	pty_ev.stop ();
200	delete pty; pty = 0;	209	delete pty; pty = 0;
201	}	210	}
202		211
203	rxvt_term::~rxvt_term ()	212	rxvt_term::~rxvt_term ()
204	{	213	{
205	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
206
207	termlist.erase (find (termlist.begin (), termlist.end(), this));	214	termlist.erase (find (termlist.begin (), termlist.end(), this));
208		215
209	emergency_cleanup ();	216	emergency_cleanup ();
210		217
211	#if ENABLE_STYLES	218	#if ENABLE_STYLES
…		…
215	#endif	222	#endif
216	delete fontset[0];	223	delete fontset[0];
217		224
218	if (display)	225	if (display)
219	{	226	{
220	dDisp;
221
222	selection_clear ();	227	selection_clear ();
223		228
224	#ifdef USE_XIM	229	#ifdef USE_XIM
225	im_destroy ();	230	im_destroy ();
226	#endif	231	#endif
227	#ifdef XTERM_SCROLLBAR	232	#ifdef XTERM_SCROLLBAR
228	if (xscrollbarGC) XFreeGC (disp, xscrollbarGC);	233	if (xscrollbarGC) XFreeGC (dpy, xscrollbarGC);
229	if (ShadowGC) XFreeGC (disp, ShadowGC);	234	if (ShadowGC) XFreeGC (dpy, ShadowGC);
230	#endif	235	#endif
231	#ifdef PLAIN_SCROLLBAR	236	#ifdef PLAIN_SCROLLBAR
232	if (pscrollbarGC) XFreeGC (disp, pscrollbarGC);	237	if (pscrollbarGC) XFreeGC (dpy, pscrollbarGC);
233	#endif	238	#endif
234	#ifdef NEXT_SCROLLBAR	239	#ifdef NEXT_SCROLLBAR
235	if (blackGC) XFreeGC (disp, blackGC);	240	if (blackGC) XFreeGC (dpy, blackGC);
236	if (whiteGC) XFreeGC (disp, whiteGC);	241	if (whiteGC) XFreeGC (dpy, whiteGC);
237	if (grayGC) XFreeGC (disp, grayGC);	242	if (grayGC) XFreeGC (dpy, grayGC);
238	if (darkGC) XFreeGC (disp, darkGC);	243	if (darkGC) XFreeGC (dpy, darkGC);
239	if (stippleGC) XFreeGC (disp, stippleGC);	244	if (stippleGC) XFreeGC (dpy, stippleGC);
240	if (dimple) XFreePixmap (disp, dimple);	245	if (dimple) XFreePixmap (dpy, dimple);
241	if (upArrow) XFreePixmap (disp, upArrow);	246	if (upArrow) XFreePixmap (dpy, upArrow);
242	if (downArrow) XFreePixmap (disp, downArrow);	247	if (downArrow) XFreePixmap (dpy, downArrow);
243	if (upArrowHi) XFreePixmap (disp, upArrowHi);	248	if (upArrowHi) XFreePixmap (dpy, upArrowHi);
244	if (downArrowHi) XFreePixmap (disp, downArrowHi);	249	if (downArrowHi) XFreePixmap (dpy, downArrowHi);
245	#endif	250	#endif
246	#ifdef RXVT_SCROLLBAR	251	#ifdef RXVT_SCROLLBAR
247	if (topShadowGC) XFreeGC (disp, topShadowGC);	252	if (topShadowGC) XFreeGC (dpy, topShadowGC);
248	if (botShadowGC) XFreeGC (disp, botShadowGC);	253	if (botShadowGC) XFreeGC (dpy, botShadowGC);
249	if (scrollbarGC) XFreeGC (disp, scrollbarGC);	254	if (scrollbarGC) XFreeGC (dpy, scrollbarGC);
250	#endif	255	#endif
251	if (gc) XFreeGC (disp, gc);	256	if (gc) XFreeGC (dpy, gc);
252		257
253	delete drawable;	258	delete drawable;
254	// destroy all windows	259	// destroy all windows
255	if (parent[0])	260	if (parent[0])
256	XDestroyWindow (disp, parent[0]);	261	XDestroyWindow (dpy, parent[0]);
257	}
258		262
259	// TODO: free pixcolours, colours should become part of rxvt_display	263	for (int i = 0; i < TOTAL_COLORS; i++)
260	delete pix_colors_focused;	264	if (ISSET_PIXCOLOR (i))
		265	{
		266	pix_colors_focused [i].free (this);
261	#if OFF_FOCUS_FADING	267	#if OFF_FOCUS_FADING
		268	pix_colors_unfocused [i].free (this);
		269	#endif
		270	}
		271
		272	clear ();
		273	}
		274
		275	delete [] pix_colors_focused;
		276	#if OFF_FOCUS_FADING
262	delete pix_colors_unfocused;	277	delete [] pix_colors_unfocused;
263	#endif	278	#endif
264		279
265	displays.put (display);	280	displays.put (display);
266		281
267	scr_release ();	282	scr_release ();
…		…
270	for (int i = 0; i < allocated.size (); i++)	285	for (int i = 0; i < allocated.size (); i++)
271	free (allocated [i]);	286	free (allocated [i]);
272		287
273	free (selection.text);	288	free (selection.text);
274	// TODO: manage env vars in child only(!)	289	// TODO: manage env vars in child only(!)
275	free (env_windowid);
276	free (env_display);	290	free (env_display);
277	free (env_term);	291	free (env_term);
278	free (env_colorfgbg);
279	free (locale);	292	free (locale);
280	free (v_buffer);	293	free (v_buffer);
281	free (incr_buf);	294	free (incr_buf);
282		295
283	delete envv;	296	delete envv;
…		…
304	rxvt_term::destroy ()	317	rxvt_term::destroy ()
305	{	318	{
306	if (destroy_ev.active)	319	if (destroy_ev.active)
307	return;	320	return;
308		321
		322	HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
		323
309	#if ENABLE_OVERLAY	324	#if ENABLE_OVERLAY
310	scr_overlay_off ();	325	scr_overlay_off ();
311	#endif	326	#endif
312		327
313	if (display)	328	if (display)
…		…
316	im_ev.stop (display);	331	im_ev.stop (display);
317	#endif	332	#endif
318	#if HAVE_SCROLLBARS	333	#if HAVE_SCROLLBARS
319	scrollbar_ev.stop (display);	334	scrollbar_ev.stop (display);
320	#endif	335	#endif
321	#if TRANSPARENT	336	#if TRANSPARENT \|\| ENABLE_PERL
322	rootwin_ev.stop (display);	337	rootwin_ev.stop (display);
323	#endif	338	#endif
324	incr_ev.stop ();	339	incr_ev.stop ();
325	termwin_ev.stop (display);	340	termwin_ev.stop (display);
326	vt_ev.stop (display);	341	vt_ev.stop (display);
…		…
367	{	382	{
368	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)	383	for (rxvt_term **t = rxvt_term::termlist.begin (); t < rxvt_term::termlist.end (); t++)
369	(*t)->emergency_cleanup ();	384	(*t)->emergency_cleanup ();
370	}	385	}
371		386
372	#if ENABLE_FRILLS	387	#if !ENABLE_MINIMAL
373	static void	388	static void
374	print_x_error (Display dpy, XErrorEvent event)	389	print_x_error (Display dpy, XErrorEvent event)
375	{	390	{
376	char buffer[BUFSIZ];	391	char buffer[BUFSIZ];
377	char mesg[BUFSIZ];	392	char mesg[BUFSIZ];
…		…
425	GET_R->allowedxerror = event->error_code;	440	GET_R->allowedxerror = event->error_code;
426	else	441	else
427	{	442	{
428	// GET_R is most likely not the terminal which caused the error,	443	// GET_R is most likely not the terminal which caused the error,
429	// so just output the error and continue	444	// so just output the error and continue
430	#if ENABLE_FRILLS	445	#if ENABLE_MINIMAL
		446	old_xerror_handler (display, event);
		447	#else
431	print_x_error (display, event);	448	print_x_error (display, event);
432	#else
433	old_xerror_handler (display, event);
434	#endif	449	#endif
435	}	450	}
436		451
437	return 0;	452	return 0;
438	}	453	}
…		…
446	_exit (EXIT_FAILURE);	461	_exit (EXIT_FAILURE);
447	}	462	}
448		463
449	/----------------------------------------------------------------------/	464	/----------------------------------------------------------------------/
450	bool	465	bool
451	rxvt_term::init (int argc, const char const argv)	466	rxvt_term::init (int argc, const char const argv, stringvec *envv)
452	{	467	{
		468	this->envv = envv;
		469
453	SET_R (this);	470	SET_R (this);
454	set_locale ("");	471	set_locale ("");
455	set_environ (envv); // few things in X do not call setlocale :(	472	set_environ (envv); // few things in X do not call setlocale :(
456		473
457	if (!init_vars ())	474	if (!init_vars ())
…		…
468	#ifdef HAVE_SCROLLBARS	485	#ifdef HAVE_SCROLLBARS
469	if (OPTION (Opt_scrollBar))	486	if (OPTION (Opt_scrollBar))
470	scrollBar.setIdle (); /* set existence for size calculations */	487	scrollBar.setIdle (); /* set existence for size calculations */
471	#endif	488	#endif
472		489
473	#if ENABLE_PERL	490	pty = ptytty::create ();
474	if (!rs[Rs_perl_ext_1])
475	rs[Rs_perl_ext_1] = "default";
476
477	if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
478	\|\| (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
479	\|\| (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
480	{
481	rxvt_perl.init (this);
482	HOOK_INVOKE ((this, HOOK_INIT, DT_END));
483	}
484	#endif
485
486	pty = rxvt_new_ptytty ();
487		491
488	create_windows (argc, argv);	492	create_windows (argc, argv);
489		493
490	dDisp;
491
492	init_xlocale ();	494	init_xlocale ();
493		495
494	scr_reset (); // initialize screen	496	scr_reset (); // initialize screen
495		497
496	#if 0	498	#if 0
497	XSynchronize (disp, True);	499	XSynchronize (dpy, True);
498	#endif	500	#endif
499		501
500	#ifdef HAVE_SCROLLBARS	502	#ifdef HAVE_SCROLLBARS
501	if (OPTION (Opt_scrollBar))	503	if (OPTION (Opt_scrollBar))
502	resize_scrollbar (); /* create and map scrollbar */	504	resize_scrollbar (); /* create and map scrollbar */
503	#endif	505	#endif
504	#ifdef TRANSPARENT	506	#ifdef TRANSPARENT
505	if (OPTION (Opt_transparent))	507	if (OPTION (Opt_transparent))
506	{	508	{
507	XSelectInput (disp, display->root, PropertyChangeMask);	509	XSelectInput (dpy, display->root, PropertyChangeMask);
508	check_our_parents ();	510	check_our_parents ();
509	rootwin_ev.start (display, display->root);	511	rootwin_ev.start (display, display->root);
510	}	512	}
511	#endif	513	#endif
512		514	#if ENABLE_PERL
513	XMapWindow (disp, vt);	515	rootwin_ev.start (display, display->root);
514	XMapWindow (disp, parent[0]);	516	#endif
515		517
516	set_colorfgbg ();	518	set_colorfgbg ();
517		519
518	init_command (cmd_argv);	520	init_command (cmd_argv);
519		521
…		…
523	pty_ev.start (pty->pty, EVENT_READ);	525	pty_ev.start (pty->pty, EVENT_READ);
524		526
525	check_ev.start ();	527	check_ev.start ();
526		528
527	HOOK_INVOKE ((this, HOOK_START, DT_END));	529	HOOK_INVOKE ((this, HOOK_START, DT_END));
		530
		531	#if ENABLE_XEMBED
		532	if (rs[Rs_embed])
		533	{
		534	long info[2] = { 0, XEMBED_MAPPED };
		535
		536	XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
		537	32, PropModeReplace, (unsigned char *)&info, 2);
		538	}
		539	#endif
		540
		541	XMapWindow (dpy, vt);
		542	XMapWindow (dpy, parent[0]);
528		543
529	return true;	544	return true;
530	}	545	}
531		546
532	static struct sig_handlers	547	static struct sig_handlers
…		…
537	* Catch a fatal signal and tidy up before quitting	552	* Catch a fatal signal and tidy up before quitting
538	*/	553	*/
539	void	554	void
540	sig_term (sig_watcher &w)	555	sig_term (sig_watcher &w)
541	{	556	{
542	#ifdef DEBUG_CMD
543	rxvt_warn ("caught signal %d, exiting.\n", w.signum);
544	#endif
545	rxvt_emergency_cleanup ();	557	rxvt_emergency_cleanup ();
546	signal (w.signum, SIG_DFL);	558	signal (w.signum, SIG_DFL);
547	kill (getpid (), w.signum);	559	kill (getpid (), w.signum);
548	}	560	}
549		561
…		…
557	char **rxvt_environ; // startup environment	569	char **rxvt_environ; // startup environment
558		570
559	void	571	void
560	rxvt_init ()	572	rxvt_init ()
561	{	573	{
562	uid_t uid = getuid ();	574	ptytty::init ();
563	gid_t gid = getgid ();
564
565	// before doing anything else, check for setuid/setgid operation,
566	// start the helper process and drop privileges
567	if (uid != geteuid ()
568	\|\| gid != getegid ())
569	{
570	#if PTYTTY_HELPER
571	rxvt_ptytty_server ();
572	#else
573	rxvt_warn ("running setuid/setgid without pty helper compiled in, continuing unprivileged.\n");
574	#endif
575
576	// drop privileges
577	#if HAVE_SETRESUID
578	setresgid (gid, gid, gid);
579	setresuid (uid, uid, uid);
580	#elif HAVE_SETREUID
581	setregid (gid, gid);
582	setreuid (uid, uid);
583	#elif HAVE_SETUID
584	setgid (gid);
585	setuid (uid);
586	#endif
587
588	if (uid != geteuid ()
589	\|\| gid != getegid ())
590	rxvt_fatal ("unable to drop privileges, aborting.\n");
591	}
592		575
593	rxvt_environ = environ;	576	rxvt_environ = environ;
594		577
595	signal (SIGHUP, SIG_IGN);	578	signal (SIGHUP, SIG_IGN);
596	signal (SIGPIPE, SIG_IGN);	579	signal (SIGPIPE, SIG_IGN);
…		…
631	rxvt_fatal ("memory allocation failure. aborting.\n");	614	rxvt_fatal ("memory allocation failure. aborting.\n");
632		615
633	return p;	616	return p;
634	}	617	}
635		618
636	void *	619	void *
637	rxvt_realloc (void *ptr, size_t size)	620	rxvt_realloc (void *ptr, size_t size)
638	{	621	{
639	void *p = realloc (ptr, size);	622	void *p = realloc (ptr, size);
640		623
641	if (!p)	624	if (!p)
…		…
654	{	637	{
655	short recalc_x, recalc_y;	638	short recalc_x, recalc_y;
656	int x, y, sb_w, flags;	639	int x, y, sb_w, flags;
657	unsigned int w, h;	640	unsigned int w, h;
658	unsigned int max_width, max_height;	641	unsigned int max_width, max_height;
659	dDisp;
660
661	D_SIZE ((stderr, "< Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
662	ncol, nrow, szHint.width, szHint.height));
663		642
664	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;	643	szHint.flags = PMinSize \| PResizeInc \| PBaseSize \| PWinGravity;
665	szHint.win_gravity = NorthWestGravity;	644	szHint.win_gravity = NorthWestGravity;
666	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */	645	/* szHint.min_aspect.x = szHint.min_aspect.y = 1; */
667		646
…		…
729		708
730	if (scrollBar.state)	709	if (scrollBar.state)
731	{	710	{
732	sb_w = scrollbar_TotalWidth ();	711	sb_w = scrollbar_TotalWidth ();
733	szHint.base_width += sb_w;	712	szHint.base_width += sb_w;
		713
734	if (!OPTION (Opt_scrollBar_right))	714	if (!OPTION (Opt_scrollBar_right))
735	window_vt_x += sb_w;	715	window_vt_x += sb_w;
736	}	716	}
737		717
738	szHint.width_inc = fwidth;	718	szHint.width_inc = fwidth;
739	szHint.height_inc = fheight;	719	szHint.height_inc = fheight;
740	szHint.min_width = szHint.base_width + szHint.width_inc;	720	szHint.min_width = szHint.base_width + szHint.width_inc;
741	szHint.min_height = szHint.base_height + szHint.height_inc;	721	szHint.min_height = szHint.base_height + szHint.height_inc;
742		722
743	if (newwidth && newwidth - szHint.base_width < max_width)	723	if (newwidth && newwidth - szHint.base_width < max_width)
744	{	724	{
745	szHint.width = newwidth;	725	szHint.width = newwidth;
…		…
764		744
765	if (scrollBar.state && OPTION (Opt_scrollBar_right))	745	if (scrollBar.state && OPTION (Opt_scrollBar_right))
766	window_sb_x = szHint.width - sb_w;	746	window_sb_x = szHint.width - sb_w;
767		747
768	if (recalc_x)	748	if (recalc_x)
769	szHint.x += DisplayWidth (disp, display->screen) - szHint.width - 2 * ext_bwidth;	749	szHint.x += DisplayWidth (dpy, display->screen) - szHint.width - 2 * ext_bwidth;
		750
770	if (recalc_y)	751	if (recalc_y)
771	szHint.y += DisplayHeight (disp, display->screen) - szHint.height - 2 * ext_bwidth;	752	szHint.y += DisplayHeight (dpy, display->screen) - szHint.height - 2 * ext_bwidth;
772		753
773	ncol = width / fwidth;	754	ncol = width / fwidth;
774	nrow = height / fheight;	755	nrow = height / fheight;
775	D_SIZE ((stderr, "> Cols/Rows: %3d x %3d ; Width/Height: %4d x %4d",
776	ncol, nrow, szHint.width,
777	szHint.height));
778	return;
779	}	756	}
780		757
781	/----------------------------------------------------------------------/	758	/----------------------------------------------------------------------/
782	/*	759	/*
783	* Tell the teletype handler what size the window is.	760	* Tell the teletype handler what size the window is.
…		…
835	delete fontset[0];	812	delete fontset[0];
836	fontset[0] = fs;	813	fontset[0] = fs;
837		814
838	prop = (*fs)[1]->properties ();	815	prop = (*fs)[1]->properties ();
839	prop.height += lineSpace;	816	prop.height += lineSpace;
		817
840	fs->set_prop (prop);	818	fs->set_prop (prop, false);
841		819
842	fwidth = prop.width;	820	fwidth = prop.width;
843	fheight = prop.height;	821	fheight = prop.height;
844	fbase = prop.ascent;	822	fbase = prop.ascent;
845		823
…		…
864	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;	842	if (SET_STYLE (0, style) & RS_Bold) prop2.weight = rxvt_fontprop::bold;
865	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;	843	if (SET_STYLE (0, style) & RS_Italic) prop2.slant = rxvt_fontprop::italic;
866	}	844	}
867		845
868	fs->populate (res);	846	fs->populate (res);
869	fs->set_prop (prop2);	847	fs->set_prop (prop2, true);
870	}	848	}
871	#else	849	#else
872	fontset[style] = fontset[0];	850	fontset[style] = fontset[0];
873	#endif	851	#endif
874	}	852	}
…		…
883	return true;	861	return true;
884	}	862	}
885		863
886	void rxvt_term::set_string_property (Atom prop, const char *str, int len)	864	void rxvt_term::set_string_property (Atom prop, const char *str, int len)
887	{	865	{
888	XChangeProperty (display->display, parent[0],	866	XChangeProperty (dpy, parent[0],
889	prop, XA_STRING, 8, PropModeReplace,	867	prop, XA_STRING, 8, PropModeReplace,
890	(const unsigned char *)str, len >= 0 ? len : strlen (str));	868	(const unsigned char *)str, len >= 0 ? len : strlen (str));
891	}	869	}
892		870
893	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)	871	void rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
894	{	872	{
895	wchar_t *ws = rxvt_mbstowcs (str, len);	873	wchar_t *ws = rxvt_mbstowcs (str, len);
896	char *s = rxvt_wcstoutf8 (ws);	874	char *s = rxvt_wcstoutf8 (ws);
897		875
898	XChangeProperty (display->display, parent[0],	876	XChangeProperty (dpy, parent[0],
899	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,	877	prop, xa[XA_UTF8_STRING], 8, PropModeReplace,
900	(const unsigned char *)s, strlen (s));	878	(const unsigned char *)s, strlen (s));
901		879
902	free (s);	880	free (s);
903	free (ws);	881	free (ws);
…		…
928	void	906	void
929	rxvt_term::set_window_color (int idx, const char *color)	907	rxvt_term::set_window_color (int idx, const char *color)
930	{	908	{
931	rxvt_color xcol;	909	rxvt_color xcol;
932	int i;	910	int i;
933		911
934	if (color == NULL \|\| *color == '\0')	912	if (color == NULL \|\| *color == '\0')
935	return;	913	return;
		914
		915	color = strdup (color);
		916	allocated.push_back ((void *)color);
		917	rs[Rs_color + idx] = color;
936		918
937	/* handle color aliases */	919	/* handle color aliases */
938	if (isdigit (*color))	920	if (isdigit (*color))
939	{	921	{
940	i = atoi (color);	922	i = atoi (color);
941		923
942	if (i >= 8 && i <= 15)	924	if (i >= 8 && i <= 15)
943	{ /* bright colors */	925	{ /* bright colors */
944	i -= 8;	926	i -= 8;
945	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];	927	pix_colors_focused[idx] = pix_colors_focused[minBrightCOLOR + i];
946	SET_PIXCOLOR (idx);
947	goto done;	928	goto done;
948	}	929	}
949		930
950	if (i >= 0 && i <= 7)	931	if (i >= 0 && i <= 7)
951	{ /* normal colors */	932	{ /* normal colors */
952	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];	933	pix_colors_focused[idx] = pix_colors_focused[minCOLOR + i];
953	SET_PIXCOLOR (idx);
954	goto done;	934	goto done;
955	}	935	}
956	}	936	}
957		937
958	if (!rXParseAllocColor (&xcol, color))	938	set_color (xcol, color);
959	return;
960
961	/* XStoreColor (display->display, display->cmap, XColor); /
962		939
963	/*	940	/*
964	* FIXME: should free colors here, but no idea how to do it so instead,	941	* FIXME: should free colors here, but no idea how to do it so instead,
965	* so just keep gobbling up the colormap	942	* so just keep gobbling up the colormap
966	*/	943	*/
967	# if 0
968	for (i = Color_Black; i <= Color_White; i++)
969	if (pix_colors[idx] == pix_colors[i])
970	break;
971	if (i > Color_White)
972	{
973	/* fprintf (stderr, "XFreeColors: pix_colors [%d] = %lu\n", idx, pix_colors [idx]); */
974	XFreeColors (display->display, display->cmap, (pix_colors + idx), 1,
975	DisplayPlanes (display->display, display->screen));
976	}
977	# endif
978		944
979	pix_colors_focused[idx] = xcol;	945	pix_colors_focused[idx] = xcol;
980	SET_PIXCOLOR (idx);
981		946
982	/* XSetWindowAttributes attr; */	947	/* XSetWindowAttributes attr; */
983	/* Cursor cursor; */	948	/* Cursor cursor; */
984	done:	949	done:
985
986	#if OFF_FOCUS_FADING
987	if (rs[Rs_fade])
988	pix_colors_unfocused[idx] = pix_colors_focused[idx].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
989	#endif
990
991	/TODO: handle Color_BD, scrollbar background, etc. /	950	/TODO: handle Color_BD, scrollbar background, etc. /
992		951
		952	update_fade_color (idx);
993	recolour_cursor ();	953	recolour_cursor ();
994	scr_recolour ();	954	scr_recolour ();
995	}	955	}
996		956
997	#else	957	#else
…		…
999	#endif /* XTERM_COLOR_CHANGE */	959	#endif /* XTERM_COLOR_CHANGE */
1000		960
1001	void	961	void
1002	rxvt_term::recolour_cursor ()	962	rxvt_term::recolour_cursor ()
1003	{	963	{
1004	XColor xcol[2];	964	XColor fg, bg;
1005		965
1006	xcol[0].pixel = ISSET_PIXCOLOR (Color_pointer_fg)	966	(ISSET_PIXCOLOR (Color_pointer_fg)
1007	? pix_colors_focused[Color_pointer_fg]	967	? pix_colors_focused[Color_pointer_fg]
1008	: pix_colors_focused[Color_fg];	968	: pix_colors_focused[Color_fg]).get (fg);
		969
1009	xcol[1].pixel = ISSET_PIXCOLOR (Color_pointer_bg)	970	(ISSET_PIXCOLOR (Color_pointer_bg)
1010	? pix_colors_focused[Color_pointer_bg]	971	? pix_colors_focused[Color_pointer_bg]
1011	: pix_colors_focused[Color_bg];	972	: pix_colors_focused[Color_bg]).get (bg);
1012		973
1013	XQueryColors (display->display, display->cmap, xcol, 2);	974	XRecolorCursor (dpy, TermWin_cursor, &fg, &bg);
1014	XRecolorCursor (display->display, TermWin_cursor, xcol + 0, xcol + 1);
1015	}	975	}
1016		976
1017	/----------------------------------------------------------------------/	977	/----------------------------------------------------------------------/
1018	/*	978	/*
1019	* find if fg/bg matches any of the normal (low-intensity) colors	979	* find if fg/bg matches any of the normal (low-intensity) colors
…		…
1023	{	983	{
1024	unsigned int i;	984	unsigned int i;
1025	const char *xpmb = "\0";	985	const char *xpmb = "\0";
1026	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];	986	char fstr[sizeof ("default") + 1], bstr[sizeof ("default") + 1];
1027		987
1028	env_colorfgbg = (char *)rxvt_malloc (sizeof ("COLORFGBG=default;default;bg") + 1);
1029	strcpy (fstr, "default");	988	strcpy (fstr, "default");
1030	strcpy (bstr, "default");	989	strcpy (bstr, "default");
1031	for (i = Color_Black; i <= Color_White; i++)	990	for (i = Color_Black; i <= Color_White; i++)
1032	if (pix_colors[Color_fg] == pix_colors[i])	991	if (pix_colors[Color_fg] == pix_colors[i])
1033	{	992	{
…		…
1048	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);	1007	sprintf (env_colorfgbg, "COLORFGBG=%s;%s%s", fstr, xpmb, bstr);
1049	}	1008	}
1050		1009
1051	/----------------------------------------------------------------------/	1010	/----------------------------------------------------------------------/
1052		1011
1053	int	1012	bool
1054	rxvt_term::rXParseAllocColor (rxvt_color screen_in_out, const char colour)	1013	rxvt_term::set_color (rxvt_color &color, const char *name)
1055	{	1014	{
1056	if (!screen_in_out->set (display, colour))	1015	if (color.set (this, name))
1057	{
1058	rxvt_warn ("can't get colour '%s', continuing without.\n", colour);
1059	return false;
1060	}
1061
1062	return true;	1016	return true;
		1017
		1018	rxvt_warn ("can't get colour '%s', continuing without.\n", name);
		1019	return false;
		1020	}
		1021
		1022	void
		1023	rxvt_term::alias_color (int dst, int src)
		1024	{
		1025	pix_colors[dst].set (this, rs[Rs_color + dst] = rs[Rs_color + src]);
1063	}	1026	}
1064		1027
1065	/* -------------------------------------------------------------------- *	1028	/* -------------------------------------------------------------------- *
1066	* - WINDOW RESIZING - *	1029	* - WINDOW RESIZING - *
1067	* -------------------------------------------------------------------- */	1030	* -------------------------------------------------------------------- */
1068	void	1031	void
1069	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)	1032	rxvt_term::resize_all_windows (unsigned int newwidth, unsigned int newheight, int ignoreparent)
1070	{	1033	{
1071	int fix_screen;	1034	int fix_screen;
1072	int old_width = szHint.width, old_height = szHint.height;	1035	int old_width = szHint.width;
1073	dDisp;	1036	int old_height = szHint.height;
1074		1037
1075	window_calc (newwidth, newheight);	1038	window_calc (newwidth, newheight);
		1039
		1040	if (!HOOK_INVOKE ((this, HOOK_RESIZE_ALL_WINDOWS, DT_INT, newwidth, DT_INT, newheight, DT_END)))
1076	XSetWMNormalHints (disp, parent[0], &szHint);	1041	XSetWMNormalHints (dpy, parent[0], &szHint);
1077		1042
1078	if (!ignoreparent)	1043	if (!ignoreparent)
1079	{	1044	{
1080	#ifdef SMART_RESIZE	1045	#ifdef SMART_RESIZE
1081	/*	1046	/*
…		…
1085	int x, y, x1, y1;	1050	int x, y, x1, y1;
1086	int dx, dy;	1051	int dx, dy;
1087	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;	1052	unsigned int unused_w1, unused_h1, unused_b1, unused_d1;
1088	Window unused_cr;	1053	Window unused_cr;
1089		1054
1090	XTranslateCoordinates (disp, parent[0], display->root,	1055	XTranslateCoordinates (dpy, parent[0], display->root,
1091	0, 0, &x, &y, &unused_cr);	1056	0, 0, &x, &y, &unused_cr);
1092	XGetGeometry (disp, parent[0], &unused_cr, &x1, &y1,	1057	XGetGeometry (dpy, parent[0], &unused_cr, &x1, &y1,
1093	&unused_w1, &unused_h1, &unused_b1, &unused_d1);	1058	&unused_w1, &unused_h1, &unused_b1, &unused_d1);
1094	/*	1059	/*
1095	* if display->root isn't the parent window, a WM will probably have offset	1060	* if display->root isn't the parent window, a WM will probably have offset
1096	* our position for handles and decorations. Counter it	1061	* our position for handles and decorations. Counter it
1097	*/	1062	*/
…		…
1099	{	1064	{
1100	x -= x1;	1065	x -= x1;
1101	y -= y1;	1066	y -= y1;
1102	}	1067	}
1103		1068
1104	x1 = (DisplayWidth (disp, display->screen) - old_width) / 2;	1069	x1 = (DisplayWidth (dpy, display->screen) - old_width ) / 2;
1105	y1 = (DisplayHeight (disp, display->screen) - old_height) / 2;	1070	y1 = (DisplayHeight (dpy, display->screen) - old_height) / 2;
1106	dx = old_width - szHint.width;	1071	dx = old_width - szHint.width;
1107	dy = old_height - szHint.height;	1072	dy = old_height - szHint.height;
1108		1073
1109	/* Check position of the center of the window */	1074	/* Check position of the center of the window */
1110	if (x < x1) /* left half */	1075	if (x < x1) /* left half */
1111	dx = 0;	1076	dx = 0;
…		…
1114	if (y < y1) /* top half */	1079	if (y < y1) /* top half */
1115	dy = 0;	1080	dy = 0;
1116	else if (y == y1) /* exact center */	1081	else if (y == y1) /* exact center */
1117	dy /= 2;	1082	dy /= 2;
1118		1083
1119	XMoveResizeWindow (disp, parent[0], x + dx, y + dy,	1084	XMoveResizeWindow (dpy, parent[0], x + dx, y + dy,
1120	szHint.width, szHint.height);	1085	szHint.width, szHint.height);
1121	#else	1086	#else
1122	XResizeWindow (disp, parent[0], szHint.width, szHint.height);	1087	XResizeWindow (dpy, parent[0], szHint.width, szHint.height);
1123	#endif	1088	#endif
1124	}	1089	}
1125		1090
1126	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;	1091	fix_screen = ncol != prev_ncol \|\| nrow != prev_nrow;
1127		1092
1128	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)	1093	if (fix_screen \|\| newwidth != old_width \|\| newheight != old_height)
1129	{	1094	{
1130	if (scrollBar.state)	1095	if (scrollBar.state)
1131	{	1096	{
1132	XMoveResizeWindow (disp, scrollBar.win,	1097	XMoveResizeWindow (dpy, scrollBar.win,
1133	window_sb_x, 0,	1098	window_sb_x, 0,
1134	scrollbar_TotalWidth (), szHint.height);	1099	scrollbar_TotalWidth (), szHint.height);
1135	resize_scrollbar ();	1100	resize_scrollbar ();
1136	}	1101	}
1137		1102
1138	XMoveResizeWindow (disp, vt,	1103	XMoveResizeWindow (dpy, vt,
1139	window_vt_x, window_vt_y,	1104	window_vt_x, window_vt_y,
1140	width, height);	1105	width, height);
1141		1106
1142	scr_clear ();	1107	scr_clear ();
1143	#ifdef XPM_BACKGROUND	1108	#ifdef XPM_BACKGROUND
1144	resize_pixmap ();	1109	resize_pixmap ();
1145	#endif	1110	#endif
1146	}	1111	}
1147		1112
1148	if (fix_screen \|\| old_height == 0)	1113	if (fix_screen \|\| old_height == 0)
1149	{
1150	int curr_screen = -1;
1151	int old_ncol = prev_ncol;
1152
1153	/* scr_reset only works on the primary screen */
1154	if (old_height) /* this is not the first time through */
1155	{
1156	unsigned int ocol = ncol;
1157	ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this
1158	curr_screen = scr_change_screen (PRIMARY);
1159	ncol = ocol;
1160	}
1161
1162	scr_reset ();	1114	scr_reset ();
1163		1115
1164	if (curr_screen >= 0) /* this is not the first time through */	1116	// TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165	{	1117	//scr_touch (false);
1166	scr_change_screen (curr_screen);
1167	selection_check (old_ncol != ncol ? 4 : 0);
1168	}
1169	}
1170
1171	old_width = szHint.width;
1172	old_height = szHint.height;
1173		1118
1174	#ifdef XPM_BACKGROUND	1119	#ifdef XPM_BACKGROUND
1175	if (pixmap)	1120	if (pixmap)
1176	scr_touch (false);	1121	scr_touch (false);
1177	#endif	1122	#endif
1178		1123
1179	#ifdef USE_XIM	1124	#ifdef USE_XIM
1180	IMSetStatusPosition ();	1125	IMSetPosition ();
1181	#endif	1126	#endif
1182	}	1127	}
1183		1128
1184	/*	1129	/*
1185	* Set the width/height of the vt window in characters. Units are pixels.	1130	* Set the width/height of the vt window in characters. Units are pixels.
…		…
1190	{	1135	{
1191	XWindowAttributes wattr;	1136	XWindowAttributes wattr;
1192		1137
1193	if (newwidth == 0 \|\| newheight == 0)	1138	if (newwidth == 0 \|\| newheight == 0)
1194	{	1139	{
1195	XGetWindowAttributes (display->display, display->root, &wattr);	1140	XGetWindowAttributes (dpy, display->root, &wattr);
1196		1141
1197	if (newwidth == 0)	1142	if (newwidth == 0)
1198	newwidth = wattr.width - szHint.base_width;	1143	newwidth = wattr.width - szHint.base_width;
1199	if (newheight == 0)	1144	if (newheight == 0)
1200	newheight = wattr.height - szHint.base_height;	1145	newheight = wattr.height - szHint.base_height;
…		…
1214	#ifdef USE_XIM	1159	#ifdef USE_XIM
1215		1160
1216	void	1161	void
1217	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)	1162	rxvt_term::im_set_color (unsigned long &fg, unsigned long &bg)
1218	{	1163	{
1219	fg = pix_colors[Color_fg];	1164	fg = pix_colors [Color_fg];
1220	bg = pix_colors[Color_bg];	1165	bg = pix_colors [Color_bg];
1221	}	1166	}
1222		1167
1223	void	1168	void
1224	rxvt_term::im_set_size (XRectangle &size)	1169	rxvt_term::im_set_size (XRectangle &size)
1225	{	1170	{
…		…
1262	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */	1207	strncat (server, & (p[4]), IMBUFSIZ - 9); /* skip "@im=" */
1263		1208
1264	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */	1209	if ((p = strchr (server + 1, '@')) != NULL) /* first one only */
1265	*p = '\0';	1210	*p = '\0';
1266		1211
1267	atom = XInternAtom (display->display, server, False);	1212	atom = XInternAtom (dpy, server, False);
1268	win = XGetSelectionOwner (display->display, atom);	1213	win = XGetSelectionOwner (dpy, atom);
1269		1214
1270	if (win != None)	1215	if (win != None)
1271	return True;	1216	return True;
1272	}	1217	}
1273		1218
…		…
1280	XPoint nspot;	1225	XPoint nspot;
1281	XVaNestedList preedit_attr;	1226	XVaNestedList preedit_attr;
1282		1227
1283	if (!Input_Context	1228	if (!Input_Context
1284	\|\| !focus	1229	\|\| !focus
1285	\|\| !(input_style & XIMPreeditPosition))	1230	\|\| !(input_style & (XIMPreeditPosition \| XIMPreeditCallbacks)))
1286	return;	1231	return;
1287		1232
1288	im_set_position (nspot);	1233	im_set_position (nspot);
1289		1234
1290	if (nspot.x == spot.x && nspot.y == spot.y)	1235	if (nspot.x == spot.x && nspot.y == spot.y)
…		…
1309	input_method = 0;	1254	input_method = 0;
1310	}	1255	}
1311		1256
1312	Input_Context = 0;	1257	Input_Context = 0;
1313	}	1258	}
		1259
		1260	#ifdef ENABLE_XIM_ONTHESPOT
		1261
		1262	static void
		1263	xim_preedit_start (XIC ic, XPointer client_data, XPointer call_data)
		1264	{
		1265	((rxvt_term *)client_data)->make_current ();
		1266	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_START, DT_END));
		1267	}
		1268
		1269	static void
		1270	xim_preedit_done (XIC ic, XPointer client_data, XPointer call_data)
		1271	{
		1272	((rxvt_term *)client_data)->make_current ();
		1273	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_DONE, DT_END));
		1274	}
		1275
		1276	static void
		1277	xim_preedit_draw (XIC ic, XPointer client_data, XIMPreeditDrawCallbackStruct *call_data)
		1278	{
		1279	rxvt_term term = (rxvt_term )client_data;
		1280	XIMText *text = call_data->text;
		1281
		1282	term->make_current ();
		1283
		1284	if (text)
		1285	{
		1286	void *str;
		1287
		1288	if (!text->encoding_is_wchar && text->string.multi_byte)
		1289	{
		1290	// of course, X makes it ugly again
		1291	if (term->rs[Rs_imLocale])
		1292	SET_LOCALE (term->rs[Rs_imLocale]);
		1293
		1294	str = rxvt_temp_buf ((text->length + 1) * sizeof (wchar_t));
		1295	mbstowcs ((wchar_t *)str, text->string.multi_byte, text->length + 1);
		1296
		1297	if (term->rs[Rs_imLocale])
		1298	SET_LOCALE (term->locale);
		1299	}
		1300	else
		1301	str = (void *)text->string.wide_char;
		1302
		1303	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1304	DT_INT, call_data->caret,
		1305	DT_INT, call_data->chg_first,
		1306	DT_INT, call_data->chg_length,
		1307	DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
		1308	DT_WCS_LEN, str, str ? (int)text->length : 0,
		1309	DT_END));
		1310	}
		1311	else
		1312	HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
		1313	DT_INT, call_data->caret,
		1314	DT_INT, call_data->chg_first,
		1315	DT_INT, call_data->chg_length,
		1316	DT_END));
		1317	}
		1318
		1319	#if 0
		1320	static void
		1321	xim_preedit_caret (XIC ic, XPointer client_data, XIMPreeditCaretCallbackStruct *call_data)
		1322	{
		1323	((rxvt_term *)client_data)->make_current ();
		1324	HOOK_INVOKE (((rxvt_term *)client_data, HOOK_XIM_PREEDIT_CARET,
		1325	DT_INT, call_data->position,
		1326	DT_INT, call_data->direction,
		1327	DT_INT, call_data->style,
		1328	DT_END));
		1329	}
		1330	#endif
		1331
		1332	#endif
1314		1333
1315	/*	1334	/*
1316	* Try to open a XIM with the current modifiers, then see if we can	1335	* Try to open a XIM with the current modifiers, then see if we can
1317	* open a suitable preedit type	1336	* open a suitable preedit type
1318	*/	1337	*/
…		…
1325	XRectangle rect, status_rect, needed_rect;	1344	XRectangle rect, status_rect, needed_rect;
1326	unsigned long fg, bg;	1345	unsigned long fg, bg;
1327	const char *p;	1346	const char *p;
1328	char **s;	1347	char **s;
1329	XIMStyles *xim_styles;	1348	XIMStyles *xim_styles;
		1349	#ifdef ENABLE_XIM_ONTHESPOT
		1350	XIMCallback xcb[4];
		1351	#endif
1330		1352
1331	set_environ (envv);	1353	set_environ (envv);
1332		1354
1333	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))	1355	if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
1334	return false;	1356	return false;
1335		1357
1336	D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
1337	input_method = display->get_xim (locale, modifiers);	1358	input_method = display->get_xim (locale, modifiers);
1338	if (input_method == NULL)	1359	if (input_method == NULL)
1339	return false;	1360	return false;
1340		1361
1341	xim = input_method->xim;	1362	xim = input_method->xim;
…		…
1361	s = rxvt_splitcommastring (p);	1382	s = rxvt_splitcommastring (p);
1362		1383
1363	for (i = found = 0; !found && s[i]; i++)	1384	for (i = found = 0; !found && s[i]; i++)
1364	{	1385	{
1365	if (!strcmp (s[i], "OverTheSpot"))	1386	if (!strcmp (s[i], "OverTheSpot"))
1366	input_style = (XIMPreeditPosition \| XIMStatusNothing);	1387	input_style = XIMPreeditPosition \| XIMStatusNothing;
1367	else if (!strcmp (s[i], "OffTheSpot"))	1388	else if (!strcmp (s[i], "OffTheSpot"))
1368	input_style = (XIMPreeditArea \| XIMStatusArea);	1389	input_style = XIMPreeditArea \| XIMStatusArea;
1369	else if (!strcmp (s[i], "Root"))	1390	else if (!strcmp (s[i], "Root"))
1370	input_style = (XIMPreeditNothing \| XIMStatusNothing);	1391	input_style = XIMPreeditNothing \| XIMStatusNothing;
1371	else if (!strcmp (s[i], "None"))	1392	else if (!strcmp (s[i], "None"))
1372	input_style = (XIMPreeditNone \| XIMStatusNone);	1393	input_style = XIMPreeditNone \| XIMStatusNone;
		1394	#ifdef ENABLE_XIM_ONTHESPOT
		1395	else if (SHOULD_INVOKE (HOOK_XIM_PREEDIT_START) && !strcmp (s[i], "OnTheSpot"))
		1396	input_style = XIMPreeditCallbacks \| XIMStatusNothing;
		1397	#endif
		1398	else
		1399	input_style = XIMPreeditNothing \| XIMStatusNothing;
1373		1400
1374	for (j = 0; j < xim_styles->count_styles; j++)	1401	for (j = 0; j < xim_styles->count_styles; j++)
1375	if (input_style == xim_styles->supported_styles[j])	1402	if (input_style == xim_styles->supported_styles[j])
1376	{	1403	{
1377	rxvt_freecommastring (s);	1404	rxvt_freecommastring (s);
…		…
1415	"*",	1442	"*",
1416	fheight,	1443	fheight,
1417	fheight + 1, fheight - 1,	1444	fheight + 1, fheight - 1,
1418	fheight - 2, fheight + 2);	1445	fheight - 2, fheight + 2);
1419		1446
1420	fs = XCreateFontSet (display->display, rs[Rs_imFont] ? rs[Rs_imFont] : pat,	1447	fs = XCreateFontSet (dpy, rs[Rs_imFont] ? rs[Rs_imFont] : pat,
1421	&missing_charset_list, &missing_charset_count, &def_string);	1448	&missing_charset_list, &missing_charset_count, &def_string);
1422		1449
1423	if (missing_charset_list)	1450	if (missing_charset_list)
1424	XFreeStringList (missing_charset_list);	1451	XFreeStringList (missing_charset_list);
1425		1452
…		…
1466	XNBackground, bg,	1493	XNBackground, bg,
1467	XNArea, &status_rect,	1494	XNArea, &status_rect,
1468	XNFontSet, fs,	1495	XNFontSet, fs,
1469	NULL);	1496	NULL);
1470	}	1497	}
		1498	#if ENABLE_XIM_ONTHESPOT
		1499	else if (input_style & XIMPreeditCallbacks)
		1500	{
		1501	im_set_position (spot);
		1502
		1503	xcb[0].client_data = (XPointer)this; xcb[0].callback = (XIMProc)xim_preedit_start;
		1504	xcb[1].client_data = (XPointer)this; xcb[1].callback = (XIMProc)xim_preedit_done;
		1505	xcb[2].client_data = (XPointer)this; xcb[2].callback = (XIMProc)xim_preedit_draw;
		1506	# if 0
		1507	xcb[3].client_data = (XPointer)this; xcb[3].callback = (XIMProc)xim_preedit_caret;
		1508	# endif
		1509
		1510	preedit_attr = XVaCreateNestedList (0,
		1511	XNSpotLocation, &spot,
		1512	XNPreeditStartCallback, &xcb[0],
		1513	XNPreeditDoneCallback , &xcb[1],
		1514	XNPreeditDrawCallback , &xcb[2],
		1515	# if 0
		1516	XNPreeditCaretCallback, &xcb[3],
		1517	# endif
		1518	NULL);
		1519	}
		1520	#endif
1471		1521
1472	Input_Context = XCreateIC (xim,	1522	Input_Context = XCreateIC (xim,
1473	XNInputStyle, input_style,	1523	XNInputStyle, input_style,
1474	XNClientWindow, vt,	1524	XNClientWindow, vt,
1475	XNFocusWindow, parent[0],	1525	XNFocusWindow, parent[0],
…		…
1477	preedit_attr,	1527	preedit_attr,
1478	status_attr ? XNStatusAttributes : NULL,	1528	status_attr ? XNStatusAttributes : NULL,
1479	status_attr, NULL);	1529	status_attr, NULL);
1480		1530
1481	if (preedit_attr) XFree (preedit_attr);	1531	if (preedit_attr) XFree (preedit_attr);
1482	if (status_attr) XFree (status_attr);	1532	if (status_attr) XFree (status_attr);
1483	if (fs) XFreeFontSet (display->display, fs);	1533	if (fs) XFreeFontSet (dpy, fs);
1484		1534
1485	if (Input_Context == NULL)	1535	if (Input_Context == NULL)
1486	{	1536	{
1487	rxvt_warn ("failed to create input context, continuing without XIM.\n");	1537	rxvt_warn ("failed to create input context, continuing without XIM.\n");
1488	im_destroy ();	1538	im_destroy ();
1489	return false;	1539	return false;
1490	}	1540	}
1491		1541
1492	if (input_style & XIMPreeditArea)	1542	#if 0
		1543	// unfortunately, only the focus window is used by XIM, hard to fix
		1544	if (!XGetICValues (Input_Context, XNFilterEvents, &vt_emask_xim, NULL))
		1545	vt_select_input ();
		1546	#endif
		1547
1493	IMSetStatusPosition ();	1548	IMSetPosition ();
1494		1549
1495	D_MAIN ((stderr, "rxvt_IM_get_IC () - successful connection"));
1496	return true;	1550	return true;
1497	}	1551	}
1498		1552
1499	void	1553	void
1500	rxvt_term::im_cb ()	1554	rxvt_term::im_cb ()
…		…
1506		1560
1507	make_current ();	1561	make_current ();
1508		1562
1509	im_destroy ();	1563	im_destroy ();
1510		1564
1511	D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
1512	if (Input_Context)	1565	if (Input_Context)
1513	return;	1566	return;
1514		1567
1515	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)	1568	#if defined(HAVE_XSETLOCALE) \|\| defined(HAVE_SETLOCALE)
1516	if (rs[Rs_imLocale])	1569	if (rs[Rs_imLocale])
…		…
1558	SET_LOCALE (locale);	1611	SET_LOCALE (locale);
1559	#endif	1612	#endif
1560	}	1613	}
1561		1614
1562	void	1615	void
1563	rxvt_term::IMSetStatusPosition ()	1616	rxvt_term::IMSetPosition ()
1564	{	1617	{
1565	XRectangle preedit_rect, status_rect, *needed_rect;	1618	XRectangle preedit_rect, status_rect, *needed_rect;
1566	XVaNestedList preedit_attr, status_attr;	1619	XVaNestedList preedit_attr, status_attr;
1567		1620
1568	if (!Input_Context	1621	if (!Input_Context
1569	\|\| !focus	1622	\|\| !focus
1570	\|\| !(input_style & XIMPreeditArea)	1623	\|\| !(input_style & (XIMPreeditArea \| XIMPreeditPosition))
1571	\|\| !IMisRunning ())	1624	\|\| !IMisRunning ())
1572	return;	1625	return;
1573		1626
		1627	if (input_style & XIMPreeditPosition)
		1628	{
		1629	im_set_size (preedit_rect);
		1630	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
		1631
		1632	XSetICValues (Input_Context,
		1633	XNPreeditAttributes, preedit_attr, NULL);
		1634	}
		1635	else
		1636	{
1574	/* Getting the necessary width of preedit area */	1637	/* Getting the necessary width of preedit area */
1575	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);	1638	status_attr = XVaCreateNestedList (0, XNAreaNeeded, &needed_rect, NULL);
1576	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);	1639	XGetICValues (Input_Context, XNStatusAttributes, status_attr, NULL);
1577	XFree (status_attr);	1640	XFree (status_attr);
1578		1641
1579	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);	1642	im_set_preedit_area (preedit_rect, status_rect, *needed_rect);
1580	XFree (needed_rect);	1643	XFree (needed_rect);
1581		1644
1582	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);	1645	preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1583	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);	1646	status_attr = XVaCreateNestedList (0, XNArea, &status_rect, NULL);
1584		1647
1585	XSetICValues (Input_Context,	1648	XSetICValues (Input_Context,
1586	XNPreeditAttributes, preedit_attr,	1649	XNPreeditAttributes, preedit_attr,
1587	XNStatusAttributes, status_attr, NULL);	1650	XNStatusAttributes, status_attr,
		1651	NULL);
1588		1652
		1653	XFree (status_attr);
		1654	}
		1655
1589	XFree (preedit_attr);	1656	XFree (preedit_attr);
1590	XFree (status_attr);
1591	}	1657	}
1592	#endif /* USE_XIM */	1658	#endif /* USE_XIM */
1593		1659
1594	/----------------------------------------------------------------------/
1595	rxvt_t rxvt_current_term;
1596
1597	/----------------------- end-of-file (C source) -----------------------/	1660	/----------------------- end-of-file (C source) -----------------------/

Diff Legend

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

Comparing rxvt-unicode/src/main.C (file contents): Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs. Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.189 by root, Thu Jan 19 09:47:15 2006 UTC vs.
Revision 1.230 by root, Sun Aug 27 10:10:25 2006 UTC