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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.368 by root, Mon Jun 25 05:43:37 2007 UTC

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

Diff Legend

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