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

Diff Legend

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