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.267 by root, Thu Jun 1 04:10:29 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 2007 UTC

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

Diff Legend

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