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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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