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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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