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

Diff Legend

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