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

Diff Legend

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