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.272 by root, Sat Jun 3 01:47:14 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

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

Diff Legend

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