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.274 by root, Sat Jun 3 22:20:52 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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