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

Diff Legend

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