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

Diff Legend

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