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

Diff Legend

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