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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.366 by root, Mon Apr 23 19:17:41 2007 UTC

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

Diff Legend

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