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.388 by root, Fri Jul 20 18:30:03 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	{ __widget_ref__ => $_[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
…		…
529	sub draw {	598	sub draw {
530	my ($self) = @_;	599	my ($self) = @_;
531		600
532	return unless $self->{h} && $self->{w};	601	return unless $self->{h} && $self->{w};
533		602
		603	# update screen rectangle
534	local $draw_x = $draw_x + $self->{x};	604	local $draw_x = $draw_x + $self->{x};
535	local $draw_y = $draw_y + $self->{y};	605	local $draw_y = $draw_y + $self->{y};
536		606
537	return if $draw_x + $self->{w} < 0;	607	# skip widgets that are entirely outside the drawing area
538	return if $draw_x >= $draw_w;	608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
539	return if $draw_y + $self->{h} < 0;	609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
540	return if $draw_y >= $draw_h;
541		610
542	glPushMatrix;	611	glPushMatrix;
543	glTranslate $self->{x}, $self->{y}, 0;	612	glTranslate $self->{x}, $self->{y}, 0;
544	$self->_draw;
545	glPopMatrix;
546		613
547	if ($self == $HOVER && $self->{can_hover}) {	614	if ($self == $HOVER && $self->{can_hover}) {
548	my ($x, $y) = @$self{qw(x y)};
549
550	glColor 1, 0.8, 0.5, 0.2;	615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
551	glEnable GL_BLEND;	616	glEnable GL_BLEND;
552	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
553	glBegin GL_QUADS;	618	glBegin GL_QUADS;
554	glVertex $x , $y;	619	glVertex 0 , 0;
555	glVertex $x + $self->{w}, $y;	620	glVertex $self->{w}, 0;
556	glVertex $x + $self->{w}, $y + $self->{h};	621	glVertex $self->{w}, $self->{h};
557	glVertex $x , $y + $self->{h};	622	glVertex 0 , $self->{h};
558	glEnd;	623	glEnd;
559	glDisable GL_BLEND;	624	glDisable GL_BLEND;
560	}	625	}
561		626
562	if ($ENV{CFPLUS_DEBUG} & 1) {	627	if ($ENV{CFPLUS_DEBUG} & 1) {
563	glPushMatrix;	628	glPushMatrix;
564	glColor 1, 1, 0, 1;	629	glColor 1, 1, 0, 1;
565	glTranslate $self->{x} + 0.375, $self->{y} + 0.375;	630	glTranslate 0.375, 0.375;
566	glBegin GL_LINE_LOOP;	631	glBegin GL_LINE_LOOP;
567	glVertex 0 , 0;	632	glVertex 0 , 0;
568	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
569	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
570	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
571	glEnd;	636	glEnd;
572	glPopMatrix;	637	glPopMatrix;
573	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
574	}	639	}
		640
		641	$self->_draw;
		642	glPopMatrix;
575	}	643	}
576		644
577	sub _draw {	645	sub _draw {
578	my ($self) = @_;	646	my ($self) = @_;
579		647
580	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
581	}	649	}
582		650
		651	my $cntx;#d#
583	sub DESTROY {	652	sub DESTROY {
584	my ($self) = @_;	653	my ($self) = @_;
585		654
		655	return if CFPlus::in_destruct;
		656
		657	eval { $self->destroy };
		658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
586	delete $WIDGET{$self+0};	660	delete $WIDGET{$self+0};
587	#$self->deactivate;
588	}	661	}
589		662
590	#############################################################################	663	#############################################################################
591		664
592	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
593		666
594	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
595		668
596	use strict;	669	use strict;
597	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
598		671
599	sub new {	672	sub new {
600	my $class = shift;	673	my $class = shift;
601		674
602	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
617		690
618	if ($color && (@$color < 4 || $color->[3])) {	691	if ($color && (@$color < 4 || $color->[3])) {
619	my ($w, $h) = @$self{qw(w h)};	692	my ($w, $h) = @$self{qw(w h)};
620		693
621	glEnable GL_BLEND;	694	glEnable GL_BLEND;
622	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glColor @$color;	696	glColor_premultiply @$color;
624		697
625	glBegin GL_QUADS;	698	glBegin GL_QUADS;
626	glVertex 0 , 0;	699	glVertex 0 , 0;
627	glVertex 0 , $h;	700	glVertex 0 , $h;
628	glVertex $w, $h;	701	glVertex $w, $h;
…		…
633	}	706	}
634	}	707	}
635		708
636	#############################################################################	709	#############################################################################
637		710
638	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
639		712
640	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
641		714
642	sub new {	715	sub new {
643	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
644	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
645	}	718	}
…		…
652		725
653	sub draw { }	726	sub draw { }
654		727
655	#############################################################################	728	#############################################################################
656		729
657	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
658		731
659	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
660		733
661	sub new {	734	sub new {
662	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
663		736
664	my $children = delete $arg{children} || [];	737	my $children = delete $arg{children};
665		738
666	my $self = $class->SUPER::new (	739	my $self = $class->SUPER::new (
667	children => [],	740	children => [],
668	can_events => 0,	741	can_events => 0,
669	%arg,	742	%arg,
670	);	743	);
		744
671	$self->add ($_) for @$children;	745	$self->add (@$children)
		746	if $children;
672		747
673	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
674	}	757	}
675		758
676	sub add {	759	sub add {
677	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
678		761
…		…
724	$x -= $self->{x};	807	$x -= $self->{x};
725	$y -= $self->{y};	808	$y -= $self->{y};
726		809
727	my $res;	810	my $res;
728		811
729	for (reverse @{ $self->{children} }) {	812	for (reverse $self->visible_children) {
730	$res = $_->find_widget ($x, $y)	813	$res = $_->find_widget ($x, $y)
731	and return $res;	814	and return $res;
732	}	815	}
733		816
734	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})	817	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
…		…
740	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
741	}	824	}
742		825
743	#############################################################################	826	#############################################################################
744		827
745	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
746		829
747	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
748		831
749	sub new {	832	sub new {
750	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
751		834
752	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
753		836
754	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
755	}	838	}
756		839
757	sub add {	840	sub add {
758	my ($self, $child) = @_;	841	my ($self, $child) = @_;
759		842
760	$self->{children} = [];	843	$self->SUPER::remove ($_) for @{ $self->{children} };
761
762	$self->SUPER::add ($child);	844	$self->SUPER::add ($child);
763	}	845	}
764		846
765	sub remove {	847	sub remove {
766	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
767		849
768	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
769		851
770	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
771	unless @{$self->{children}};	853	unless @{$self->{children}};
772	}	854	}
773		855
774	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
775		857
776	sub size_request {	858	sub size_request {
777	$_[0]{children}[0]->size_request	859	$_[0]{children}[0]->size_request
778	}	860	}
779		861
780	sub size_allocate {	862	sub invoke_size_allocate {
781	my ($self, $w, $h) = @_;	863	my ($self, $w, $h) = @_;
782		864
783	$self->{children}[0]->configure (0, 0, $w, $h);	865	$self->{children}[0]->configure (0, 0, $w, $h);
		866
		867	1
784	}	868	}
785		869
786	#############################################################################	870	#############################################################################
787		871
		872	# back-buffered drawing area
		873
788	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
789		875
790	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
791		877
792	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
793		879
794	sub new {	880	sub new {
795	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
796		882
797	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
802		888
803	$ROOT->on_post_alloc ($self => sub { $self->render_child });	889	$ROOT->on_post_alloc ($self => sub { $self->render_child });
804	$self->SUPER::update;	890	$self->SUPER::update;
805	}	891	}
806		892
807	sub size_allocate {	893	sub invoke_size_allocate {
808	my ($self, $w, $h) = @_;	894	my ($self, $w, $h) = @_;
809		895
810	$self->SUPER::size_allocate ($w, $h);
811	$self->update;	896	$self->update;
		897
		898	$self->SUPER::invoke_size_allocate ($w, $h)
812	}	899	}
813		900
814	sub _render {	901	sub _render {
815	my ($self) = @_;	902	my ($self) = @_;
816		903
…		…
818	}	905	}
819		906
820	sub render_child {	907	sub render_child {
821	my ($self) = @_;	908	my ($self) = @_;
822		909
823	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
824	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
825	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
826		913
827	{	914	{
828	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
829		916
830	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
831	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
832	}	921	}
833
834	$self->_render;
835	};	922	};
836	}	923	}
837		924
838	sub _draw {	925	sub _draw {
839	my ($self) = @_;	926	my ($self) = @_;
840
841	my ($w, $h) = @$self{qw(w h)};
842		927
843	my $tex = $self->{texture}	928	my $tex = $self->{texture}
844	or return;	929	or return;
845		930
846	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
847	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
848	glColor 1, 1, 1, 1;	933	glColor 0, 0, 0, 1;
849		934
850	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
851		936
852	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
853	}	938	}
854		939
855	#############################################################################	940	#############################################################################
856		941
857	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
858		943
		944	use List::Util qw(min max);
		945
859	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
860		947
861	sub new {	948	sub new {
862	my $class = shift;	949	my $class = shift;
863		950
864	$class->SUPER::new (	951	$class->SUPER::new (
…		…
877	$h = 10 if $self->{scroll_y};	964	$h = 10 if $self->{scroll_y};
878		965
879	($w, $h)	966	($w, $h)
880	}	967	}
881		968
882	sub size_allocate {	969	sub invoke_size_allocate {
883	my ($self, $w, $h) = @_;	970	my ($self, $w, $h) = @_;
884		971
885	my $child = $self->child;	972	my $child = $self->child;
886		973
887	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};	974	$w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
888	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};	975	$h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
889		976
890	$self->child->configure (0, 0, $w, $h);	977	$self->child->configure (0, 0, $w, $h);
891	$self->update;	978	$self->update;
		979
		980	1
892	}	981	}
893		982
894	sub set_offset {	983	sub set_offset {
895	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
896		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
897	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
898	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
899		992
		993	$self->emit (changed => $x, $y);
900	$self->update;	994	$self->update;
		995	}
901	}	996	}
902		997
903	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
904	sub coord2local {	999	sub coord2local {
905	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
920	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
921		1016
922	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
923	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
924	) {	1019	) {
925	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
926	} else {	1021	} else {
927	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
928	}	1023	}
929	}	1024	}
930		1025
931	sub _render {	1026	sub _render {
932	my ($self) = @_;	1027	my ($self) = @_;
933		1028
934	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	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};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
936		1031
937	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
938		1033
939	$self->SUPER::_render;	1034	$self->SUPER::_render;
940	}	1035	}
941		1036
942	#############################################################################	1037	#############################################################################
943		1038
944	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
945		1040
946	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
947		1042
948	sub new {	1043	sub new {
949	my $class = shift;	1044	my ($class, %arg) = @_;
		1045
		1046	my $child = delete $arg{child};
950		1047
951	my $self;	1048	my $self;
952		1049
953	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
954	vertical => 1,	1060	vertical => 1,
955	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
956	on_changed => sub {	1062	on_changed => sub {
957	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
958	},	1065	},
959	;	1066	;
960		1067
961	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
962	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
		1071	can_events => 1,
963	slider => $slider,	1072	hslider => $hslider,
964	@_,	1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
		1076	%arg,
965	);	1077	);
966		1078
967	$self->{vp}->add ($self->{scrolled});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
968	$self->add ($self->{vp});	1093	$self->SUPER::add_at (0, 0, $self->{vp});
969	$self->add ($self->{slider});	1094
		1095	$self->add ($child) if $child;
970		1096
971	$self	1097	$self
972	}	1098	}
973		1099
		1100	#TODO# update range on size_allocate depending on child
		1101
		1102	sub add {
		1103	my ($self, $widget) = @_;
		1104
		1105	$self->{vp}->add ($self->{child} = $widget);
		1106	}
		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
974	sub update {	1132	sub update {
975	my ($self) = @_;	1133	my ($self) = @_;
976		1134
		1135	$self->update_slider;
977	$self->SUPER::update;	1136	$self->SUPER::update;
978
979	# todo: overwrite size_allocate of child
980	my $child = $self->{vp}->child;
981	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
982	}	1137	}
983		1138
		1139	sub invoke_mouse_wheel {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
		1147
		1148	1
		1149	}
		1150
		1151	sub invoke_button_down {
		1152	my ($self, $ev, $x, $y) = @_;
		1153
		1154	if ($ev->{button} == 2) {
		1155	$self->grab_focus;
		1156
		1157	my $ox = $self->{vp}{view_x} + $ev->{x};
		1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
		1162
		1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
		1166
		1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
		1192	}
		1193
984	sub size_allocate {	1194	sub invoke_size_allocate {
985	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
986		1196
		1197	$self->update_slider;
987	$self->SUPER::size_allocate ($w, $h);	1198	$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	}	1199	}
992
993	#TODO# update range on size_allocate depending on child
994	# update viewport offset on scroll
995		1200
996	#############################################################################	1201	#############################################################################
997		1202
998	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
999		1204
1000	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1001		1206
1002	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1003		1208
1004	sub new {	1209	sub new {
1005	my $class = shift;	1210	my $class = shift;
1006		1211
1007	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1015		1220
1016	if ($self->{bg}) {	1221	if ($self->{bg}) {
1017	my ($w, $h) = @$self{qw(w h)};	1222	my ($w, $h) = @$self{qw(w h)};
1018		1223
1019	glEnable GL_BLEND;	1224	glEnable GL_BLEND;
1020	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1021	glColor @{ $self->{bg} };	1226	glColor_premultiply @{ $self->{bg} };
1022		1227
1023	glBegin GL_QUADS;	1228	glBegin GL_QUADS;
1024	glVertex 0 , 0;	1229	glVertex 0 , 0;
1025	glVertex 0 , $h;	1230	glVertex 0 , $h;
1026	glVertex $w, $h;	1231	glVertex $w, $h;
…		…
1033	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1034	}	1239	}
1035		1240
1036	#############################################################################	1241	#############################################################################
1037		1242
1038	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1039		1244
1040	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1041		1246
1042	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1043		1348
1044	my $bg =	1349	my $bg =
1045	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1046	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1047		1352
1048	my @border =	1353	my @border =
1049	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	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);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1051		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
		1360
1052	sub new {	1361	sub new {
1053	my $class = shift;	1362	my ($class, %arg) = @_;
1054		1363
1055	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
1056	bg => [1, 1, 1, 1],	1365	bg => [1, 1, 1, 1],
1057	border_bg => [1, 1, 1, 1],	1366	border_bg => [1, 1, 1, 1],
1058	border => 0.6,	1367	border => 0.6,
1059	can_events => 1,	1368	can_events => 1,
1060	min_w => 16,	1369	min_w => 64,
1061	min_h => 16,	1370	min_h => 32,
1062	@_	1371	%arg,
1063	);	1372	);
1064		1373
1065	$self->{title} &&= new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1066	align => 0,	1375	align => 0,
1067	valign => 1,	1376	valign => 1,
1068	text => $self->{title},	1377	text => $self->{title},
1069	fontsize => $self->{border};	1378	fontsize => $self->{border},
		1379	if exists $self->{title};
		1380
		1381	if ($self->{has_close_button}) {
		1382	$self->{close_button} =
		1383	new CFPlus::UI::ImageButton
		1384	path => 'x1_close.png',
		1385	on_activate => sub { $self->emit ("delete") };
		1386
		1387	$self->CFPlus::UI::Container::add ($self->{close_button});
		1388	}
1070		1389
1071	$self	1390	$self
		1391	}
		1392
		1393	sub add {
		1394	my ($self, @widgets) = @_;
		1395
		1396	$self->SUPER::add (@widgets);
		1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1072	}	1399	}
1073		1400
1074	sub border {	1401	sub border {
1075	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1076	}	1403	}
1077		1404
1078	sub size_request {	1405	sub size_request {
1079	my ($self) = @_;	1406	my ($self) = @_;
		1407
		1408	$self->{title_widget}->size_request
		1409	if $self->{title_widget};
		1410
		1411	$self->{close_button}->size_request
		1412	if $self->{close_button};
1080		1413
1081	my ($w, $h) = $self->SUPER::size_request;	1414	my ($w, $h) = $self->SUPER::size_request;
1082		1415
1083	(	1416	(
1084	$w + $self->border * 2,	1417	$w + $self->border * 2,
1085	$h + $self->border * 2,	1418	$h + $self->border * 2,
1086	)	1419	)
1087	}	1420	}
1088		1421
1089	sub size_allocate {	1422	sub invoke_size_allocate {
1090	my ($self, $w, $h) = @_;	1423	my ($self, $w, $h) = @_;
1091		1424
		1425	if ($self->{title_widget}) {
		1426	$self->{title_widget}{w} = $w;
		1427	$self->{title_widget}{h} = $h;
		1428	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1429	}
		1430
		1431	my $border = $self->border;
		1432
1092	$h -= List::Util::max 0, $self->border * 2;	1433	$h -= List::Util::max 0, $border * 2;
1093	$w -= List::Util::max 0, $self->border * 2;	1434	$w -= List::Util::max 0, $border * 2;
1094		1435
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);	1436	$self->child->configure ($border, $border, $w, $h);
1099	}
1100		1437
		1438	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1439	if $self->{close_button};
		1440
		1441	1
		1442	}
		1443
		1444	sub invoke_delete {
		1445	my ($self) = @_;
		1446
		1447	$self->hide;
		1448
		1449	1
		1450	}
		1451
1101	sub button_down {	1452	sub invoke_button_down {
1102	my ($self, $ev, $x, $y) = @_;	1453	my ($self, $ev, $x, $y) = @_;
1103		1454
1104	my ($w, $h) = @$self{qw(w h)};	1455	my ($w, $h) = @$self{qw(w h)};
1105	my $border = $self->border;	1456	my $border = $self->border;
1106		1457
…		…
1122	my $dy = $ev->{y} - $oy;	1473	my $dy = $ev->{y} - $oy;
1123		1474
1124	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1475	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1125	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1476	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1126		1477
		1478	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1127	$self->realloc;	1479	$self->realloc;
1128	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	};	1480	};
1130		1481
1131	} elsif ($lr ^ $td) {	1482	} elsif ($lr ^ $td) {
1132	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1483	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1133	my ($bx, $by) = ($self->{x}, $self->{y});	1484	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1136	my ($ev, $x, $y) = @_;	1487	my ($ev, $x, $y) = @_;
1137		1488
1138	($x, $y) = ($ev->{x}, $ev->{y});	1489	($x, $y) = ($ev->{x}, $ev->{y});
1139		1490
1140	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1491	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1492	# HACK: the next line is required to enforce placement
		1493	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1141	};	1494	};
		1495	} else {
		1496	return 0;
		1497	}
		1498
1142	}	1499	1
1143	}	1500	}
1144		1501
1145	sub button_up {	1502	sub invoke_button_up {
1146	my ($self, $ev, $x, $y) = @_;	1503	my ($self, $ev, $x, $y) = @_;
1147		1504
1148	delete $self->{motion};	1505	! ! delete $self->{motion}
1149	}	1506	}
1150		1507
1151	sub mouse_motion {	1508	sub invoke_mouse_motion {
1152	my ($self, $ev, $x, $y) = @_;	1509	my ($self, $ev, $x, $y) = @_;
1153		1510
1154	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1512
		1513	! ! $self->{motion}
		1514	}
		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
1155	}	1522	}
1156		1523
1157	sub _draw {	1524	sub _draw {
1158	my ($self) = @_;	1525	my ($self) = @_;
1159		1526
		1527	my $child = $self->{children}[0];
		1528
1160	my ($w, $h ) = ($self->{w}, $self->{h});	1529	my ($w, $h ) = ($self->{w}, $self->{h});
1161	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1530	my ($cw, $ch) = ($child->{w}, $child->{h});
1162		1531
1163	glEnable GL_TEXTURE_2D;	1532	glEnable GL_TEXTURE_2D;
1164	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1165		1534
1166	my $border = $self->border;	1535	my $border = $self->border;
1167		1536
1168	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1169	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1170	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1171	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1172	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1173		1556
1174	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1175	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1176		1559
1177	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1181	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1564	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1182	}	1565	}
1183		1566
1184	glDisable GL_TEXTURE_2D;	1567	glDisable GL_TEXTURE_2D;
1185		1568
1186	$self->{title}->draw if $self->{title};
1187
1188	$self->child->draw;	1569	$child->draw;
		1570
		1571	if ($self->{title_widget}) {
		1572	glTranslate 0, $border - $self->{h};
		1573	$self->{title_widget}->_draw;
		1574
		1575	glTranslate 0, - ($border - $self->{h});
		1576	}
		1577
		1578	$self->{close_button}->draw
		1579	if $self->{close_button};
1189	}	1580	}
1190		1581
1191	#############################################################################	1582	#############################################################################
1192		1583
1193	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1194		1585
1195	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1196		1587
1197	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1198		1589
1199	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1200		1591
1201	sub new {	1592	sub new {
1202	my $class = shift;	1593	my $class = shift;
1203		1594
1204	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1205	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1206	@_,	1599	@_,
1207	)	1600	)
1208	}	1601	}
1209		1602
1210	sub children {	1603	sub children {
1211	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1212	}	1605	}
1213		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1214	sub add {	1608	sub add {
1215	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1216		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1217	$child->set_parent ($self);	1621	$child->set_parent ($self);
1218	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
		1623	}
1219		1624
		1625	$self->{force_realloc} = 1;
		1626	$self->{force_size_alloc} = 1;
1220	$self->realloc;	1627	$self->realloc;
		1628	}
		1629
		1630	sub remove {
		1631	my ($self, $child) = @_;
		1632
		1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1221	}	1638	}
1222		1639
1223	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1224	sub clear {	1641	sub clear {
1225	my ($self) = @_;	1642	my ($self) = @_;
…		…
1266	(sum @$ws),	1683	(sum @$ws),
1267	(sum @$hs),	1684	(sum @$hs),
1268	)	1685	)
1269	}	1686	}
1270		1687
1271	sub size_allocate {	1688	sub invoke_size_allocate {
1272	my ($self, $w, $h) = @_;	1689	my ($self, $w, $h) = @_;
1273		1690
1274	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1275		1692
1276	my $req_w = (sum @$ws) || 1;	1693	my $req_w = (sum @$ws) || 1;
1277	my $req_h = (sum @$hs) || 1;	1694	my $req_h = (sum @$hs) || 1;
1278		1695
1279	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1280	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1281	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1282	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1283		1700
1284	# linearly scale sizes
1285	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1286	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1287		1702
1288	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1289	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1290		1712
1291	my $y;	1713	my $y;
1292		1714
1293	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1294	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1308	}	1730	}
1309		1731
1310	$y += $row_h;	1732	$y += $row_h;
1311	}	1733	}
1312		1734
		1735	1
1313	}	1736	}
1314		1737
1315	sub find_widget {	1738	sub find_widget {
1316	my ($self, $x, $y) = @_;	1739	my ($self, $x, $y) = @_;
1317		1740
…		…
1336	}	1759	}
1337	}	1760	}
1338		1761
1339	#############################################################################	1762	#############################################################################
1340		1763
1341	package CFClient::UI::Box;	1764	package CFPlus::UI::Fixed;
1342		1765
		1766	use List::Util qw(min max);
		1767
1343	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
1344		1849
1345	sub size_request {	1850	sub size_request {
1346	my ($self) = @_;	1851	my ($self) = @_;
1347		1852
1348	$self->{vertical}	1853	$self->{vertical}
…		…
1354	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1859	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1355	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1860	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1356	)	1861	)
1357	}	1862	}
1358		1863
1359	sub size_allocate {	1864	sub invoke_size_allocate {
1360	my ($self, $w, $h) = @_;	1865	my ($self, $w, $h) = @_;
1361		1866
1362	my $space = $self->{vertical} ? $h : $w;	1867	my $space = $self->{vertical} ? $h : $w;
1363	my $children = $self->{children};	1868	my @children = $self->visible_children;
1364		1869
1365	my @req;	1870	my @req;
1366		1871
1367	if ($self->{homogeneous}) {	1872	if ($self->{homogeneous}) {
1368	@req = ($space / (@$children || 1)) x @$children;	1873	@req = ($space / (@children || 1)) x @children;
1369	} else {	1874	} else {
1370	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1875	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1371	my $req = List::Util::sum @req;	1876	my $req = List::Util::sum @req;
1372		1877
1373	if ($req > $space) {	1878	if ($req > $space) {
1374	# ah well, not enough space	1879	# ah well, not enough space
1375	$_ *= $space / $req for @req;	1880	$_ *= $space / $req for @req;
1376	} else {	1881	} else {
1377	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1882	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1378		1883
1379	$space = ($space - $req) / $expand; # remaining space to give away	1884	$space = ($space - $req) / $expand; # remaining space to give away
1380		1885
1381	$req[$_] += $space * $children->[$_]{expand}	1886	$req[$_] += $space * $children[$_]{expand}
1382	for 0 .. $#$children;	1887	for 0 .. $#children;
1383	}	1888	}
1384	}	1889	}
1385		1890
1386	CFClient::UI::harmonize \@req;	1891	CFPlus::UI::harmonize \@req;
1387		1892
1388	my $pos = 0;	1893	my $pos = 0;
1389	for (0 .. $#$children) {	1894	for (0 .. $#children) {
1390	my $alloc = $req[$_];	1895	my $alloc = $req[$_];
1391	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1392		1897
1393	$pos += $alloc;	1898	$pos += $alloc;
1394	}	1899	}
1395		1900
1396	1	1901	1
1397	}	1902	}
1398		1903
1399	#############################################################################	1904	#############################################################################
1400		1905
1401	package CFClient::UI::HBox;	1906	package CFPlus::UI::HBox;
1402		1907
1403	our @ISA = CFClient::UI::Box::;	1908	our @ISA = CFPlus::UI::Box::;
1404		1909
1405	sub new {	1910	sub new {
1406	my $class = shift;	1911	my $class = shift;
1407		1912
1408	$class->SUPER::new (	1913	$class->SUPER::new (
…		…
1411	)	1916	)
1412	}	1917	}
1413		1918
1414	#############################################################################	1919	#############################################################################
1415		1920
1416	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1417		1922
1418	our @ISA = CFClient::UI::Box::;	1923	our @ISA = CFPlus::UI::Box::;
1419		1924
1420	sub new {	1925	sub new {
1421	my $class = shift;	1926	my $class = shift;
1422		1927
1423	$class->SUPER::new (	1928	$class->SUPER::new (
…		…
1426	)	1931	)
1427	}	1932	}
1428		1933
1429	#############################################################################	1934	#############################################################################
1430		1935
1431	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1432		1937
1433	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1434		1939
1435	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1436		1941
1437	sub new {	1942	sub new {
1438	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1439		1944
1440	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1443	#active_bg => none	1948	#active_bg => none
1444	#font => default_font	1949	#font => default_font
1445	#text => initial text	1950	#text => initial text
1446	#markup => initial narkup	1951	#markup => initial narkup
1447	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1448	ellipsise => 3, # end	1954	ellipsise => 3, # end
1449	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1450	fontsize => 1,	1956	fontsize => 1,
1451	align => -1,	1957	align => -1,
1452	valign => -1,	1958	valign => -1,
1453	padding_x => 2,	1959	padding_x => 2,
1454	padding_y => 2,	1960	padding_y => 2,
1455	can_events => 0,	1961	can_events => 0,
1456	%arg	1962	%arg
1457	);	1963	);
1458		1964
1459	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1460	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1461	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1462	$self->{template} = $layout;	1968	$self->{template} = $layout;
1463	}	1969	}
1464		1970
1465	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1469	}	1975	}
1470		1976
1471	$self	1977	$self
1472	}	1978	}
1473		1979
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 {	1980	sub update {
1485	my ($self) = @_;	1981	my ($self) = @_;
1486		1982
1487	delete $self->{texture};	1983	delete $self->{texture};
1488	$self->SUPER::update;	1984	$self->SUPER::update;
1489	}	1985	}
1490		1986
		1987	sub realloc {
		1988	my ($self) = @_;
		1989
		1990	delete $self->{ox};
		1991	$self->SUPER::realloc;
		1992	}
		1993
1491	sub set_text {	1994	sub set_text {
1492	my ($self, $text) = @_;	1995	my ($self, $text) = @_;
1493		1996
1494	return if $self->{text} eq "T$text";	1997	return if $self->{text} eq "T$text";
1495	$self->{text} = "T$text";	1998	$self->{text} = "T$text";
1496		1999
1497	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1498	$self->{layout}->set_text ($text);	2000	$self->{layout}->set_text ($text);
1499		2001
		2002	delete $self->{size_req};
1500	$self->realloc;	2003	$self->realloc;
1501	$self->update;	2004	$self->update;
1502	}	2005	}
1503		2006
1504	sub set_markup {	2007	sub set_markup {
…		…
1507	return if $self->{text} eq "M$markup";	2010	return if $self->{text} eq "M$markup";
1508	$self->{text} = "M$markup";	2011	$self->{text} = "M$markup";
1509		2012
1510	my $rgba = $markup =~ /span.*(?:foreground|background)/;	2013	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1511		2014
1512	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1513	$self->{layout}->set_markup ($markup);	2015	$self->{layout}->set_markup ($markup);
1514		2016
		2017	delete $self->{size_req};
1515	$self->realloc;	2018	$self->realloc;
1516	$self->update;	2019	$self->update;
1517	}	2020	}
1518		2021
1519	sub size_request {	2022	sub size_request {
1520	my ($self) = @_;	2023	my ($self) = @_;
1521		2024
		2025	$self->{size_req} ||= do {
1522	$self->{layout}->set_font ($self->{font}) if $self->{font};	2026	$self->{layout}->set_font ($self->{font}) if $self->{font};
1523	$self->{layout}->set_width ($self->{max_w} || -1);	2027	$self->{layout}->set_width ($self->{max_w} || -1);
1524	$self->{layout}->set_ellipsise ($self->{ellipsise});	2028	$self->{layout}->set_ellipsise ($self->{ellipsise});
1525	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2029	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1526	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2030	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1527		2031
1528	my ($w, $h) = $self->{layout}->size;	2032	my ($w, $h) = $self->{layout}->size;
1529		2033
1530	if (exists $self->{template}) {	2034	if (exists $self->{template}) {
1531	$self->{template}->set_font ($self->{font}) if $self->{font};	2035	$self->{template}->set_font ($self->{font}) if $self->{font};
		2036	$self->{template}->set_width ($self->{max_w} || -1);
1532	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2037	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1533		2038
1534	my ($w2, $h2) = $self->{template}->size;	2039	my ($w2, $h2) = $self->{template}->size;
1535		2040
1536	$w = List::Util::max $w, $w2;	2041	$w = List::Util::max $w, $w2;
1537	$h = List::Util::max $h, $h2;	2042	$h = List::Util::max $h, $h2;
		2043	}
		2044
		2045	[$w, $h]
1538	}	2046	};
1539		2047
1540	($w, $h)	2048	@{ $self->{size_req} }
1541	}	2049	}
1542		2050
		2051	sub baseline_shift {
		2052	$_[0]{layout}->descent
		2053	}
		2054
1543	sub size_allocate {	2055	sub invoke_size_allocate {
1544	my ($self, $w, $h) = @_;	2056	my ($self, $w, $h) = @_;
		2057
		2058	delete $self->{ox};
1545		2059
1546	delete $self->{texture}	2060	delete $self->{texture}
1547	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2061	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2062
		2063	1
1548	}	2064	}
1549		2065
1550	sub set_fontsize {	2066	sub set_fontsize {
1551	my ($self, $fontsize) = @_;	2067	my ($self, $fontsize) = @_;
1552		2068
1553	$self->{fontsize} = $fontsize;	2069	$self->{fontsize} = $fontsize;
		2070	delete $self->{size_req};
1554	delete $self->{texture};	2071	delete $self->{texture};
1555		2072
1556	$self->realloc;	2073	$self->realloc;
1557	}	2074	}
1558		2075
		2076	sub reconfigure {
		2077	my ($self) = @_;
		2078
		2079	delete $self->{size_req};
		2080	delete $self->{texture};
		2081
		2082	$self->SUPER::reconfigure;
		2083	}
		2084
1559	sub _draw {	2085	sub _draw {
1560	my ($self) = @_;	2086	my ($self) = @_;
1561		2087
1562	$self->SUPER::_draw; # draw background, if applicable	2088	$self->SUPER::_draw; # draw background, if applicable
1563		2089
1564	my $tex = $self->{texture} ||= do {	2090	my $size = $self->{texture} ||= do {
1565	$self->{layout}->set_foreground (@{$self->{fg}});	2091	$self->{layout}->set_foreground (@{$self->{fg}});
1566	$self->{layout}->set_font ($self->{font}) if $self->{font};	2092	$self->{layout}->set_font ($self->{font}) if $self->{font};
1567	$self->{layout}->set_width ($self->{w});	2093	$self->{layout}->set_width ($self->{w});
1568	$self->{layout}->set_ellipsise ($self->{ellipsise});	2094	$self->{layout}->set_ellipsise ($self->{ellipsise});
1569	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2095	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1570	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2096	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1571		2097
1572	my $tex = new_from_layout CFClient::Texture $self->{layout};	2098	[$self->{layout}->size]
		2099	};
1573		2100
		2101	unless (exists $self->{ox}) {
1574	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2102	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1575	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2103	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1576	: ($self->{w} - $tex->{w}) * 0.5);	2104	: ($self->{w} - $size->[0]) * 0.5);
1577		2105
1578	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2106	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1579	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2107	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1580	: ($self->{h} - $tex->{h}) * 0.5);	2108	: ($self->{h} - $size->[1]) * 0.5);
1581
1582	$tex
1583	};	2109	};
1584		2110
1585	glEnable GL_TEXTURE_2D;	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
1586	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
1587		2113
1588	if ($tex->{format} == GL_ALPHA) {	2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1589	glColor @{$self->{fg}};
1590	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1591	} else {
1592	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1593	}
1594
1595	glDisable GL_TEXTURE_2D;
1596	}	2115	}
1597		2116
1598	#############################################################################	2117	#############################################################################
1599		2118
1600	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1601		2120
1602	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1603		2122
1604	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1605		2124
1606	sub new {	2125	sub new {
1607	my $class = shift;	2126	my $class = shift;
1608		2127
1609	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1613	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1614	can_hover => 1,	2133	can_hover => 1,
1615	can_focus => 1,	2134	can_focus => 1,
1616	valign => 0,	2135	valign => 0,
1617	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
1618	#text => ...	2138	#text => ...
		2139	#hidden => "*",
1619	@_	2140	@_
1620	)	2141	)
1621	}	2142	}
1622		2143
1623	sub _set_text {	2144	sub _set_text {
…		…
1625		2146
1626	delete $self->{cur_h};	2147	delete $self->{cur_h};
1627		2148
1628	return if $self->{text} eq $text;	2149	return if $self->{text} eq $text;
1629		2150
1630	delete $self->{texture};
1631
1632	$self->{last_activity} = $::NOW;	2151	$self->{last_activity} = $::NOW;
1633	$self->{text} = $text;	2152	$self->{text} = $text;
1634		2153
1635	$text =~ s/./*/g if $self->{hidden};	2154	$text =~ s/./*/g if $self->{hidden};
1636	$self->{layout}->set_text ("$text ");	2155	$self->{layout}->set_text ("$text ");
		2156	delete $self->{size_req};
1637		2157
1638	$self->_emit (changed => $self->{text});	2158	$self->emit (changed => $self->{text});
		2159
		2160	$self->realloc;
		2161	$self->update;
1639	}	2162	}
1640		2163
1641	sub set_text {	2164	sub set_text {
1642	my ($self, $text) = @_;	2165	my ($self, $text) = @_;
1643		2166
1644	$self->{cursor} = length $text;	2167	$self->{cursor} = length $text;
1645	$self->_set_text ($text);	2168	$self->_set_text ($text);
1646
1647	$self->realloc;
1648	}	2169	}
1649		2170
1650	sub get_text {	2171	sub get_text {
1651	$_[0]{text}	2172	$_[0]{text}
1652	}	2173	}
…		…
1657	my ($w, $h) = $self->SUPER::size_request;	2178	my ($w, $h) = $self->SUPER::size_request;
1658		2179
1659	($w + 1, $h) # add 1 for cursor	2180	($w + 1, $h) # add 1 for cursor
1660	}	2181	}
1661		2182
1662	sub key_down {	2183	sub invoke_key_down {
1663	my ($self, $ev) = @_;	2184	my ($self, $ev) = @_;
1664		2185
1665	my $mod = $ev->{mod};	2186	my $mod = $ev->{mod};
1666	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1667	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1668		2189
1669	my $text = $self->get_text;	2190	my $text = $self->get_text;
		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1670		2193
1671	if ($uni == 8) {	2194	if ($uni == 8) {
1672	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1673	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1674	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1675	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1676	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1677	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1678	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1679	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1680	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1681	} elsif ($sym == CFClient::SDLK_END) {
1682	$self->{cursor} = length $text;
1683	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1684	$self->_emit ('escape');	2218	$self->emit ('escape');
1685	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1686	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
		2223	} else {
		2224	return 0;
1687	}	2225	}
1688		2226
1689	$self->_set_text ($text);	2227	$self->_set_text ($text);
1690		2228
1691	$self->realloc;	2229	$self->realloc;
1692	}	2230	$self->update;
1693		2231
		2232	1
		2233	}
		2234
1694	sub focus_in {	2235	sub invoke_focus_in {
1695	my ($self) = @_;	2236	my ($self) = @_;
1696		2237
1697	$self->{last_activity} = $::NOW;	2238	$self->{last_activity} = $::NOW;
1698		2239
1699	$self->SUPER::focus_in;	2240	$self->SUPER::invoke_focus_in
1700	}	2241	}
1701		2242
1702	sub button_down {	2243	sub invoke_button_down {
1703	my ($self, $ev, $x, $y) = @_;	2244	my ($self, $ev, $x, $y) = @_;
1704		2245
1705	$self->SUPER::button_down ($ev, $x, $y);	2246	$self->SUPER::invoke_button_down ($ev, $x, $y);
1706		2247
1707	my $idx = $self->{layout}->xy_to_index ($x, $y);	2248	my $idx = $self->{layout}->xy_to_index ($x, $y);
1708		2249
1709	# byte-index to char-index	2250	# byte-index to char-index
1710	my $text = $self->{text};	2251	my $text = $self->{text};
1711	utf8::encode $text;	2252	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1712	$self->{cursor} = length substr $text, 0, $idx;	2253	$self->{cursor} = length $text;
1713		2254
1714	$self->_set_text ($self->{text});	2255	$self->_set_text ($self->{text});
1715	$self->update;	2256	$self->update;
		2257
		2258	1
1716	}	2259	}
1717		2260
1718	sub mouse_motion {	2261	sub invoke_mouse_motion {
1719	my ($self, $ev, $x, $y) = @_;	2262	my ($self, $ev, $x, $y) = @_;
1720	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2263	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2264
		2265	1
1721	}	2266	}
1722		2267
1723	sub _draw {	2268	sub _draw {
1724	my ($self) = @_;	2269	my ($self) = @_;
1725		2270
1726	local $self->{fg} = $self->{fg};	2271	local $self->{fg} = $self->{fg};
1727		2272
1728	if ($FOCUS == $self) {	2273	if ($FOCUS == $self) {
1729	glColor @{$self->{active_bg}};	2274	glColor_premultiply @{$self->{active_bg}};
1730	$self->{fg} = $self->{active_fg};	2275	$self->{fg} = $self->{active_fg};
1731	} else {	2276	} else {
1732	glColor @{$self->{bg}};	2277	glColor_premultiply @{$self->{bg}};
1733	}	2278	}
1734		2279
1735	glEnable GL_BLEND;	2280	glEnable GL_BLEND;
1736	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2281	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1737	glBegin GL_QUADS;	2282	glBegin GL_QUADS;
1738	glVertex 0 , 0;	2283	glVertex 0 , 0;
1739	glVertex 0 , $self->{h};	2284	glVertex 0 , $self->{h};
1740	glVertex $self->{w}, $self->{h};	2285	glVertex $self->{w}, $self->{h};
1741	glVertex $self->{w}, 0;	2286	glVertex $self->{w}, 0;
…		…
1752	utf8::encode $text;	2297	utf8::encode $text;
1753		2298
1754	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1755	}	2300	}
1756		2301
1757	glColor @{$self->{fg}};
1758	glBegin GL_LINES;	2302	glBegin GL_LINES;
1759	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	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};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1761	glEnd;	2305	glEnd;
1762	}	2306	}
1763	}	2307	}
1764		2308
		2309	#############################################################################
		2310
1765	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1766		2312
1767	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1768		2314
1769	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1770		2316
1771	sub key_down {	2317	sub invoke_key_down {
1772	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1773		2319
1774	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1775		2321
1776	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1777	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1778	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
		2325
1779	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1780	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1781	$self->_emit (activate => $txt);	2328	$self->emit (activate => $txt);
1782	$self->update;	2329	$self->update;
1783		2330
1784	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1785	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1786	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1787	}	2334	}
1788	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1789	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1791	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1792	}	2339	}
1793	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1794	}	2341	}
1795		2342
1796	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1797	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1798	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1799		2346
1800	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1801	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1802	} else {	2349	} else {
1803	$self->set_text ($self->{history_saveback});	2350	$self->set_text ($self->{history_saveback});
1804	}	2351	}
1805		2352
1806	} else {	2353	} else {
1807	$self->SUPER::key_down ($ev);	2354	return $self->SUPER::invoke_key_down ($ev)
		2355	}
		2356
1808	}	2357	1
1809
1810	}	2358	}
1811		2359
1812	#############################################################################	2360	#############################################################################
1813		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
1814	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
1815		2402
1816	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
1817		2404
1818	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
1819		2406
1820	my @tex =	2407	my @tex =
1821	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1822	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
1823		2410
1824	sub new {	2411	sub new {
1825	my $class = shift;	2412	my $class = shift;
1826		2413
1827	$class->SUPER::new (	2414	$class->SUPER::new (
1828	padding_x => 4,	2415	padding_x => 4,
1829	padding_y => 4,	2416	padding_y => 4,
1830	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
1831	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
1832	can_hover => 1,	2419	can_hover => 1,
1833	align => 0,	2420	align => 0,
1834	valign => 0,	2421	valign => 0,
1835	can_events => 1,	2422	can_events => 1,
1836	@_	2423	@_
1837	)	2424	)
1838	}	2425	}
1839		2426
1840	sub activate { }
1841
1842	sub button_up {	2427	sub invoke_button_up {
1843	my ($self, $ev, $x, $y) = @_;	2428	my ($self, $ev, $x, $y) = @_;
1844		2429
1845	$self->emit ("activate")	2430	$self->emit ("activate")
1846	if $x >= 0 && $x < $self->{w}	2431	if $x >= 0 && $x < $self->{w}
1847	&& $y >= 0 && $y < $self->{h};	2432	&& $y >= 0 && $y < $self->{h};
		2433
		2434	1
1848	}	2435	}
1849		2436
1850	sub _draw {	2437	sub _draw {
1851	my ($self) = @_;	2438	my ($self) = @_;
1852		2439
1853	local $self->{fg} = $self->{fg};	2440	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1854
1855	if ($GRAB == $self) {
1856	$self->{fg} = $self->{active_fg};
1857	}
1858		2441
1859	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
1860	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
1862		2445
		2446	my $tex = $tex[$GRAB == $self];
1863	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1864		2448
1865	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
1866		2450
1867	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
1868	}	2452	}
1869		2453
1870	#############################################################################	2454	#############################################################################
1871		2455
1872	package CFClient::UI::CheckBox;	2456	package CFPlus::UI::CheckBox;
1873		2457
1874	our @ISA = CFClient::UI::DrawBG::;	2458	our @ISA = CFPlus::UI::DrawBG::;
1875		2459
1876	my @tex =	2460	my @tex =
1877	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1878	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1879		2463
1880	use CFClient::OpenGL;	2464	use CFPlus::OpenGL;
1881		2465
1882	sub new {	2466	sub new {
1883	my $class = shift;	2467	my $class = shift;
1884		2468
1885	$class->SUPER::new (	2469	$class->SUPER::new (
…		…
1899	my ($self) = @_;	2483	my ($self) = @_;
1900		2484
1901	(6) x 2	2485	(6) x 2
1902	}	2486	}
1903		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
1904	sub button_down {	2496	sub invoke_button_down {
1905	my ($self, $ev, $x, $y) = @_;	2497	my ($self, $ev, $x, $y) = @_;
1906		2498
1907	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1908	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1909	$self->{state} = !$self->{state};	2501	$self->toggle;
1910	$self->_emit (changed => $self->{state});	2502	} else {
		2503	return 0
		2504	}
		2505
1911	}	2506	1
1912	}	2507	}
1913		2508
1914	sub _draw {	2509	sub _draw {
1915	my ($self) = @_;	2510	my ($self) = @_;
1916		2511
…		…
1931	glDisable GL_TEXTURE_2D;	2526	glDisable GL_TEXTURE_2D;
1932	}	2527	}
1933		2528
1934	#############################################################################	2529	#############################################################################
1935		2530
1936	package CFClient::UI::Image;	2531	package CFPlus::UI::Image;
1937		2532
1938	our @ISA = CFClient::UI::Base::;	2533	our @ISA = CFPlus::UI::Base::;
1939		2534
1940	use CFClient::OpenGL;	2535	use CFPlus::OpenGL;
1941	use Carp qw/confess/;
1942		2536
1943	our %loaded_images;	2537	our %texture_cache;
1944		2538
1945	sub new {	2539	sub new {
1946	my $class = shift;	2540	my $class = shift;
1947		2541
1948	my $self = $class->SUPER::new (can_events => 0, @_);	2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
1949		2546
1950	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
1951		2549
1952	$loaded_images{$self->{image}} ||=	2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1953	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1954		2552
1955	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2553	CFPlus::weaken $texture_cache{$self->{path}};
1956		2554
1957	Scalar::Util::weaken $loaded_images{$self->{image}};	2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1958
1959	$self->{aspect} = $tex->{w} / $tex->{h};
1960		2556
1961	$self	2557	$self
1962	}	2558	}
1963		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
1964	sub size_request {	2575	sub size_request {
1965	my ($self) = @_;	2576	my ($self) = @_;
1966		2577
1967	($self->{tex}->{w}, $self->{tex}->{h})	2578	($self->{tex}{w}, $self->{tex}{h})
1968	}	2579	}
1969		2580
1970	sub _draw {	2581	sub _draw {
1971	my ($self) = @_;	2582	my ($self) = @_;
1972		2583
…		…
1982	}	2593	}
1983		2594
1984	glEnable GL_TEXTURE_2D;	2595	glEnable GL_TEXTURE_2D;
1985	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1986		2597
1987	$tex->draw_quad_alpha (0, 0, $w, $h);	2598	$tex->draw_quad (0, 0, $w, $h);
1988		2599
1989	glDisable GL_TEXTURE_2D;	2600	glDisable GL_TEXTURE_2D;
1990	}	2601	}
1991		2602
1992	#############################################################################	2603	#############################################################################
1993		2604
		2605	package CFPlus::UI::ImageButton;
		2606
		2607	our @ISA = CFPlus::UI::Image::;
		2608
		2609	use CFPlus::OpenGL;
		2610
		2611	my %textures;
		2612
		2613	sub new {
		2614	my $class = shift;
		2615
		2616	my $self = $class->SUPER::new (
		2617	padding_x => 4,
		2618	padding_y => 4,
		2619	fg => [1, 1, 1],
		2620	active_fg => [0, 0, 1],
		2621	can_hover => 1,
		2622	align => 0,
		2623	valign => 0,
		2624	can_events => 1,
		2625	@_
		2626	);
		2627	}
		2628
		2629	sub invoke_button_up {
		2630	my ($self, $ev, $x, $y) = @_;
		2631
		2632	$self->emit ("activate")
		2633	if $x >= 0 && $x < $self->{w}
		2634	&& $y >= 0 && $y < $self->{h};
		2635
		2636	1
		2637	}
		2638
		2639	#############################################################################
		2640
1994	package CFClient::UI::VGauge;	2641	package CFPlus::UI::VGauge;
1995		2642
1996	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
1997		2644
1998	use List::Util qw(min max);	2645	use List::Util qw(min max);
1999		2646
2000	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
2001		2648
2002	my %tex = (	2649	my %tex = (
2003	food => [	2650	food => [
2004	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2005	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2006	],	2653	],
2007	grace => [	2654	grace => [
2008	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	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/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2010	],	2657	],
2011	hp => [	2658	hp => [
2012	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2013	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2014	],	2661	],
2015	mana => [	2662	mana => [
2016	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	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/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2018	],	2665	],
2019	);	2666	);
2020		2667
2021	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2081	my $ycut1 = max 0, min 1, $ycut;	2728	my $ycut1 = max 0, min 1, $ycut;
2082	my $ycut2 = max 0, min 1, $ycut - 1;	2729	my $ycut2 = max 0, min 1, $ycut - 1;
2083		2730
2084	my $h1 = $self->{h} * (1 - $ycut1);	2731	my $h1 = $self->{h} * (1 - $ycut1);
2085	my $h2 = $self->{h} * (1 - $ycut2);	2732	my $h2 = $self->{h} * (1 - $ycut2);
		2733	my $h3 = $self->{h};
		2734
		2735	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2086		2736
2087	glEnable GL_BLEND;	2737	glEnable GL_BLEND;
2088	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2738	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2739	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2089	glEnable GL_TEXTURE_2D;	2740	glEnable GL_TEXTURE_2D;
2090	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2741	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2091		2742
2092	glBindTexture GL_TEXTURE_2D, $t1->{name};	2743	glBindTexture GL_TEXTURE_2D, $t1->{name};
2093	glBegin GL_QUADS;	2744	glBegin GL_QUADS;
…		…
2108		2759
2109	if ($t3) {	2760	if ($t3) {
2110	glBindTexture GL_TEXTURE_2D, $t3->{name};	2761	glBindTexture GL_TEXTURE_2D, $t3->{name};
2111	glBegin GL_QUADS;	2762	glBegin GL_QUADS;
2112	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2763	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2113	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2764	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2114	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2765	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2115	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2766	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2116	glEnd;	2767	glEnd;
2117	}	2768	}
2118		2769
2119	glDisable GL_BLEND;	2770	glDisable GL_BLEND;
2120	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2121	}	2772	}
2122		2773
2123	#############################################################################	2774	#############################################################################
2124		2775
2125	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
2126		2777
2127	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
2128		2779
2129	sub new {	2780	sub new {
2130	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2131		2782
2132	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
2134	can_hover => 1,	2785	can_hover => 1,
2135	can_events => 1,	2786	can_events => 1,
2136	%arg,	2787	%arg,
2137	);	2788	);
2138		2789
2139	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$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);	2791	$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");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2142		2793
2143	$self	2794	$self
2144	}	2795	}
2145		2796
2146	sub set_fontsize {	2797	sub set_fontsize {
…		…
2167	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2168	}	2819	}
2169		2820
2170	#############################################################################	2821	#############################################################################
2171		2822
2172	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2173		2824
2174	use strict;	2825	use strict;
2175		2826
2176	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2177		2828
2178	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2179		2830
2180	my @tex =	2831	my @tex =
2181	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2182	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2183		2834
2184	sub new {	2835	sub new {
2185	my $class = shift;	2836	my $class = shift;
2186		2837
…		…
2207	$self->update;	2858	$self->update;
2208		2859
2209	$self	2860	$self
2210	}	2861	}
2211		2862
2212	sub changed { }
2213
2214	sub set_range {	2863	sub set_range {
2215	my ($self, $range) = @_;	2864	my ($self, $range) = @_;
2216		2865
2217	($range, $self->{range}) = ($self->{range}, $range);	2866	($range, $self->{range}) = ($self->{range}, $range);
2218		2867
2219	$self->update
2220	if "@$range" ne "@{$self->{range}}";	2868	if ("@$range" ne "@{$self->{range}}") {
		2869	$self->update;
		2870	$self->set_value ($self->{range}[0]);
		2871	}
2221	}	2872	}
2222		2873
2223	sub set_value {	2874	sub set_value {
2224	my ($self, $value) = @_;	2875	my ($self, $value) = @_;
2225		2876
…		…
2236	if $unit;	2887	if $unit;
2237		2888
2238	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2889	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2239		2890
2240	if ($value != $old_value) {	2891	if ($value != $old_value) {
2241	$self->_emit (changed => $value);	2892	$self->emit (changed => $value);
2242	$self->update;	2893	$self->update;
2243	}	2894	}
2244	}	2895	}
2245		2896
2246	sub size_request {	2897	sub size_request {
2247	my ($self) = @_;	2898	my ($self) = @_;
2248		2899
2249	($self->{req_w}, $self->{req_h})	2900	($self->{req_w}, $self->{req_h})
2250	}	2901	}
2251		2902
2252	sub button_down {	2903	sub invoke_button_down {
2253	my ($self, $ev, $x, $y) = @_;	2904	my ($self, $ev, $x, $y) = @_;
2254		2905
2255	$self->SUPER::button_down ($ev, $x, $y);	2906	$self->SUPER::invoke_button_down ($ev, $x, $y);
2256		2907
2257	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2908	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2258		2909
2259	$self->mouse_motion ($ev, $x, $y);	2910	$self->invoke_mouse_motion ($ev, $x, $y)
2260	}	2911	}
2261		2912
2262	sub mouse_motion {	2913	sub invoke_mouse_motion {
2263	my ($self, $ev, $x, $y) = @_;	2914	my ($self, $ev, $x, $y) = @_;
2264		2915
2265	if ($GRAB == $self) {	2916	if ($GRAB == $self) {
2266	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2917	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2267		2918
2268	my (undef, $lo, $hi, $page) = @{$self->{range}};	2919	my (undef, $lo, $hi, $page) = @{$self->{range}};
2269		2920
2270	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2921	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2271		2922
2272	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2923	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2924	} else {
		2925	return 0;
		2926	}
		2927
2273	}	2928	1
		2929	}
		2930
		2931	sub invoke_mouse_wheel {
		2932	my ($self, $ev) = @_;
		2933
		2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
		2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2939
		2940	! ! $delta
2274	}	2941	}
2275		2942
2276	sub update {	2943	sub update {
2277	my ($self) = @_;	2944	my ($self) = @_;
2278		2945
2279	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2946	delete $self->{knob_w};
		2947	$self->SUPER::update;
		2948	}
		2949
		2950	sub _draw {
		2951	my ($self) = @_;
		2952
		2953	unless ($self->{knob_w}) {
2280	$self->set_value ($self->{range}[0]);	2954	$self->set_value ($self->{range}[0]);
2281		2955
2282	my ($value, $lo, $hi, $page) = @{$self->{range}};	2956	my ($value, $lo, $hi, $page) = @{$self->{range}};
2283	my $range = ($hi - $page - $lo) || 1e-100;	2957	my $range = ($hi - $page - $lo) || 1e-100;
2284		2958
…		…
2290	$value = ($value - $lo) / $range;	2964	$value = ($value - $lo) / $range;
2291	$value = $value * $self->{scale} + $self->{offset};	2965	$value = $value * $self->{scale} + $self->{offset};
2292		2966
2293	$self->{knob_x} = $value - $knob_w * 0.5;	2967	$self->{knob_x} = $value - $knob_w * 0.5;
2294	$self->{knob_w} = $knob_w;	2968	$self->{knob_w} = $knob_w;
2295	});	2969	}
2296
2297	$self->SUPER::update;
2298	}
2299
2300	sub _draw {
2301	my ($self) = @_;
2302		2970
2303	$self->SUPER::_draw ();	2971	$self->SUPER::_draw ();
2304		2972
2305	glScale $self->{w}, $self->{h};	2973	glScale $self->{w}, $self->{h};
2306		2974
…		…
2326	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2327	}	2995	}
2328		2996
2329	#############################################################################	2997	#############################################################################
2330		2998
2331	package CFClient::UI::ValSlider;	2999	package CFPlus::UI::ValSlider;
2332		3000
2333	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2334		3002
2335	sub new {	3003	sub new {
2336	my ($class, %arg) = @_;	3004	my ($class, %arg) = @_;
2337		3005
2338	my $range = delete $arg{range};	3006	my $range = delete $arg{range};
2339		3007
2340	my $self = $class->SUPER::new (	3008	my $self = $class->SUPER::new (
2341	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2342	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2343	to_value => sub { shift },	3011	to_value => sub { shift },
2344	from_value => sub { shift },	3012	from_value => sub { shift },
2345	%arg,	3013	%arg,
2346	);	3014	);
2347		3015
…		…
2367	sub set_range { shift->{slider}->set_range (@_) }	3035	sub set_range { shift->{slider}->set_range (@_) }
2368	sub set_value { shift->{slider}->set_value (@_) }	3036	sub set_value { shift->{slider}->set_value (@_) }
2369		3037
2370	#############################################################################	3038	#############################################################################
2371		3039
2372	package CFClient::UI::TextView;	3040	package CFPlus::UI::TextScroller;
2373		3041
2374	our @ISA = CFClient::UI::HBox::;	3042	our @ISA = CFPlus::UI::HBox::;
2375		3043
2376	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2377		3045
2378	sub new {	3046	sub new {
2379	my $class = shift;	3047	my $class = shift;
2380		3048
2381	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
2382	fontsize => 1,	3050	fontsize => 1,
2383	can_events => 0,	3051	can_events => 1,
		3052	indent => 0,
2384	#font => default_font	3053	#font => default_font
2385	@_,	3054	@_,
2386		3055
2387	layout => (new CFClient::Layout 1),	3056	layout => (new CFPlus::Layout),
2388	par => [],	3057	par => [],
		3058	max_par => 0,
2389	height => 0,	3059	height => 0,
2390	children => [	3060	children => [
2391	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2392	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2393	],	3063	],
2394	);	3064	);
2395		3065
2396	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2397		3067
…		…
2403		3073
2404	$self->{fontsize} = $fontsize;	3074	$self->{fontsize} = $fontsize;
2405	$self->reflow;	3075	$self->reflow;
2406	}	3076	}
2407		3077
		3078	sub size_request {
		3079	my ($self) = @_;
		3080
		3081	my ($empty, $slider) = @{ $self->{children} };
		3082
		3083	local $self->{children} = [$empty, $slider];
		3084	$self->SUPER::size_request
		3085	}
		3086
2408	sub size_allocate {	3087	sub invoke_size_allocate {
2409	my ($self, $w, $h) = @_;	3088	my ($self, $w, $h) = @_;
2410		3089
2411	$self->SUPER::size_allocate ($w, $h);	3090	my ($empty, $slider, @other) = @{ $self->{children} };
		3091	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2412		3092
2413	$self->{layout}->set_font ($self->{font}) if $self->{font};	3093	$self->{layout}->set_font ($self->{font}) if $self->{font};
2414	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3094	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2415	$self->{layout}->set_width ($self->{children}[0]{w});	3095	$self->{layout}->set_width ($empty->{w});
		3096	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2416		3097
2417	$self->reflow;	3098	$self->reflow;
2418	}
2419		3099
2420	sub text_size {	3100	local $self->{children} = [$empty, $slider];
		3101	$self->SUPER::invoke_size_allocate ($w, $h)
		3102	}
		3103
		3104	sub invoke_mouse_wheel {
2421	my ($self, $text, $indent) = @_;	3105	my ($self, $ev) = @_;
		3106
		3107	return 0 unless $ev->{dy}; # only vertical movements
		3108
		3109	$self->{children}[1]->emit (mouse_wheel => $ev);
		3110
		3111	1
		3112	}
		3113
		3114	sub get_layout {
		3115	my ($self, $para) = @_;
2422		3116
2423	my $layout = $self->{layout};	3117	my $layout = $self->{layout};
2424		3118
		3119	$layout->set_font ($self->{font}) if $self->{font};
		3120	$layout->set_foreground (@{$para->{fg}});
2425	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3121	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2426	$layout->set_width ($self->{children}[0]{w} - $indent);	3122	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3123	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427	$layout->set_markup ($text);	3124	$layout->set_markup ($para->{markup});
		3125
		3126	$layout->set_shapes (
		3127	map
		3128	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3129	@{$para->{widget}}
2428		3130	);
		3131
2429	$layout->size	3132	$layout
2430	}	3133	}
2431		3134
2432	sub reflow {	3135	sub reflow {
2433	my ($self) = @_;	3136	my ($self) = @_;
2434		3137
…		…
2441		3144
2442	# todo: base offset on lines or so, not on pixels	3145	# todo: base offset on lines or so, not on pixels
2443	$self->{children}[1]->set_value ($offset);	3146	$self->{children}[1]->set_value ($offset);
2444	}	3147	}
2445		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
		3156	my ($self, $para) = @_;
		3157
		3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3159
		3160	$self->{scroll_to} = $para;
		3161	$self->update;
		3162	}
		3163
2446	sub clear {	3164	sub clear {
2447	my ($self) = @_;	3165	my ($self) = @_;
		3166
		3167	my (undef, undef, @other) = @{ $self->{children} };
		3168	$self->remove ($_) for @other;
2448		3169
2449	$self->{par} = [];	3170	$self->{par} = [];
2450	$self->{height} = 0;	3171	$self->{height} = 0;
2451	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2452	}	3173	}
2453		3174
2454	sub add_paragraph {	3175	sub add_paragraph {
2455	my ($self, $color, $text, $indent) = @_;	3176	my $self = shift;
2456		3177
2457	for my $line (split /\n/, $text) {	3178	for my $para (@_) {
2458	my ($w, $h) = $self->text_size ($line);	3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
		3185	w => 1e10,
		3186	wrapped => 1,
		3187	};
		3188
		3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3190	push @{$self->{par}}, $para;
		3191	}
		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
		3196
		3197	$self->{need_reflow}++;
		3198	$self->update;
		3199	}
		3200
		3201	sub scroll_to_bottom {
		3202	my ($self) = @_;
		3203
		3204	$self->{scroll_to} = $#{$self->{par}};
		3205	$self->update;
		3206	}
		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
2459	$self->{height} += $h;	3230	$self->{height} = $height;
2460	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2461	}
2462		3232
2463	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3233	delete $self->{texture};
		3234	}
		3235
		3236	if (my $paridx = delete $self->{scroll_to}) {
		3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
2464	}	3239	}
2465		3240
2466	sub update {	3241	sub update {
2467	my ($self) = @_;	3242	my ($self) = @_;
2468		3243
…		…
2470		3245
2471	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2472		3247
2473	delete $self->{texture};	3248	delete $self->{texture};
2474		3249
2475	$ROOT->on_post_alloc ($self, sub {	3250	$ROOT->on_post_alloc ($self => sub {
		3251	$self->force_uptodate;
		3252
2476	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2477		3254
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 {	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2505	glClearColor 0.5, 0.5, 0.5, 0;	3256	glClearColor 0, 0, 0, 0;
2506	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2507		3258
		3259	package CFPlus::UI::Base;
		3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
		3262
		3263	my $top = int $self->{children}[1]{range}[0];
		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
2508	my $top = int $self->{children}[1]{range}[0];	3267	my $top = int $self->{children}[1]{range}[0];
2509		3268
2510	my $y0 = $top;	3269	my $y0 = $top;
2511	my $y1 = $top + $H;	3270	my $y1 = $top + $H;
2512		3271
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}}) {	3272	for my $para (@{$self->{par}}) {
2524	my $h = $par->[1];	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2525		3275
2526	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2527	$layout->set_foreground (@{ $par->[2] });	3277	my $layout = $self->get_layout ($para);
2528	$layout->set_width ($W - $par->[3]);
2529	$layout->set_markup ($par->[4]);
2530		3278
2531	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3279	$layout->render ($para->{indent}, $y - $y0);
2532		3280
2533	glRasterPos $par->[3], $y - $y0;	3281	if (my @w = @{ $para->{widget} }) {
2534	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3282	my @s = $layout->get_shapes;
		3283
		3284	for (@w) {
		3285	my ($dx, $dy) = splice @s, 0, 2, ();
		3286
		3287	$_->{x} = $dx + $para->{indent};
		3288	$_->{y} = $dy + $y - $y0;
		3289
		3290	$_->draw;
		3291	}
		3292	}
2535	}	3293	}
2536		3294
2537	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2538	}	3297	}
2539		3298
2540	glDisable GL_BLEND;	3299	$self->{top_paragraph} = $top_paragraph;
2541	};	3300	};
2542	});	3301	});
2543	}	3302	}
2544		3303
		3304	sub reconfigure {
		3305	my ($self) = @_;
		3306
		3307	$self->SUPER::reconfigure;
		3308
		3309	$_->{w} = 1e10 for @{ $self->{par} };
		3310	$self->reflow;
		3311	}
		3312
2545	sub _draw {	3313	sub _draw {
2546	my ($self) = @_;	3314	my ($self) = @_;
2547		3315
2548	glEnable GL_TEXTURE_2D;	3316	glEnable GL_TEXTURE_2D;
2549	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3317	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2550	glColor 1, 1, 1, 1;	3318	glColor 0, 0, 0, 1;
2551	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3319	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2552	glDisable GL_TEXTURE_2D;	3320	glDisable GL_TEXTURE_2D;
2553		3321
2554	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2555
2556	}	3323	}
2557		3324
2558	#############################################################################	3325	#############################################################################
2559		3326
2560	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2561		3328
2562	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2563		3330
2564	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2565		3332
2566	sub moveto {	3333	sub moveto {
2567	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2568		3335
2569	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2597	glPopMatrix;	3364	glPopMatrix;
2598	}	3365	}
2599		3366
2600	#############################################################################	3367	#############################################################################
2601		3368
2602	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2603		3370
2604	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2605		3372
2606	sub new {	3373	sub new {
2607	my $class = shift;	3374	my $class = shift;
2608		3375
2609	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
…		…
2621	$self->{other}->toggle_visibility;	3388	$self->{other}->toggle_visibility;
2622	}	3389	}
2623		3390
2624	#############################################################################	3391	#############################################################################
2625		3392
2626	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2627		3394
2628	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2629		3396
2630	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2631		3398
2632	sub new {	3399	sub new {
2633	my $class = shift;	3400	my $class = shift;
2634		3401
2635	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2638	)	3405	)
2639	}	3406	}
2640		3407
2641	sub set_tooltip_from {	3408	sub set_tooltip_from {
2642	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
2643		3413
2644	my $tooltip = $widget->{tooltip};	3414	my $tooltip = $widget->{tooltip};
2645		3415
2646	if ($ENV{CFPLUS_DEBUG} & 2) {	3416	if ($ENV{CFPLUS_DEBUG} & 2) {
2647	$tooltip .= "\n\n" . (ref $widget) . "\n"	3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
2648	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3418	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2649	. "req $widget->{req_w} $widget->{req_h}\n"	3419	. "req $widget->{req_w} $widget->{req_h}\n"
2650	. "visible $widget->{visible}";	3420	. "visible $widget->{visible}";
2651	}	3421	}
2652		3422
		3423	$tooltip =~ s/^\n+//;
		3424	$tooltip =~ s/\n+$//;
		3425
2653	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2654	markup => $tooltip,	3427	markup => $tooltip,
2655	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2656	fontsize => 0.8,	3429	fontsize => 0.8,
2657	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2658	ellipsise => 0,	3431	ellipsise => 0,
2659	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2660	);	3433	);
2661	}	3434	}
2662		3435
…		…
2666	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3439	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2667		3440
2668	($w + 4, $h + 4)	3441	($w + 4, $h + 4)
2669	}	3442	}
2670		3443
2671	sub size_allocate {	3444	sub invoke_size_allocate {
2672	my ($self, $w, $h) = @_;	3445	my ($self, $w, $h) = @_;
2673		3446
2674	$self->SUPER::size_allocate ($w - 4, $h - 4);	3447	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2675	}	3448	}
2676		3449
2677	sub visibility_change {	3450	sub invoke_visibility_change {
2678	my ($self, $visible) = @_;	3451	my ($self, $visible) = @_;
2679		3452
2680	return unless $visible;	3453	return unless $visible;
2681		3454
2682	$self->{root}->on_post_alloc ("move_$self" => sub {	3455	$self->{root}->on_post_alloc ("move_$self" => sub {
2683	my $widget = $self->{owner}	3456	my $widget = $self->{owner}
2684	or return;	3457	or return;
2685		3458
		3459	if ($widget->{visible}) {
2686	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3460	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2687		3461
2688	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3462	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2689	if $x + $self->{w} > $::WIDTH;	3463	if $x + $self->{w} > $self->{root}{w};
2690		3464
2691	$self->move_abs ($x, $y);	3465	$self->move_abs ($x, $y);
		3466	} else {
		3467	$self->hide;
		3468	}
2692	});	3469	});
2693	}	3470	}
2694		3471
2695	sub _draw {	3472	sub _draw {
2696	my ($self) = @_;	3473	my ($self) = @_;
…		…
2720	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
2721	}	3498	}
2722		3499
2723	#############################################################################	3500	#############################################################################
2724		3501
2725	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
2726		3503
2727	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
2728		3505
2729	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
2730		3507
2731	sub new {	3508	sub new {
2732	my $class = shift;	3509	my $class = shift;
2733		3510
2734	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
2735	aspect => 1,	3514	aspect => 1,
2736	can_events => 0,	3515	can_events => 0,
2737	@_,	3516	@_,
2738	);	3517	);
2739		3518
2740	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
2741	Scalar::Util::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
2742		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2743	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
2744	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2745	hard => 1,	3525	parked => 1,
2746	interval => $self->{animspeed},
2747	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
2748	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
2749	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
2750	},	3534	},
2751	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
2752	}	3539	}
2753		3540
2754	$self	3541	$self
2755	}	3542	}
2756		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
2757	sub size_request {	3574	sub size_request {
2758	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
2759	}	3590	}
2760		3591
2761	sub update {	3592	sub update {
2762	my ($self) = @_;	3593	my ($self) = @_;
2763		3594
2764	return unless $self->{visible};	3595	return unless $self->{visible};
2765		3596
2766	$self->SUPER::update;	3597	$self->SUPER::update;
2767	}	3598	}
2768		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
2769	sub _draw {	3608	sub _draw {
2770	my ($self) = @_;	3609	my ($self) = @_;
2771		3610
2772	return unless $::CONN;	3611	return unless $::CONN;
2773		3612
2774	my $face;	3613	$self->SUPER::_draw;
2775		3614
2776	if ($self->{frame}) {
2777	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
2778		3616	or return;
2779	$face = $anim->[ $self->{frame} % @$anim ]
2780	if $anim && @$anim;
2781	}
2782		3617
2783	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
2784		3619
2785	if ($tex) {	3620	if ($tex) {
2786	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
2787	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2788	glColor 1, 1, 1, 1;	3623	glColor 0, 0, 0, 1;
2789	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3624	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2790	glDisable GL_TEXTURE_2D;	3625	glDisable GL_TEXTURE_2D;
2791	}	3626	}
2792	}	3627	}
2793		3628
2794	sub DESTROY {	3629	sub destroy {
2795	my ($self) = @_;	3630	my ($self) = @_;
2796		3631
2797	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
2798	if $self->{timer};	3633	if $self->{timer};
2799		3634
2800	$self->SUPER::DESTROY;	3635	$self->SUPER::destroy;
2801	}	3636	}
2802		3637
2803	#############################################################################	3638	#############################################################################
2804		3639
		3640	package CFPlus::UI::Buttonbar;
		3641
		3642	our @ISA = CFPlus::UI::HBox::;
		3643
		3644	# TODO: should actually wrap buttons and other goodies.
		3645
		3646	#############################################################################
		3647
2805	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
2806		3649
2807	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
2808		3651
2809	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
2810		3653
2811	sub new {	3654	sub new {
2812	my $class = shift;	3655	my $class = shift;
2813		3656
2814	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
2815	items => [],	3658	items => [],
2816	z => 100,	3659	z => 100,
2817	@_,	3660	@_,
2818	);	3661	);
2819		3662
2820	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2821		3664
2822	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
2823	my ($widget, $cb) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
2824		3667
2825	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
2826	if (!ref $widget) {	3669	if (!ref $widget) {
		3670	if ($widget =~ /\t/) {
		3671	my ($left, $right) = split /\t/, $widget, 2;
		3672
2827	$widget = new CFClient::UI::Label	3673	$widget = new CFPlus::UI::HBox
2828	can_hover => 1,	3674	can_hover => 1,
2829	can_events => 1,	3675	can_events => 1,
		3676	tooltip => $tooltip,
		3677	children => [
		3678	(new CFPlus::UI::Label markup => $left, expand => 1),
		3679	(new CFPlus::UI::Label markup => $right, align => +1),
		3680	],
		3681	;
		3682
		3683	} else {
		3684	$widget = new CFPlus::UI::Label
		3685	can_hover => 1,
		3686	can_events => 1,
2830	text => $widget;	3687	markup => $widget,
		3688	tooltip => $tooltip;
		3689	}
2831	}	3690	}
2832		3691
2833	$self->{item}{$widget} = $item;	3692	$self->{item}{$widget} = $item;
2834		3693
2835	$self->{vbox}->add ($widget);	3694	$self->{vbox}->add ($widget);
…		…
2840		3699
2841	# popup given the event (must be a mouse button down event currently)	3700	# popup given the event (must be a mouse button down event currently)
2842	sub popup {	3701	sub popup {
2843	my ($self, $ev) = @_;	3702	my ($self, $ev) = @_;
2844		3703
2845	$self->_emit ("popdown");	3704	$self->emit ("popdown");
2846		3705
2847	# maybe save $GRAB? must be careful about events...	3706	# maybe save $GRAB? must be careful about events...
2848	$GRAB = $self;	3707	$GRAB = $self;
2849	$self->{button} = $ev->{button};	3708	$self->{button} = $ev->{button};
2850		3709
2851	$self->show;	3710	$self->show;
2852	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3711	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2853	}	3712	}
2854		3713
2855	sub mouse_motion {	3714	sub invoke_mouse_motion {
2856	my ($self, $ev, $x, $y) = @_;	3715	my ($self, $ev, $x, $y) = @_;
2857		3716
2858	# TODO: should use vbox->find_widget or so	3717	# TODO: should use vbox->find_widget or so
2859	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3718	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2860	$self->{hover} = $self->{item}{$HOVER};	3719	$self->{hover} = $self->{item}{$HOVER};
2861	}
2862		3720
		3721	0
		3722	}
		3723
2863	sub button_up {	3724	sub invoke_button_up {
2864	my ($self, $ev, $x, $y) = @_;	3725	my ($self, $ev, $x, $y) = @_;
2865		3726
2866	if ($ev->{button} == $self->{button}) {	3727	if ($ev->{button} == $self->{button}) {
2867	undef $GRAB;	3728	undef $GRAB;
2868	$self->hide;	3729	$self->hide;
2869		3730
2870	$self->_emit ("popdown");	3731	$self->emit ("popdown");
2871	$self->{hover}[1]->() if $self->{hover};	3732	$self->{hover}[1]->() if $self->{hover};
		3733	} else {
		3734	return 0
		3735	}
		3736
2872	}	3737	1
2873	}	3738	}
2874		3739
2875	#############################################################################	3740	#############################################################################
2876		3741
2877	package CFClient::UI::Statusbox;	3742	package CFPlus::UI::Multiplexer;
2878		3743
2879	our @ISA = CFClient::UI::VBox::;	3744	our @ISA = CFPlus::UI::Container::;
2880		3745
2881	sub new {	3746	sub new {
2882	my $class = shift;	3747	my $class = shift;
2883		3748
2884	$class->SUPER::new (	3749	my $self = $class->SUPER::new (
		3750	@_,
		3751	);
		3752
		3753	$self->{current} = $self->{children}[0]
		3754	if @{ $self->{children} };
		3755
		3756	$self
		3757	}
		3758
		3759	sub add {
		3760	my ($self, @widgets) = @_;
		3761
		3762	$self->SUPER::add (@widgets);
		3763
		3764	$self->{current} = $self->{children}[0]
		3765	if @{ $self->{children} };
		3766	}
		3767
		3768	sub get_current_page {
		3769	my ($self) = @_;
		3770
		3771	$self->{current}
		3772	}
		3773
		3774	sub set_current_page {
		3775	my ($self, $page_or_widget) = @_;
		3776
		3777	my $widget = ref $page_or_widget
		3778	? $page_or_widget
		3779	: $self->{children}[$page_or_widget];
		3780
		3781	$self->{current} = $widget;
		3782	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3783
		3784	$self->emit (page_changed => $self->{current});
		3785
		3786	$self->realloc;
		3787	}
		3788
		3789	sub visible_children {
		3790	$_[0]{current}
		3791	}
		3792
		3793	sub size_request {
		3794	my ($self) = @_;
		3795
		3796	$self->{current}->size_request
		3797	}
		3798
		3799	sub invoke_size_allocate {
		3800	my ($self, $w, $h) = @_;
		3801
		3802	$self->{current}->configure (0, 0, $w, $h);
		3803
		3804	1
		3805	}
		3806
		3807	sub _draw {
		3808	my ($self) = @_;
		3809
		3810	$self->{current}->draw;
		3811	}
		3812
		3813	#############################################################################
		3814
		3815	package CFPlus::UI::Notebook;
		3816
		3817	our @ISA = CFPlus::UI::VBox::;
		3818
		3819	sub new {
		3820	my $class = shift;
		3821
		3822	my $self = $class->SUPER::new (
		3823	buttonbar => (new CFPlus::UI::Buttonbar),
		3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3825	# filter => # will be put between multiplexer and $self
		3826	@_,
		3827	);
		3828
		3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3830	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3831
		3832	$self
		3833	}
		3834
		3835	sub add {
		3836	my ($self, $title, $widget, $tooltip) = @_;
		3837
		3838	CFPlus::weaken $self;
		3839
		3840	$self->{buttonbar}->add (new CFPlus::UI::Button
		3841	markup => $title,
		3842	tooltip => $tooltip,
		3843	on_activate => sub { $self->set_current_page ($widget) },
		3844	);
		3845
		3846	$self->{multiplexer}->add ($widget);
		3847	}
		3848
		3849	sub get_current_page {
		3850	my ($self) = @_;
		3851
		3852	$self->{multiplexer}->get_current_page
		3853	}
		3854
		3855	sub set_current_page {
		3856	my ($self, $page) = @_;
		3857
		3858	$self->{multiplexer}->set_current_page ($page);
		3859	$self->emit (page_changed => $self->{multiplexer}{current});
		3860	}
		3861
		3862	#############################################################################
		3863
		3864	package CFPlus::UI::Selector;
		3865
		3866	use utf8;
		3867
		3868	our @ISA = CFPlus::UI::Button::;
		3869
		3870	sub new {
		3871	my $class = shift;
		3872
		3873	my $self = $class->SUPER::new (
		3874	options => [], # [value, title, longdesc], ...
		3875	value => undef,
		3876	@_,
		3877	);
		3878
		3879	$self->_set_value ($self->{value});
		3880
		3881	$self
		3882	}
		3883
		3884	sub invoke_button_down {
		3885	my ($self, $ev) = @_;
		3886
		3887	my @menu_items;
		3888
		3889	for (@{ $self->{options} }) {
		3890	my ($value, $title, $tooltip) = @$_;
		3891
		3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3893	}
		3894
		3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3896	}
		3897
		3898	sub _set_value {
		3899	my ($self, $value) = @_;
		3900
		3901	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3902	or return;
		3903
		3904	$self->{value} = $item->[0];
		3905	$self->set_markup ("$item->[1] ⇓");
		3906	$self->set_tooltip ($item->[2]);
		3907	}
		3908
		3909	sub set_value {
		3910	my ($self, $value) = @_;
		3911
		3912	return unless $self->{value} ne $value;
		3913
		3914	$self->_set_value ($value);
		3915	$self->emit (changed => $value);
		3916	}
		3917
		3918	#############################################################################
		3919
		3920	package CFPlus::UI::Statusbox;
		3921
		3922	our @ISA = CFPlus::UI::VBox::;
		3923
		3924	sub new {
		3925	my $class = shift;
		3926
		3927	my $self = $class->SUPER::new (
2885	fontsize => 0.8,	3928	fontsize => 0.8,
2886	@_,	3929	@_,
2887	)	3930	);
		3931
		3932	CFPlus::weaken (my $this = $self);
		3933
		3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3935
		3936	$self
2888	}	3937	}
2889		3938
2890	sub reorder {	3939	sub reorder {
2891	my ($self) = @_;	3940	my ($self) = @_;
2892	my $NOW = time;	3941	my $NOW = Time::HiRes::time;
		3942
		3943	# freeze display when hovering over any label
		3944	return if $CFPlus::UI::TOOLTIP->{owner}
		3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3946	values %{ $self->{item} };
2893		3947
2894	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
2895	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2896	}	3950	}
2897		3951
…		…
2900	my @items = sort {	3954	my @items = sort {
2901	$a->{pri} <=> $b->{pri}	3955	$a->{pri} <=> $b->{pri}
2902	or $b->{id} <=> $a->{id}	3956	or $b->{id} <=> $a->{id}
2903	} values %{ $self->{item} };	3957	} values %{ $self->{item} };
2904		3958
		3959	$self->{timer}->interval (1);
		3960
2905	my $count = 10 + 1;	3961	my $count = 10 + 1;
2906	for my $item (@items) {	3962	for my $item (@items) {
2907	last unless --$count;	3963	last unless --$count;
2908		3964
2909	push @widgets, $item->{label} ||= do {	3965	my $label = $item->{label} ||= do {
2910	# TODO: doesn't handle markup well (read as: at all)	3966	# TODO: doesn't handle markup well (read as: at all)
2911	my $short = $item->{count} > 1	3967	my $short = $item->{count} > 1
2912	? "<b>$item->{count} ×</b> $item->{text}"	3968	? "<b>$item->{count} ×</b> $item->{text}"
2913	: $item->{text};	3969	: $item->{text};
2914		3970
2915	for ($short) {	3971	for ($short) {
2916	s/^\s+//;	3972	s/^\s+//;
2917	s/\s+/ /g;	3973	s/\s+/ /g;
2918	}	3974	}
2919		3975
2920	new CFClient::UI::Label	3976	new CFPlus::UI::Label
2921	markup => $short,	3977	markup => $short,
2922	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
2923	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
2924	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
2925	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
2926	max_w => $::WIDTH * 0.44,	3982	max_w => $::WIDTH * 0.44,
2927	fg => $item->{fg},	3983	fg => [@{ $item->{fg} }],
2928	can_events => 1,	3984	can_events => 1,
2929	can_hover => 1	3985	can_hover => 1
2930	};	3986	};
		3987
		3988	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3989	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3990	$label->update;
		3991	$label->set_max_size (undef, $label->{req_h} * $diff)
		3992	if $diff < 1;
		3993	$self->{timer}->interval (1/30);
		3994	} else {
		3995	$label->{fg}[3] = $item->{fg}[3] || 1;
		3996	}
		3997
		3998	push @widgets, $label;
2931	}	3999	}
2932		4000
2933	$self->clear;	4001	$self->clear;
2934	$self->SUPER::add (reverse @widgets);	4002	$self->SUPER::add (reverse @widgets);
2935	}	4003	}
…		…
2940	$text =~ s/^\s+//;	4008	$text =~ s/^\s+//;
2941	$text =~ s/\s+$//;	4009	$text =~ s/\s+$//;
2942		4010
2943	return unless $text;	4011	return unless $text;
2944		4012
2945	my $timeout = time + ((delete $arg{timeout}) || 60);	4013	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2946		4014
2947	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	4015	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2948		4016
2949	if (my $item = $self->{item}{$group}) {	4017	if (my $item = $self->{item}{$group}) {
2950	if ($item->{text} eq $text) {	4018	if ($item->{text} eq $text) {
2951	$item->{count}++;	4019	$item->{count}++;
2952	} else {	4020	} else {
2953	$item->{count} = 1;	4021	$item->{count} = 1;
2954	$item->{text} = $item->{tooltip} = $text;	4022	$item->{text} = $item->{tooltip} = $text;
2955	}	4023	}
2956	$item->{id} = ++$self->{id};	4024	$item->{id} += 0.2;#d#
2957	$item->{timeout} = $timeout;	4025	$item->{timeout} = $timeout;
2958	delete $item->{label};	4026	delete $item->{label};
2959	} else {	4027	} else {
2960	$self->{item}{$group} = {	4028	$self->{item}{$group} = {
2961	id => ++$self->{id},	4029	id => ++$self->{id},
…		…
2967	count => 1,	4035	count => 1,
2968	%arg,	4036	%arg,
2969	};	4037	};
2970	}	4038	}
2971		4039
		4040	$ROOT->on_refresh (reorder => sub {
2972	$self->reorder;	4041	$self->reorder;
		4042	});
2973	}	4043	}
2974		4044
2975	sub reconfigure {	4045	sub reconfigure {
2976	my ($self) = @_;	4046	my ($self) = @_;
2977		4047
…		…
2980		4050
2981	$self->reorder;	4051	$self->reorder;
2982	$self->SUPER::reconfigure;	4052	$self->SUPER::reconfigure;
2983	}	4053	}
2984		4054
		4055	sub destroy {
		4056	my ($self) = @_;
		4057
		4058	$self->{timer}->cancel;
		4059
		4060	$self->SUPER::destroy;
		4061	}
		4062
2985	#############################################################################	4063	#############################################################################
2986		4064
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;	4065	package CFPlus::UI::Root;
3279		4066
3280	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
3281		4068
		4069	use List::Util qw(min max);
		4070
3282	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
3283		4072
3284	sub new {	4073	sub new {
3285	my $class = shift;	4074	my $class = shift;
3286		4075
3287	my $self = $class->SUPER::new (	4076	my $self = $class->SUPER::new (
3288	visible => 1,	4077	visible => 1,
3289	@_,	4078	@_,
3290	);	4079	);
3291		4080
3292	Scalar::Util::weaken ($self->{root} = $self);	4081	CFPlus::weaken ($self->{root} = $self);
3293		4082
3294	$self	4083	$self
3295	}	4084	}
3296		4085
3297	sub size_request {	4086	sub size_request {
…		…
3312	$coord = $max - $size if $coord > $max - $size;	4101	$coord = $max - $size if $coord > $max - $size;
3313		4102
3314	int $coord + 0.5	4103	int $coord + 0.5
3315	}	4104	}
3316		4105
3317	sub size_allocate {	4106	sub invoke_size_allocate {
3318	my ($self, $w, $h) = @_;	4107	my ($self, $w, $h) = @_;
3319		4108
3320	for my $child ($self->children) {	4109	for my $child ($self->children) {
3321	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4110	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3322		4111
…		…
3326	$X = _to_pixel $X, $W, $self->{w};	4115	$X = _to_pixel $X, $W, $self->{w};
3327	$Y = _to_pixel $Y, $H, $self->{h};	4116	$Y = _to_pixel $Y, $H, $self->{h};
3328		4117
3329	$child->configure ($X, $Y, $W, $H);	4118	$child->configure ($X, $Y, $W, $H);
3330	}	4119	}
		4120
		4121	1
3331	}	4122	}
3332		4123
3333	sub coord2local {	4124	sub coord2local {
3334	my ($self, $x, $y) = @_;	4125	my ($self, $x, $y) = @_;
3335		4126
…		…
3420		4211
3421	delete $queue{$widget+0};	4212	delete $queue{$widget+0};
3422		4213
3423	my ($w, $h) = $widget->size_request;	4214	my ($w, $h) = $widget->size_request;
3424		4215
3425	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4216	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3426	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4217	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4218
		4219	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4220	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3427		4221
3428	$w = $widget->{force_w} if exists $widget->{force_w};	4222	$w = $widget->{force_w} if exists $widget->{force_w};
3429	$h = $widget->{force_h} if exists $widget->{force_h};	4223	$h = $widget->{force_h} if exists $widget->{force_h};
3430		4224
3431	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4225	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3458	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4252	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3459		4253
3460	$w = 0 if $w < 0;	4254	$w = 0 if $w < 0;
3461	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3462		4256
		4257	$w = max $widget->{min_w}, $w;
		4258	$h = max $widget->{min_h}, $h;
		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
		4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
		4265
3463	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3464	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
3465		4268
3466	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4269	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3467	$widget->{old_w} = $widget->{w};	4270	$widget->{old_w} = $widget->{w};
…		…
3477		4280
3478	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3479	$_->()	4282	$_->()
3480	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
3481	}	4284	}
3482
3483		4285
3484	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3485	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3486	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3487		4289
…		…
3490	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3491	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3492	glLoadIdentity;	4294	glLoadIdentity;
3493		4295
3494	{	4296	{
3495	package CFClient::UI::Base;	4297	package CFPlus::UI::Base;
3496		4298
3497	($draw_x, $draw_y, $draw_w, $draw_h) =	4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3498	(0, 0, $self->{w}, $self->{h});	4300	(0, 0, $self->{w}, $self->{h});
3499	}
3500		4301
3501	$self->_draw;	4302	$self->_draw;
		4303	}
3502	}	4304	}
3503		4305
3504	#############################################################################	4306	#############################################################################
3505		4307
3506	package CFClient::UI;	4308	package CFPlus::UI;
3507		4309
3508	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3509	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3510		4312
3511	1	4313	1
3512		4314

Diff Legend

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