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

Diff Legend

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