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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 2006 UTC

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

Diff Legend

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