ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.393 by root, Sat Jul 21 13:41:46 2007 UTC

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

Diff Legend

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