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.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
		3	use utf8;
3	use strict;	4	use strict;
4		5
5	use Scalar::Util ();	6	use Scalar::Util ();
6	use List::Util ();	7	use List::Util ();
		8	use Event;
7		9
8	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
		12	use CFPlus::Texture;
9		13
10	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
11		15
		16	our $LAYOUT;
12	our $ROOT;	17	our $ROOT;
13	our $TOOLTIP;	18	our $TOOLTIP;
14	our $BUTTON_STATE;	19	our $BUTTON_STATE;
15		20
16	sub check_tooltip {	21	our %WIDGET; # all widgets, weak-referenced
		22
		23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
17	if (!$GRAB) {	24	if (!$GRAB) {
18	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
20
21	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->hide;
		29
22	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31
		32	return if $ENV{CFPLUS_DEBUG} & 8;
23		33
24	my $tip = $widget->{tooltip};	34	my $tip = $widget->{tooltip};
25		35
26	$tip = $tip->($widget) if CODE:: eq ref $tip;	36	$tip = $tip->($widget) if CODE:: eq ref $tip;
27		37
28	$TOOLTIP->set_markup ($widget->{tooltip});	38	$TOOLTIP->set_tooltip_from ($widget);
29
30	$TOOLTIP->show;	39	$TOOLTIP->show;
31
32	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34	if ($x + $TOOLTIP->{w} > $::WIDTH) {
35	($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36	}
37
38	$TOOLTIP->move ($x, $y);
39	}	40	}
40		41
41	return;	42	return;
42	}	43	}
43	}	44	}
44	}	45	}
45		46
46	$TOOLTIP->hide;	47	$TOOLTIP->hide;
47	delete $TOOLTIP->{owner};	48	delete $TOOLTIP->{owner};
		49	});
		50
		51	sub get_layout {
		52	my $layout;
		53
		54	for (grep { $_->{name} } values %WIDGET) {
		55	my $win = $layout->{$_->{name}} = { };
		56
		57	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
		58	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
		59	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
		60	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
		61
		62	$win->{show} = $_->{visible} && $_->{is_toplevel};
		63	}
		64
		65	$layout
		66	}
		67
		68	sub set_layout {
		69	my ($layout) = @_;
		70
		71	$LAYOUT = $layout;
48	}	72	}
49		73
50	# class methods for events	74	# class methods for events
51	sub feed_sdl_key_down_event {	75	sub feed_sdl_key_down_event {
52	$FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])	76	$FOCUS->emit (key_down => $_[0])
53	if $FOCUS;	77	if $FOCUS;
54	}	78	}
55		79
56	sub feed_sdl_key_up_event {	80	sub feed_sdl_key_up_event {
57	$FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])	81	$FOCUS->emit (key_up => $_[0])
58	if $FOCUS;	82	if $FOCUS;
		83	}
		84
		85	sub check_hover {
		86	my ($widget) = @_;
		87
		88	if ($widget != $HOVER) {
		89	my $hover = $HOVER; $HOVER = $widget;
		90
		91	$hover->update if $hover && $hover->{can_hover};
		92	$HOVER->update if $HOVER && $HOVER->{can_hover};
		93
		94	$TOOLTIP_WATCHER->start;
		95	}
59	}	96	}
60		97
61	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
62	my ($ev) = @_;	99	my ($ev) = @_;
63	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
64		101
65	if (!$BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
66	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
67		106
68	$GRAB = $widget;	107	$GRAB = $widget;
69	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
70		109
71	check_tooltip;	110	$TOOLTIP_WATCHER->cb->();
72	}	111	}
73
74	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
75		112
76	if ($GRAB) {	113	if ($GRAB) {
77	($x, $y) = $GRAB->coord2local ($x, $y);	114	if ($ev->{button} == 4 || $ev->{button} == 5) {
78	$GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);	115	# mousewheel
		116	$ev->{dx} = 0;
		117	$ev->{dy} = $ev->{button} * 2 - 9;
		118	$GRAB->emit (mouse_wheel => $ev);
		119	} else {
		120	$GRAB->emit (button_down => $ev)
		121	}
79	}	122	}
80	}	123	}
81		124
82	sub feed_sdl_button_up_event {	125	sub feed_sdl_button_up_event {
83	my ($ev) = @_;	126	my ($ev) = @_;
84	my ($x, $y) = ($ev->{x}, $ev->{y});
85		127
86	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	128	my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
87		129
88	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));	130	$BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89		131
90	if ($GRAB) {	132	$GRAB->emit (button_up => $ev)
91	($x, $y) = $GRAB->coord2local ($x, $y);	133	if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
92	$GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93	}
94		134
95	if (!$BUTTON_STATE) {	135	unless ($BUTTON_STATE) {
96	my $grab = $GRAB; undef $GRAB;	136	my $grab = $GRAB; undef $GRAB;
97	$grab->update if $grab;	137	$grab->update if $grab;
98	$GRAB->update if $GRAB;	138	$GRAB->update if $GRAB;
99		139
100	check_tooltip;	140	check_hover $widget;
		141	$TOOLTIP_WATCHER->cb->();
101	}	142	}
102	}	143	}
103		144
104	sub feed_sdl_motion_event {	145	sub feed_sdl_motion_event {
105	my ($ev) = @_;	146	my ($ev) = @_;
106	my ($x, $y) = ($ev->{x}, $ev->{y});	147	my ($x, $y) = ($ev->{x}, $ev->{y});
107		148
108	my $widget = $GRAB || $ROOT->find_widget ($x, $y);	149	my $widget = $GRAB || $ROOT->find_widget ($x, $y);
109		150
110	if ($widget != $HOVER) {	151	check_hover $widget;
111	my $hover = $HOVER; $HOVER = $widget;
112		152
113	$hover->update if $hover && $hover->{can_hover};	153	$HOVER->emit (mouse_motion => $ev)
114	$HOVER->update if $HOVER && $HOVER->{can_hover};
115
116	check_tooltip;
117	}
118
119	if ($HOVER) {	154	if $HOVER;
120	($x, $y) = $HOVER->coord2local ($x, $y);
121	$HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
122	}
123	}	155	}
124		156
125	# convert position array to integers	157	# convert position array to integers
126	sub harmonize {	158	sub harmonize {
127	my ($vals) = @_;	159	my ($vals) = @_;
…		…
133	$rem += $_ - $i;	165	$rem += $_ - $i;
134	$_ = $i;	166	$_ = $i;
135	}	167	}
136	}	168	}
137		169
		170	sub full_refresh {
		171	# make a copy, otherwise for complains about freed values.
		172	my @widgets = values %WIDGET;
		173
		174	$_->update
		175	for @widgets;
		176	}
		177
		178	sub reconfigure_widgets {
		179	# make a copy, otherwise C<for> complains about freed values.
		180	my @widgets = values %WIDGET;
		181
		182	$_->reconfigure
		183	for @widgets;
		184	}
		185
		186	# call when resolution changes etc.
		187	sub rescale_widgets {
		188	my ($sx, $sy) = @_;
		189
		190	for my $widget (values %WIDGET) {
		191	if ($widget->{is_toplevel}) {
		192	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		193	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		194
		195	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
		196	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
		197	$widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
		198	$widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
		199	$widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
		200	$widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
		201
		202	$widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
		203	$widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
		204
		205	}
		206	}
		207
		208	reconfigure_widgets;
		209	}
		210
138	#############################################################################	211	#############################################################################
139		212
		213	package CFPlus::UI::Event;
		214
		215	sub xy {
		216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
		217	}
		218
		219	#############################################################################
		220
140	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
141		222
142	use strict;	223	use strict;
143		224
144	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
145		226
146	sub new {	227	sub new {
147	my $class = shift;	228	my $class = shift;
148		229
149	my $self = bless {	230	my $self = bless {
150	x => 0,	231	x => "center",
151	y => 0,	232	y => "center",
152	z => 0,	233	z => 0,
		234	w => undef,
		235	h => undef,
153	can_events => 1,	236	can_events => 1,
154	@_	237	@_
155	}, $class;	238	}, $class;
156		239
		240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
		241
157	for (keys %$self) {	242	for (keys %$self) {
158	if (/^connect_(.*)$/) {	243	if (/^on_(.*)$/) {
159	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
160	}	245	}
161	}	246	}
162		247
		248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
		249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
		250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
		251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
		252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
		253
		254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
		255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
		256
		257	$self->show if $layout->{show};
		258	}
		259
163	$self	260	$self
164	}	261	}
165		262
166	sub destroy {	263	sub destroy {
167	my ($self) = @_;	264	my ($self) = @_;
…		…
173	sub show {	270	sub show {
174	my ($self) = @_;	271	my ($self) = @_;
175		272
176	return if $self->{parent};	273	return if $self->{parent};
177		274
178	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
179	}	276	}
180		277
181	sub hide {	278	sub set_visible {
182	my ($self) = @_;	279	my ($self) = @_;
		280
		281	return if $self->{visible};
		282
		283	$self->{root} = $self->{parent}{root};
		284	$self->{visible} = $self->{parent}{visible} + 1;
		285
		286	$self->emit (visibility_change => 1);
		287
		288	$self->realloc if !exists $self->{req_w};
		289
		290	$_->set_visible for $self->children;
		291	}
		292
		293	sub set_invisible {
		294	my ($self) = @_;
		295
		296	return unless $self->{visible};
		297
		298	$_->set_invisible for $self->children;
		299
		300	delete $self->{visible};
		301	delete $self->{root};
183		302
184	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
185	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
186		305
		306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
		307	if $TOOLTIP->{owner} == $self;
		308
		309	$self->emit ("focus_out");
		310	$self->emit (visibility_change => 0);
		311	}
		312
		313	sub set_visibility {
		314	my ($self, $visible) = @_;
		315
		316	return if $self->{visible} == $visible;
		317
		318	$visible ? $self->hide
		319	: $self->show;
		320	}
		321
		322	sub toggle_visibility {
		323	my ($self) = @_;
		324
		325	$self->{visible}
		326	? $self->hide
		327	: $self->show;
		328	}
		329
		330	sub hide {
		331	my ($self) = @_;
		332
		333	$self->set_invisible;
		334
187	$self->{parent}->remove ($self)	335	$self->{parent}->remove ($self)
188	if $self->{parent};	336	if $self->{parent};
189	}	337	}
190		338
191	sub move {	339	sub move_abs {
192	my ($self, $x, $y, $z) = @_;	340	my ($self, $x, $y, $z) = @_;
193		341
194	$self->{x} = int $x;	342	$self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
195	$self->{y} = int $y;	343	$self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
196	$self->{z} = $z if defined $z;	344	$self->{z} = $z if defined $z;
197		345
198	$self->update;	346	$self->update;
199	}	347	}
200		348
201	sub set_size {	349	sub set_size {
202	my ($self, $w, $h) = @_;	350	my ($self, $w, $h) = @_;
203		351
204	$self->{user_w} = $w;	352	$self->{force_w} = $w;
205	$self->{user_h} = $h;	353	$self->{force_h} = $h;
206		354
207	$self->check_size;	355	$self->realloc;
208	}	356	}
209		357
210	sub size_request {	358	sub size_request {
211	require Carp;	359	require Carp;
212	Carp::confess "size_request is abstract";	360	Carp::confess "size_request is abstract";
213	}	361	}
214		362
		363	sub baseline_shift {
		364	0
		365	}
		366
215	sub configure {	367	sub configure {
216	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
217		369
218	if ($self->{aspect}) {	370	if ($self->{aspect}) {
		371	my ($ow, $oh) = ($w, $h);
		372
219	my $w2 = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
220	my $h2 = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
221		375
222	# use alignment to adjust x, y	376	# use alignment to adjust x, y
223		377
224	$x += int +($w - $w2) * 0.5;	378	$x += int 0.5 * ($ow - $w);
225	$y += int +($h - $h2) * 0.5;	379	$y += int 0.5 * ($oh - $h);
226
227	($w, $h) = ($w2, $h2);
228	}	380	}
229		381
230	if ($self->{x} != $x || $self->{y} != $y) {	382	if ($self->{x} ne $x || $self->{y} ne $y) {
231	$self->{x} = $x;	383	$self->{x} = $x;
232	$self->{y} = $y;	384	$self->{y} = $y;
233	$self->update;	385	$self->update;
234	}	386	}
235		387
236	if ($self->{w} != $w || $self->{h} != $h) {	388	if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
		389	return unless $self->{visible};
		390
237	$self->{w} = $w;	391	$self->{alloc_w} = $w;
238	$self->{h} = $h;	392	$self->{alloc_h} = $h;
239		393
240	$self->size_allocate ($w, $h);	394	$self->{root}{size_alloc}{$self+0} = $self;
241	$self->update;
242	$self->emit (size_allocate => $w, $h);
243	}	395	}
244	}
245
246	sub size_allocate {
247	# nothing to be done
248	}	396	}
249		397
250	sub children {	398	sub children {
		399	# nop
251	}	400	}
252		401
253	# call when resolution changes etc.	402	sub visible_children {
254	sub reconfigure {	403	$_[0]->children
255	my ($self) = @_;
256
257	$_->reconfigure
258	for $self->children;
259
260	$_->check_size;
261	}	404	}
262		405
263	sub set_max_size {	406	sub set_max_size {
264	my ($self, $w, $h) = @_;	407	my ($self, $w, $h) = @_;
265		408
266	delete $self->{max_w}; $self->{max_w} = $w if $w;	409	$self->{max_w} = int $w if defined $w;
267	delete $self->{max_h}; $self->{max_h} = $h if $h;	410	$self->{max_h} = int $h if defined $h;
268	}
269		411
270	# return top left coordinates	412	$self->realloc;
271	sub _topleft {	413	}
		414
		415	sub set_tooltip {
272	my ($self, $x, $y) = @_;	416	my ($self, $tooltip) = @_;
273		417
274	$self->{parent}	418	$tooltip =~ s/^\s+//;
275	or Carp::confess "no parent widget in _topleft\n";#d#	419	$tooltip =~ s/\s+$//;
276		420
277	$self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});	421	return if $self->{tooltip} eq $tooltip;
		422
		423	$self->{tooltip} = $tooltip;
		424
		425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
		426	delete $CFPlus::UI::TOOLTIP->{owner};
		427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
		428	}
278	}	429	}
279		430
280	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
281	sub coord2local {	432	sub coord2local {
282	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
283		434
284	my ($X, $Y) = $self->_topleft;	435	Carp::confess unless $self->{parent};#d#
285	($x - $X, $y - $Y)	436
		437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
286	}	438	}
287		439
288	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
289	sub coord2global {	441	sub coord2global {
290	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
291		443
292	my ($X, $Y) = $self->_topleft;	444	Carp::confess unless $self->{parent};#d#
293	($x + $X, $y + $Y)
294	}
295		445
		446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
		447	}
		448
296	sub focus_in {	449	sub invoke_focus_in {
297	my ($self) = @_;	450	my ($self) = @_;
298		451
299	return if $FOCUS == $self;	452	return if $FOCUS == $self;
300	return unless $self->{can_focus};	453	return unless $self->{can_focus};
301		454
302	my $focus = $FOCUS; $FOCUS = $self;	455	$FOCUS = $self;
303		456
304	$self->emit (focus_in => $focus);	457	$self->update;
305		458
306	$focus->update if $focus;	459	0
307	$FOCUS->update;
308	}	460	}
309		461
310	sub focus_out {	462	sub invoke_focus_out {
311	my ($self) = @_;	463	my ($self) = @_;
312		464
313	return unless $FOCUS == $self;	465	return unless $FOCUS == $self;
314		466
315	my $focus = $FOCUS; undef $FOCUS;	467	undef $FOCUS;
316		468
317	$self->emit (focus_out => $focus);	469	$self->update;
318		470
319	$focus->update if $focus; #?	471	$::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
320	}	472	unless $FOCUS;
321		473
		474	0
		475	}
		476
		477	sub grab_focus {
		478	my ($self) = @_;
		479
		480	$FOCUS->emit ("focus_out") if $FOCUS;
		481	$self->emit ("focus_in");
		482	}
		483
322	sub mouse_motion { }	484	sub invoke_mouse_motion { 0 }
323	sub button_up { }	485	sub invoke_button_up { 0 }
324	sub key_down { }	486	sub invoke_key_down { 0 }
325	sub key_up { }	487	sub invoke_key_up { 0 }
		488	sub invoke_mouse_wheel { 0 }
326		489
327	sub button_down {	490	sub invoke_button_down {
328	my ($self, $ev, $x, $y) = @_;	491	my ($self, $ev, $x, $y) = @_;
329		492
330	$self->focus_in;	493	$self->grab_focus;
331	}
332		494
333	sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }	495	0
334	sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }	496	}
335	sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }	497
336	sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }	498	sub connect {
337	sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }	499	my ($self, $signal, $cb) = @_;
		500
		501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
		507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
		515
		516	sub emit {
		517	my ($self, $signal, @args) = @_;
		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
		521	my @append
		522	= $has_coords{$signal}
		523	? $args[0]->xy ($self)
		524	: ();
		525
		526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
		527
		528	#d##TODO# stop propagating at first true, do not use sum
		529	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
		530	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
		531	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		532	}
		533
		534	sub find_widget {
		535	my ($self, $x, $y) = @_;
		536
		537	return () unless $self->{can_events};
		538
		539	return $self
		540	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
		541	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
		542
		543	()
		544	}
		545
		546	sub set_parent {
		547	my ($self, $parent) = @_;
		548
		549	Scalar::Util::weaken ($self->{parent} = $parent);
		550	$self->set_visible if $parent->{visible};
		551	}
		552
		553	sub realloc {
		554	my ($self) = @_;
		555
		556	if ($self->{visible}) {
		557	return if $self->{root}{realloc}{$self+0};
		558
		559	$self->{root}{realloc}{$self+0} = $self;
		560	$self->{root}->update;
		561	} else {
		562	delete $self->{req_w};
		563	delete $self->{req_h};
		564	}
		565	}
		566
		567	sub update {
		568	my ($self) = @_;
		569
		570	$self->{parent}->update
		571	if $self->{parent};
		572	}
		573
		574	sub reconfigure {
		575	my ($self) = @_;
		576
		577	$self->realloc;
		578	$self->update;
		579	}
		580
		581	# using global variables seems a bit hacky, but passing through all drawing
		582	# functions seems pointless.
		583	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
338		584
339	sub draw {	585	sub draw {
340	my ($self) = @_;	586	my ($self) = @_;
341		587
342	return unless $self->{h} && $self->{w};	588	return unless $self->{h} && $self->{w};
		589
		590	# update screen rectangle
		591	local $draw_x = $draw_x + $self->{x};
		592	local $draw_y = $draw_y + $self->{y};
		593
		594	# skip widgets that are entirely outside the drawing area
		595	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
		596	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
343		597
344	glPushMatrix;	598	glPushMatrix;
345	glTranslate $self->{x}, $self->{y}, 0;	599	glTranslate $self->{x}, $self->{y}, 0;
346	$self->_draw;
347	glPopMatrix;
348		600
349	if ($self == $HOVER && $self->{can_hover}) {	601	if ($self == $HOVER && $self->{can_hover}) {
350	my ($x, $y) = @$self{qw(x y)};
351
352	glColor 1, 0.8, 0.5, 0.2;	602	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
353	glEnable GL_BLEND;	603	glEnable GL_BLEND;
354	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	604	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
355	glBegin GL_QUADS;	605	glBegin GL_QUADS;
356	glVertex $x , $y;
357	glVertex $x + $self->{w}, $y;
358	glVertex $x + $self->{w}, $y + $self->{h};
359	glVertex $x , $y + $self->{h};
360	glEnd;
361	glDisable GL_BLEND;
362	}
363
364	if ($ENV{PCLIENT_DEBUG}) {
365	glPushMatrix;
366	glColor 1, 1, 0, 1;
367	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368	glBegin GL_LINE_LOOP;
369	glVertex 0 , 0;	606	glVertex 0 , 0;
370	glVertex $self->{w}, 0;	607	glVertex $self->{w}, 0;
371	glVertex $self->{w}, $self->{h};	608	glVertex $self->{w}, $self->{h};
372	glVertex 0 , $self->{h};	609	glVertex 0 , $self->{h};
373	glEnd;	610	glEnd;
		611	glDisable GL_BLEND;
		612	}
		613
		614	if ($ENV{CFPLUS_DEBUG} & 1) {
		615	glPushMatrix;
		616	glColor 1, 1, 0, 1;
		617	glTranslate 0.375, 0.375;
		618	glBegin GL_LINE_LOOP;
		619	glVertex 0 , 0;
		620	glVertex $self->{w} - 1, 0;
		621	glVertex $self->{w} - 1, $self->{h} - 1;
		622	glVertex 0 , $self->{h} - 1;
		623	glEnd;
374	glPopMatrix;	624	glPopMatrix;
375	CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376	}	626	}
		627
		628	$self->_draw;
		629	glPopMatrix;
377	}	630	}
378		631
379	sub _draw {	632	sub _draw {
380	my ($self) = @_;	633	my ($self) = @_;
381		634
382	warn "no draw defined for $self\n";	635	warn "no draw defined for $self\n";
383	}	636	}
384		637
385	sub find_widget {
386	my ($self, $x, $y) = @_;
387
388	return () unless $self->{can_events};
389
390	return $self
391	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
392	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
393
394	()
395	}
396
397	sub set_parent {
398	my ($self, $parent) = @_;
399
400	Scalar::Util::weaken ($self->{parent} = $parent);
401	}
402
403	sub check_size {
404	my ($self) = @_;
405
406	$self->{parent}
407	or return 1;
408
409	my ($w, $h) = $self->{user_w} && $self->{user_h}
410	? @$self{qw(user_w user_h)}
411	: $self->size_request;
412
413	if ($w != $self->{req_w} || $h != $self->{req_h}) {
414	$self->{req_w} = $w;
415	$self->{req_h} = $h;
416
417	$self->{parent}->check_size
418	or $self->size_allocate (
419	(List::Util::max $self->{w}, $w),
420	(List::Util::max $self->{h}, $h),
421	);
422
423	1
424	} else {
425	0
426	}
427	}
428
429	sub update {
430	my ($self) = @_;
431
432	$self->{parent}->update
433	if $self->{parent};
434	}
435
436	sub connect {
437	my ($self, $signal, $cb) = @_;
438
439	push @{ $self->{signal_cb}{$signal} }, $cb;
440	}
441
442	sub emit {
443	my ($self, $signal, @args) = @_;
444
445	List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
446	}
447
448	sub DESTROY {	638	sub DESTROY {
449	my ($self) = @_;	639	my ($self) = @_;
450		640
451	#$self->deactivate;	641	return if CFPlus::in_destruct;
		642
		643	delete $WIDGET{$self+0};
		644
		645	eval { $self->destroy };
		646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
452	}	647	}
453		648
454	#############################################################################	649	#############################################################################
455		650
456	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
457		652
458	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
459		654
460	use strict;	655	use strict;
461	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
462		657
463	sub new {	658	sub new {
464	my $class = shift;	659	my $class = shift;
465		660
466	# range [value, low, high, page]	661	# range [value, low, high, page]
467		662
468	$class->SUPER::new (	663	$class->SUPER::new (
469	bg => [0, 0, 0, 0.2],	664	#bg => [0, 0, 0, 0.2],
470	active_bg => [1, 1, 1, 0.5],	665	#active_bg => [1, 1, 1, 0.5],
471	@_	666	@_
472	)	667	)
473	}	668	}
474		669
475	sub _draw {	670	sub _draw {
476	my ($self) = @_;	671	my ($self) = @_;
477		672
		673	my $color = $FOCUS == $self && $self->{active_bg}
		674	? $self->{active_bg}
		675	: $self->{bg};
		676
		677	if ($color && (@$color < 4 || $color->[3])) {
478	my ($w, $h) = @$self{qw(w h)};	678	my ($w, $h) = @$self{qw(w h)};
479		679
480	glEnable GL_BLEND;	680	glEnable GL_BLEND;
481	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	681	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
482	glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };	682	glColor_premultiply @$color;
483		683
484	glBegin GL_QUADS;	684	glBegin GL_QUADS;
485	glVertex 0 , 0;	685	glVertex 0 , 0;
486	glVertex 0 , $h;	686	glVertex 0 , $h;
487	glVertex $w, $h;	687	glVertex $w, $h;
488	glVertex $w, 0;	688	glVertex $w, 0;
489	glEnd;	689	glEnd;
490		690
491	glDisable GL_BLEND;	691	glDisable GL_BLEND;
		692	}
492	}	693	}
493		694
494	#############################################################################	695	#############################################################################
495		696
496	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
497		698
498	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
499		700
500	sub new {	701	sub new {
501	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
502	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
503	}	704	}
504		705
505	sub size_request {	706	sub size_request {
506	(0, 0)	707	my ($self) = @_;
		708
		709	($self->{w} + 0, $self->{h} + 0)
507	}	710	}
508		711
509	sub draw { }	712	sub draw { }
510		713
511	#############################################################################	714	#############################################################################
512		715
513	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
514		717
515	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
516		719
517	sub new {	720	sub new {
518	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
519		722
520	my $children = delete $arg{children} || [];	723	my $children = delete $arg{children};
521		724
522	my $self = $class->SUPER::new (	725	my $self = $class->SUPER::new (
523	children => [],	726	children => [],
524	can_events => 0,	727	can_events => 0,
525	%arg,	728	%arg,
526	);	729	);
		730
527	$self->add ($_) for @$children;	731	$self->add (@$children)
		732	if $children;
528		733
529	$self	734	$self
530	}	735	}
531		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
532	sub add {	745	sub add {
533	my ($self, $child) = @_;	746	my ($self, @widgets) = @_;
534		747
535	$child->set_parent ($self);	748	$_->set_parent ($self)
		749	for @widgets;
536		750
537	use sort 'stable';	751	use sort 'stable';
538		752
539	$self->{children} = [	753	$self->{children} = [
540	sort { $a->{z} <=> $b->{z} }	754	sort { $a->{z} <=> $b->{z} }
541	@{$self->{children}}, $child	755	@{$self->{children}}, @widgets
542	];	756	];
543		757
544	$child->check_size;	758	$self->realloc;
545	$self->update;
546	}	759	}
547		760
548	sub children {	761	sub children {
549	@{ $_[0]{children} }	762	@{ $_[0]{children} }
550	}	763	}
…		…
555	delete $child->{parent};	768	delete $child->{parent};
556	$child->hide;	769	$child->hide;
557		770
558	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	771	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
559		772
560	$self->check_size;	773	$self->realloc;
561	$self->update;
562	}	774	}
563		775
564	sub clear {	776	sub clear {
565	my ($self) = @_;	777	my ($self) = @_;
566		778
…		…
570	for (@$children) {	782	for (@$children) {
571	delete $_->{parent};	783	delete $_->{parent};
572	$_->hide;	784	$_->hide;
573	}	785	}
574		786
575	$self->check_size;	787	$self->realloc;
576	$self->update;
577	}	788	}
578		789
579	sub find_widget {	790	sub find_widget {
580	my ($self, $x, $y) = @_;	791	my ($self, $x, $y) = @_;
581		792
582	$x -= $self->{x};	793	$x -= $self->{x};
583	$y -= $self->{y};	794	$y -= $self->{y};
584		795
585	my $res;	796	my $res;
586		797
587	for (reverse @{ $self->{children} }) {	798	for (reverse $self->visible_children) {
588	$res = $_->find_widget ($x, $y)	799	$res = $_->find_widget ($x, $y)
589	and return $res;	800	and return $res;
590	}	801	}
591		802
592	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	803	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
598	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
599	}	810	}
600		811
601	#############################################################################	812	#############################################################################
602		813
603	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
604		815
605	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
606		817
607	sub new {	818	sub new {
608	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
609		820
610	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
611		822
612	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
613	}	824	}
614		825
615	sub add {	826	sub add {
616	my ($self, $child) = @_;	827	my ($self, $child) = @_;
617		828
618	$self->{children} = [];	829	$self->SUPER::remove ($_) for @{ $self->{children} };
619
620	$self->SUPER::add ($child);	830	$self->SUPER::add ($child);
621	}	831	}
622		832
623	sub remove {	833	sub remove {
624	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
625		835
626	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
627		837
628	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
629	unless @{$self->{children}};	839	unless @{$self->{children}};
630	}	840	}
631		841
632	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
633		843
634	sub size_request {	844	sub size_request {
635	$_[0]{children}[0]->size_request	845	$_[0]{children}[0]->size_request
636	}	846	}
637		847
638	sub size_allocate {	848	sub invoke_size_allocate {
639	my ($self, $w, $h) = @_;	849	my ($self, $w, $h) = @_;
640		850
641	$self->{children}[0]->configure (0, 0, $w, $h);	851	$self->{children}[0]->configure (0, 0, $w, $h);
		852
		853	1
642	}	854	}
643		855
644	#############################################################################	856	#############################################################################
645		857
		858	# back-buffered drawing area
		859
646	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
647		861
648	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
649		863
650	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
651		865
652	sub new {	866	sub new {
653	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
654		868
655	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
656	}	870	}
657		871
658	sub update {	872	sub update {
659	my ($self) = @_;	873	my ($self) = @_;
660		874
661	$ROOT->on_refresh ($self => sub { $self->render_child });	875	$ROOT->on_post_alloc ($self => sub { $self->render_child });
662	$self->SUPER::update;	876	$self->SUPER::update;
663	}	877	}
664		878
665	sub size_allocate {	879	sub invoke_size_allocate {
666	my ($self, $w, $h) = @_;	880	my ($self, $w, $h) = @_;
667		881
668	$self->SUPER::size_allocate ($w, $h);
669	$self->update;	882	$self->update;
		883
		884	$self->SUPER::invoke_size_allocate ($w, $h)
670	}	885	}
671		886
672	sub _render {	887	sub _render {
		888	my ($self) = @_;
		889
673	$_[0]{children}[0]->draw;	890	$self->{children}[0]->draw;
674	}	891	}
675		892
676	sub render_child {	893	sub render_child {
677	my ($self) = @_;	894	my ($self) = @_;
678		895
679	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
680	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
681	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
682		899
		900	{
		901	package CFPlus::UI::Base;
		902
		903	($draw_x, $draw_y, $draw_w, $draw_h) =
		904	(0, 0, $self->{w}, $self->{h});
		905	}
		906
683	$self->_render;	907	$self->_render;
684	# glColorMask 1, 1, 1, 0;
685	# glEnable GL_BLEND;
686	# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687	# glRasterPos 0, 0;
688	# glCopyPixels 0, 0, $self->{w}, $self->{h};
689	# glDisable GL_BLEND;
690	# glColorMask 1, 1, 1, 1;
691	};	908	};
692	}	909	}
693		910
694	sub _draw {	911	sub _draw {
695	my ($self) = @_;	912	my ($self) = @_;
696
697	my ($w, $h) = ($self->w, $self->h);
698		913
699	my $tex = $self->{texture}	914	my $tex = $self->{texture}
700	or return;	915	or return;
701		916
702	glEnable GL_BLEND;
703	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
705	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
707		920
708	$tex->draw_quad (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
709		922
710	glDisable GL_BLEND;
711	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
712	}	924	}
713		925
714	#############################################################################	926	#############################################################################
715		927
716	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
717		929
718	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
		931
		932	sub new {
		933	my $class = shift;
		934
		935	$class->SUPER::new (
		936	scroll_x => 0,
		937	scroll_y => 1,
		938	@_,
		939	)
		940	}
719		941
720	sub size_request {	942	sub size_request {
721	my ($self) = @_;	943	my ($self) = @_;
722		944
723	@$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};	945	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
724	$self->child->configure (0, 0, @$self{qw(child_w child_h)});
725		946
726	@$self{qw(child_w child_h)}	947	$w = 10 if $self->{scroll_x};
727	}	948	$h = 10 if $self->{scroll_y};
728		949
		950	($w, $h)
		951	}
		952
729	sub size_allocate {	953	sub invoke_size_allocate {
730	my ($self, $w, $h) = @_;	954	my ($self, $w, $h) = @_;
731		955
		956	my $child = $self->child;
		957
		958	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
		959	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
		960
		961	$self->child->configure (0, 0, $w, $h);
732	$self->update;	962	$self->update;
		963
		964	1
733	}	965	}
734		966
735	sub set_offset {	967	sub set_offset {
736	my ($self, $x, $y) = @_;	968	my ($self, $x, $y) = @_;
737		969
…		…
739	$self->{view_y} = int $y;	971	$self->{view_y} = int $y;
740		972
741	$self->update;	973	$self->update;
742	}	974	}
743		975
744	# hmm, this does not work for topleft of $self... but we should not aks for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
745	sub _topleft {	977	sub coord2local {
746	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
747		979
748	$self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})	980	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
		981	}
		982
		983	sub coord2global {
		984	my ($self, $x, $y) = @_;
		985
		986	$x = List::Util::min $self->{w}, $x - $self->{view_x};
		987	$y = List::Util::min $self->{h}, $y - $self->{view_y};
		988
		989	$self->SUPER::coord2global ($x, $y)
749	}	990	}
750		991
751	sub find_widget {	992	sub find_widget {
752	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
753		994
754	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
756	) {	997	) {
757	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758	} else {	999	} else {
759	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
760	}	1001	}
761	}	1002	}
762		1003
763	sub _render {	1004	sub _render {
764	my ($self) = @_;	1005	my ($self) = @_;
765		1006
		1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
		1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
		1009
766	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767		1011
768	$self->SUPER::_render;	1012	$self->SUPER::_render;
769	}	1013	}
770		1014
771	#############################################################################	1015	#############################################################################
772		1016
773	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
774		1018
775	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
		1020
		1021	sub new {
		1022	my ($class, %arg) = @_;
		1023
		1024	my $child = delete $arg{child};
		1025
		1026	my $self;
		1027
		1028	my $slider = new CFPlus::UI::Slider
		1029	vertical => 1,
		1030	range => [0, 0, 1, 0.01], # HACK fix
		1031	on_changed => sub {
		1032	$self->{vp}->set_offset (0, $_[1]);
		1033	},
		1034	;
		1035
		1036	$self = $class->SUPER::new (
		1037	vp => (new CFPlus::UI::ViewPort expand => 1),
		1038	can_events => 1,
		1039	slider => $slider,
		1040	%arg,
		1041	);
		1042
		1043	$self->SUPER::add ($self->{vp}, $self->{slider});
		1044	$self->add ($child) if $child;
		1045
		1046	$self
		1047	}
		1048
		1049	#TODO# update range on size_allocate depending on child
		1050
		1051	sub add {
		1052	my ($self, $widget) = @_;
		1053
		1054	$self->{vp}->add ($self->{child} = $widget);
		1055	}
		1056
		1057	sub invoke_mouse_wheel {
		1058	my ($self, $ev) = @_;
		1059
		1060	return 0 unless $ev->{dy}; # only vertical movements
		1061
		1062	$self->{slider}->emit (mouse_wheel => $ev);
		1063
		1064	1
		1065	}
		1066
		1067	sub update_slider {
		1068	my ($self) = @_;
		1069
		1070	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
		1071	}
		1072
		1073	sub update {
		1074	my ($self) = @_;
		1075
		1076	$self->SUPER::update;
		1077
		1078	$self->update_slider;
		1079	}
		1080
		1081	sub invoke_size_allocate {
		1082	my ($self, $w, $h) = @_;
		1083
		1084	$self->update_slider;
		1085
		1086	$self->SUPER::invoke_size_allocate ($w, $h)
		1087	}
		1088
		1089	#############################################################################
		1090
		1091	package CFPlus::UI::Frame;
		1092
		1093	our @ISA = CFPlus::UI::Bin::;
		1094
		1095	use CFPlus::OpenGL;
776		1096
777	sub new {	1097	sub new {
778	my $class = shift;	1098	my $class = shift;
779		1099
780	my $self;
781
782	my $slider = new CFClient::UI::Slider
783	vertical => 1,
784	range => [0, 0, 1, 0.01], # HACK fix
785	connect_changed => sub {
786	$self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787	},
788	;
789
790	$self = $class->SUPER::new (	1100	$class->SUPER::new (
791	vp => (new CFClient::UI::ViewPort),	1101	bg => undef,
792	slider => $slider,
793	@_,	1102	@_,
		1103	)
		1104	}
		1105
		1106	sub _draw {
		1107	my ($self) = @_;
		1108
		1109	if ($self->{bg}) {
		1110	my ($w, $h) = @$self{qw(w h)};
		1111
		1112	glEnable GL_BLEND;
		1113	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		1114	glColor_premultiply @{ $self->{bg} };
		1115
		1116	glBegin GL_QUADS;
		1117	glVertex 0 , 0;
		1118	glVertex 0 , $h;
		1119	glVertex $w, $h;
		1120	glVertex $w, 0;
		1121	glEnd;
		1122
		1123	glDisable GL_BLEND;
		1124	}
		1125
		1126	$self->SUPER::_draw;
		1127	}
		1128
		1129	#############################################################################
		1130
		1131	package CFPlus::UI::FancyFrame;
		1132
		1133	our @ISA = CFPlus::UI::Bin::;
		1134
		1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
794	);	1154	);
795		1155
796	$self->{vp}->add ($self->{scrolled});
797	$self->add ($self->{vp});
798	$self->add ($self->{slider});
799
800	$self	1156	$self
801	}	1157	}
802		1158
803	#TODO# update range on size_allocate depeneing on child	1159	sub add {
804	# update viewport offset on scroll
805
806	#############################################################################
807
808	package CFClient::UI::Frame;
809
810	our @ISA = CFClient::UI::Bin::;
811
812	use CFClient::OpenGL;
813
814	sub new {
815	my $class = shift;
816
817	my $self = $class->SUPER::new (
818	bg => [1, 1, 1, 1],
819	border_bg => [1, 1, 1, 1],
820	border => 0.8,
821	@_
822	);
823
824	$self
825	}
826
827	sub _draw {
828	my ($self) = @_;	1160	my ($self, @widgets) = @_;
829		1161
830	my ($w, $h) = ($self->{w}, $self->{h});	1162	$self->SUPER::add (@widgets);
831		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
832	glEnable GL_BLEND;
833	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
834	glEnable GL_TEXTURE_2D;
835	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
836
837	# glBegin GL_QUADS;
838	# glColor 0, 0, 0, 0;
839	# glVertex 0 , 0;
840	# glVertex 0 , $h;
841	# glVertex $w, $h;
842	# glVertex $w, 0;
843	# glEnd;
844
845
846	$self->child->draw;
847	glDisable GL_BLEND;
848	glDisable GL_TEXTURE_2D;
849	}
850
851	#############################################################################
852
853	package CFClient::UI::FancyFrame;
854
855	our @ISA = CFClient::UI::Bin::;
856
857	use CFClient::OpenGL;
858
859	my @tex =
860	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
861	qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
862
863	sub new {
864	my $class = shift;
865
866	# TODO: user_x, user_y, overwrite moveto?
867
868	my $self = $class->SUPER::new (
869	bg => [1, 1, 1, 1],
870	border_bg => [1, 1, 1, 1],
871	border => 0.6,
872	can_events => 1,
873	@_
874	);
875
876	$self->{title} &&= new CFClient::UI::Label
877	align => 0,
878	valign => 1,
879	text => $self->{title},
880	fontsize => $self->{border};
881
882	$self
883	}	1164	}
884		1165
885	sub border {	1166	sub border {
886	int $_[0]{border} * $::FONTSIZE	1167	int $_[0]{border} * $::FONTSIZE
887	}	1168	}
888		1169
889	sub size_request {	1170	sub size_request {
890	my ($self) = @_;	1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
891		1175
892	my ($w, $h) = $self->SUPER::size_request;	1176	my ($w, $h) = $self->SUPER::size_request;
893		1177
894	(	1178	(
895	$w + $self->border * 2,	1179	$w + $self->border * 2,
896	$h + $self->border * 2,	1180	$h + $self->border * 2,
897	)	1181	)
898	}	1182	}
899		1183
900	sub size_allocate {	1184	sub invoke_size_allocate {
901	my ($self, $w, $h) = @_;	1185	my ($self, $w, $h) = @_;
902		1186
903	$h -= List::Util::max 0, $self->border * 2;	1187	my $border = $self->border;
		1188
904	$w -= List::Util::max 0, $self->border * 2;	1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
905		1191
906	$self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)	1192	if (my $label = $self->{label}) {
907	if $self->{title};	1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
908		1197
909	$self->child->configure ($self->border, $self->border, $w, $h);	1198	$self->child->configure ($border, $border, $w, $h);
910	}
911		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
		1236
		1237	my $bg =
		1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
		1239	mipmap => 1, wrap => 1;
		1240
		1241	my @border =
		1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1244
		1245	sub new {
		1246	my ($class, %arg) = @_;
		1247
		1248	my $self = $class->SUPER::new (
		1249	bg => [1, 1, 1, 1],
		1250	border_bg => [1, 1, 1, 1],
		1251	border => 0.6,
		1252	can_events => 1,
		1253	min_w => 64,
		1254	min_h => 32,
		1255	%arg,
		1256	);
		1257
		1258	$self->{title_widget} = new CFPlus::UI::Label
		1259	align => 0,
		1260	valign => 1,
		1261	text => $self->{title},
		1262	fontsize => $self->{border},
		1263	if exists $self->{title};
		1264
		1265	if ($self->{has_close_button}) {
		1266	$self->{close_button} =
		1267	new CFPlus::UI::ImageButton
		1268	path => 'x1_close.png',
		1269	on_activate => sub { $self->emit ("delete") };
		1270
		1271	$self->CFPlus::UI::Container::add ($self->{close_button});
		1272	}
		1273
		1274	$self
		1275	}
		1276
		1277	sub add {
		1278	my ($self, @widgets) = @_;
		1279
		1280	$self->SUPER::add (@widgets);
		1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	$self->{title_widget}->size_request
		1293	if $self->{title_widget};
		1294
		1295	$self->{close_button}->size_request
		1296	if $self->{close_button};
		1297
		1298	my ($w, $h) = $self->SUPER::size_request;
		1299
		1300	(
		1301	$w + $self->border * 2,
		1302	$h + $self->border * 2,
		1303	)
		1304	}
		1305
		1306	sub invoke_size_allocate {
		1307	my ($self, $w, $h) = @_;
		1308
		1309	if ($self->{title_widget}) {
		1310	$self->{title_widget}{w} = $w;
		1311	$self->{title_widget}{h} = $h;
		1312	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1313	}
		1314
		1315	my $border = $self->border;
		1316
		1317	$h -= List::Util::max 0, $border * 2;
		1318	$w -= List::Util::max 0, $border * 2;
		1319
		1320	$self->child->configure ($border, $border, $w, $h);
		1321
		1322	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1323	if $self->{close_button};
		1324
		1325	1
		1326	}
		1327
		1328	sub invoke_delete {
		1329	my ($self) = @_;
		1330
		1331	$self->hide;
		1332
		1333	1
		1334	}
		1335
912	sub button_down {	1336	sub invoke_button_down {
913	my ($self, $ev, $x, $y) = @_;	1337	my ($self, $ev, $x, $y) = @_;
914		1338
915	my ($w, $h) = @$self{qw(w h)};	1339	my ($w, $h) = @$self{qw(w h)};
916	my $border = $self->border;	1340	my $border = $self->border;
917		1341
…		…
930	my ($ev, $x, $y) = @_;	1354	my ($ev, $x, $y) = @_;
931		1355
932	my $dx = $ev->{x} - $ox;	1356	my $dx = $ev->{x} - $ox;
933	my $dy = $ev->{y} - $oy;	1357	my $dy = $ev->{y} - $oy;
934		1358
935	$self->{user_w} = $bw + $dx * ($mx ? -1 : 1);	1359	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
936	$self->{user_h} = $bh + $dy * ($my ? -1 : 1);	1360	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
		1361
937	$self->move ($wx + $dx * $mx, $wy + $dy * $my);	1362	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
938	$self->check_size;	1363	$self->realloc;
939	};	1364	};
940		1365
941	} elsif ($lr ^ $td) {	1366	} elsif ($lr ^ $td) {
942	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1367	my ($ox, $oy) = ($ev->{x}, $ev->{y});
943	my ($bx, $by) = ($self->{x}, $self->{y});	1368	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
945	$self->{motion} = sub {	1370	$self->{motion} = sub {
946	my ($ev, $x, $y) = @_;	1371	my ($ev, $x, $y) = @_;
947		1372
948	($x, $y) = ($ev->{x}, $ev->{y});	1373	($x, $y) = ($ev->{x}, $ev->{y});
949		1374
950	$self->move ($bx + $x - $ox, $by + $y - $oy);	1375	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
951	$self->update;	1376	# HACK: the next line is required to enforce placement
		1377	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
952	};	1378	};
		1379	} else {
		1380	return 0;
		1381	}
		1382
953	}	1383	1
954	}	1384	}
955		1385
956	sub button_up {	1386	sub invoke_button_up {
957	my ($self, $ev, $x, $y) = @_;	1387	my ($self, $ev, $x, $y) = @_;
958		1388
959	delete $self->{motion};	1389	! ! delete $self->{motion}
960	}	1390	}
961		1391
962	sub mouse_motion {	1392	sub invoke_mouse_motion {
963	my ($self, $ev, $x, $y) = @_;	1393	my ($self, $ev, $x, $y) = @_;
964		1394
965	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1396
		1397	! ! $self->{motion}
		1398	}
		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
966	}	1406	}
967		1407
968	sub _draw {	1408	sub _draw {
969	my ($self) = @_;	1409	my ($self) = @_;
970		1410
		1411	my $child = $self->{children}[0];
		1412
971	my ($w, $h ) = ($self->{w}, $self->{h});	1413	my ($w, $h ) = ($self->{w}, $self->{h});
972	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1414	my ($cw, $ch) = ($child->{w}, $child->{h});
973		1415
974	glEnable GL_BLEND;
975	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
976	glEnable GL_TEXTURE_2D;	1416	glEnable GL_TEXTURE_2D;
977	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1417	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
978		1418
979	my $border = $self->border;	1419	my $border = $self->border;
980		1420
981	glColor @{ $self->{border_bg} };	1421	glColor @{ $self->{border_bg} };
982	$tex[1]->draw_quad (0, 0, $w, $border);	1422	$border[0]->draw_quad_alpha (0, 0, $w, $border);
983	$tex[3]->draw_quad (0, $border, $border, $ch);	1423	$border[1]->draw_quad_alpha (0, $border, $border, $ch);
984	$tex[2]->draw_quad ($w - $border, $border, $border, $ch);	1424	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
985	$tex[4]->draw_quad (0, $h - $border, $w, $border);	1425	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
986		1426
987	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1427	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
988	my $bg = $tex[0];	1428	glColor @{ $self->{bg} };
989		1429
990	# TODO: repeat texture not scale	1430	# TODO: repeat texture not scale
		1431	# solve this better(?)
991	my $rep_x = $cw / $bg->{w};	1432	$bg->{s} = $cw / $bg->{w};
992	my $rep_y = $ch / $bg->{h};	1433	$bg->{t} = $ch / $bg->{h};
993
994	glColor @{ $self->{bg} };
995
996	$bg->{s} = $rep_x;
997	$bg->{t} = $rep_y;
998	$bg->{wrap_mode} = 1;
999	$bg->draw_quad ($border, $border, $cw, $ch);	1434	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
		1435	}
1000		1436
1001	glDisable GL_TEXTURE_2D;	1437	glDisable GL_TEXTURE_2D;
1002	glDisable GL_BLEND;
1003	}
1004		1438
1005	$self->{title}->draw if $self->{title};
1006
1007	$self->child->draw;	1439	$child->draw;
		1440
		1441	if ($self->{title_widget}) {
		1442	glTranslate 0, $border - $self->{h};
		1443	$self->{title_widget}->_draw;
		1444
		1445	glTranslate 0, - ($border - $self->{h});
		1446	}
		1447
		1448	$self->{close_button}->draw
		1449	if $self->{close_button};
1008	}	1450	}
1009		1451
1010	#############################################################################	1452	#############################################################################
1011		1453
1012	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1013		1455
1014	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1015		1457
1016	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1017		1459
1018	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1019		1461
1020	sub new {	1462	sub new {
1021	my $class = shift;	1463	my $class = shift;
1022		1464
1023	$class->SUPER::new (	1465	$class->SUPER::new (
1024	col_expand => [],	1466	col_expand => [],
1025	@_	1467	@_,
1026	)	1468	)
1027	}
1028
1029	sub add {
1030	my ($self, $x, $y, $child) = @_;
1031
1032	$child->set_parent ($self);
1033	$self->{children}[$y][$x] = $child;
1034
1035	$child->check_size;
1036	}	1469	}
1037		1470
1038	sub children {	1471	sub children {
1039	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1040	}	1473	}
1041		1474
		1475	sub add {
		1476	my ($self) = shift;
		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
		1480	$child->set_parent ($self);
		1481	$self->{children}[$y][$x] = $child;
		1482	}
		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
		1486	$self->realloc;
		1487	}
		1488
		1489	sub remove {
		1490	my ($self, $child) = @_;
		1491
		1492	# TODO: not yet implemented
		1493	}
		1494
1042	# TODO: move to container class maybe? send childs a signal on removal?	1495	# TODO: move to container class maybe? send children a signal on removal?
1043	sub clear {	1496	sub clear {
1044	my ($self) = @_;	1497	my ($self) = @_;
1045		1498
1046	my @children = $self->children;	1499	my @children = $self->children;
1047	delete $self->{children};	1500	delete $self->{children};
…		…
1049	for (@children) {	1502	for (@children) {
1050	delete $_->{parent};	1503	delete $_->{parent};
1051	$_->hide;	1504	$_->hide;
1052	}	1505	}
1053		1506
1054	$self->update;	1507	$self->realloc;
1055	}	1508	}
1056		1509
1057	sub get_wh {	1510	sub get_wh {
1058	my ($self) = @_;	1511	my ($self) = @_;
1059		1512
…		…
1085	(sum @$ws),	1538	(sum @$ws),
1086	(sum @$hs),	1539	(sum @$hs),
1087	)	1540	)
1088	}	1541	}
1089		1542
1090	sub size_allocate {	1543	sub invoke_size_allocate {
1091	my ($self, $w, $h) = @_;	1544	my ($self, $w, $h) = @_;
1092		1545
1093	my ($ws, $hs) = $self->get_wh;	1546	my ($ws, $hs) = $self->get_wh;
1094		1547
1095	my $req_w = sum @$ws;	1548	my $req_w = (sum @$ws) || 1;
1096	my $req_h = sum @$hs;	1549	my $req_h = (sum @$hs) || 1;
1097		1550
1098	# TODO: nicer code && do row_expand	1551	# TODO: nicer code && do row_expand
1099	my @col_expand = @{$self->{col_expand}};	1552	my @col_expand = @{$self->{col_expand}};
1100	@col_expand = (1) x @$ws unless @col_expand;	1553	@col_expand = (1) x @$ws unless @col_expand;
1101	my $col_expand = (sum @col_expand) || 1;	1554	my $col_expand = (sum @col_expand) || 1;
1102		1555
1103	# linearly scale sizes	1556	# linearly scale sizes
1104	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1105	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1106		1559
1107	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1108	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1109		1562
1110	my $y;	1563	my $y;
1111		1564
1112	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1113	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1127	}	1580	}
1128		1581
1129	$y += $row_h;	1582	$y += $row_h;
1130	}	1583	}
1131		1584
		1585	1
1132	}	1586	}
1133		1587
1134	sub find_widget {	1588	sub find_widget {
1135	my ($self, $x, $y) = @_;	1589	my ($self, $x, $y) = @_;
1136		1590
…		…
1155	}	1609	}
1156	}	1610	}
1157		1611
1158	#############################################################################	1612	#############################################################################
1159		1613
1160	package CFClient::UI::HBox;	1614	package CFPlus::UI::Box;
1161		1615
1162	# TODO: wrap into common Box base class
1163
1164	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1165		1617
1166	sub size_request {	1618	sub size_request {
1167	my ($self) = @_;	1619	my ($self) = @_;
1168		1620
1169	my @alloc = map [$_->size_request], @{$self->{children}};	1621	$self->{vertical}
		1622	? (
		1623	(List::Util::max map $_->{req_w}, @{$self->{children}}),
		1624	(List::Util::sum map $_->{req_h}, @{$self->{children}}),
		1625	)
		1626	: (
		1627	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
		1628	(List::Util::max map $_->{req_h}, @{$self->{children}}),
		1629	)
		1630	}
1170		1631
		1632	sub invoke_size_allocate {
		1633	my ($self, $w, $h) = @_;
		1634
		1635	my $space = $self->{vertical} ? $h : $w;
		1636	my @children = $self->visible_children;
		1637
		1638	my @req;
		1639
		1640	if ($self->{homogeneous}) {
		1641	@req = ($space / (@children || 1)) x @children;
		1642	} else {
		1643	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
		1644	my $req = List::Util::sum @req;
		1645
		1646	if ($req > $space) {
		1647	# ah well, not enough space
		1648	$_ *= $space / $req for @req;
		1649	} else {
		1650	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
		1651
		1652	$space = ($space - $req) / $expand; # remaining space to give away
		1653
		1654	$req[$_] += $space * $children[$_]{expand}
		1655	for 0 .. $#children;
		1656	}
1171	(	1657	}
1172	(List::Util::sum map $_->[0], @alloc),	1658
1173	(List::Util::max map $_->[1], @alloc),	1659	CFPlus::UI::harmonize \@req;
		1660
		1661	my $pos = 0;
		1662	for (0 .. $#children) {
		1663	my $alloc = $req[$_];
		1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
		1665
		1666	$pos += $alloc;
		1667	}
		1668
		1669	1
		1670	}
		1671
		1672	#############################################################################
		1673
		1674	package CFPlus::UI::HBox;
		1675
		1676	our @ISA = CFPlus::UI::Box::;
		1677
		1678	sub new {
		1679	my $class = shift;
		1680
		1681	$class->SUPER::new (
		1682	vertical => 0,
		1683	@_,
1174	)	1684	)
1175	}	1685	}
1176		1686
1177	sub size_allocate {
1178	my ($self, $w, $h) = @_;
1179
1180	($h, $w) = ($w, $h);
1181
1182	my $children = $self->{children};
1183
1184	my @h = map $_->{req_w}, @$children;
1185
1186	my $req_h = List::Util::sum @h;
1187
1188	if ($req_h > $h) {
1189	# ah well, not enough space
1190	$_ *= $h / $req_h for @h;
1191	} else {
1192	my $exp = List::Util::sum map $_->{expand}, @$children;
1193	$exp ||= 1;
1194
1195	for (0 .. $#$children) {
1196	my $child = $children->[$_];
1197
1198	my $alloc_h = $h[$_];
1199	$alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1200	$h[$_] = $alloc_h;
1201	}
1202	}
1203
1204	CFClient::UI::harmonize \@h;
1205
1206	my $y = 0;
1207	for (0 .. $#$children) {
1208	my $child = $children->[$_];
1209	my $h = $h[$_];
1210	$child->configure ($y, 0, $h, $w);
1211
1212	$y += $h;
1213	}
1214
1215	1
1216	}
1217
1218	#############################################################################	1687	#############################################################################
1219		1688
1220	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1221		1690
1222	# TODO: wrap into common Box base class	1691	our @ISA = CFPlus::UI::Box::;
1223		1692
1224	our @ISA = CFClient::UI::Container::;	1693	sub new {
		1694	my $class = shift;
1225		1695
1226	sub size_request {	1696	$class->SUPER::new (
1227	my ($self) = @_;	1697	vertical => 1,
1228		1698	@_,
1229	my @alloc = map [$_->size_request], @{$self->{children}};
1230
1231	(
1232	(List::Util::max map $_->[0], @alloc),
1233	(List::Util::sum map $_->[1], @alloc),
1234	)	1699	)
1235	}	1700	}
1236		1701
1237	sub size_allocate {
1238	my ($self, $w, $h) = @_;
1239
1240	my $children = $self->{children};
1241
1242	my @h = map $_->{req_h}, @$children;
1243
1244	my $req_h = List::Util::sum @h;
1245
1246	if ($req_h > $h) {
1247	# ah well, not enough space
1248	$_ *= $h / $req_h for @h;
1249	} else {
1250	my $exp = List::Util::sum map $_->{expand}, @$children;
1251	$exp ||= 1;
1252
1253	for (0 .. $#$children) {
1254	my $child = $children->[$_];
1255
1256	$h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1257	}
1258	}
1259
1260	CFClient::UI::harmonize \@h;
1261
1262	my $y = 0;
1263	for (0 .. $#$children) {
1264	my $child = $children->[$_];
1265	my $h = $h[$_];
1266	$child->configure (0, $y, $w, $h);
1267
1268	$y += $h;
1269	}
1270
1271	1
1272	}
1273
1274	#############################################################################	1702	#############################################################################
1275		1703
1276	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1277		1705
1278	our @ISA = CFClient::UI::Base::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1279		1707
1280	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1281		1709
1282	sub new {	1710	sub new {
1283	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1284		1712
1285	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
1286	fg => [1, 1, 1],	1714	fg => [1, 1, 1],
		1715	#bg => none
		1716	#active_bg => none
1287	#font => default_font	1717	#font => default_font
		1718	#text => initial text
		1719	#markup => initial narkup
		1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
		1722	ellipsise => 3, # end
		1723	layout => (new CFPlus::Layout),
1288	fontsize => 1,	1724	fontsize => 1,
1289	text => "",
1290	align => -1,	1725	align => -1,
1291	valign => -1,	1726	valign => -1,
1292	padding => 2,	1727	padding_x => 2,
1293	layout => new CFClient::Layout,	1728	padding_y => 2,
1294	can_events => 0,	1729	can_events => 0,
1295	%arg	1730	%arg
1296	);	1731	);
1297		1732
1298	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1299	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1300	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1301	$self->{template} = $layout;	1736	$self->{template} = $layout;
1302	}	1737	}
1303		1738
1304	$self->set_text (delete $self->{text}) if exists $self->{text};	1739	if (exists $self->{markup}) {
1305	$self->set_markup (delete $self->{markup}) if exists $self->{markup};	1740	$self->set_markup (delete $self->{markup});
		1741	} else {
		1742	$self->set_text (delete $self->{text});
		1743	}
1306		1744
1307	$self	1745	$self
1308	}
1309
1310	sub escape {
1311	local $_ = $_[1];
1312
1313	s/&/&amp;/g;
1314	s/>/&gt;/g;
1315	s/</&lt;/g;
1316
1317	$_[1]
1318	}	1746	}
1319		1747
1320	sub update {	1748	sub update {
1321	my ($self) = @_;	1749	my ($self) = @_;
1322		1750
1323	delete $self->{texture};	1751	delete $self->{texture};
1324	$self->SUPER::update;	1752	$self->SUPER::update;
1325	}	1753	}
1326		1754
1327	sub reconfigure {	1755	sub realloc {
1328	my ($self) = @_;	1756	my ($self) = @_;
1329		1757
1330	delete $self->{texture};	1758	delete $self->{ox};
		1759	$self->SUPER::realloc;
1331	}	1760	}
1332		1761
1333	sub set_text {	1762	sub set_text {
1334	my ($self, $text) = @_;	1763	my ($self, $text) = @_;
1335		1764
1336	return if $self->{text} eq "T$text";	1765	return if $self->{text} eq "T$text";
1337	$self->{text} = "T$text";	1766	$self->{text} = "T$text";
1338		1767
1339	$self->{layout}->set_text ($text);	1768	$self->{layout}->set_text ($text);
1340		1769
1341	delete $self->{texture};	1770	delete $self->{size_req};
		1771	$self->realloc;
1342	$self->update;	1772	$self->update;
1343	$self->check_size;
1344	}	1773	}
1345		1774
1346	sub set_markup {	1775	sub set_markup {
1347	my ($self, $markup) = @_;	1776	my ($self, $markup) = @_;
1348		1777
1349	return if $self->{text} eq "M$markup";	1778	return if $self->{text} eq "M$markup";
1350	$self->{text} = "M$markup";	1779	$self->{text} = "M$markup";
1351		1780
		1781	my $rgba = $markup =~ /span.*(?:foreground|background)/;
		1782
1352	$self->{layout}->set_markup ($markup);	1783	$self->{layout}->set_markup ($markup);
1353		1784
1354	delete $self->{texture};	1785	delete $self->{size_req};
		1786	$self->realloc;
1355	$self->update;	1787	$self->update;
1356	$self->check_size;
1357	}	1788	}
1358		1789
1359	sub size_request {	1790	sub size_request {
1360	my ($self) = @_;	1791	my ($self) = @_;
1361		1792
		1793	$self->{size_req} ||= do {
1362	$self->{layout}->set_font ($self->{font}) if $self->{font};	1794	$self->{layout}->set_font ($self->{font}) if $self->{font};
1363	$self->{layout}->set_width ($self->{max_w} || -1);	1795	$self->{layout}->set_width ($self->{max_w} || -1);
		1796	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1797	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1364	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1798	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365		1799
1366	my ($w, $h) = $self->{layout}->size;	1800	my ($w, $h) = $self->{layout}->size;
1367		1801
1368	if (exists $self->{template}) {	1802	if (exists $self->{template}) {
1369	$self->{template}->set_font ($self->{font}) if $self->{font};	1803	$self->{template}->set_font ($self->{font}) if $self->{font};
		1804	$self->{template}->set_width ($self->{max_w} || -1);
1370	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1805	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1371		1806
1372	my ($w2, $h2) = $self->{template}->size;	1807	my ($w2, $h2) = $self->{template}->size;
1373		1808
1374	$w = List::Util::max $w, $w2;	1809	$w = List::Util::max $w, $w2;
1375	$h = List::Util::max $h, $h2;	1810	$h = List::Util::max $h, $h2;
		1811	}
		1812
		1813	[$w, $h]
1376	}	1814	};
1377		1815
1378	(	1816	@{ $self->{size_req} }
1379	$w + $self->{padding} * 2,
1380	$h + $self->{padding} * 2,
1381	)
1382	}	1817	}
1383		1818
		1819	sub baseline_shift {
		1820	$_[0]{layout}->descent
		1821	}
		1822
1384	sub size_allocate {	1823	sub invoke_size_allocate {
1385	my ($self, $w, $h) = @_;	1824	my ($self, $w, $h) = @_;
1386		1825
		1826	delete $self->{ox};
		1827
1387	delete $self->{texture};	1828	delete $self->{texture}
		1829	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		1830
		1831	1
1388	}	1832	}
1389		1833
1390	sub set_fontsize {	1834	sub set_fontsize {
1391	my ($self, $fontsize) = @_;	1835	my ($self, $fontsize) = @_;
1392		1836
1393	$self->{fontsize} = $fontsize;	1837	$self->{fontsize} = $fontsize;
		1838	delete $self->{size_req};
1394	delete $self->{texture};	1839	delete $self->{texture};
1395	$self->check_size;	1840
1396	$self->update;	1841	$self->realloc;
		1842	}
		1843
		1844	sub reconfigure {
		1845	my ($self) = @_;
		1846
		1847	delete $self->{size_req};
		1848	delete $self->{texture};
		1849
		1850	$self->SUPER::reconfigure;
1397	}	1851	}
1398		1852
1399	sub _draw {	1853	sub _draw {
1400	my ($self) = @_;	1854	my ($self) = @_;
1401		1855
		1856	$self->SUPER::_draw; # draw background, if applicable
		1857
1402	my $tex = $self->{texture} ||= do {	1858	my $size = $self->{texture} ||= do {
		1859	$self->{layout}->set_foreground (@{$self->{fg}});
1403	$self->{layout}->set_font ($self->{font}) if $self->{font};	1860	$self->{layout}->set_font ($self->{font}) if $self->{font};
1404	$self->{layout}->set_width ($self->{w});	1861	$self->{layout}->set_width ($self->{w});
		1862	$self->{layout}->set_ellipsise ($self->{ellipsise});
		1863	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1405	$self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);	1864	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1406	new_from_layout CFClient::Texture $self->{layout}	1865
		1866	[$self->{layout}->size]
1407	};	1867	};
1408		1868
1409	glEnable GL_BLEND;	1869	unless (exists $self->{ox}) {
1410	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411	glEnable GL_TEXTURE_2D;
1412	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413
1414	glColor @{$self->{fg}};
1415
1416	$self->{ox} = int (
1417	$self->{align} < 0 ? $self->{padding}	1870	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1418	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}	1871	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1419	: ($self->{w} - $tex->{w}) * 0.5	1872	: ($self->{w} - $size->[0]) * 0.5);
1420	);
1421		1873
1422	$self->{oy} = int (
1423	$self->{valign} < 0 ? $self->{padding}	1874	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1424	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}	1875	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1425	: ($self->{h} - $tex->{h}) * 0.5	1876	: ($self->{h} - $size->[1]) * 0.5);
1426	);	1877	};
1427		1878
1428	$tex->draw_quad ($self->{ox}, $self->{oy});	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
		1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1429		1881
1430	glDisable GL_TEXTURE_2D;	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1431	glDisable GL_BLEND;
1432	}	1883	}
1433		1884
1434	#############################################################################	1885	#############################################################################
1435		1886
1436	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1437		1888
1438	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1439		1890
1440	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1441		1892
1442	sub new {	1893	sub new {
1443	my $class = shift;	1894	my $class = shift;
1444		1895
1445	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1449	active_fg => [0, 0, 0],	1900	active_fg => [0, 0, 0],
1450	can_hover => 1,	1901	can_hover => 1,
1451	can_focus => 1,	1902	can_focus => 1,
1452	valign => 0,	1903	valign => 0,
1453	can_events => 1,	1904	can_events => 1,
		1905	#text => ...
		1906	#hidden => "*",
1454	@_	1907	@_
1455	)	1908	)
1456	}	1909	}
1457		1910
1458	sub _set_text {	1911	sub _set_text {
…		…
1460		1913
1461	delete $self->{cur_h};	1914	delete $self->{cur_h};
1462		1915
1463	return if $self->{text} eq $text;	1916	return if $self->{text} eq $text;
1464		1917
1465	delete $self->{texture};
1466
1467	$self->{last_activity} = $::NOW;	1918	$self->{last_activity} = $::NOW;
1468	$self->{text} = $text;	1919	$self->{text} = $text;
1469		1920
1470	$text =~ s/./*/g if $self->{hidden};	1921	$text =~ s/./*/g if $self->{hidden};
1471	$self->{layout}->set_text ("$text ");	1922	$self->{layout}->set_text ("$text ");
		1923	delete $self->{size_req};
1472		1924
1473	$self->emit (changed => $self->{text});	1925	$self->emit (changed => $self->{text});
		1926
		1927	$self->realloc;
		1928	$self->update;
		1929	}
		1930
		1931	sub set_text {
		1932	my ($self, $text) = @_;
		1933
		1934	$self->{cursor} = length $text;
		1935	$self->_set_text ($text);
1474	}	1936	}
1475		1937
1476	sub get_text {	1938	sub get_text {
1477	$_[0]{text}	1939	$_[0]{text}
1478	}	1940	}
…		…
1483	my ($w, $h) = $self->SUPER::size_request;	1945	my ($w, $h) = $self->SUPER::size_request;
1484		1946
1485	($w + 1, $h) # add 1 for cursor	1947	($w + 1, $h) # add 1 for cursor
1486	}	1948	}
1487		1949
1488	sub size_allocate {
1489	my ($self, $w, $h) = @_;
1490
1491	$self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492	}
1493
1494	sub set_text {
1495	my ($self, $text) = @_;
1496
1497	$self->{cursor} = length $text;
1498	$self->_set_text ($text);
1499	$self->update;
1500	}
1501
1502	sub key_down {	1950	sub invoke_key_down {
1503	my ($self, $ev) = @_;	1951	my ($self, $ev) = @_;
1504		1952
1505	my $mod = $ev->{mod};	1953	my $mod = $ev->{mod};
1506	my $sym = $ev->{sym};	1954	my $sym = $ev->{sym};
1507	my $uni = $ev->{unicode};	1955	my $uni = $ev->{unicode};
1508		1956
1509	my $text = $self->get_text;	1957	my $text = $self->get_text;
1510		1958
1511	if ($sym == 8) {	1959	if ($uni == 8) {
1512	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513	} elsif ($sym == 127) {	1961	} elsif ($uni == 127) {
1514	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1515	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1516	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1517	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1518	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1519	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1520	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1521	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1522	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1523	} elsif ($sym == 27) {	1974	} elsif ($uni == 27) {
1524	$self->emit ('escape');	1975	$self->emit ('escape');
1525	} elsif ($uni) {	1976	} elsif ($uni) {
1526	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
		1978	} else {
		1979	return 0;
1527	}	1980	}
1528		1981
1529	$self->_set_text ($text);	1982	$self->_set_text ($text);
1530	$self->update;
1531	}
1532		1983
		1984	$self->realloc;
		1985
		1986	1
		1987	}
		1988
1533	sub focus_in {	1989	sub invoke_focus_in {
1534	my ($self) = @_;	1990	my ($self) = @_;
1535		1991
1536	$self->{last_activity} = $::NOW;	1992	$self->{last_activity} = $::NOW;
1537		1993
1538	$self->SUPER::focus_in;	1994	$self->SUPER::invoke_focus_in
1539	}	1995	}
1540		1996
1541	sub button_down {	1997	sub invoke_button_down {
1542	my ($self, $ev, $x, $y) = @_;	1998	my ($self, $ev, $x, $y) = @_;
1543		1999
1544	$self->SUPER::button_down ($ev, $x, $y);	2000	$self->SUPER::invoke_button_down ($ev, $x, $y);
1545		2001
1546	my $idx = $self->{layout}->xy_to_index ($x, $y);	2002	my $idx = $self->{layout}->xy_to_index ($x, $y);
1547		2003
1548	# byte-index to char-index	2004	# byte-index to char-index
1549	my $text = $self->{text};	2005	my $text = $self->{text};
1550	utf8::encode $text;	2006	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1551	$self->{cursor} = length substr $text, 0, $idx;	2007	$self->{cursor} = length $text;
1552		2008
1553	$self->_set_text ($self->{text});	2009	$self->_set_text ($self->{text});
1554	$self->update;	2010	$self->update;
		2011
		2012	1
1555	}	2013	}
1556		2014
1557	sub mouse_motion {	2015	sub invoke_mouse_motion {
1558	my ($self, $ev, $x, $y) = @_;	2016	my ($self, $ev, $x, $y) = @_;
1559	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2017	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2018
		2019	1
1560	}	2020	}
1561		2021
1562	sub _draw {	2022	sub _draw {
1563	my ($self) = @_;	2023	my ($self) = @_;
1564		2024
1565	local $self->{fg} = $self->{fg};	2025	local $self->{fg} = $self->{fg};
1566		2026
1567	if ($FOCUS == $self) {	2027	if ($FOCUS == $self) {
1568	glColor @{$self->{active_bg}};	2028	glColor_premultiply @{$self->{active_bg}};
1569	$self->{fg} = $self->{active_fg};	2029	$self->{fg} = $self->{active_fg};
1570	} else {	2030	} else {
1571	glColor @{$self->{bg}};	2031	glColor_premultiply @{$self->{bg}};
1572	}	2032	}
1573		2033
1574	glEnable GL_BLEND;	2034	glEnable GL_BLEND;
1575	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2035	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1576	glBegin GL_QUADS;	2036	glBegin GL_QUADS;
1577	glVertex 0 , 0;	2037	glVertex 0 , 0;
1578	glVertex 0 , $self->{h};	2038	glVertex 0 , $self->{h};
1579	glVertex $self->{w}, $self->{h};	2039	glVertex $self->{w}, $self->{h};
1580	glVertex $self->{w}, 0;	2040	glVertex $self->{w}, 0;
…		…
1591	utf8::encode $text;	2051	utf8::encode $text;
1592		2052
1593	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1594	}	2054	}
1595		2055
1596	glColor @{$self->{fg}};
1597	glBegin GL_LINES;	2056	glBegin GL_LINES;
1598	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1599	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1600	glEnd;	2059	glEnd;
1601	}	2060	}
1602	}	2061	}
1603		2062
1604	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1605		2064
1606	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1607		2066
1608	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1609		2068
1610	sub key_down {	2069	sub invoke_key_down {
1611	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1612		2071
1613	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
1614		2073
1615	if ($sym == 13) {	2074	if ($sym == 13) {
1616	unshift @{$self->{history}},	2075	unshift @{$self->{history}},
1617	my $txt = $self->get_text;	2076	my $txt = $self->get_text;
		2077
1618	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1619	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1620	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1621	$self->update;	2081	$self->update;
1622		2082
1623	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1624	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1625	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1626	}	2086	}
1627	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1628	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1630	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1631	}	2091	}
1632	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1633	}	2093	}
1634		2094
1635	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1636	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1637	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1638		2098
1639	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
1640	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1641	} else {	2101	} else {
1642	$self->set_text ($self->{history_saveback});	2102	$self->set_text ($self->{history_saveback});
1643	}	2103	}
1644		2104
1645	} else {	2105	} else {
1646	$self->SUPER::key_down ($ev);	2106	return $self->SUPER::invoke_key_down ($ev)
		2107	}
		2108
1647	}	2109	1
1648
1649	}	2110	}
1650		2111
1651	#############################################################################	2112	#############################################################################
1652		2113
1653	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
1654		2115
1655	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
1656		2117
1657	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
1658		2119
1659	my @tex =	2120	my @tex =
1660	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1661	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
1662		2123
1663	sub new {	2124	sub new {
1664	my $class = shift;	2125	my $class = shift;
1665		2126
1666	$class->SUPER::new (	2127	$class->SUPER::new (
1667	padding => 4,	2128	padding_x => 4,
		2129	padding_y => 4,
1668	fg => [1, 1, 1],	2130	fg => [1, 1, 1],
1669	bg => [1, 1, 1, 0.2],
1670	active_fg => [0, 0, 1],	2131	active_fg => [0, 0, 1],
1671	can_hover => 1,	2132	can_hover => 1,
1672	align => 0,	2133	align => 0,
1673	valign => 0,	2134	valign => 0,
1674	can_events => 1,	2135	can_events => 1,
1675	@_	2136	@_
1676	)	2137	)
1677	}	2138	}
1678		2139
1679	sub button_up {	2140	sub invoke_button_up {
1680	my ($self, $ev, $x, $y) = @_;	2141	my ($self, $ev, $x, $y) = @_;
1681		2142
		2143	$self->emit ("activate")
1682	if ($x >= 0 && $x < $self->{w}	2144	if $x >= 0 && $x < $self->{w}
1683	&& $y >= 0 && $y < $self->{h}) {	2145	&& $y >= 0 && $y < $self->{h};
1684	$self->emit ("activate");	2146
1685	}	2147	1
1686	}	2148	}
1687		2149
1688	sub _draw {	2150	sub _draw {
1689	my ($self) = @_;	2151	my ($self) = @_;
1690		2152
1691	local $self->{fg} = $self->{fg};	2153	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1692		2154
1693	if ($GRAB == $self) {
1694	$self->{fg} = $self->{active_fg};
1695	}
1696
1697	glEnable GL_BLEND;
1698	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699	glEnable GL_TEXTURE_2D;	2155	glEnable GL_TEXTURE_2D;
1700	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2156	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701	glColor 0, 0, 0, 1;	2157	glColor 0, 0, 0, 1;
1702		2158
1703	$tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});	2159	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704		2160
1705	glDisable GL_TEXTURE_2D;	2161	glDisable GL_TEXTURE_2D;
1706	glDisable GL_BLEND;
1707		2162
1708	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
1709	}	2164	}
1710		2165
1711	#############################################################################	2166	#############################################################################
1712		2167
1713	package CFClient::UI::CheckBox;	2168	package CFPlus::UI::CheckBox;
1714		2169
1715	our @ISA = CFClient::UI::DrawBG::;	2170	our @ISA = CFPlus::UI::DrawBG::;
1716		2171
1717	my @tex =	2172	my @tex =
1718	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1719	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1720		2175
1721	use CFClient::OpenGL;	2176	use CFPlus::OpenGL;
1722		2177
1723	sub new {	2178	sub new {
1724	my $class = shift;	2179	my $class = shift;
1725		2180
1726	$class->SUPER::new (	2181	$class->SUPER::new (
1727	padding => 2,	2182	padding_x => 2,
		2183	padding_y => 2,
1728	fg => [1, 1, 1],	2184	fg => [1, 1, 1],
1729	active_fg => [1, 1, 0],	2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
1730	state => 0,	2188	state => 0,
1731	can_hover => 1,	2189	can_hover => 1,
1732	@_	2190	@_
1733	)	2191	)
1734	}	2192	}
1735		2193
1736	sub size_request {	2194	sub size_request {
1737	my ($self) = @_;	2195	my ($self) = @_;
1738		2196
1739	($self->{padding} * 2 + 6) x 2	2197	(6) x 2
1740	}	2198	}
1741		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
1742	sub button_down {	2208	sub invoke_button_down {
1743	my ($self, $ev, $x, $y) = @_;	2209	my ($self, $ev, $x, $y) = @_;
1744		2210
1745	if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}	2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1746	&& $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {	2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1747	$self->{state} = !$self->{state};	2213	$self->toggle;
1748	$self->emit (changed => $self->{state});	2214	} else {
		2215	return 0
		2216	}
		2217
1749	}	2218	1
1750	}	2219	}
1751		2220
1752	sub _draw {	2221	sub _draw {
1753	my ($self) = @_;	2222	my ($self) = @_;
1754		2223
1755	$self->SUPER::_draw;	2224	$self->SUPER::_draw;
1756		2225
1757	glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;	2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1758		2227
1759	my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;	2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1760		2231
1761	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };	2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762		2233
1763	glEnable GL_BLEND;	2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
1764	glEnable GL_TEXTURE_2D;	2236	glEnable GL_TEXTURE_2D;
1765	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767	my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769	$tex->draw_quad (0, 0, $s, $s);	2237	$tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771	glDisable GL_TEXTURE_2D;	2238	glDisable GL_TEXTURE_2D;
1772	glDisable GL_BLEND;
1773	}	2239	}
1774		2240
1775	#############################################################################	2241	#############################################################################
1776		2242
1777	package CFClient::UI::Image;	2243	package CFPlus::UI::Image;
1778		2244
1779	our @ISA = CFClient::UI::Base::;	2245	our @ISA = CFPlus::UI::Base::;
1780		2246
1781	use CFClient::OpenGL;	2247	use CFPlus::OpenGL;
1782	use Carp qw/confess/;
1783		2248
1784	our %loaded_images;	2249	our %texture_cache;
1785		2250
1786	sub new {	2251	sub new {
1787	my $class = shift;	2252	my $class = shift;
1788		2253
1789	my $self = $class->SUPER::new (can_events => 0, @_);	2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
1790		2258
1791	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
1792		2261
1793	$loaded_images{$self->{image}} ||=	2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1794	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1795		2264
1796	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2265	Scalar::Util::weaken $texture_cache{$self->{path}};
1797		2266
1798	Scalar::Util::weaken $loaded_images{$self->{image}};	2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1799
1800	$self->{aspect} = $tex->{w} / $tex->{h};
1801		2268
1802	$self	2269	$self
1803	}	2270	}
1804		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
1805	sub size_request {	2287	sub size_request {
1806	my ($self) = @_;	2288	my ($self) = @_;
1807		2289
1808	($self->{tex}->{w}, $self->{tex}->{h})	2290	($self->{tex}{w}, $self->{tex}{h})
1809	}	2291	}
1810		2292
1811	sub _draw {	2293	sub _draw {
1812	my ($self) = @_;	2294	my ($self) = @_;
1813		2295
…		…
1820	glTranslate 0, -$self->{w}, 0;	2302	glTranslate 0, -$self->{w}, 0;
1821		2303
1822	($w, $h) = ($h, $w);	2304	($w, $h) = ($h, $w);
1823	}	2305	}
1824		2306
1825	glEnable GL_BLEND;
1826	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827	glEnable GL_TEXTURE_2D;	2307	glEnable GL_TEXTURE_2D;
1828	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829		2309
1830	$tex->draw_quad (0, 0, $w, $h);	2310	$tex->draw_quad (0, 0, $w, $h);
1831		2311
1832	glDisable GL_BLEND;
1833	glDisable GL_TEXTURE_2D;	2312	glDisable GL_TEXTURE_2D;
1834	}	2313	}
1835		2314
1836	#############################################################################	2315	#############################################################################
1837		2316
		2317	package CFPlus::UI::ImageButton;
		2318
		2319	our @ISA = CFPlus::UI::Image::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	my %textures;
		2324
		2325	sub new {
		2326	my $class = shift;
		2327
		2328	my $self = $class->SUPER::new (
		2329	padding_x => 4,
		2330	padding_y => 4,
		2331	fg => [1, 1, 1],
		2332	active_fg => [0, 0, 1],
		2333	can_hover => 1,
		2334	align => 0,
		2335	valign => 0,
		2336	can_events => 1,
		2337	@_
		2338	);
		2339	}
		2340
		2341	sub invoke_button_up {
		2342	my ($self, $ev, $x, $y) = @_;
		2343
		2344	$self->emit ("activate")
		2345	if $x >= 0 && $x < $self->{w}
		2346	&& $y >= 0 && $y < $self->{h};
		2347
		2348	1
		2349	}
		2350
		2351	#############################################################################
		2352
1838	package CFClient::UI::VGauge;	2353	package CFPlus::UI::VGauge;
1839		2354
1840	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
1841		2356
1842	use List::Util qw(min max);	2357	use List::Util qw(min max);
1843		2358
1844	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1845		2360
1846	my %tex = (	2361	my %tex = (
1847	food => [	2362	food => [
1848	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1849	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1850	],	2365	],
1851	grace => [	2366	grace => [
1852	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1853	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1854	],	2369	],
1855	hp => [	2370	hp => [
1856	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1857	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1858	],	2373	],
1859	mana => [	2374	mana => [
1860	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1861	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1862	],	2377	],
1863	);	2378	);
1864		2379
1865	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
1925	my $ycut1 = max 0, min 1, $ycut;	2440	my $ycut1 = max 0, min 1, $ycut;
1926	my $ycut2 = max 0, min 1, $ycut - 1;	2441	my $ycut2 = max 0, min 1, $ycut - 1;
1927		2442
1928	my $h1 = $self->{h} * (1 - $ycut1);	2443	my $h1 = $self->{h} * (1 - $ycut1);
1929	my $h2 = $self->{h} * (1 - $ycut2);	2444	my $h2 = $self->{h} * (1 - $ycut2);
		2445	my $h3 = $self->{h};
		2446
		2447	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1930		2448
1931	glEnable GL_BLEND;	2449	glEnable GL_BLEND;
1932	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2450	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2451	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933	glEnable GL_TEXTURE_2D;	2452	glEnable GL_TEXTURE_2D;
1934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2453	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1935		2454
1936	glBindTexture GL_TEXTURE_2D, $t1->{name};	2455	glBindTexture GL_TEXTURE_2D, $t1->{name};
1937	glBegin GL_QUADS;	2456	glBegin GL_QUADS;
…		…
1952		2471
1953	if ($t3) {	2472	if ($t3) {
1954	glBindTexture GL_TEXTURE_2D, $t3->{name};	2473	glBindTexture GL_TEXTURE_2D, $t3->{name};
1955	glBegin GL_QUADS;	2474	glBegin GL_QUADS;
1956	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2475	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1957	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2476	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1958	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2477	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1959	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2478	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1960	glEnd;	2479	glEnd;
1961	}	2480	}
1962		2481
1963	glDisable GL_BLEND;	2482	glDisable GL_BLEND;
1964	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
1965	}	2484	}
1966		2485
1967	#############################################################################	2486	#############################################################################
1968		2487
1969	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
1970		2489
1971	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
1972		2491
1973	sub new {	2492	sub new {
1974	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
1975		2494
1976	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
1978	can_hover => 1,	2497	can_hover => 1,
1979	can_events => 1,	2498	can_events => 1,
1980	%arg,	2499	%arg,
1981	);	2500	);
1982		2501
1983	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
1984	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2503	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1985	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1986		2505
1987	$self	2506	$self
1988	}	2507	}
1989		2508
1990	sub set_fontsize {	2509	sub set_fontsize {
…		…
2011	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2012	}	2531	}
2013		2532
2014	#############################################################################	2533	#############################################################################
2015		2534
2016	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2017		2536
2018	use strict;	2537	use strict;
2019		2538
2020	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2021		2540
2022	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2023		2542
2024	my @tex =	2543	my @tex =
2025	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2026	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2027		2546
2028	sub new {	2547	sub new {
2029	my $class = shift;	2548	my $class = shift;
2030		2549
2031	# range [value, low, high, page]	2550	# range [value, low, high, page, unit]
2032		2551
2033	# TODO: 0-width page	2552	# TODO: 0-width page
2034	# TODO: req_w/h are wrong with vertical	2553	# TODO: req_w/h are wrong with vertical
2035	# TODO: calculations are off	2554	# TODO: calculations are off
2036	my $self = $class->SUPER::new (	2555	my $self = $class->SUPER::new (
2037	fg => [1, 1, 1],	2556	fg => [1, 1, 1],
2038	active_fg => [0, 0, 0],	2557	active_fg => [0, 0, 0],
		2558	bg => [0, 0, 0, 0.2],
		2559	active_bg => [1, 1, 1, 0.5],
2039	range => [0, 0, 100, 10],	2560	range => [0, 0, 100, 10, 0],
2040	req_w => $::WIDTH / 80,	2561	min_w => $::WIDTH / 80,
2041	req_h => $::WIDTH / 80,	2562	min_h => $::WIDTH / 80,
2042	vertical => 0,	2563	vertical => 0,
2043	can_hover => 1,	2564	can_hover => 1,
2044	inner_pad => 5,	2565	inner_pad => 0.02,
2045	@_	2566	@_
2046	);	2567	);
2047		2568
		2569	$self->set_value ($self->{range}[0]);
		2570	$self->update;
		2571
2048	$self	2572	$self
2049	}	2573	}
2050		2574
		2575	sub set_range {
		2576	my ($self, $range) = @_;
		2577
		2578	($range, $self->{range}) = ($self->{range}, $range);
		2579
		2580	if ("@$range" ne "@{$self->{range}}") {
		2581	$self->update;
		2582	$self->set_value ($self->{range}[0]);
		2583	}
		2584	}
		2585
		2586	sub set_value {
		2587	my ($self, $value) = @_;
		2588
		2589	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
		2590
		2591	$hi = $lo + 1 if $hi <= $lo;
		2592
		2593	$page = $hi - $lo if $page > $hi - $lo;
		2594
		2595	$value = $lo if $value < $lo;
		2596	$value = $hi - $page if $value > $hi - $page;
		2597
		2598	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
		2599	if $unit;
		2600
		2601	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
		2602
		2603	if ($value != $old_value) {
		2604	$self->emit (changed => $value);
		2605	$self->update;
		2606	}
		2607	}
		2608
2051	sub size_request {	2609	sub size_request {
2052	my ($self) = @_;	2610	my ($self) = @_;
2053		2611
2054	my $w = $self->{req_w};	2612	($self->{req_w}, $self->{req_h})
2055	my $h = $self->{req_h};
2056
2057	$self->{vertical} ? ($h, $w) : ($w, $h)
2058	}	2613	}
2059		2614
2060	sub button_down {	2615	sub invoke_button_down {
2061	my ($self, $ev, $x, $y) = @_;	2616	my ($self, $ev, $x, $y) = @_;
2062		2617
2063	$self->SUPER::button_down ($ev, $x, $y);	2618	$self->SUPER::invoke_button_down ($ev, $x, $y);
		2619
		2620	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
		2621
2064	$self->mouse_motion ($ev, $x, $y);	2622	$self->invoke_mouse_motion ($ev, $x, $y)
2065	}	2623	}
2066		2624
2067	sub mouse_motion {	2625	sub invoke_mouse_motion {
2068	my ($self, $ev, $x, $y) = @_;	2626	my ($self, $ev, $x, $y) = @_;
2069		2627
2070	if ($GRAB == $self) {	2628	if ($GRAB == $self) {
		2629	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
		2630
		2631	my (undef, $lo, $hi, $page) = @{$self->{range}};
		2632
		2633	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
		2634
		2635	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2636	} else {
		2637	return 0;
		2638	}
		2639
		2640	1
		2641	}
		2642
		2643	sub invoke_mouse_wheel {
		2644	my ($self, $ev) = @_;
		2645
		2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2647
		2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
		2649
		2650	! ! $delta
		2651	}
		2652
		2653	sub update {
		2654	my ($self) = @_;
		2655
		2656	delete $self->{knob_w};
		2657	$self->SUPER::update;
		2658	}
		2659
		2660	sub _draw {
		2661	my ($self) = @_;
		2662
		2663	unless ($self->{knob_w}) {
		2664	$self->set_value ($self->{range}[0]);
		2665
2071	my ($value, $lo, $hi, $page) = @{$self->{range}};	2666	my ($value, $lo, $hi, $page) = @{$self->{range}};
		2667	my $range = ($hi - $page - $lo) || 1e-100;
2072		2668
2073	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2669	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074		2670
2075	my $inner_pad_px = $self->_calc_inner_pad_px ($w);	2671	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right	2672	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077		2673
2078	$x -= $inner_pad_px; # substract the padding	2674	$value = ($value - $lo) / $range;
2079	$x = $x * ($hi - $lo) / $inner_w + $lo;	2675	$value = $value * $self->{scale} + $self->{offset};
2080	$x = $lo if $x < $lo;
2081	$x = $hi - $page if $x > $hi - $page;
2082	$self->{range}[0] = $x;
2083		2676
2084	$self->emit (changed => $x);	2677	$self->{knob_x} = $value - $knob_w * 0.5;
2085	$self->update;	2678	$self->{knob_w} = $knob_w;
2086	}	2679	}
2087	}
2088
2089	# the inner_* stuff is for generating a padding for the slider handle,
2090	# so that the handle doesn't leave the texture. This calculation isn't 100%
2091	# correct propably, but it does the job for now
2092	sub _calc_inner_pad_px {
2093	my ($self, $w) = @_;
2094	($w / 100) * $self->{inner_pad} # % to pixels
2095	}
2096
2097	sub _draw {
2098	my ($self) = @_;
2099		2680
2100	$self->SUPER::_draw ();	2681	$self->SUPER::_draw ();
2101		2682
2102	my ($w, $h) = @$self{qw(w h)};	2683	glScale $self->{w}, $self->{h};
2103		2684
2104	if ($self->{vertical}) {	2685	if ($self->{vertical}) {
2105	# draw a vertical slider like a rotated horizontal slider	2686	# draw a vertical slider like a rotated horizontal slider
2106		2687
		2688	glTranslate 1, 0, 0;
2107	glRotate 90, 0, 0, 1;	2689	glRotate 90, 0, 0, 1;
2108	glTranslate 0, -$self->{w}, 0;
2109
2110	($w, $h) = ($h, $w);
2111	}	2690	}
2112		2691
2113	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	2692	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};	2693	my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115		2694
2116	my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118	$hi = $value + 1 if $lo == $hi;
2119
2120	my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121	my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123	$page = int $page * $inner_w / ($hi - $lo);
2124	$value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126	$w -= $page;
2127	$page &= ~1;
2128	glTranslate $page * 0.5, 0, 0;
2129	$page ||= 2;
2130
2131	my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132	my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134	glEnable GL_BLEND;
2135	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136	glEnable GL_TEXTURE_2D;	2695	glEnable GL_TEXTURE_2D;
2137	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2696	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138		2697
2139	# draw background	2698	# draw background
2140	$tex[1]->draw_quad (0, 0, $w, $h);	2699	$tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141		2700
2142	# draw handle	2701	# draw handle
2143	$tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);	2702	$tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144		2703
2145	glDisable GL_BLEND;
2146	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2147	}	2705	}
2148		2706
2149	#############################################################################	2707	#############################################################################
2150		2708
2151	package CFClient::UI::TextView;	2709	package CFPlus::UI::ValSlider;
2152		2710
2153	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2154		2712
		2713	sub new {
		2714	my ($class, %arg) = @_;
		2715
		2716	my $range = delete $arg{range};
		2717
		2718	my $self = $class->SUPER::new (
		2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
		2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
		2721	to_value => sub { shift },
		2722	from_value => sub { shift },
		2723	%arg,
		2724	);
		2725
		2726	$self->{slider}->connect (changed => sub {
		2727	my ($self, $value) = @_;
		2728	$self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
		2729	$self->{parent}->emit (changed => $value);
		2730	});
		2731
		2732	# $self->{entry}->connect (changed => sub {
		2733	# my ($self, $value) = @_;
		2734	# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
		2735	# $self->{parent}->emit (changed => $value);
		2736	# });
		2737
		2738	$self->add ($self->{slider}, $self->{entry});
		2739
		2740	$self->{slider}->emit (changed => $self->{slider}{range}[0]);
		2741
		2742	$self
		2743	}
		2744
		2745	sub set_range { shift->{slider}->set_range (@_) }
		2746	sub set_value { shift->{slider}->set_value (@_) }
		2747
		2748	#############################################################################
		2749
		2750	package CFPlus::UI::TextScroller;
		2751
		2752	our @ISA = CFPlus::UI::HBox::;
		2753
2155	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2156		2755
2157	sub new {	2756	sub new {
2158	my $class = shift;	2757	my $class = shift;
2159		2758
2160	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
2161	fontsize => 1,	2760	fontsize => 1,
2162	can_events => 0,	2761	can_events => 1,
		2762	indent => 0,
2163	#font => default_font	2763	#font => default_font
2164	@_,	2764	@_,
2165		2765
2166	layout => (new CFClient::Layout),	2766	layout => (new CFPlus::Layout),
2167	par => [],	2767	par => [],
2168	height => 0,	2768	height => 0,
2169	children => [	2769	children => [
2170	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2171	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2172	],	2772	],
2173	);	2773	);
2174		2774
2175	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2176		2776
…		…
2182		2782
2183	$self->{fontsize} = $fontsize;	2783	$self->{fontsize} = $fontsize;
2184	$self->reflow;	2784	$self->reflow;
2185	}	2785	}
2186		2786
2187	sub text_height {	2787	sub size_request {
		2788	my ($self) = @_;
		2789
		2790	my ($empty, $slider) = @{ $self->{children} };
		2791
		2792	local $self->{children} = [$empty, $slider];
		2793	$self->SUPER::size_request
		2794	}
		2795
		2796	sub invoke_size_allocate {
		2797	my ($self, $w, $h) = @_;
		2798
		2799	my ($empty, $slider, @other) = @{ $self->{children} };
		2800	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
		2801
		2802	$self->{layout}->set_font ($self->{font}) if $self->{font};
		2803	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
		2804	$self->{layout}->set_width ($empty->{w});
		2805	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		2806
		2807	$self->reflow;
		2808
		2809	local $self->{children} = [$empty, $slider];
		2810	$self->SUPER::invoke_size_allocate ($w, $h)
		2811	}
		2812
		2813	sub invoke_mouse_wheel {
2188	my ($self, $text) = @_;	2814	my ($self, $ev) = @_;
		2815
		2816	return 0 unless $ev->{dy}; # only vertical movements
		2817
		2818	$self->{children}[1]->emit (mouse_wheel => $ev);
		2819
		2820	1
		2821	}
		2822
		2823	sub get_layout {
		2824	my ($self, $para) = @_;
2189		2825
2190	my $layout = $self->{layout};	2826	my $layout = $self->{layout};
2191		2827
		2828	$layout->set_font ($self->{font}) if $self->{font};
		2829	$layout->set_foreground (@{$para->{fg}});
2192	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	2830	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193	$layout->set_width ($self->{children}[0]{w});	2831	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
2194	$layout->set_text ($text);	2832	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
		2833	$layout->set_markup ($para->{markup});
		2834
		2835	$layout->set_shapes (
		2836	map
		2837	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		2838	@{$para->{widget}}
2195		2839	);
2196	($layout->size)[1]	2840
		2841	$layout
2197	}	2842	}
2198		2843
2199	sub reflow {	2844	sub reflow {
2200	my ($self) = @_;	2845	my ($self) = @_;
2201		2846
2202	$self->{need_reflow}++;	2847	$self->{need_reflow}++;
2203	$self->update;	2848	$self->update;
2204	}	2849	}
2205		2850
2206	sub size_allocate {	2851	sub set_offset {
		2852	my ($self, $offset) = @_;
		2853
		2854	# todo: base offset on lines or so, not on pixels
		2855	$self->{children}[1]->set_value ($offset);
		2856	}
		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
2207	my ($self, $w, $h) = @_;	2865	my ($self, $para) = @_;
2208		2866
2209	$self->SUPER::size_allocate ($w, $h);	2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2210		2868
2211	$self->{layout}->set_font ($self->{font}) if $self->{font};	2869	$self->{scroll_to} = $para;
2212	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2870	$self->update;
2213	$self->{layout}->set_width ($self->{children}[0]{w});	2871	}
2214		2872
2215	$self->reflow;	2873	sub clear {
		2874	my ($self) = @_;
		2875
		2876	my (undef, undef, @other) = @{ $self->{children} };
		2877	$self->remove ($_) for @other;
		2878
		2879	$self->{par} = [];
		2880	$self->{height} = 0;
		2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2216	}	2882	}
2217		2883
2218	sub add_paragraph {	2884	sub add_paragraph {
2219	my ($self, $color, $text) = @_;	2885	my $self = shift;
2220		2886
2221	#TODO: intelligently "reformat" paragraph	2887	for my $para (@_) {
		2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
		2894	w => 1e10,
		2895	wrapped => 1,
		2896	};
2222		2897
2223	my $height = $self->text_height ($text);	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		2899	push @{$self->{par}}, $para;
		2900	}
2224		2901
		2902	$self->{need_reflow}++;
		2903	$self->update;
		2904	}
		2905
		2906	sub scroll_to_bottom {
		2907	my ($self) = @_;
		2908
		2909	$self->{scroll_to} = $#{$self->{par}};
		2910	$self->update;
		2911	}
		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
2225	$self->{height} += $height;	2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2226		2937
2227	push @{$self->{par}}, [$height, $color, $text];	2938	delete $self->{texture};
		2939	}
2228		2940
2229	$self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];	2941	if (my $paridx = delete $self->{scroll_to}) {
2230	$self->{children}[1]->update;	2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
2231	}	2944	}
2232		2945
2233	sub update {	2946	sub update {
2234	my ($self) = @_;	2947	my ($self) = @_;
2235		2948
…		…
2237		2950
2238	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2239		2952
2240	delete $self->{texture};	2953	delete $self->{texture};
2241		2954
2242	$ROOT->on_refresh ($self, sub {	2955	$ROOT->on_post_alloc ($self => sub {
2243	if (delete $self->{need_reflow}) {	2956	$self->force_uptodate;
2244	my $height = 0;
2245		2957
2246	$height += $_->[0] = $self->text_height ($_->[2])	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2247	for @{$self->{par}};
2248		2959
2249	$self->{height} = $height;	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2250
2251	$self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2252
2253	delete $self->{texture};
2254	}
2255
2256	$self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
2257	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2258	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2259		2963
2260	glEnable GL_BLEND;
2261	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2262	glEnable GL_TEXTURE_2D;
2263	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265	my $top = int $self->{children}[1]{range}[0];	2964	my $top = int $self->{children}[1]{range}[0];
2266		2965
		2966	my $paridx = 0;
		2967	my $top_paragraph;
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
2267	my $y0 = $top;	2970	my $y0 = $top;
2268	my $y1 = $top + $self->{h};	2971	my $y1 = $top + $H;
2269		2972
2270	my $y = 0;
2271
2272	my $layout = $self->{layout};
2273
2274	$layout->set_font ($self->{font}) if $self->{font};
2275
2276	for my $par (@{$self->{par}}) {	2973	for my $para (@{$self->{par}}) {
2277	my $h = $par->[0];	2974	my $h = $para->{h};
		2975	my $y = $para->{y};
2278		2976
2279	if ($y0 < $y + $h && $y < $y1) {	2977	if ($y0 < $y + $h && $y < $y1) {
2280	$layout->set_text ($par->[2]);	2978	my $layout = $self->get_layout ($para);
2281		2979
2282	glColor @{ $par->[1] };	2980	$layout->render ($para->{indent}, $y - $y0);
2283	my ($W, $H) = $layout->size;	2981
2284	CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);	2982	if (my @w = @{ $para->{widget} }) {
		2983	my @s = $layout->get_shapes;
		2984
		2985	for (@w) {
		2986	my ($dx, $dy) = splice @s, 0, 2, ();
		2987
		2988	$_->{x} = $dx + $para->{indent};
		2989	$_->{y} = $dy + $y - $y0;
		2990
		2991	$_->draw;
		2992	}
		2993	}
2285	}	2994	}
2286		2995
2287	$y += $h;	2996	$paridx++;
		2997	$top_paragraph ||= $paridx if $y >= $top;
2288	}	2998	}
2289		2999
2290	glDisable GL_TEXTURE_2D;	3000	$self->{top_paragraph} = $top_paragraph;
2291	glDisable GL_BLEND;
2292	};	3001	};
2293	});	3002	});
2294	}	3003	}
2295		3004
		3005	sub reconfigure {
		3006	my ($self) = @_;
		3007
		3008	$self->SUPER::reconfigure;
		3009
		3010	$_->{w} = 1e10 for @{ $self->{par} };
		3011	$self->reflow;
		3012	}
		3013
2296	sub _draw {	3014	sub _draw {
2297	my ($self) = @_;	3015	my ($self) = @_;
2298		3016
2299	glEnable GL_BLEND;
2300	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301	glEnable GL_TEXTURE_2D;	3017	glEnable GL_TEXTURE_2D;
2302	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3018	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303	glColor 1, 1, 1, 1;	3019	glColor 0, 0, 0, 1;
2304	$self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3020	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2305	glDisable GL_TEXTURE_2D;	3021	glDisable GL_TEXTURE_2D;
2306	glDisable GL_BLEND;
2307		3022
2308	$self->{children}[1]->draw;	3023	$self->{children}[1]->draw;
2309
2310	}	3024	}
2311		3025
2312	#############################################################################	3026	#############################################################################
2313		3027
2314	package CFClient::UI::Animator;	3028	package CFPlus::UI::Animator;
2315		3029
2316	use CFClient::OpenGL;	3030	use CFPlus::OpenGL;
2317		3031
2318	our @ISA = CFClient::UI::Bin::;	3032	our @ISA = CFPlus::UI::Bin::;
2319		3033
2320	sub moveto {	3034	sub moveto {
2321	my ($self, $x, $y) = @_;	3035	my ($self, $x, $y) = @_;
2322		3036
2323	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3037	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2351	glPopMatrix;	3065	glPopMatrix;
2352	}	3066	}
2353		3067
2354	#############################################################################	3068	#############################################################################
2355		3069
2356	package CFClient::UI::Flopper;	3070	package CFPlus::UI::Flopper;
2357		3071
2358	our @ISA = CFClient::UI::Button::;	3072	our @ISA = CFPlus::UI::Button::;
2359		3073
2360	sub new {	3074	sub new {
2361	my $class = shift;	3075	my $class = shift;
2362		3076
2363	my $self = $class->SUPER::new (	3077	my $self = $class->SUPER::new (
2364	state => 0,	3078	state => 0,
2365	connect_activate => \&toggle_flopper,	3079	on_activate => \&toggle_flopper,
2366	@_	3080	@_
2367	);	3081	);
2368		3082
2369	if ($self->{state}) {
2370	$self->{state} = 0;
2371	$self->toggle_flopper;
2372	}
2373
2374	$self	3083	$self
2375	}	3084	}
2376		3085
2377	sub toggle_flopper {	3086	sub toggle_flopper {
2378	my ($self) = @_;	3087	my ($self) = @_;
2379		3088
2380	# TODO: use animation	3089	$self->{other}->toggle_visibility;
2381	if ($self->{state} = !$self->{state}) {
2382	$CFClient::UI::ROOT->add ($self->{other});
2383	$self->{other}->move ($self->coord2global (0, $self->{h}));
2384	$self->emit ("open");
2385	} else {
2386	$CFClient::UI::ROOT->remove ($self->{other});
2387	$self->emit ("close");
2388	}
2389
2390	$self->emit (changed => $self->{state});
2391	}	3090	}
2392		3091
2393	#############################################################################	3092	#############################################################################
2394		3093
2395	package CFClient::UI::Tooltip;	3094	package CFPlus::UI::Tooltip;
2396		3095
2397	our @ISA = CFClient::UI::Bin::;	3096	our @ISA = CFPlus::UI::Bin::;
2398		3097
2399	use CFClient::OpenGL;	3098	use CFPlus::OpenGL;
2400		3099
2401	sub new {	3100	sub new {
2402	my $class = shift;	3101	my $class = shift;
2403		3102
2404	$class->SUPER::new (	3103	$class->SUPER::new (
2405	@_,	3104	@_,
2406	can_events => 0,	3105	can_events => 0,
2407	)	3106	)
2408	}	3107	}
2409		3108
2410	sub set_markup {	3109	sub set_tooltip_from {
2411	my ($self, $text) = @_;	3110	my ($self, $widget) = @_;
2412		3111
2413	$self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];	3112	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2414	$self->{label}->set_markup ($text);	3113	if $widget->{tooltip} =~ /^#(.*)$/;
2415	$self->add ($self->{label});	3114
		3115	my $tooltip = $widget->{tooltip};
		3116
		3117	if ($ENV{CFPLUS_DEBUG} & 2) {
		3118	$tooltip .= "\n\n" . (ref $widget) . "\n"
		3119	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3120	. "req $widget->{req_w} $widget->{req_h}\n"
		3121	. "visible $widget->{visible}";
		3122	}
		3123
		3124	$tooltip =~ s/^\n+//;
		3125	$tooltip =~ s/\n+$//;
		3126
		3127	$self->add (new CFPlus::UI::Label
		3128	markup => $tooltip,
		3129	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3130	fontsize => 0.8,
		3131	style => 1, # FLAG_INVERSE
		3132	ellipsise => 0,
		3133	font => ($widget->{tooltip_font} || $::FONT_PROP),
		3134	);
2416	}	3135	}
2417		3136
2418	sub size_request {	3137	sub size_request {
2419	my ($self) = @_;	3138	my ($self) = @_;
2420		3139
2421	$self->child->set_max_size ($::WIDTH * 0.3);
2422
2423	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3140	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424		3141
2425	($w + 4, $h + 4)	3142	($w + 4, $h + 4)
2426	}	3143	}
2427		3144
2428	sub size_allocate {	3145	sub invoke_size_allocate {
2429	my ($self, $w, $h) = @_;	3146	my ($self, $w, $h) = @_;
2430		3147
2431	$self->SUPER::size_allocate ($w - 4, $h - 4);	3148	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
		3149	}
		3150
		3151	sub invoke_visibility_change {
		3152	my ($self, $visible) = @_;
		3153
		3154	return unless $visible;
		3155
		3156	$self->{root}->on_post_alloc ("move_$self" => sub {
		3157	my $widget = $self->{owner}
		3158	or return;
		3159
		3160	if ($widget->{visible}) {
		3161	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
		3162
		3163	($x, $y) = $widget->coord2global (-$self->{w}, 0)
		3164	if $x + $self->{w} > $self->{root}{w};
		3165
		3166	$self->move_abs ($x, $y);
		3167	} else {
		3168	$self->hide;
		3169	}
		3170	});
2432	}	3171	}
2433		3172
2434	sub _draw {	3173	sub _draw {
2435	my ($self) = @_;	3174	my ($self) = @_;
2436		3175
2437	glPushMatrix;
2438	glTranslate 0.375, 0.375;	3176	glTranslate 0.375, 0.375;
2439		3177
2440	my ($w, $h) = @$self{qw(w h)};	3178	my ($w, $h) = @$self{qw(w h)};
2441		3179
2442	glColor 1, 0.8, 0.4;	3180	glColor 1, 0.8, 0.4;
…		…
2453	glVertex 0 , $h;	3191	glVertex 0 , $h;
2454	glVertex $w, $h;	3192	glVertex $w, $h;
2455	glVertex $w, 0;	3193	glVertex $w, 0;
2456	glEnd;	3194	glEnd;
2457		3195
2458	glPopMatrix;	3196	glTranslate 2 - 0.375, 2 - 0.375;
2459		3197
2460	glTranslate 2, 2;
2461	$self->SUPER::_draw;	3198	$self->SUPER::_draw;
2462	}	3199	}
2463		3200
2464	#############################################################################	3201	#############################################################################
2465		3202
2466	package CFClient::UI::Face;	3203	package CFPlus::UI::Face;
2467		3204
2468	our @ISA = CFClient::UI::Base::;	3205	our @ISA = CFPlus::UI::DrawBG::;
2469		3206
2470	use CFClient::OpenGL;	3207	use CFPlus::OpenGL;
2471		3208
2472	sub new {	3209	sub new {
2473	my $class = shift;	3210	my $class = shift;
2474		3211
2475	$class->SUPER::new (	3212	my $self = $class->SUPER::new (
2476	aspect => 1,	3213	aspect => 1,
		3214	can_events => 0,
2477	@_,	3215	@_,
2478	)	3216	);
		3217
		3218	if ($self->{anim} && $self->{animspeed}) {
		3219	Scalar::Util::weaken (my $widget = $self);
		3220
		3221	$self->{timer} = Event->timer (
		3222	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
		3223	hard => 1,
		3224	interval => $self->{animspeed},
		3225	cb => sub {
		3226	++$widget->{frame};
		3227	$widget->update;
		3228	},
		3229	);
		3230	}
		3231
		3232	$self
2479	}	3233	}
2480		3234
2481	sub size_request {	3235	sub size_request {
2482	(32, 8)	3236	(32, 8)
2483	}	3237	}
2484		3238
		3239	sub update {
		3240	my ($self) = @_;
		3241
		3242	return unless $self->{visible};
		3243
		3244	$self->SUPER::update;
		3245	}
		3246
2485	sub _draw {	3247	sub _draw {
2486	my ($self) = @_;	3248	my ($self) = @_;
2487		3249
		3250	return unless $::CONN;
		3251
		3252	$self->SUPER::_draw;
		3253
		3254	my $face;
		3255
		3256	if ($self->{frame}) {
		3257	my $anim = $::CONN->{anim}[$self->{anim}];
		3258
		3259	$face = $anim->[ $self->{frame} % @$anim ]
		3260	if $anim && @$anim;
		3261	}
		3262
2488	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];	3263	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2489		3264
2490	# TODO animation
2491	if ($tex) {	3265	if ($tex) {
2492	glEnable GL_BLEND;
2493	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494	glEnable GL_TEXTURE_2D;	3266	glEnable GL_TEXTURE_2D;
2495	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3267	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496	glColor 1, 1, 1, 1;	3268	glColor 0, 0, 0, 1;
2497	$tex->draw_quad (0, 0, $self->{w}, $self->{h});	3269	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2498	glDisable GL_TEXTURE_2D;	3270	glDisable GL_TEXTURE_2D;
2499	glDisable GL_BLEND;
2500	}	3271	}
		3272	}
		3273
		3274	sub destroy {
		3275	my ($self) = @_;
		3276
		3277	$self->{timer}->cancel
		3278	if $self->{timer};
		3279
		3280	$self->SUPER::destroy;
2501	}	3281	}
2502		3282
2503	#############################################################################	3283	#############################################################################
2504		3284
		3285	package CFPlus::UI::Buttonbar;
		3286
		3287	our @ISA = CFPlus::UI::HBox::;
		3288
		3289	# TODO: should actualyl wrap buttons and other goodies.
		3290
		3291	#############################################################################
		3292
2505	package CFClient::UI::Menu;	3293	package CFPlus::UI::Menu;
2506		3294
2507	our @ISA = CFClient::UI::FancyFrame::;	3295	our @ISA = CFPlus::UI::Toplevel::;
2508		3296
2509	use CFClient::OpenGL;	3297	use CFPlus::OpenGL;
2510		3298
2511	sub new {	3299	sub new {
2512	my $class = shift;	3300	my $class = shift;
2513		3301
2514	my $self = $class->SUPER::new (	3302	my $self = $class->SUPER::new (
2515	items => [],	3303	items => [],
2516	z => 100,	3304	z => 100,
2517	@_,	3305	@_,
2518	);	3306	);
2519		3307
2520	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3308	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2521		3309
2522	for my $item (@{ $self->{items} }) {	3310	for my $item (@{ $self->{items} }) {
2523	my ($widget, $cb) = @$item;	3311	my ($widget, $cb, $tooltip) = @$item;
2524		3312
2525	# handle various types of items, only text for now	3313	# handle various types of items, only text for now
2526	if (!ref $widget) {	3314	if (!ref $widget) {
		3315	if ($widget =~ /\t/) {
		3316	my ($left, $right) = split /\t/, $widget, 2;
		3317
2527	$widget = new CFClient::UI::Label	3318	$widget = new CFPlus::UI::HBox
2528	can_hover => 1,	3319	can_hover => 1,
2529	can_events => 1,	3320	can_events => 1,
		3321	tooltip => $tooltip,
		3322	children => [
		3323	(new CFPlus::UI::Label markup => $left, expand => 1),
		3324	(new CFPlus::UI::Label markup => $right, align => +1),
		3325	],
		3326	;
		3327
		3328	} else {
		3329	$widget = new CFPlus::UI::Label
		3330	can_hover => 1,
		3331	can_events => 1,
2530	text => $widget;	3332	markup => $widget,
		3333	tooltip => $tooltip;
		3334	}
2531	}	3335	}
2532		3336
2533	$self->{item}{$widget} = $item;	3337	$self->{item}{$widget} = $item;
2534		3338
2535	$self->{vbox}->add ($widget);	3339	$self->{vbox}->add ($widget);
…		…
2547	# maybe save $GRAB? must be careful about events...	3351	# maybe save $GRAB? must be careful about events...
2548	$GRAB = $self;	3352	$GRAB = $self;
2549	$self->{button} = $ev->{button};	3353	$self->{button} = $ev->{button};
2550		3354
2551	$self->show;	3355	$self->show;
2552	$self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3356	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553	}	3357	}
2554		3358
2555	sub mouse_motion {	3359	sub invoke_mouse_motion {
2556	my ($self, $ev, $x, $y) = @_;	3360	my ($self, $ev, $x, $y) = @_;
2557		3361
2558	# TODO: should use vbox->find_widget or so	3362	# TODO: should use vbox->find_widget or so
2559	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3363	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560	$self->{hover} = $self->{item}{$HOVER};	3364	$self->{hover} = $self->{item}{$HOVER};
2561	}
2562		3365
		3366	0
		3367	}
		3368
2563	sub button_up {	3369	sub invoke_button_up {
2564	my ($self, $ev, $x, $y) = @_;	3370	my ($self, $ev, $x, $y) = @_;
2565		3371
2566	if ($ev->{button} == $self->{button}) {	3372	if ($ev->{button} == $self->{button}) {
2567	undef $GRAB;	3373	undef $GRAB;
2568	$self->hide;	3374	$self->hide;
2569		3375
2570	$self->emit ("popdown");	3376	$self->emit ("popdown");
2571	$self->{hover}[1]->() if $self->{hover};	3377	$self->{hover}[1]->() if $self->{hover};
		3378	} else {
		3379	return 0
		3380	}
		3381
2572	}	3382	1
2573	}	3383	}
2574		3384
2575	#############################################################################	3385	#############################################################################
2576		3386
2577	package CFClient::UI::Root;	3387	package CFPlus::UI::Multiplexer;
2578		3388
2579	our @ISA = CFClient::UI::Container::;	3389	our @ISA = CFPlus::UI::Container::;
2580		3390
2581	use CFClient::OpenGL;	3391	sub new {
		3392	my $class = shift;
2582		3393
2583	sub check_size {	3394	my $self = $class->SUPER::new (
		3395	@_,
		3396	);
		3397
		3398	$self->{current} = $self->{children}[0]
		3399	if @{ $self->{children} };
		3400
		3401	$self
		3402	}
		3403
		3404	sub add {
2584	my ($self) = @_;	3405	my ($self, @widgets) = @_;
2585		3406
2586	$self->configure (0, 0, $::WIDTH, $::HEIGHT);	3407	$self->SUPER::add (@widgets);
		3408
		3409	$self->{current} = $self->{children}[0]
		3410	if @{ $self->{children} };
		3411	}
		3412
		3413	sub get_current_page {
		3414	my ($self) = @_;
		3415
		3416	$self->{current}
		3417	}
		3418
		3419	sub set_current_page {
		3420	my ($self, $page_or_widget) = @_;
		3421
		3422	my $widget = ref $page_or_widget
		3423	? $page_or_widget
		3424	: $self->{children}[$page_or_widget];
		3425
		3426	$self->{current} = $widget;
		3427	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3428
		3429	$self->emit (page_changed => $self->{current});
		3430
		3431	$self->realloc;
		3432	}
		3433
		3434	sub visible_children {
		3435	$_[0]{current}
2587	}	3436	}
2588		3437
2589	sub size_request {	3438	sub size_request {
2590	($::WIDTH, $::HEIGHT)	3439	my ($self) = @_;
2591	}
2592		3440
		3441	$self->{current}->size_request
		3442	}
		3443
		3444	sub invoke_size_allocate {
		3445	my ($self, $w, $h) = @_;
		3446
		3447	$self->{current}->configure (0, 0, $w, $h);
		3448
		3449	1
		3450	}
		3451
		3452	sub _draw {
		3453	my ($self) = @_;
		3454
		3455	$self->{current}->draw;
		3456	}
		3457
		3458	#############################################################################
		3459
		3460	package CFPlus::UI::Notebook;
		3461
		3462	our @ISA = CFPlus::UI::VBox::;
		3463
		3464	sub new {
		3465	my $class = shift;
		3466
		3467	my $self = $class->SUPER::new (
		3468	buttonbar => (new CFPlus::UI::Buttonbar),
		3469	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3470	# filter => # will be put between multiplexer and $self
		3471	@_,
		3472	);
		3473
		3474	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3475	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3476
		3477	$self
		3478	}
		3479
		3480	sub add {
		3481	my ($self, $title, $widget, $tooltip) = @_;
		3482
		3483	Scalar::Util::weaken $self;
		3484
		3485	$self->{buttonbar}->add (new CFPlus::UI::Button
		3486	markup => $title,
		3487	tooltip => $tooltip,
		3488	on_activate => sub { $self->set_current_page ($widget) },
		3489	);
		3490
		3491	$self->{multiplexer}->add ($widget);
		3492	}
		3493
		3494	sub get_current_page {
		3495	my ($self) = @_;
		3496
		3497	$self->{multiplexer}->get_current_page
		3498	}
		3499
		3500	sub set_current_page {
		3501	my ($self, $page) = @_;
		3502
		3503	$self->{multiplexer}->set_current_page ($page);
		3504	$self->emit (page_changed => $self->{multiplexer}{current});
		3505	}
		3506
		3507	#############################################################################
		3508
		3509	package CFPlus::UI::Selector;
		3510
		3511	use utf8;
		3512
		3513	our @ISA = CFPlus::UI::Button::;
		3514
		3515	sub new {
		3516	my $class = shift;
		3517
		3518	my $self = $class->SUPER::new (
		3519	options => [], # [value, title, longdesc], ...
		3520	value => undef,
		3521	@_,
		3522	);
		3523
		3524	$self->_set_value ($self->{value});
		3525
		3526	$self
		3527	}
		3528
		3529	sub invoke_button_down {
		3530	my ($self, $ev) = @_;
		3531
		3532	my @menu_items;
		3533
		3534	for (@{ $self->{options} }) {
		3535	my ($value, $title, $tooltip) = @$_;
		3536
		3537	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3538	}
		3539
		3540	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3541	}
		3542
		3543	sub _set_value {
		3544	my ($self, $value) = @_;
		3545
		3546	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3547	or return;
		3548
		3549	$self->{value} = $item->[0];
		3550	$self->set_markup ("$item->[1] ⇓");
		3551	$self->set_tooltip ($item->[2]);
		3552	}
		3553
		3554	sub set_value {
		3555	my ($self, $value) = @_;
		3556
		3557	return unless $self->{value} ne $value;
		3558
		3559	$self->_set_value ($value);
		3560	$self->emit (changed => $value);
		3561	}
		3562
		3563	#############################################################################
		3564
		3565	package CFPlus::UI::Statusbox;
		3566
		3567	our @ISA = CFPlus::UI::VBox::;
		3568
		3569	sub new {
		3570	my $class = shift;
		3571
		3572	my $self = $class->SUPER::new (
		3573	fontsize => 0.8,
		3574	@_,
		3575	);
		3576
		3577	Scalar::Util::weaken (my $this = $self);
		3578
		3579	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3580
		3581	$self
		3582	}
		3583
		3584	sub reorder {
		3585	my ($self) = @_;
		3586	my $NOW = Time::HiRes::time;
		3587
		3588	# freeze display when hovering over any label
		3589	return if $CFPlus::UI::TOOLTIP->{owner}
		3590	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3591	values %{ $self->{item} };
		3592
		3593	while (my ($k, $v) = each %{ $self->{item} }) {
		3594	delete $self->{item}{$k} if $v->{timeout} < $NOW;
		3595	}
		3596
		3597	my @widgets;
		3598
		3599	my @items = sort {
		3600	$a->{pri} <=> $b->{pri}
		3601	or $b->{id} <=> $a->{id}
		3602	} values %{ $self->{item} };
		3603
		3604	$self->{timer}->interval (1);
		3605
		3606	my $count = 10 + 1;
		3607	for my $item (@items) {
		3608	last unless --$count;
		3609
		3610	my $label = $item->{label} ||= do {
		3611	# TODO: doesn't handle markup well (read as: at all)
		3612	my $short = $item->{count} > 1
		3613	? "<b>$item->{count} ×</b> $item->{text}"
		3614	: $item->{text};
		3615
		3616	for ($short) {
		3617	s/^\s+//;
		3618	s/\s+/ /g;
		3619	}
		3620
		3621	new CFPlus::UI::Label
		3622	markup => $short,
		3623	tooltip => $item->{tooltip},
		3624	tooltip_font => $::FONT_PROP,
		3625	tooltip_width => 0.67,
		3626	fontsize => $item->{fontsize} || $self->{fontsize},
		3627	max_w => $::WIDTH * 0.44,
		3628	fg => [@{ $item->{fg} }],
		3629	can_events => 1,
		3630	can_hover => 1
		3631	};
		3632
		3633	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3634	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3635	$label->update;
		3636	$label->set_max_size (undef, $label->{req_h} * $diff)
		3637	if $diff < 1;
		3638	$self->{timer}->interval (1/30);
		3639	} else {
		3640	$label->{fg}[3] = $item->{fg}[3] || 1;
		3641	}
		3642
		3643	push @widgets, $label;
		3644	}
		3645
		3646	$self->clear;
		3647	$self->SUPER::add (reverse @widgets);
		3648	}
		3649
		3650	sub add {
		3651	my ($self, $text, %arg) = @_;
		3652
		3653	$text =~ s/^\s+//;
		3654	$text =~ s/\s+$//;
		3655
		3656	return unless $text;
		3657
		3658	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
		3659
		3660	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
		3661
		3662	if (my $item = $self->{item}{$group}) {
		3663	if ($item->{text} eq $text) {
		3664	$item->{count}++;
		3665	} else {
		3666	$item->{count} = 1;
		3667	$item->{text} = $item->{tooltip} = $text;
		3668	}
		3669	$item->{id} += 0.2;#d#
		3670	$item->{timeout} = $timeout;
		3671	delete $item->{label};
		3672	} else {
		3673	$self->{item}{$group} = {
		3674	id => ++$self->{id},
		3675	text => $text,
		3676	timeout => $timeout,
		3677	tooltip => $text,
		3678	fg => [0.8, 0.8, 0.8, 0.8],
		3679	pri => 0,
		3680	count => 1,
		3681	%arg,
		3682	};
		3683	}
		3684
		3685	$ROOT->on_refresh (reorder => sub {
		3686	$self->reorder;
		3687	});
		3688	}
		3689
2593	sub configure {	3690	sub reconfigure {
		3691	my ($self) = @_;
		3692
		3693	delete $_->{label}
		3694	for values %{ $self->{item} || {} };
		3695
		3696	$self->reorder;
		3697	$self->SUPER::reconfigure;
		3698	}
		3699
		3700	sub destroy {
		3701	my ($self) = @_;
		3702
		3703	$self->{timer}->cancel;
		3704
		3705	$self->SUPER::destroy;
		3706	}
		3707
		3708	#############################################################################
		3709
		3710	package CFPlus::UI::Inventory;
		3711
		3712	our @ISA = CFPlus::UI::Table::;
		3713
		3714	sub new {
		3715	my $class = shift;
		3716
		3717	my $self = $class->SUPER::new (
		3718	col_expand => [0, 1, 0],
		3719	items => [],
		3720	@_,
		3721	);
		3722
		3723	$self->set_sort_order (undef);
		3724
		3725	$self
		3726	}
		3727
		3728	sub update_items {
		3729	my ($self) = @_;
		3730
		3731	$self->clear;
		3732
		3733	my @item = $self->{sort}->(@{ $self->{items} });
		3734
		3735	my @adds;
		3736	my $row = 0;
		3737	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3738	CFPlus::Item::update_widgets $item;
		3739
		3740	push @adds, 0, $row, $item->{face_widget};
		3741	push @adds, 1, $row, $item->{desc_widget};
		3742	push @adds, 2, $row, $item->{weight_widget};
		3743
		3744	$row++;
		3745	}
		3746
		3747	$self->add (@adds);
		3748	}
		3749
		3750	sub set_sort_order {
		3751	my ($self, $order) = @_;
		3752
		3753	$self->{sort} = $order ||= sub {
		3754	sort {
		3755	$a->{type} <=> $b->{type}
		3756	or $a->{name} cmp $b->{name}
		3757	} @_
		3758	};
		3759
		3760	$self->update_items;
		3761	}
		3762
		3763	sub set_items {
		3764	my ($self, $items) = @_;
		3765
		3766	$self->{items} = [$items ? values %$items : ()];
		3767	$self->update_items;
		3768	}
		3769
		3770	#############################################################################
		3771
		3772	package CFPlus::UI::SpellList;
		3773
		3774	our @ISA = CFPlus::UI::Table::;
		3775
		3776	sub new {
		3777	my $class = shift;
		3778
		3779	my $self = $class->SUPER::new (
		3780	binding => [],
		3781	commands => [],
		3782	@_,
		3783	)
		3784	}
		3785
		3786	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
		3787
		3788	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3789	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
		3790	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
		3791	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
		3792	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3793	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
		3794	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3795	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
		3796	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
		3797	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
		3798
		3799	sub rebuild_spell_list {
		3800	my ($self) = @_;
		3801
		3802	$CFPlus::UI::ROOT->on_refresh ($self => sub {
		3803	$self->clear;
		3804
		3805	return unless $::CONN;
		3806
		3807	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
		3808	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
		3809	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
		3810	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
		3811	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
		3812
		3813	my $row = 0;
		3814
		3815	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
		3816	my $spell = $self->{spell}{$_};
		3817
		3818	$row++;
		3819
		3820	my $spell_cb = sub {
		3821	my ($widget, $ev) = @_;
		3822
		3823	if ($ev->{button} == 1) {
		3824	$::CONN->user_send ("cast $spell->{name}");
		3825	} elsif ($ev->{button} == 2) {
		3826	$::CONN->user_send ("invoke $spell->{name}");
		3827	} elsif ($ev->{button} == 3) {
		3828	(new CFPlus::UI::Menu
		3829	items => [
		3830	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
		3831	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
		3832	],
		3833	)->popup ($ev);
		3834	} else {
		3835	return 0;
		3836	}
		3837
		3838	1
		3839	};
		3840
		3841	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
		3842
		3843	#TODO: add path info to tooltip
		3844	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
		3845
		3846	$self->add (0, $row, new CFPlus::UI::Face
		3847	face => $spell->{face},
		3848	can_hover => 1,
		3849	can_events => 1,
		3850	tooltip => $tooltip,
		3851	on_button_down => $spell_cb,
		3852	);
		3853
		3854	$self->add (1, $row, new CFPlus::UI::Label
		3855	expand => 1,
		3856	text => $spell->{name},
		3857	can_hover => 1,
		3858	can_events => 1,
		3859	tooltip => $tooltip,
		3860	on_button_down => $spell_cb,
		3861	);
		3862
		3863	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
		3864	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
		3865	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
		3866	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
		3867	}
		3868	});
		3869	}
		3870
		3871	sub add_spell {
		3872	my ($self, $spell) = @_;
		3873
		3874	$self->{spell}->{$spell->{name}} = $spell;
		3875	$self->rebuild_spell_list;
		3876	}
		3877
		3878	sub remove_spell {
		3879	my ($self, $spell) = @_;
		3880
		3881	delete $self->{spell}->{$spell->{name}};
		3882	$self->rebuild_spell_list;
		3883	}
		3884
		3885	sub clear_spells {
		3886	my ($self) = @_;
		3887
		3888	$self->{spell} = {};
		3889	$self->rebuild_spell_list;
		3890	}
		3891
		3892	#############################################################################
		3893
		3894	package CFPlus::UI::Root;
		3895
		3896	our @ISA = CFPlus::UI::Container::;
		3897
		3898	use List::Util qw(min max);
		3899
		3900	use CFPlus::OpenGL;
		3901
		3902	sub new {
		3903	my $class = shift;
		3904
		3905	my $self = $class->SUPER::new (
		3906	visible => 1,
		3907	@_,
		3908	);
		3909
		3910	Scalar::Util::weaken ($self->{root} = $self);
		3911
		3912	$self
		3913	}
		3914
		3915	sub size_request {
		3916	my ($self) = @_;
		3917
		3918	($self->{w}, $self->{h})
		3919	}
		3920
		3921	sub _to_pixel {
		3922	my ($coord, $size, $max) = @_;
		3923
		3924	$coord =
		3925	$coord eq "center" ? ($max - $size) * 0.5
		3926	: $coord eq "max" ? $max
		3927	: $coord;
		3928
		3929	$coord = 0 if $coord < 0;
		3930	$coord = $max - $size if $coord > $max - $size;
		3931
		3932	int $coord + 0.5
		3933	}
		3934
		3935	sub invoke_size_allocate {
2594	my ($self, $x, $y, $w, $h) = @_;	3936	my ($self, $w, $h) = @_;
2595		3937
2596	$self->SUPER::configure ($x, $y, $w, $h);
2597
2598	for my $child (@{$self->{children}}) {	3938	for my $child ($self->children) {
2599	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	3939	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600		3940
2601	$X = List::Util::max 0, List::Util::min $w - $W, $X;	3941	$X = $child->{force_x} if exists $child->{force_x};
2602	$Y = List::Util::max 0, List::Util::min $h - $H, $Y;	3942	$Y = $child->{force_y} if exists $child->{force_y};
		3943
		3944	$X = _to_pixel $X, $W, $self->{w};
		3945	$Y = _to_pixel $Y, $H, $self->{h};
		3946
2603	$child->configure ($X, $Y, $W,$H);	3947	$child->configure ($X, $Y, $W, $H);
		3948	}
		3949
2604	}	3950	1
2605	}	3951	}
2606		3952
2607	sub _topleft {	3953	sub coord2local {
2608	my ($self, $x, $y) = @_;	3954	my ($self, $x, $y) = @_;
2609		3955
2610	($x, $y)	3956	($x, $y)
2611	}	3957	}
2612		3958
		3959	sub coord2global {
		3960	my ($self, $x, $y) = @_;
		3961
		3962	($x, $y)
		3963	}
		3964
2613	sub update {	3965	sub update {
2614	my ($self) = @_;	3966	my ($self) = @_;
2615		3967
2616	$self->check_size;	3968	$::WANT_REFRESH++;
2617	::refresh ();
2618	}	3969	}
2619		3970
2620	sub add {	3971	sub add {
2621	my ($self, $child) = @_;	3972	my ($self, @children) = @_;
2622		3973
2623	# integerize window positions	3974	$_->{is_toplevel} = 1
2624	$child->{x} = int $child->{x};	3975	for @children;
2625	$child->{y} = int $child->{y};
2626		3976
2627	$self->SUPER::add ($child);	3977	$self->SUPER::add (@children);
		3978	}
		3979
		3980	sub remove {
		3981	my ($self, @children) = @_;
		3982
		3983	$self->SUPER::remove (@children);
		3984
		3985	delete $self->{is_toplevel}
		3986	for @children;
		3987
		3988	while (@children) {
		3989	my $w = pop @children;
		3990	push @children, $w->children;
		3991	$w->set_invisible;
		3992	}
2628	}	3993	}
2629		3994
2630	sub on_refresh {	3995	sub on_refresh {
2631	my ($self, $id, $cb) = @_;	3996	my ($self, $id, $cb) = @_;
2632		3997
2633	$self->{refresh_hook}{$id} = $cb;	3998	$self->{refresh_hook}{$id} = $cb;
2634	}	3999	}
2635		4000
		4001	sub on_post_alloc {
		4002	my ($self, $id, $cb) = @_;
		4003
		4004	$self->{post_alloc_hook}{$id} = $cb;
		4005	}
		4006
2636	sub draw {	4007	sub draw {
2637	my ($self) = @_;	4008	my ($self) = @_;
2638		4009
2639	while (my $rcb = delete $self->{refresh_hook}) {	4010	while ($self->{refresh_hook}) {
2640	$_->() for values %$rcb;	4011	$_->()
		4012	for values %{delete $self->{refresh_hook}};
2641	}	4013	}
		4014
		4015	if ($self->{realloc}) {
		4016	my %queue;
		4017	my @queue;
		4018	my $widget;
		4019
		4020	outer:
		4021	while () {
		4022	if (my $realloc = delete $self->{realloc}) {
		4023	for $widget (values %$realloc) {
		4024	$widget->{visible} or next; # do not resize invisible widgets
		4025
		4026	$queue{$widget+0}++ and next; # duplicates are common
		4027
		4028	push @{ $queue[$widget->{visible}] }, $widget;
		4029	}
		4030	}
		4031
		4032	while () {
		4033	@queue or last outer;
		4034
		4035	$widget = pop @{ $queue[-1] || [] }
		4036	and last;
		4037
		4038	pop @queue;
		4039	}
		4040
		4041	delete $queue{$widget+0};
		4042
		4043	my ($w, $h) = $widget->size_request;
		4044
		4045	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
		4046	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4047
		4048	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4049	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4050
		4051	$w = $widget->{force_w} if exists $widget->{force_w};
		4052	$h = $widget->{force_h} if exists $widget->{force_h};
		4053
		4054	if ($widget->{req_w} != $w || $widget->{req_h} != $h
		4055	|| delete $widget->{force_realloc}) {
		4056	$widget->{req_w} = $w;
		4057	$widget->{req_h} = $h;
		4058
		4059	$self->{size_alloc}{$widget+0} = $widget;
		4060
		4061	if (my $parent = $widget->{parent}) {
		4062	$self->{realloc}{$parent+0} = $parent
		4063	unless $queue{$parent+0};
		4064
		4065	$parent->{force_size_alloc} = 1;
		4066	$self->{size_alloc}{$parent+0} = $parent;
		4067	}
		4068	}
		4069
		4070	delete $self->{realloc}{$widget+0};
		4071	}
		4072	}
		4073
		4074	while (my $size_alloc = delete $self->{size_alloc}) {
		4075	my @queue = sort { $b->{visible} <=> $a->{visible} }
		4076	values %$size_alloc;
		4077
		4078	while () {
		4079	my $widget = pop @queue || last;
		4080
		4081	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
		4082
		4083	$w = 0 if $w < 0;
		4084	$h = 0 if $h < 0;
		4085
		4086	$w = max $widget->{min_w}, $w;
		4087	$h = max $widget->{min_h}, $h;
		4088
		4089	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4090	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4091
		4092	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4093	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4094
		4095	$w = int $w + 0.5;
		4096	$h = int $h + 0.5;
		4097
		4098	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
		4099	$widget->{old_w} = $widget->{w};
		4100	$widget->{old_h} = $widget->{h};
		4101
		4102	$widget->{w} = $w;
		4103	$widget->{h} = $h;
		4104
		4105	$widget->emit (size_allocate => $w, $h);
		4106	}
		4107	}
		4108	}
		4109
		4110	while ($self->{post_alloc_hook}) {
		4111	$_->()
		4112	for values %{delete $self->{post_alloc_hook}};
		4113	}
		4114
2642		4115
2643	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4116	glViewport 0, 0, $::WIDTH, $::HEIGHT;
2644	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4117	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2645	glClear GL_COLOR_BUFFER_BIT;	4118	glClear GL_COLOR_BUFFER_BIT;
2646		4119
2647	glMatrixMode GL_PROJECTION;	4120	glMatrixMode GL_PROJECTION;
2648	glLoadIdentity;	4121	glLoadIdentity;
2649	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;	4122	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2650	glMatrixMode GL_MODELVIEW;	4123	glMatrixMode GL_MODELVIEW;
2651	glLoadIdentity;	4124	glLoadIdentity;
2652		4125
		4126	{
		4127	package CFPlus::UI::Base;
		4128
		4129	($draw_x, $draw_y, $draw_w, $draw_h) =
		4130	(0, 0, $self->{w}, $self->{h});
		4131	}
		4132
2653	$self->_draw;	4133	$self->_draw;
2654	}	4134	}
2655		4135
2656	#############################################################################	4136	#############################################################################
2657		4137
2658	package CFClient::UI::InventoryItem;
2659
2660	our @ISA = CFClient::UI::HBox::;
2661
2662	sub new {
2663	my $class = shift;
2664
2665	my %args = @_;
2666
2667	my $item = $args{item};
2668
2669	my $desc = $item->{nrof} < 2
2670	? $item->{name}
2671	: "$item->{nrof} $item->{name_pl}";
2672
2673
2674	my $self = $class->SUPER::new (
2675	can_hover => 1,
2676	can_events => 1,
2677	tooltip => (CFClient::UI::Label->escape ($desc)
2678	. "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679	connect_button_down => sub {
2680	my ($self, $ev, $x, $y) = @_;
2681
2682	# todo: maybe put examine on 1? but should just be a tooltip :(
2683	if ($ev->{button} == 1) {
2684	$::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685	} elsif ($ev->{button} == 2) {
2686	$::CONN->send ("apply $item->{tag}");
2687	} elsif ($ev->{button} == 3) {
2688	CFClient::UI::Menu->new (
2689	items => [
2690	["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691	[
2692	$item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693	sub { $::CONN->send ("lock $item->{tag}") },
2694	],
2695	["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696	["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697	["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698	],
2699	)->popup ($ev);
2700	}
2701
2702	1
2703	},
2704	%args
2705	);
2706	$self->add(new CFClient::UI::Face
2707	can_events => 0,
2708	face => $item->{face},
2709	anim => $item->{anim},
2710	animspeed => $item->{animspeed});
2711	$self->add(new CFClient::UI::Label
2712	can_events => 0,
2713	text => $desc);
2714
2715	$self
2716	}
2717
2718	#############################################################################
2719
2720	package CFClient::UI::Inventory;
2721
2722	our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724	sub new {
2725	my $class = shift;
2726
2727	my $self = $class->SUPER::new (
2728	scrolled => (new CFClient::UI::VBox),
2729	@_,
2730	);
2731
2732	$self
2733	}
2734
2735	sub set_items {
2736	my ($self, $items) = @_;
2737
2738	$self->{scrolled}->clear;
2739	return unless $items;
2740
2741	my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743	$self->{real_items} = \@items;
2744
2745	for my $item (@items) {
2746	my $desc = $item->{nrof} < 2
2747	? $item->{name}
2748	: "$item->{nrof} $item->{name_pl}";
2749
2750	$self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751	}
2752
2753	# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754	}
2755
2756	sub size_request {
2757	my ($self) = @_;
2758	($self->{req_w}, $self->{req_h});
2759	}
2760
2761	#############################################################################
2762
2763	package CFClient::UI;	4138	package CFPlus::UI;
2764		4139
2765	$ROOT = new CFClient::UI::Root;	4140	$ROOT = new CFPlus::UI::Root;
2766	$TOOLTIP = new CFClient::UI::Tooltip;	4141	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2767		4142
2768	1	4143	1
2769		4144

Diff Legend

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