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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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