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

Diff Legend

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