ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.235 by root, Thu May 25 16:35:42 2006 UTC

…		…
11	our ($FOCUS, $HOVER, $GRAB); # various widgets	11	our ($FOCUS, $HOVER, $GRAB); # various widgets
12		12
13	our $ROOT;	13	our $ROOT;
14	our $TOOLTIP;	14	our $TOOLTIP;
15	our $BUTTON_STATE;	15	our $BUTTON_STATE;
		16
		17	our %WIDGET; # all widgets, weak-referenced
16		18
17	sub check_tooltip {	19	sub check_tooltip {
18	if (!$GRAB) {	20	if (!$GRAB) {
19	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	21	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20	if (length $widget->{tooltip}) {	22	if (length $widget->{tooltip}) {
…		…
29	$TOOLTIP->set_tooltip_from ($widget);	31	$TOOLTIP->set_tooltip_from ($widget);
30	$TOOLTIP->show;	32	$TOOLTIP->show;
31		33
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	34	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33		35
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);	36	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36	}	37	if $x + $TOOLTIP->{w} > $::WIDTH;
37		38
38	$TOOLTIP->move ($x, $y);	39	$TOOLTIP->move ($x, $y);
		40	$TOOLTIP->check_size;
		41	$TOOLTIP->update;
39	}	42	}
40		43
41	return;	44	return;
42	}	45	}
43	}	46	}
…		…
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	}	51	}
49		52
50	# class methods for events	53	# class methods for events
51	sub feed_sdl_key_down_event {	54	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	55	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	56	if $FOCUS;
54	}	57	}
55		58
56	sub feed_sdl_key_up_event {	59	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	60	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	61	if $FOCUS;
59	}	62	}
60		63
61	sub feed_sdl_button_down_event {	64	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	65	my ($ev) = @_;
…		…
71	check_tooltip;	74	check_tooltip;
72	}	75	}
73		76
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);	77	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		78
76	if ($GRAB) {	79	$GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77	($x, $y) = $GRAB->coord2local ($x, $y);	80	if $GRAB;
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79	}
80	}	81	}
81		82
82	sub feed_sdl_button_up_event {	83	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	84	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});	85	my ($x, $y) = ($ev->{x}, $ev->{y});
85		86
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	87	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87		88
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	89	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		90
90	if ($GRAB) {	91	$GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91	($x, $y) = $GRAB->coord2local ($x, $y);	92	if $GRAB;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		93
95	if (!$BUTTON_STATE) {	94	if (!$BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	95	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	96	$grab->update if $grab;
98	$GRAB->update if $GRAB;	97	$GRAB->update if $GRAB;
…		…
114	$HOVER->update if $HOVER && $HOVER->{can_hover};	113	$HOVER->update if $HOVER && $HOVER->{can_hover};
115		114
116	check_tooltip;	115	check_tooltip;
117	}	116	}
118		117
119	if ($HOVER) {
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);	118	$HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122	}	119	if $HOVER;
123	}	120	}
124		121
125	# convert position array to integers	122	# convert position array to integers
126	sub harmonize {	123	sub harmonize {
127	my ($vals) = @_;	124	my ($vals) = @_;
…		…
131	for (@$vals) {	128	for (@$vals) {
132	my $i = int $_ + $rem;	129	my $i = int $_ + $rem;
133	$rem += $_ - $i;	130	$rem += $_ - $i;
134	$_ = $i;	131	$_ = $i;
135	}	132	}
		133	}
		134
		135	sub full_refresh {
		136	# make a copy, otherwise for complains about freed values.
		137	my @widgets = values %WIDGET;
		138
		139	$_->update
		140	for @widgets;
		141	}
		142
		143	sub reconfigure_widgets {
		144	# make a copy, otherwise C<for> complains about freed values.
		145	my @widgets = values %WIDGET;
		146
		147	$_->reconfigure
		148	for @widgets;
		149	}
		150
		151	# call when resolution changes etc.
		152	sub rescale_widgets {
		153	my ($sx, $sy) = @_;
		154
		155	for my $widget (values %WIDGET) {
		156	if ($widget->{is_toplevel}) {
		157	$widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
		158	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		159	$widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
		160	$widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
		161	$widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
		162	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		163	$widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
		164	$widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
		165	}
		166	}
		167
		168	reconfigure_widgets;
136	}	169	}
137		170
138	#############################################################################	171	#############################################################################
139		172
140	package CFClient::UI::Base;	173	package CFClient::UI::Base;
…		…
158	if (/^connect_(.*)$/) {	191	if (/^connect_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	192	$self->connect ($1 => delete $self->{$_});
160	}	193	}
161	}	194	}
162		195
		196	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
		197
163	$self	198	$self
164	}	199	}
165		200
166	sub destroy {	201	sub destroy {
167	my ($self) = @_;	202	my ($self) = @_;
…		…
170	%$self = ();	205	%$self = ();
171	}	206	}
172		207
173	sub show {	208	sub show {
174	my ($self) = @_;	209	my ($self) = @_;
175
176	return if $self->{parent};	210	return if $self->{parent};
177		211
178	$CFClient::UI::ROOT->add ($self);	212	$CFClient::UI::ROOT->add ($self);
179	}	213	}
180		214
181	sub hide {	215	sub show_centered {
182	my ($self) = @_;	216	my ($self) = @_;
		217	return if $self->{parent};
		218
		219	$self->show;
		220
		221	$CFClient::UI::ROOT->on_post_alloc (
		222	"centered $self" => sub {
		223	$self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
		224	},
		225	);
		226	}
		227
		228	sub set_invisible {
		229	my ($self) = @_;
		230
		231	# broken show/hide model
		232
		233	delete $self->{visible};
183		234
184	undef $GRAB if $GRAB == $self;	235	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	236	undef $HOVER if $HOVER == $self;
		237
		238	CFClient::UI::check_tooltip
		239	if $CFClient::UI::TOOLTIP->{owner} == $self;
		240
		241	$self->focus_out;
		242	}
		243
		244	sub hide {
		245	my ($self) = @_;
		246
		247	$self->set_invisible;
186		248
187	$self->{parent}->remove ($self)	249	$self->{parent}->remove ($self)
188	if $self->{parent};	250	if $self->{parent};
189	}	251	}
190		252
…		…
240		302
241	sub size_allocate {	303	sub size_allocate {
242	# nothing to be done	304	# nothing to be done
243	}	305	}
244		306
		307	sub reconfigure {
		308	my ($self) = @_;
		309
		310	$self->check_size (1);
		311	$self->update;
		312	}
		313
245	sub children {	314	sub children {
246	}
247
248	# call when resolution changes etc.
249	sub reconfigure {
250	my ($self) = @_;
251
252	$_->reconfigure
253	for $self->children;
254
255	$self->check_size;
256	$CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257	$self->update;
258	}	315	}
259		316
260	sub set_max_size {	317	sub set_max_size {
261	my ($self, $w, $h) = @_;	318	my ($self, $w, $h) = @_;
262		319
263	delete $self->{max_w}; $self->{max_w} = $w if $w;	320	delete $self->{max_w}; $self->{max_w} = $w if $w;
264	delete $self->{max_h}; $self->{max_h} = $h if $h;	321	delete $self->{max_h}; $self->{max_h} = $h if $h;
		322	}
		323
		324	sub set_tooltip {
		325	my ($self, $tooltip) = @_;
		326
		327	$tooltip =~ s/^\s+//;
		328	$tooltip =~ s/\s+$//;
		329
		330	return if $self->{tooltip} eq $tooltip;
		331
		332	$self->{tooltip} = $tooltip;
		333
		334	if ($CFClient::UI::TOOLTIP->{owner} == $self) {
		335	delete $CFClient::UI::TOOLTIP->{owner};
		336	CFClient::UI::check_tooltip;
		337	}
265	}	338	}
266		339
267	# translate global coordinates to local coordinate system	340	# translate global coordinates to local coordinate system
268	sub coord2local {	341	sub coord2local {
269	my ($self, $x, $y) = @_;	342	my ($self, $x, $y) = @_;
…		…
284	return if $FOCUS == $self;	357	return if $FOCUS == $self;
285	return unless $self->{can_focus};	358	return unless $self->{can_focus};
286		359
287	my $focus = $FOCUS; $FOCUS = $self;	360	my $focus = $FOCUS; $FOCUS = $self;
288		361
289	$self->emit (focus_in => $focus);	362	$self->_emit (focus_in => $focus);
290		363
291	$focus->update if $focus;	364	$focus->update if $focus;
292	$FOCUS->update;	365	$FOCUS->update;
293	}	366	}
294		367
…		…
297		370
298	return unless $FOCUS == $self;	371	return unless $FOCUS == $self;
299		372
300	my $focus = $FOCUS; undef $FOCUS;	373	my $focus = $FOCUS; undef $FOCUS;
301		374
302	$self->emit (focus_out => $focus);	375	$self->_emit (focus_out => $focus);
303		376
304	$focus->update if $focus; #?	377	$focus->update if $focus; #?
		378
		379	$::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
		380	unless $FOCUS;
305	}	381	}
306		382
307	sub mouse_motion { }	383	sub mouse_motion { }
308	sub button_up { }	384	sub button_up { }
309	sub key_down { }	385	sub key_down { }
310	sub key_up { }	386	sub key_up { }
311		387
312	sub button_down {	388	sub button_down {
313	my ($self, $ev, $x, $y) = @_;	389	my ($self, $ev, $x, $y) = @_;
314		390
315	$self->focus_in;	391	$self->focus_in;
…		…
349	if ($ENV{PCLIENT_DEBUG}) {	425	if ($ENV{PCLIENT_DEBUG}) {
350	glPushMatrix;	426	glPushMatrix;
351	glColor 1, 1, 0, 1;	427	glColor 1, 1, 0, 1;
352	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	428	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353	glBegin GL_LINE_LOOP;	429	glBegin GL_LINE_LOOP;
354	glVertex 0 , 0;	430	glVertex 0 , 0;
355	glVertex $self->{w}, 0;	431	glVertex $self->{w} - 1, 0;
356	glVertex $self->{w}, $self->{h};	432	glVertex $self->{w} - 1, $self->{h} - 1;
357	glVertex 0 , $self->{h};	433	glVertex 0 , $self->{h} - 1;
358	glEnd;	434	glEnd;
359	glPopMatrix;	435	glPopMatrix;
360	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	436	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361	}	437	}
362	}	438	}
363		439
364	sub _draw {	440	sub _draw {
365	my ($self) = @_;	441	my ($self) = @_;
…		…
382	sub set_parent {	458	sub set_parent {
383	my ($self, $parent) = @_;	459	my ($self, $parent) = @_;
384		460
385	Scalar::Util::weaken ($self->{parent} = $parent);	461	Scalar::Util::weaken ($self->{parent} = $parent);
386		462
		463	# TODO: req_w _does_change after ->reconfigure
387	$self->check_size	464	$self->check_size
388	unless exists $self->{req_w};	465	unless exists $self->{req_w};
		466
		467	$self->show;
389	}	468	}
390		469
391	sub check_size {	470	sub check_size {
392	my ($self) = @_;	471	my ($self, $forced) = @_;
393		472
		473	$self->{force_alloc} = 1 if $forced;
394	$CFClient::UI::ROOT->{check_size}{$self} = $self;	474	$CFClient::UI::ROOT->{check_size}{$self} = $self;
395	}	475	}
396		476
397	sub update {	477	sub update {
398	my ($self) = @_;	478	my ($self) = @_;
…		…
405	my ($self, $signal, $cb) = @_;	485	my ($self, $signal, $cb) = @_;
406		486
407	push @{ $self->{signal_cb}{$signal} }, $cb;	487	push @{ $self->{signal_cb}{$signal} }, $cb;
408	}	488	}
409		489
		490	sub _emit {
		491	my ($self, $signal, @args) = @_;
		492
		493	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
		494	}
		495
410	sub emit {	496	sub emit {
411	my ($self, $signal, @args) = @_;	497	my ($self, $signal, @args) = @_;
412		498
413	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}	499	$self->_emit ($signal, @args)
		500	|| $self->$signal (@args);
414	}	501	}
415		502
416	sub DESTROY {	503	sub DESTROY {
417	my ($self) = @_;	504	my ($self) = @_;
418		505
		506	delete $WIDGET{$self+0};
419	#$self->deactivate;	507	#$self->deactivate;
420	}	508	}
421		509
422	#############################################################################	510	#############################################################################
423		511
…		…
432	my $class = shift;	520	my $class = shift;
433		521
434	# range [value, low, high, page]	522	# range [value, low, high, page]
435		523
436	$class->SUPER::new (	524	$class->SUPER::new (
437	bg => [0, 0, 0, 0.2],	525	#bg => [0, 0, 0, 0.2],
438	active_bg => [1, 1, 1, 0.5],	526	#active_bg => [1, 1, 1, 0.5],
439	@_	527	@_
440	)	528	)
441	}	529	}
442		530
443	sub _draw {	531	sub _draw {
444	my ($self) = @_;	532	my ($self) = @_;
445		533
		534	my $color = $FOCUS == $self && $self->{active_bg}
		535	? $self->{active_bg}
		536	: $self->{bg};
		537
		538	if ($color && (@$color < 4 || $color->[3])) {
446	my ($w, $h) = @$self{qw(w h)};	539	my ($w, $h) = @$self{qw(w h)};
447		540
448	glEnable GL_BLEND;	541	glEnable GL_BLEND;
449	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	542	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
450	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	543	glColor @$color;
451		544
452	glBegin GL_QUADS;	545	glBegin GL_QUADS;
453	glVertex 0 , 0;	546	glVertex 0 , 0;
454	glVertex 0 , $h;	547	glVertex 0 , $h;
455	glVertex $w, $h;	548	glVertex $w, $h;
456	glVertex $w, 0;	549	glVertex $w, 0;
457	glEnd;	550	glEnd;
458		551
459	glDisable GL_BLEND;	552	glDisable GL_BLEND;
		553	}
460	}	554	}
461		555
462	#############################################################################	556	#############################################################################
463		557
464	package CFClient::UI::Empty;	558	package CFClient::UI::Empty;
…		…
508	$self->{children} = [	602	$self->{children} = [
509	sort { $a->{z} <=> $b->{z} }	603	sort { $a->{z} <=> $b->{z} }
510	@{$self->{children}}, @widgets	604	@{$self->{children}}, @widgets
511	];	605	];
512		606
513	$self->check_size;	607	$self->check_size (1);
514	$self->update;	608	$self->update;
515	}	609	}
516		610
517	sub children {	611	sub children {
518	@{ $_[0]{children} }	612	@{ $_[0]{children} }
…		…
625	}	719	}
626		720
627	sub update {	721	sub update {
628	my ($self) = @_;	722	my ($self) = @_;
629		723
630	$ROOT->on_refresh ($self => sub { $self->render_child });	724	$ROOT->on_post_alloc ($self => sub { $self->render_child });
631	$self->SUPER::update;	725	$self->SUPER::update;
632	}	726	}
633		727
634	sub size_allocate {	728	sub size_allocate {
635	my ($self, $w, $h) = @_;	729	my ($self, $w, $h) = @_;
…		…
648	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	742	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649	glClearColor 0, 0, 0, 0;	743	glClearColor 0, 0, 0, 0;
650	glClear GL_COLOR_BUFFER_BIT;	744	glClear GL_COLOR_BUFFER_BIT;
651		745
652	$self->_render;	746	$self->_render;
653	# glColorMask 1, 1, 1, 0;
654	# glEnable GL_BLEND;
655	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656	# glRasterPos 0, 0;
657	# glCopyPixels 0, 0, $self->{w}, $self->{h};
658	# glDisable GL_BLEND;
659	# glColorMask 1, 1, 1, 1;
660	};	747	};
661	}	748	}
662		749
663	sub _draw {	750	sub _draw {
664	my ($self) = @_;	751	my ($self) = @_;
…		…
668	my $tex = $self->{texture}	755	my $tex = $self->{texture}
669	or return;	756	or return;
670		757
671	glEnable GL_TEXTURE_2D;	758	glEnable GL_TEXTURE_2D;
672	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	759	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
673	glColor 0, 0, 0, 1;	760	glColor 1, 1, 1, 1;
674		761
675	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	762	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
676		763
677	glDisable GL_TEXTURE_2D;	764	glDisable GL_TEXTURE_2D;
678	}	765	}
…		…
681		768
682	package CFClient::UI::ViewPort;	769	package CFClient::UI::ViewPort;
683		770
684	our @ISA = CFClient::UI::Window::;	771	our @ISA = CFClient::UI::Window::;
685		772
		773	sub new {
		774	my $class = shift;
		775
		776	$class->SUPER::new (
		777	scroll_x => 0,
		778	scroll_y => 1,
		779	@_,
		780	)
		781	}
		782
686	sub size_request {	783	sub size_request {
687	my ($self) = @_;	784	my ($self) = @_;
688		785
689	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	786	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
690	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
691		787
692	@$self{qw(child_w child_h)}	788	@$self{qw(child_w child_h)}
693	}	789	}
694		790
695	sub size_allocate {	791	sub size_allocate {
696	my ($self, $w, $h) = @_;	792	my ($self, $w, $h) = @_;
697		793
		794	$w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
		795	$h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
		796
		797	$self->child->configure (0, 0, $w, $h);
698	$self->update;	798	$self->update;
699	}	799	}
700		800
701	sub set_offset {	801	sub set_offset {
702	my ($self, $x, $y) = @_;	802	my ($self, $x, $y) = @_;
…		…
756		856
757	my $slider = new CFClient::UI::Slider	857	my $slider = new CFClient::UI::Slider
758	vertical => 1,	858	vertical => 1,
759	range => [0, 0, 1, 0.01], # HACK fix	859	range => [0, 0, 1, 0.01], # HACK fix
760	connect_changed => sub {	860	connect_changed => sub {
761	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));	861	$self->{vp}->set_offset (0, $_[1]);
762	},	862	},
763	;	863	;
764		864
765	$self = $class->SUPER::new (	865	$self = $class->SUPER::new (
766	vp => (new CFClient::UI::ViewPort),	866	vp => (new CFClient::UI::ViewPort expand => 1),
767	slider => $slider,	867	slider => $slider,
768	@_,	868	@_,
769	);	869	);
770		870
771	$self->{vp}->add ($self->{scrolled});	871	$self->{vp}->add ($self->{scrolled});
…		…
773	$self->add ($self->{slider});	873	$self->add ($self->{slider});
774		874
775	$self	875	$self
776	}	876	}
777		877
		878	sub size_allocate {
		879	my ($self, $w, $h) = @_;
		880
		881	$self->SUPER::size_allocate ($w, $h);
		882
		883	my $child = $self->{vp}->child;
		884	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
		885	}
		886
778	#TODO# update range on size_allocate depeneing on child	887	#TODO# update range on size_allocate depending on child
779	# update viewport offset on scroll	888	# update viewport offset on scroll
780		889
781	#############################################################################	890	#############################################################################
782		891
783	package CFClient::UI::Frame;	892	package CFClient::UI::Frame;
…		…
787	use CFClient::OpenGL;	896	use CFClient::OpenGL;
788		897
789	sub new {	898	sub new {
790	my $class = shift;	899	my $class = shift;
791		900
792	my $self = $class->SUPER::new (	901	$class->SUPER::new (
793	bg => [1, 1, 1, 1],	902	bg => undef,
794	border_bg => [1, 1, 1, 1],
795	border => 0.8,
796	@_	903	@_,
797	);	904	)
798
799	$self
800	}	905	}
801		906
802	sub _draw {	907	sub _draw {
803	my ($self) = @_;	908	my ($self) = @_;
804		909
805	my ($w, $h) = ($self->{w}, $self->{h});	910	if ($self->{bg}) {
		911	my ($w, $h) = @$self{qw(w h)};
806		912
807	glEnable GL_BLEND;	913	glEnable GL_BLEND;
808	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	914	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809	glEnable GL_TEXTURE_2D;	915	glColor @{ $self->{bg} };
810	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811		916
812	# glBegin GL_QUADS;	917	glBegin GL_QUADS;
813	# glColor 0, 0, 0, 0;
814	# glVertex 0 , 0;	918	glVertex 0 , 0;
815	# glVertex 0 , $h;	919	glVertex 0 , $h;
816	# glVertex $w, $h;	920	glVertex $w, $h;
817	# glVertex $w, 0;	921	glVertex $w, 0;
818	# glEnd;	922	glEnd;
819		923
820
821	$self->child->draw;
822	glDisable GL_BLEND;	924	glDisable GL_BLEND;
823	glDisable GL_TEXTURE_2D;	925	}
		926
		927	$self->SUPER::_draw;
824	}	928	}
825		929
826	#############################################################################	930	#############################################################################
827		931
828	package CFClient::UI::FancyFrame;	932	package CFClient::UI::FancyFrame;
…		…
839	my $class = shift;	943	my $class = shift;
840		944
841	# TODO: user_x, user_y, overwrite moveto?	945	# TODO: user_x, user_y, overwrite moveto?
842		946
843	my $self = $class->SUPER::new (	947	my $self = $class->SUPER::new (
844	bg => [1, 1, 1, 1],	948	bg => [1, 1, 1, 1],
845	border_bg => [1, 1, 1, 1],	949	border_bg => [1, 1, 1, 1],
846	border => 0.6,	950	border => 0.6,
		951	is_toplevel => 1,
847	can_events => 1,	952	can_events => 1,
848	@_	953	@_
849	);	954	);
850		955
851	$self->{title} &&= new CFClient::UI::Label	956	$self->{title} &&= new CFClient::UI::Label
852	align => 0,	957	align => 0,
…		…
876	my ($self, $w, $h) = @_;	981	my ($self, $w, $h) = @_;
877		982
878	$h -= List::Util::max 0, $self->border * 2;	983	$h -= List::Util::max 0, $self->border * 2;
879	$w -= List::Util::max 0, $self->border * 2;	984	$w -= List::Util::max 0, $self->border * 2;
880		985
881	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	986	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
882	if $self->{title};	987	if $self->{title};
883		988
884	$self->child->configure ($self->border, $self->border, $w, $h);	989	$self->child->configure ($self->border, $self->border, $w, $h);
885	}	990	}
886		991
…		…
944	my ($self) = @_;	1049	my ($self) = @_;
945		1050
946	my ($w, $h ) = ($self->{w}, $self->{h});	1051	my ($w, $h ) = ($self->{w}, $self->{h});
947	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1052	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
948		1053
949	glEnable GL_BLEND;
950	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951	glEnable GL_TEXTURE_2D;	1054	glEnable GL_TEXTURE_2D;
952	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1055	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953		1056
954	my $border = $self->border;	1057	my $border = $self->border;
955		1058
956	glColor @{ $self->{border_bg} };	1059	glColor @{ $self->{border_bg} };
957	$tex[1]->draw_quad (0, 0, $w, $border);	1060	$tex[1]->draw_quad_alpha (0, 0, $w, $border);
958	$tex[3]->draw_quad (0, $border, $border, $ch);	1061	$tex[3]->draw_quad_alpha (0, $border, $border, $ch);
959	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1062	$tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1063	$tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
961		1064
962	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1065	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963	my $bg = $tex[0];	1066	my $bg = $tex[0];
964		1067
965	# TODO: repeat texture not scale	1068	# TODO: repeat texture not scale
…		…
969	glColor @{ $self->{bg} };	1072	glColor @{ $self->{bg} };
970		1073
971	$bg->{s} = $rep_x;	1074	$bg->{s} = $rep_x;
972	$bg->{t} = $rep_y;	1075	$bg->{t} = $rep_y;
973	$bg->{wrap_mode} = 1;	1076	$bg->{wrap_mode} = 1;
974	$bg->draw_quad ($border, $border, $cw, $ch);	1077	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1078	}
975		1079
976	glDisable GL_TEXTURE_2D;	1080	glDisable GL_TEXTURE_2D;
977	glDisable GL_BLEND;
978	}
979		1081
980	$self->{title}->draw if $self->{title};	1082	$self->{title}->draw if $self->{title};
981		1083
982	$self->child->draw;	1084	$self->child->draw;
983	}	1085	}
…		…
995	sub new {	1097	sub new {
996	my $class = shift;	1098	my $class = shift;
997		1099
998	$class->SUPER::new (	1100	$class->SUPER::new (
999	col_expand => [],	1101	col_expand => [],
1000	@_	1102	@_,
1001	)	1103	)
1002	}	1104	}
1003		1105
1004	sub add {	1106	sub add {
1005	my ($self, $x, $y, $child) = @_;	1107	my ($self, $x, $y, $child) = @_;
…		…
1250		1352
1251	#############################################################################	1353	#############################################################################
1252		1354
1253	package CFClient::UI::Label;	1355	package CFClient::UI::Label;
1254		1356
1255	our @ISA = CFClient::UI::Base::;	1357	our @ISA = CFClient::UI::DrawBG::;
1256		1358
1257	use CFClient::OpenGL;	1359	use CFClient::OpenGL;
1258		1360
1259	sub new {	1361	sub new {
1260	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1261		1363
1262	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1263	fg => [1, 1, 1],	1365	fg => [1, 1, 1],
		1366	#bg => none
		1367	#active_bg => none
1264	#font => default_font	1368	#font => default_font
1265	#text => initial text	1369	#text => initial text
1266	#markup => initial narkup	1370	#markup => initial narkup
		1371	#max_w => maximum pixel width
		1372	ellipsise => 3, # end
1267	layout => (new CFClient::Layout),	1373	layout => (new CFClient::Layout),
1268	fontsize => 1,	1374	fontsize => 1,
1269	align => -1,	1375	align => -1,
1270	valign => -1,	1376	valign => -1,
1271	padding => 2,	1377	padding => 2,
…		…
1286	}	1392	}
1287		1393
1288	$self	1394	$self
1289	}	1395	}
1290		1396
1291	sub escape {	1397	sub escape($) {
1292	local $_ = $_[1];	1398	local $_ = $_[0];
1293		1399
1294	s/&/&amp;/g;	1400	s/&/&amp;/g;
1295	s/>/&gt;/g;	1401	s/>/&gt;/g;
1296	s/</&lt;/g;	1402	s/</&lt;/g;
1297		1403
1298	$_[1]	1404	$_
1299	}	1405	}
1300		1406
1301	sub update {	1407	sub update {
1302	my ($self) = @_;	1408	my ($self) = @_;
1303		1409
…		…
1336	sub size_request {	1442	sub size_request {
1337	my ($self) = @_;	1443	my ($self) = @_;
1338		1444
1339	$self->{layout}->set_font ($self->{font}) if $self->{font};	1445	$self->{layout}->set_font ($self->{font}) if $self->{font};
1340	$self->{layout}->set_width ($self->{max_w} || -1);	1446	$self->{layout}->set_width ($self->{max_w} || -1);
		1447	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1448	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1449	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342		1450
1343	my ($w, $h) = $self->{layout}->size;	1451	my ($w, $h) = $self->{layout}->size;
1344		1452
1345	if (exists $self->{template}) {	1453	if (exists $self->{template}) {
…		…
1375	}	1483	}
1376		1484
1377	sub _draw {	1485	sub _draw {
1378	my ($self) = @_;	1486	my ($self) = @_;
1379		1487
		1488	$self->SUPER::_draw; # draw background, if applicable
		1489
1380	my $tex = $self->{texture} ||= do {	1490	my $tex = $self->{texture} ||= do {
1381	$self->{layout}->set_foreground (@{$self->{fg}});	1491	$self->{layout}->set_foreground (@{$self->{fg}});
1382	$self->{layout}->set_font ($self->{font}) if $self->{font};	1492	$self->{layout}->set_font ($self->{font}) if $self->{font};
1383	$self->{layout}->set_width ($self->{w});	1493	$self->{layout}->set_width ($self->{w});
		1494	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1495	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1496	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385		1497
1386	my $tex = new_from_layout CFClient::Texture $self->{layout};	1498	my $tex = new_from_layout CFClient::Texture $self->{layout};
1387		1499
1388	$self->{ox} = int $self->{align} < 0 ? $self->{padding}	1500	$self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1389	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1501	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390	: ($self->{w} - $tex->{w}) * 0.5;	1502	: ($self->{w} - $tex->{w}) * 0.5);
1391		1503
1392	$self->{oy} = int $self->{valign} < 0 ? $self->{padding}	1504	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1393	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1505	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394	: ($self->{h} - $tex->{h}) * 0.5;	1506	: ($self->{h} - $tex->{h}) * 0.5);
1395		1507
1396	$tex	1508	$tex
1397	};	1509	};
1398		1510
1399	glEnable GL_TEXTURE_2D;	1511	glEnable GL_TEXTURE_2D;
…		…
1427	active_fg => [0, 0, 0],	1539	active_fg => [0, 0, 0],
1428	can_hover => 1,	1540	can_hover => 1,
1429	can_focus => 1,	1541	can_focus => 1,
1430	valign => 0,	1542	valign => 0,
1431	can_events => 1,	1543	can_events => 1,
		1544	#text => ...
1432	@_	1545	@_
1433	)	1546	)
1434	}	1547	}
1435		1548
1436	sub _set_text {	1549	sub _set_text {
…		…
1446	$self->{text} = $text;	1559	$self->{text} = $text;
1447		1560
1448	$text =~ s/./*/g if $self->{hidden};	1561	$text =~ s/./*/g if $self->{hidden};
1449	$self->{layout}->set_text ("$text ");	1562	$self->{layout}->set_text ("$text ");
1450		1563
1451	$self->emit (changed => $self->{text});	1564	$self->_emit (changed => $self->{text});
1452	}	1565	}
1453		1566
1454	sub set_text {	1567	sub set_text {
1455	my ($self, $text) = @_;	1568	my ($self, $text) = @_;
1456		1569
1457	$self->{cursor} = length $text;	1570	$self->{cursor} = length $text;
1458	$self->_set_text ($text);	1571	$self->_set_text ($text);
		1572	$self->update;
1459	$self->check_size;	1573	$self->check_size;
1460	$self->update;
1461	}	1574	}
1462		1575
1463	sub get_text {	1576	sub get_text {
1464	$_[0]{text}	1577	$_[0]{text}
1465	}	1578	}
…		…
1468	my ($self) = @_;	1581	my ($self) = @_;
1469		1582
1470	my ($w, $h) = $self->SUPER::size_request;	1583	my ($w, $h) = $self->SUPER::size_request;
1471		1584
1472	($w + 1, $h) # add 1 for cursor	1585	($w + 1, $h) # add 1 for cursor
1473	}
1474
1475	sub size_allocate {
1476	my ($self, $w, $h) = @_;
1477
1478	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479	}	1586	}
1480		1587
1481	sub key_down {	1588	sub key_down {
1482	my ($self, $ev) = @_;	1589	my ($self, $ev) = @_;
1483		1590
…		…
1485	my $sym = $ev->{sym};	1592	my $sym = $ev->{sym};
1486	my $uni = $ev->{unicode};	1593	my $uni = $ev->{unicode};
1487		1594
1488	my $text = $self->get_text;	1595	my $text = $self->get_text;
1489		1596
1490	if ($sym == 8) {	1597	if ($uni == 8) {
1491	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1598	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492	} elsif ($sym == 127) {	1599	} elsif ($uni == 127) {
1493	substr $text, $self->{cursor}, 1, "";	1600	substr $text, $self->{cursor}, 1, "";
1494	} elsif ($sym == CFClient::SDLK_LEFT) {	1601	} elsif ($sym == CFClient::SDLK_LEFT) {
1495	--$self->{cursor} if $self->{cursor};	1602	--$self->{cursor} if $self->{cursor};
1496	} elsif ($sym == CFClient::SDLK_RIGHT) {	1603	} elsif ($sym == CFClient::SDLK_RIGHT) {
1497	++$self->{cursor} if $self->{cursor} < length $self->{text};	1604	++$self->{cursor} if $self->{cursor} < length $self->{text};
1498	} elsif ($sym == CFClient::SDLK_HOME) {	1605	} elsif ($sym == CFClient::SDLK_HOME) {
1499	$self->{cursor} = 0;	1606	$self->{cursor} = 0;
1500	} elsif ($sym == CFClient::SDLK_END) {	1607	} elsif ($sym == CFClient::SDLK_END) {
1501	$self->{cursor} = length $text;	1608	$self->{cursor} = length $text;
1502	} elsif ($sym == 27) {	1609	} elsif ($uni == 27) {
1503	$self->emit ('escape');	1610	$self->_emit ('escape');
1504	} elsif ($uni) {	1611	} elsif ($uni) {
1505	substr $text, $self->{cursor}++, 0, chr $uni;	1612	substr $text, $self->{cursor}++, 0, chr $uni;
1506	}	1613	}
1507		1614
1508	$self->_set_text ($text);	1615	$self->_set_text ($text);
1509	$self->update;	1616	$self->update;
		1617	$self->check_size;
1510	}	1618	}
1511		1619
1512	sub focus_in {	1620	sub focus_in {
1513	my ($self) = @_;	1621	my ($self) = @_;
1514		1622
…		…
1594	if ($sym == 13) {	1702	if ($sym == 13) {
1595	unshift @{$self->{history}},	1703	unshift @{$self->{history}},
1596	my $txt = $self->get_text;	1704	my $txt = $self->get_text;
1597	$self->{history_pointer} = -1;	1705	$self->{history_pointer} = -1;
1598	$self->{history_saveback} = '';	1706	$self->{history_saveback} = '';
1599	$self->emit (activate => $txt);	1707	$self->_emit (activate => $txt);
1600	$self->update;	1708	$self->update;
1601		1709
1602	} elsif ($sym == CFClient::SDLK_UP) {	1710	} elsif ($sym == CFClient::SDLK_UP) {
1603	if ($self->{history_pointer} < 0) {	1711	if ($self->{history_pointer} < 0) {
1604	$self->{history_saveback} = $self->get_text;	1712	$self->{history_saveback} = $self->get_text;
…		…
1643	my $class = shift;	1751	my $class = shift;
1644		1752
1645	$class->SUPER::new (	1753	$class->SUPER::new (
1646	padding => 4,	1754	padding => 4,
1647	fg => [1, 1, 1],	1755	fg => [1, 1, 1],
1648	bg => [1, 1, 1, 0.2],
1649	active_fg => [0, 0, 1],	1756	active_fg => [0, 0, 1],
1650	can_hover => 1,	1757	can_hover => 1,
1651	align => 0,	1758	align => 0,
1652	valign => 0,	1759	valign => 0,
1653	can_events => 1,	1760	can_events => 1,
1654	@_	1761	@_
1655	)	1762	)
1656	}	1763	}
1657		1764
		1765	sub activate { }
		1766
1658	sub button_up {	1767	sub button_up {
1659	my ($self, $ev, $x, $y) = @_;	1768	my ($self, $ev, $x, $y) = @_;
1660		1769
		1770	$self->emit ("activate")
1661	if ($x >= 0 && $x < $self->{w}	1771	if $x >= 0 && $x < $self->{w}
1662	&& $y >= 0 && $y < $self->{h}) {	1772	&& $y >= 0 && $y < $self->{h};
1663	$self->emit ("activate");
1664	}
1665	}	1773	}
1666		1774
1667	sub _draw {	1775	sub _draw {
1668	my ($self) = @_;	1776	my ($self) = @_;
1669		1777
…		…
1701		1809
1702	$class->SUPER::new (	1810	$class->SUPER::new (
1703	padding => 2,	1811	padding => 2,
1704	fg => [1, 1, 1],	1812	fg => [1, 1, 1],
1705	active_fg => [1, 1, 0],	1813	active_fg => [1, 1, 0],
		1814	bg => [0, 0, 0, 0.2],
		1815	active_bg => [1, 1, 1, 0.5],
1706	state => 0,	1816	state => 0,
1707	can_hover => 1,	1817	can_hover => 1,
1708	@_	1818	@_
1709	)	1819	)
1710	}	1820	}
…		…
1719	my ($self, $ev, $x, $y) = @_;	1829	my ($self, $ev, $x, $y) = @_;
1720		1830
1721	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	1831	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1722	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	1832	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1723	$self->{state} = !$self->{state};	1833	$self->{state} = !$self->{state};
1724	$self->emit (changed => $self->{state});	1834	$self->_emit (changed => $self->{state});
1725	}	1835	}
1726	}	1836	}
1727		1837
1728	sub _draw {	1838	sub _draw {
1729	my ($self) = @_;	1839	my ($self) = @_;
…		…
1734		1844
1735	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	1845	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1736		1846
1737	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	1847	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738		1848
		1849	my $tex = $self->{state} ? $tex[1] : $tex[0];
		1850
1739	glEnable GL_TEXTURE_2D;	1851	glEnable GL_TEXTURE_2D;
1740
1741	my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743	$tex->draw_quad_alpha (0, 0, $s, $s);	1852	$tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745	glDisable GL_TEXTURE_2D;	1853	glDisable GL_TEXTURE_2D;
1746	}	1854	}
1747		1855
1748	#############################################################################	1856	#############################################################################
1749		1857
…		…
1996	qw(s1_slider.png s1_slider_bg.png);	2104	qw(s1_slider.png s1_slider_bg.png);
1997		2105
1998	sub new {	2106	sub new {
1999	my $class = shift;	2107	my $class = shift;
2000		2108
2001	# range [value, low, high, page]	2109	# range [value, low, high, page, unit]
2002		2110
2003	# TODO: 0-width page	2111	# TODO: 0-width page
2004	# TODO: req_w/h are wrong with vertical	2112	# TODO: req_w/h are wrong with vertical
2005	# TODO: calculations are off	2113	# TODO: calculations are off
2006	my $self = $class->SUPER::new (	2114	my $self = $class->SUPER::new (
2007	fg => [1, 1, 1],	2115	fg => [1, 1, 1],
2008	active_fg => [0, 0, 0],	2116	active_fg => [0, 0, 0],
		2117	bg => [0, 0, 0, 0.2],
		2118	active_bg => [1, 1, 1, 0.5],
2009	range => [0, 0, 100, 10],	2119	range => [0, 0, 100, 10, 0],
2010	req_w => $::WIDTH / 80,	2120	req_w => $::WIDTH / 80,
2011	req_h => $::WIDTH / 80,	2121	req_h => $::WIDTH / 80,
2012	vertical => 0,	2122	vertical => 0,
2013	can_hover => 1,	2123	can_hover => 1,
2014	inner_pad => 5,	2124	inner_pad => 0.02,
2015	@_	2125	@_
2016	);	2126	);
2017		2127
		2128	$self->set_value ($self->{range}[0]);
		2129	$self->update;
		2130
2018	$self	2131	$self
		2132	}
		2133
		2134	sub set_range {
		2135	my ($self, $range) = @_;
		2136
		2137	$self->{range} = $range;
		2138
		2139	$self->update;
		2140	}
		2141
		2142	sub set_value {
		2143	my ($self, $value) = @_;
		2144
		2145	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2146
		2147	$hi = $lo + 1 if $hi <= $lo;
		2148
		2149	$page = $hi - $lo if $page > $hi - $lo;
		2150
		2151	$value = $lo if $value < $lo;
		2152	$value = $hi - $page if $value > $hi - $page;
		2153
		2154	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2155	if $unit;
		2156
		2157	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2158
		2159	if ($value != $old_value) {
		2160	$self->_emit (changed => $value);
		2161	$self->update;
		2162	}
2019	}	2163	}
2020		2164
2021	sub size_request {	2165	sub size_request {
2022	my ($self) = @_;	2166	my ($self) = @_;
2023		2167
…		…
2029		2173
2030	sub button_down {	2174	sub button_down {
2031	my ($self, $ev, $x, $y) = @_;	2175	my ($self, $ev, $x, $y) = @_;
2032		2176
2033	$self->SUPER::button_down ($ev, $x, $y);	2177	$self->SUPER::button_down ($ev, $x, $y);
		2178
		2179	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2180
2034	$self->mouse_motion ($ev, $x, $y);	2181	$self->mouse_motion ($ev, $x, $y);
2035	}	2182	}
2036		2183
2037	sub mouse_motion {	2184	sub mouse_motion {
2038	my ($self, $ev, $x, $y) = @_;	2185	my ($self, $ev, $x, $y) = @_;
2039		2186
2040	if ($GRAB == $self) {	2187	if ($GRAB == $self) {
		2188	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2189
		2190	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2191
		2192	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2193
		2194	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2195	}
		2196	}
		2197
		2198	sub update {
		2199	my ($self) = @_;
		2200
		2201	$CFClient::UI::ROOT->on_post_alloc ($self => sub {
		2202	$self->set_value ($self->{range}[0]);
		2203
2041	my ($value, $lo, $hi, $page) = @{$self->{range}};	2204	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2205	my $range = ($hi - $page - $lo) || 1e-100;
2042		2206
2043	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2207	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044		2208
2045	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2209	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2210	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047		2211
2048	$x -= $inner_pad_px; # substract the padding	2212	$value = ($value - $lo) / $range;
2049	$x = $x * ($hi - $lo) / $inner_w + $lo;	2213	$value = $value * $self->{scale} + $self->{offset};
2050	$x = $lo if $x < $lo;
2051	$x = $hi - $page if $x > $hi - $page;
2052	$self->{range}[0] = $x;
2053		2214
2054	$self->emit (changed => $x);	2215	$self->{knob_x} = $value - $knob_w * 0.5;
2055	$self->update;	2216	$self->{knob_w} = $knob_w;
2056	}	2217	});
2057	}
2058		2218
2059	# the inner_* stuff is for generating a padding for the slider handle,	2219	$self->SUPER::update;
2060	# so that the handle doesn't leave the texture. This calculation isn't 100%
2061	# correct propably, but it does the job for now
2062	sub _calc_inner_pad_px {
2063	my ($self, $w) = @_;
2064	($w / 100) * $self->{inner_pad} # % to pixels
2065	}	2220	}
2066		2221
2067	sub _draw {	2222	sub _draw {
2068	my ($self) = @_;	2223	my ($self) = @_;
2069		2224
2070	$self->SUPER::_draw ();	2225	$self->SUPER::_draw ();
2071		2226
2072	my ($w, $h) = @$self{qw(w h)};	2227	glScale $self->{w}, $self->{h};
2073		2228
2074	if ($self->{vertical}) {	2229	if ($self->{vertical}) {
2075	# draw a vertical slider like a rotated horizontal slider	2230	# draw a vertical slider like a rotated horizontal slider
2076		2231
		2232	glTranslate 1, 0, 0;
2077	glRotate 90, 0, 0, 1;	2233	glRotate 90, 0, 0, 1;
2078	glTranslate 0, -$self->{w}, 0;
2079
2080	($w, $h) = ($h, $w);
2081	}	2234	}
2082		2235
2083	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2236	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2237	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085		2238
2086	my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088	$hi = $value + 1 if $lo == $hi;
2089
2090	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093	$page = int $page * $inner_w / ($hi - $lo);
2094	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096	$w -= $page;
2097	$page &= ~1;
2098	glTranslate $page * 0.5, 0, 0;
2099	$page ||= 2;
2100
2101	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104	glEnable GL_TEXTURE_2D;	2239	glEnable GL_TEXTURE_2D;
2105	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2240	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106		2241
2107	# draw background	2242	# draw background
2108	$tex[1]->draw_quad_alpha (0, 0, $w, $h);	2243	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109		2244
2110	# draw handle	2245	# draw handle
2111	$tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);	2246	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112		2247
2113	glDisable GL_TEXTURE_2D;	2248	glDisable GL_TEXTURE_2D;
2114	}	2249	}
		2250
		2251	#############################################################################
		2252
		2253	package CFClient::UI::ValSlider;
		2254
		2255	our @ISA = CFClient::UI::HBox::;
		2256
		2257	sub new {
		2258	my ($class, %arg) = @_;
		2259
		2260	my $range = delete $arg{range};
		2261
		2262	my $self = $class->SUPER::new (
		2263	slider => (new CFClient::UI::Slider expand => 1, range => $range),
		2264	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
		2265	to_value => sub { shift },
		2266	from_value => sub { shift },
		2267	%arg,
		2268	);
		2269
		2270	$self->{slider}->connect (changed => sub {
		2271	my ($self, $value) = @_;
		2272	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2273	$self->{parent}->emit (changed => $value);
		2274	});
		2275
		2276	# $self->{entry}->connect (changed => sub {
		2277	# my ($self, $value) = @_;
		2278	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2279	# $self->{parent}->emit (changed => $value);
		2280	# });
		2281
		2282	$self->add ($self->{slider}, $self->{entry});
		2283
		2284	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2285
		2286	$self
		2287	}
		2288
		2289	sub set_range { shift->{slider}->set_range (@_) }
		2290	sub set_value { shift->{slider}->set_value (@_) }
2115		2291
2116	#############################################################################	2292	#############################################################################
2117		2293
2118	package CFClient::UI::TextView;	2294	package CFClient::UI::TextView;
2119		2295
…		…
2149		2325
2150	$self->{fontsize} = $fontsize;	2326	$self->{fontsize} = $fontsize;
2151	$self->reflow;	2327	$self->reflow;
2152	}	2328	}
2153		2329
2154	sub text_height {
2155	my ($self, $text) = @_;
2156
2157	my $layout = $self->{layout};
2158
2159	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160	$layout->set_width ($self->{children}[0]{w});
2161	$layout->set_markup ($text);
2162
2163	($layout->size)[1]
2164	}
2165
2166	sub reflow {
2167	my ($self) = @_;
2168
2169	$self->{need_reflow}++;
2170	$self->update;
2171	}
2172
2173	sub size_allocate {	2330	sub size_allocate {
2174	my ($self, $w, $h) = @_;	2331	my ($self, $w, $h) = @_;
2175		2332
2176	$self->SUPER::size_allocate ($w, $h);	2333	$self->SUPER::size_allocate ($w, $h);
2177		2334
…		…
2180	$self->{layout}->set_width ($self->{children}[0]{w});	2337	$self->{layout}->set_width ($self->{children}[0]{w});
2181		2338
2182	$self->reflow;	2339	$self->reflow;
2183	}	2340	}
2184		2341
		2342	sub text_size {
		2343	my ($self, $text, $indent) = @_;
		2344
		2345	my $layout = $self->{layout};
		2346
		2347	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2348	$layout->set_width ($self->{children}[0]{w} - $indent);
		2349	$layout->set_markup ($text);
		2350
		2351	$layout->size
		2352	}
		2353
		2354	sub reflow {
		2355	my ($self) = @_;
		2356
		2357	$self->{need_reflow}++;
		2358	$self->update;
		2359	}
		2360
		2361	sub set_offset {
		2362	my ($self, $offset) = @_;
		2363
		2364	# todo: base offset on lines or so, not on pixels
		2365	$self->{children}[1]->set_value ($offset);
		2366	}
		2367
		2368	sub clear {
		2369	my ($self) = @_;
		2370
		2371	$self->{par} = [];
		2372	$self->{height} = 0;
		2373	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
		2374	}
		2375
2185	sub add_paragraph {	2376	sub add_paragraph {
2186	my ($self, $color, $text) = @_;	2377	my ($self, $color, $text, $indent) = @_;
2187		2378
2188	#TODO: intelligently "reformat" paragraph	2379	for my $line (split /\n/, $text) {
2189		2380	my ($w, $h) = $self->text_size ($line);
2190	my $height = $self->text_height ($text);
2191
2192	$self->{height} += $height;	2381	$self->{height} += $h;
		2382	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
		2383	}
2193		2384
2194	push @{$self->{par}}, [$height, $color, $text];
2195
2196	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2385	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2197	$self->{children}[1]->update;
2198	}	2386	}
2199		2387
2200	sub update {	2388	sub update {
2201	my ($self) = @_;	2389	my ($self) = @_;
2202		2390
…		…
2204		2392
2205	return unless $self->{h} > 0;	2393	return unless $self->{h} > 0;
2206		2394
2207	delete $self->{texture};	2395	delete $self->{texture};
2208		2396
2209	$ROOT->on_refresh ($self, sub {	2397	$ROOT->on_post_alloc ($self, sub {
		2398	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2399
2210	if (delete $self->{need_reflow}) {	2400	if (delete $self->{need_reflow}) {
2211	my $height = 0;	2401	my $height = 0;
2212		2402
2213	$height += $_->[0] = $self->text_height ($_->[2])	2403	my $layout = $self->{layout};
		2404
		2405	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
		2406
2214	for @{$self->{par}};	2407	for (@{$self->{par}}) {
		2408	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
		2409	$layout->set_width ($W - $_->[3]);
		2410	$layout->set_markup ($_->[4]);
		2411	my ($w, $h) = $layout->size;
		2412	$_->[0] = $w + $_->[3];
		2413	$_->[1] = $h;
		2414	}
		2415
		2416	$height += $_->[1];
		2417	}
2215		2418
2216	$self->{height} = $height;	2419	$self->{height} = $height;
2217		2420
2218	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];	2421	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219		2422
2220	delete $self->{texture};	2423	delete $self->{texture};
2221	}	2424	}
2222		2425
2223	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {	2426	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2224	glClearColor 0, 0, 0, 0;	2427	glClearColor 0.5, 0.5, 0.5, 0;
2225	glClear GL_COLOR_BUFFER_BIT;	2428	glClear GL_COLOR_BUFFER_BIT;
2226		2429
2227	glEnable GL_TEXTURE_2D;
2228	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230	my $top = int $self->{children}[1]{range}[0];	2430	my $top = int $self->{children}[1]{range}[0];
2231		2431
2232	my $y0 = $top;	2432	my $y0 = $top;
2233	my $y1 = $top + $self->{h};	2433	my $y1 = $top + $H;
2234		2434
2235	my $y = 0;	2435	my $y = 0;
2236		2436
2237	my $layout = $self->{layout};	2437	my $layout = $self->{layout};
2238		2438
2239	$layout->set_font ($self->{font}) if $self->{font};	2439	$layout->set_font ($self->{font}) if $self->{font};
2240		2440
		2441	glEnable GL_BLEND;
		2442	#TODO# not correct in windows where rgba is forced off
		2443	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2444
2241	for my $par (@{$self->{par}}) {	2445	for my $par (@{$self->{par}}) {
2242	my $h = $par->[0];	2446	my $h = $par->[1];
2243		2447
2244	if ($y0 < $y + $h && $y < $y1) {	2448	if ($y0 < $y + $h && $y < $y1) {
2245	$layout->set_foreground (@{ $par->[1] });	2449	$layout->set_foreground (@{ $par->[2] });
		2450	$layout->set_width ($W - $par->[3]);
2246	$layout->set_markup ($par->[2]);	2451	$layout->set_markup ($par->[4]);
2247		2452
2248	my ($W, $H) = $layout->size;	2453	my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249	CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);	2454
		2455	glRasterPos $par->[3], $y - $y0;
		2456	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250	}	2457	}
2251		2458
2252	$y += $h;	2459	$y += $h;
2253	}	2460	}
2254		2461
2255	glDisable GL_TEXTURE_2D;	2462	glDisable GL_BLEND;
2256	};	2463	};
2257	});	2464	});
2258	}	2465	}
2259		2466
2260	sub _draw {	2467	sub _draw {
2261	my ($self) = @_;	2468	my ($self) = @_;
2262		2469
2263	glEnable GL_TEXTURE_2D;	2470	glEnable GL_TEXTURE_2D;
2264	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265	glColor 1, 1, 1, 1;	2472	glColor 1, 1, 1, 1;
2266	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	2473	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267	glDisable GL_TEXTURE_2D;	2474	glDisable GL_TEXTURE_2D;
2268		2475
2269	$self->{children}[1]->draw;	2476	$self->{children}[1]->draw;
2270		2477
2271	}	2478	}
…		…
2340		2547
2341	# TODO: use animation	2548	# TODO: use animation
2342	if ($self->{state} = !$self->{state}) {	2549	if ($self->{state} = !$self->{state}) {
2343	$CFClient::UI::ROOT->add ($self->{other});	2550	$CFClient::UI::ROOT->add ($self->{other});
2344	$self->{other}->move ($self->coord2global (0, $self->{h}));	2551	$self->{other}->move ($self->coord2global (0, $self->{h}));
2345	$self->emit ("open");	2552	$self->_emit ("open");
2346	} else {	2553	} else {
2347	$CFClient::UI::ROOT->remove ($self->{other});	2554	$CFClient::UI::ROOT->remove ($self->{other});
2348	$self->emit ("close");	2555	$self->_emit ("close");
2349	}	2556	}
2350		2557
2351	$self->emit (changed => $self->{state});	2558	$self->_emit (changed => $self->{state});
2352	}	2559	}
2353		2560
2354	#############################################################################	2561	#############################################################################
2355		2562
2356	package CFClient::UI::Tooltip;	2563	package CFClient::UI::Tooltip;
…		…
2369	}	2576	}
2370		2577
2371	sub set_tooltip_from {	2578	sub set_tooltip_from {
2372	my ($self, $widget) = @_;	2579	my ($self, $widget) = @_;
2373		2580
2374	$self->{label} = new CFClient::UI::Label	2581	$self->add (new CFClient::UI::Label
2375	markup => $widget->{tooltip},	2582	markup => $widget->{tooltip},
2376	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2583	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377	fontsize => 0.8,	2584	fontsize => 0.8,
2378	fg => [0, 0, 0, 1],	2585	fg => [0, 0, 0, 1],
		2586	ellipsise => 0,
2379	font => ($widget->{tooltip_font} || $::FONT_PROP);	2587	font => ($widget->{tooltip_font} || $::FONT_PROP),
2380		2588	);
2381	$self->add ($self->{label});
2382	}	2589	}
2383		2590
2384	sub size_request {	2591	sub size_request {
2385	my ($self) = @_;	2592	my ($self) = @_;
2386		2593
…		…
2396	}	2603	}
2397		2604
2398	sub _draw {	2605	sub _draw {
2399	my ($self) = @_;	2606	my ($self) = @_;
2400		2607
2401	glPushMatrix;
2402	glTranslate 0.375, 0.375;	2608	glTranslate 0.375, 0.375;
2403		2609
2404	my ($w, $h) = @$self{qw(w h)};	2610	my ($w, $h) = @$self{qw(w h)};
2405		2611
2406	glColor 1, 0.8, 0.4;	2612	glColor 1, 0.8, 0.4;
…		…
2417	glVertex 0 , $h;	2623	glVertex 0 , $h;
2418	glVertex $w, $h;	2624	glVertex $w, $h;
2419	glVertex $w, 0;	2625	glVertex $w, 0;
2420	glEnd;	2626	glEnd;
2421		2627
2422	glPopMatrix;	2628	glTranslate 2 - 0.375, 2 - 0.375;
2423
2424	glTranslate 2, 2;
2425	$self->SUPER::_draw;	2629	$self->SUPER::_draw;
2426	}	2630	}
2427		2631
2428	#############################################################################	2632	#############################################################################
2429		2633
…		…
2434	use CFClient::OpenGL;	2638	use CFClient::OpenGL;
2435		2639
2436	sub new {	2640	sub new {
2437	my $class = shift;	2641	my $class = shift;
2438		2642
2439	$class->SUPER::new (	2643	my $self = $class->SUPER::new (
2440	aspect => 1,	2644	aspect => 1,
		2645	can_events => 0,
2441	@_,	2646	@_,
2442	)	2647	);
		2648
		2649	if ($self->{anim} && $self->{animspeed}) {
		2650	Scalar::Util::weaken (my $widget = $self);
		2651
		2652	$self->{timer} = Event->timer (
		2653	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		2654	hard => 1,
		2655	interval => $self->{animspeed},
		2656	cb => sub {
		2657	++$widget->{frame};
		2658	$widget->update;
		2659	},
		2660	);
		2661	}
		2662
		2663	$self
2443	}	2664	}
2444		2665
2445	sub size_request {	2666	sub size_request {
2446	(32, 8)	2667	(32, 8)
2447	}	2668	}
2448		2669
		2670	sub update {
		2671	my ($self) = @_;
		2672
		2673	return unless $self->{visible};
		2674
		2675	$self->SUPER::update;
		2676	}
		2677
2449	sub _draw {	2678	sub _draw {
2450	my ($self) = @_;	2679	my ($self) = @_;
2451		2680
2452	return unless $::CONN;#d# manage and cache textures differently	2681	return unless $::CONN;
		2682
		2683	my $face;
		2684
		2685	if ($self->{frame}) {
		2686	my $anim = $::CONN->{anim}[$self->{anim}];
		2687
		2688	$face = $anim->[ $self->{frame} % @$anim ]
		2689	if $anim && @$anim;
		2690	}
		2691
2453	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	2692	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454		2693
2455	# TODO animation
2456	if ($tex) {	2694	if ($tex) {
2457	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459	glColor 1, 1, 1, 1;	2697	glColor 1, 1, 1, 1;
2460	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2698	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461	glDisable GL_TEXTURE_2D;	2699	glDisable GL_TEXTURE_2D;
2462	}	2700	}
2463	}	2701	}
2464		2702
		2703	sub DESTROY {
		2704	my ($self) = @_;
		2705
		2706	$self->{timer}->cancel
		2707	if $self->{timer};
		2708
		2709	$self->SUPER::DESTROY;
		2710	}
		2711
2465	#############################################################################	2712	#############################################################################
2466		2713
2467	package CFClient::UI::InventoryItem;	2714	package CFClient::UI::Inventory;
2468		2715
2469	our @ISA = CFClient::UI::HBox::;	2716	our @ISA = CFClient::UI::ScrolledWindow::;
2470		2717
2471	sub new {	2718	sub new {
2472	my $class = shift;	2719	my $class = shift;
2473		2720
2474	my %args = @_;
2475
2476	my $item = delete $args{item};
2477
2478	my $desc = $item->{nrof} < 2
2479	? $item->{name}
2480	: "$item->{nrof} $item->{name_pl}";
2481
2482
2483	my $self = $class->SUPER::new (	2721	my $self = $class->SUPER::new (
2484	can_hover => 1,	2722	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2485	can_events => 1,
2486	tooltip => (CFClient::UI::Label->escape ($desc)
2487	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488	connect_button_down => sub {
2489	my ($self, $ev, $x, $y) = @_;
2490
2491	# todo: maybe put examine on 1? but should just be a tooltip :(
2492	if ($ev->{button} == 1) {
2493	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494	} elsif ($ev->{button} == 2) {
2495	$::CONN->send ("apply $item->{tag}");
2496	} elsif ($ev->{button} == 3) {
2497	CFClient::UI::Menu->new (
2498	items => [
2499	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500	[
2501	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502	sub { $::CONN->send ("lock $item->{tag}") },
2503	],
2504	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507	],
2508	)->popup ($ev);
2509	}
2510
2511	1
2512	},
2513	%args
2514	);
2515
2516	$self->add (new CFClient::UI::Face
2517	can_events => 0,
2518	face => $item->{face},
2519	anim => $item->{anim},
2520	animspeed => $item->{animspeed},
2521	);
2522
2523	$self->add (new CFClient::UI::Label
2524	can_events => 0,
2525	text => $desc,
2526	);
2527
2528	$self
2529	}
2530
2531	#############################################################################
2532
2533	package CFClient::UI::Inventory;
2534
2535	our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537	sub new {
2538	my $class = shift;
2539
2540	my $self = $class->SUPER::new (
2541	scrolled => (new CFClient::UI::VBox),
2542	@_,	2723	@_,
2543	);	2724	);
2544		2725
2545	$self	2726	$self
2546	}	2727	}
…		…
2549	my ($self, $items) = @_;	2730	my ($self, $items) = @_;
2550		2731
2551	$self->{scrolled}->clear;	2732	$self->{scrolled}->clear;
2552	return unless $items;	2733	return unless $items;
2553		2734
2554	my @items = sort { $a->{type} <=> $b->{type} } @$items;	2735	my @items = sort {
		2736	($a->{type} <=> $b->{type})
		2737	or ($a->{name} cmp $b->{name})
		2738	} @$items;
2555		2739
2556	$self->{real_items} = \@items;	2740	$self->{real_items} = \@items;
2557		2741
		2742	my $row = 0;
2558	for my $item (@items) {	2743	for my $item (@items) {
2559	my $desc = $item->{nrof} < 2	2744	CFClient::Item::update_widgets $item;
2560	? $item->{name}
2561	: "$item->{nrof} $item->{name_pl}";
2562		2745
2563	$self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);	2746	$self->{scrolled}->add (0, $row, $item->{face_widget});
		2747	$self->{scrolled}->add (1, $row, $item->{desc_widget});
		2748	$self->{scrolled}->add (2, $row, $item->{weight_widget});
		2749
		2750	$row++;
2564	}	2751	}
2565		2752
2566	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];	2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567	}	2754	}
2568		2755
…		…
2611		2798
2612	# popup given the event (must be a mouse button down event currently)	2799	# popup given the event (must be a mouse button down event currently)
2613	sub popup {	2800	sub popup {
2614	my ($self, $ev) = @_;	2801	my ($self, $ev) = @_;
2615		2802
2616	$self->emit ("popdown");	2803	$self->_emit ("popdown");
2617		2804
2618	# maybe save $GRAB? must be careful about events...	2805	# maybe save $GRAB? must be careful about events...
2619	$GRAB = $self;	2806	$GRAB = $self;
2620	$self->{button} = $ev->{button};	2807	$self->{button} = $ev->{button};
2621		2808
…		…
2636		2823
2637	if ($ev->{button} == $self->{button}) {	2824	if ($ev->{button} == $self->{button}) {
2638	undef $GRAB;	2825	undef $GRAB;
2639	$self->hide;	2826	$self->hide;
2640		2827
2641	$self->emit ("popdown");	2828	$self->_emit ("popdown");
2642	$self->{hover}[1]->() if $self->{hover};	2829	$self->{hover}[1]->() if $self->{hover};
2643	}	2830	}
2644	}	2831	}
2645		2832
2646	#############################################################################	2833	#############################################################################
2647		2834
2648	package CFClient::UI::Statusbox;	2835	package CFClient::UI::Statusbox;
2649		2836
2650	our @ISA = CFClient::UI::VBox::;	2837	our @ISA = CFClient::UI::VBox::;
		2838
		2839	sub new {
		2840	my $class = shift;
		2841
		2842	$class->SUPER::new (
		2843	fontsize => 0.8,
		2844	@_,
		2845	)
		2846	}
2651		2847
2652	sub reorder {	2848	sub reorder {
2653	my ($self) = @_;	2849	my ($self) = @_;
2654	my $NOW = time;	2850	my $NOW = time;
2655		2851
2656	while (my ($k, $v) = each %{ $self->{item} }) {	2852	while (my ($k, $v) = each %{ $self->{item} }) {
2657	delete $self->{item}{$k} if $v->{timeout} < $NOW;	2853	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658	}	2854	}
2659		2855
2660	my @widgets;	2856	my @widgets;
2661	my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };	2857
		2858	my @items = sort {
		2859	$a->{pri} <=> $b->{pri}
		2860	or $b->{id} <=> $a->{id}
		2861	} values %{ $self->{item} };
		2862
2662	my $count = 10 + 1;	2863	my $count = 10 + 1;
2663	for my $item (@items) {	2864	for my $item (@items) {
2664	last unless --$count;	2865	last unless --$count;
2665		2866
2666	push @widgets, $item->{label} ||= do {	2867	push @widgets, $item->{label} ||= do {
2667	# TODO: doesn't handle markup well (read as: at all)	2868	# TODO: doesn't handle markup well (read as: at all)
2668	my $short = delete $item->{text};	2869	my $short = $item->{count} > 1
		2870	? "<b>$item->{count} ×</b> $item->{text}"
		2871	: $item->{text};
		2872
2669	for ($short) {	2873	for ($short) {
2670	s/^\s+//;	2874	s/^\s+//;
2671	s/\012.*//s;	2875	s/\s+/ /g;
2672	my $len = int 30 / $item->{fontsize};
2673	substr $_, $len, length, "…" if $len < length;
2674	}	2876	}
2675		2877
2676	new CFClient::UI::Label	2878	new CFClient::UI::Label
2677	markup => $short,	2879	markup => $short,
2678	tooltip => delete $item->{tooltip},	2880	tooltip => $item->{tooltip},
2679	tooltip_font => $::FONT_PROP,	2881	tooltip_font => $::FONT_PROP,
2680	tooltip_width => 0.75,	2882	tooltip_width => 0.67,
2681	fontsize => delete $item->{fontsize},	2883	fontsize => $item->{fontsize} || $self->{fontsize},
2682	color => delete $item->{color},	2884	max_w => $::WIDTH * 0.44,
		2885	fg => $item->{fg},
2683	can_events => 1,	2886	can_events => 1,
2684	can_hover => 1,	2887	can_hover => 1
2685	};	2888	};
2686	}	2889	}
2687		2890
2688	$self->clear;	2891	$self->clear;
2689	$self->SUPER::add (@widgets);	2892	$self->SUPER::add (reverse @widgets);
2690	}	2893	}
2691		2894
2692	sub add {	2895	sub add {
2693	my ($self, $text, %arg) = @_;	2896	my ($self, $text, %arg) = @_;
2694		2897
2695	my $item = {	2898	$text =~ s/^\s+//;
2696	time => time,	2899	$text =~ s/\s+$//;
		2900
		2901	return unless $text;
		2902
		2903	my $timeout = time + ((delete $arg{timeout}) || 60);
		2904
		2905	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		2906
		2907	if (my $item = $self->{item}{$group}) {
		2908	if ($item->{text} eq $text) {
		2909	$item->{count}++;
		2910	} else {
		2911	$item->{count} = 1;
		2912	$item->{text} = $item->{tooltip} = $text;
		2913	}
		2914	$item->{id} = ++$self->{id};
		2915	$item->{timeout} = $timeout;
		2916	delete $item->{label};
		2917	} else {
		2918	$self->{item}{$group} = {
		2919	id => ++$self->{id},
2697	text => $text,	2920	text => $text,
2698	timeout => 60,	2921	timeout => $timeout,
2699	tooltip => $text,	2922	tooltip => $text,
2700	fontsize => 0.8,
2701	color => [0.8, 0.8, 0.8, 0.8],	2923	fg => [0.8, 0.8, 0.8, 0.8],
		2924	pri => 0,
		2925	count => 1,
2702	%arg,	2926	%arg,
		2927	};
2703	};	2928	}
2704
2705	$item->{timeout} += time;
2706	$item->{group} ||= $item+0;
2707
2708	$item = $self->{item}{$item->{group}} ||= $item;
2709		2929
2710	$self->reorder;	2930	$self->reorder;
		2931	}
		2932
		2933	sub reconfigure {
		2934	my ($self) = @_;
		2935
		2936	delete $_->{label}
		2937	for values %{ $self->{item} || {} };
		2938
		2939	$self->reorder;
		2940	$self->SUPER::reconfigure;
2711	}	2941	}
2712		2942
2713	#############################################################################	2943	#############################################################################
2714		2944
2715	package CFClient::UI::Root;	2945	package CFClient::UI::Root;
…		…
2747	}	2977	}
2748		2978
2749	sub size_allocate {	2979	sub size_allocate {
2750	my ($self, $w, $h) = @_;	2980	my ($self, $w, $h) = @_;
2751		2981
2752	my $old_w = $self->{old_w};
2753	my $old_h = $self->{old_h};
2754
2755	if ($old_w && $old_h) {
2756	for my $child ($self->children) {
2757	$child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758	$child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759	$child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760	$child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761	$child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762	$child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763	$child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764	$child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765	}
2766	}
2767
2768	for my $child ($self->children) {	2982	for my $child ($self->children) {
2769	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	2983	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770		2984
		2985	$X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
		2986	if exists $child->{req_x};
		2987
		2988	$Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
		2989	if exists $child->{req_y};
		2990
2771	$X = List::Util::max 0, List::Util::min $w - $W, $X;	2991	$X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2772	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	2992	$Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
		2993
2773	$child->configure ($X, $Y, $W, $H);	2994	$child->configure ($X, $Y, $W, $H);
2774	}	2995	}
2775
2776	$self->{old_w} = $w;
2777	$self->{old_h} = $h;
2778	}	2996	}
2779		2997
2780	sub coord2local {	2998	sub coord2local {
2781	my ($self, $x, $y) = @_;	2999	my ($self, $x, $y) = @_;
2782		3000
…		…
2795	$self->check_size;	3013	$self->check_size;
2796	$::WANT_REFRESH++;	3014	$::WANT_REFRESH++;
2797	}	3015	}
2798		3016
2799	sub add {	3017	sub add {
2800	my ($self, $child) = @_;	3018	my ($self, @children) = @_;
2801		3019
		3020	for (my @widgets = @children; my $w = pop @widgets; ) {
		3021	push @widgets, $w->children;
		3022	$w->{root} = $self;
		3023	$w->{visible} = 1;
		3024	}
		3025
		3026	for my $child (@children) {
		3027	$child->{is_toplevel} = 1;
		3028
2802	# integerise window positions	3029	# integerise window positions
2803	$child->{x} = int $child->{x};	3030	$child->{x} = int $child->{x};
2804	$child->{y} = int $child->{y};	3031	$child->{y} = int $child->{y};
		3032	}
2805		3033
2806	$self->SUPER::add ($child);	3034	$self->SUPER::add (@children);
		3035	}
		3036
		3037	sub remove {
		3038	my ($self, @children) = @_;
		3039
		3040	$self->SUPER::remove (@children);
		3041
		3042	while (@children) {
		3043	my $w = pop @children;
		3044	push @children, $w->children;
		3045	$w->set_invisible;
		3046	}
2807	}	3047	}
2808		3048
2809	sub on_refresh {	3049	sub on_refresh {
2810	my ($self, $id, $cb) = @_;	3050	my ($self, $id, $cb) = @_;
2811		3051
2812	$self->{refresh_hook}{$id} = $cb;	3052	$self->{refresh_hook}{$id} = $cb;
2813	}	3053	}
2814		3054
		3055	sub on_post_alloc {
		3056	my ($self, $id, $cb) = @_;
		3057
		3058	$self->{post_alloc_hook}{$id} = $cb;
		3059	}
		3060
2815	sub draw {	3061	sub draw {
2816	my ($self) = @_;	3062	my ($self) = @_;
		3063
		3064	while ($self->{refresh_hook}) {
		3065	$_->()
		3066	for values %{delete $self->{refresh_hook}};
		3067	}
2817		3068
2818	if ($self->{check_size}) {	3069	if ($self->{check_size}) {
2819	my @queue = ([], []);	3070	my @queue = ([], []);
2820		3071
2821	for (;;) {	3072	for (;;) {
…		…
2829		3080
2830	my ($w, $h) = $widget->{user_w} && $widget->{user_h}	3081	my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831	? @$widget{qw(user_w user_h)}	3082	? @$widget{qw(user_w user_h)}
2832	: $widget->size_request;	3083	: $widget->size_request;
2833		3084
		3085	if (delete $widget->{force_alloc}
2834	if ($w != $widget->{req_w} || $h != $widget->{req_h}) {	3086	or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2835	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#	3087	Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836		3088
2837	$widget->{req_w} = $w;	3089	$widget->{req_w} = $w;
2838	$widget->{req_h} = $h;	3090	$widget->{req_h} = $h;
2839		3091
2840	$self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];	3092	$self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2841		3093
2842	$widget->{parent}->check_size	3094	$widget->{parent}->check_size
2843	if $widget->{parent};	3095	if $widget->{parent};
2844	}	3096	}
2845	}	3097	}
…		…
2852	$w = 0 if $w < 0;	3104	$w = 0 if $w < 0;
2853	$h = 0 if $h < 0;	3105	$h = 0 if $h < 0;
2854		3106
2855	$widget->{w} = $w;	3107	$widget->{w} = $w;
2856	$widget->{h} = $h;	3108	$widget->{h} = $h;
2857	$widget->size_allocate ($w, $h);
2858	$widget->emit (size_allocate => $w, $h);	3109	$widget->emit (size_allocate => $w, $h);
2859	}	3110	}
2860	}	3111	}
2861		3112
2862	while ($self->{refresh_hook}) {	3113	while ($self->{post_alloc_hook}) {
2863	$_->()	3114	$_->()
2864	for values %{delete $self->{refresh_hook}};	3115	for values %{delete $self->{post_alloc_hook}};
2865	}	3116	}
2866		3117
2867	glViewport 0, 0, $::WIDTH, $::HEIGHT;	3118	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	3119	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869	glClear GL_COLOR_BUFFER_BIT;	3120	glClear GL_COLOR_BUFFER_BIT;
2870		3121
2871	glMatrixMode GL_PROJECTION;	3122	glMatrixMode GL_PROJECTION;
2872	glLoadIdentity;	3123	glLoadIdentity;
2873	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	3124	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874	glMatrixMode GL_MODELVIEW;	3125	glMatrixMode GL_MODELVIEW;
2875	glLoadIdentity;	3126	glLoadIdentity;
2876		3127
2877	$self->_draw;	3128	$self->_draw;
2878	}	3129	}
…		…
2880	#############################################################################	3131	#############################################################################
2881		3132
2882	package CFClient::UI;	3133	package CFClient::UI;
2883		3134
2884	$ROOT = new CFClient::UI::Root;	3135	$ROOT = new CFClient::UI::Root;
2885	$TOOLTIP = new CFClient::UI::Tooltip;	3136	$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886		3137
2887	1	3138	1
2888		3139

Diff Legend

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