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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.365 by root, Thu Apr 12 07:53:31 2007 UTC

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

Diff Legend

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