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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

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

Diff Legend

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