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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 2006 UTC

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

Diff Legend

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