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

Diff Legend

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