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.268 by root, Thu Jun 1 05:04:41 2006 UTC vs.
Revision 1.379 by root, Tue Jul 17 12:04:18 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 (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 (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 (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;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		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;
1045		1351
1046	my $bg =	1352	my $bg =
1047	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1048	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1049		1355
1050	my @border =	1356	my @border =
1051	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1052	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1053		1359
1054	sub new {	1360	sub new {
1055	my $class = shift;	1361	my ($class, %arg) = @_;
1056		1362
1057	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
1058	bg => [1, 1, 1, 1],	1364	bg => [1, 1, 1, 1],
1059	border_bg => [1, 1, 1, 1],	1365	border_bg => [1, 1, 1, 1],
1060	border => 0.6,	1366	border => 0.6,
1061	can_events => 1,	1367	can_events => 1,
1062	min_w => 16,	1368	min_w => 64,
1063	min_h => 16,	1369	min_h => 32,
1064	@_	1370	%arg,
1065	);	1371	);
1066		1372
1067	$self->{title} &&= new CFClient::UI::Label	1373	$self->{title_widget} = new CFPlus::UI::Label
1068	align => 0,	1374	align => 0,
1069	valign => 1,	1375	valign => 1,
1070	text => $self->{title},	1376	text => $self->{title},
1071	fontsize => $self->{border};	1377	fontsize => $self->{border},
		1378	if exists $self->{title};
		1379
		1380	if ($self->{has_close_button}) {
		1381	$self->{close_button} =
		1382	new CFPlus::UI::ImageButton
		1383	path => 'x1_close.png',
		1384	on_activate => sub { $self->emit ("delete") };
		1385
		1386	$self->CFPlus::UI::Container::add ($self->{close_button});
		1387	}
1072		1388
1073	$self	1389	$self
		1390	}
		1391
		1392	sub add {
		1393	my ($self, @widgets) = @_;
		1394
		1395	$self->SUPER::add (@widgets);
		1396	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
		1397	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1074	}	1398	}
1075		1399
1076	sub border {	1400	sub border {
1077	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
1078	}	1402	}
1079		1403
1080	sub size_request {	1404	sub size_request {
1081	my ($self) = @_;	1405	my ($self) = @_;
		1406
		1407	$self->{title_widget}->size_request
		1408	if $self->{title_widget};
		1409
		1410	$self->{close_button}->size_request
		1411	if $self->{close_button};
1082		1412
1083	my ($w, $h) = $self->SUPER::size_request;	1413	my ($w, $h) = $self->SUPER::size_request;
1084		1414
1085	(	1415	(
1086	$w + $self->border * 2,	1416	$w + $self->border * 2,
1087	$h + $self->border * 2,	1417	$h + $self->border * 2,
1088	)	1418	)
1089	}	1419	}
1090		1420
1091	sub size_allocate {	1421	sub invoke_size_allocate {
1092	my ($self, $w, $h) = @_;	1422	my ($self, $w, $h) = @_;
1093		1423
		1424	if ($self->{title_widget}) {
		1425	$self->{title_widget}{w} = $w;
		1426	$self->{title_widget}{h} = $h;
		1427	$self->{title_widget}->invoke_size_allocate ($w, $h);
		1428	}
		1429
		1430	my $border = $self->border;
		1431
1094	$h -= List::Util::max 0, $self->border * 2;	1432	$h -= List::Util::max 0, $border * 2;
1095	$w -= List::Util::max 0, $self->border * 2;	1433	$w -= List::Util::max 0, $border * 2;
1096		1434
1097	$self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1098	if $self->{title};
1099
1100	$self->child->configure ($self->border, $self->border, $w, $h);	1435	$self->child->configure ($border, $border, $w, $h);
1101	}
1102		1436
		1437	$self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
		1438	if $self->{close_button};
		1439
		1440	1
		1441	}
		1442
		1443	sub invoke_delete {
		1444	my ($self) = @_;
		1445
		1446	$self->hide;
		1447
		1448	1
		1449	}
		1450
1103	sub button_down {	1451	sub invoke_button_down {
1104	my ($self, $ev, $x, $y) = @_;	1452	my ($self, $ev, $x, $y) = @_;
1105		1453
1106	my ($w, $h) = @$self{qw(w h)};	1454	my ($w, $h) = @$self{qw(w h)};
1107	my $border = $self->border;	1455	my $border = $self->border;
1108		1456
…		…
1124	my $dy = $ev->{y} - $oy;	1472	my $dy = $ev->{y} - $oy;
1125		1473
1126	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1474	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1127	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1475	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1128		1476
		1477	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1129	$self->realloc;	1478	$self->realloc;
1130	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1131	};	1479	};
1132		1480
1133	} elsif ($lr ^ $td) {	1481	} elsif ($lr ^ $td) {
1134	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1482	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1135	my ($bx, $by) = ($self->{x}, $self->{y});	1483	my ($bx, $by) = ($self->{x}, $self->{y});
…		…
1138	my ($ev, $x, $y) = @_;	1486	my ($ev, $x, $y) = @_;
1139		1487
1140	($x, $y) = ($ev->{x}, $ev->{y});	1488	($x, $y) = ($ev->{x}, $ev->{y});
1141		1489
1142	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);	1490	$self->move_abs ($bx + $x - $ox, $by + $y - $oy);
		1491	# HACK: the next line is required to enforce placement
		1492	$self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1143	};	1493	};
		1494	} else {
		1495	return 0;
		1496	}
		1497
1144	}	1498	1
1145	}	1499	}
1146		1500
1147	sub button_up {	1501	sub invoke_button_up {
1148	my ($self, $ev, $x, $y) = @_;	1502	my ($self, $ev, $x, $y) = @_;
1149		1503
1150	delete $self->{motion};	1504	! ! delete $self->{motion}
1151	}	1505	}
1152		1506
1153	sub mouse_motion {	1507	sub invoke_mouse_motion {
1154	my ($self, $ev, $x, $y) = @_;	1508	my ($self, $ev, $x, $y) = @_;
1155		1509
1156	$self->{motion}->($ev, $x, $y) if $self->{motion};	1510	$self->{motion}->($ev, $x, $y) if $self->{motion};
		1511
		1512	! ! $self->{motion}
		1513	}
		1514
		1515	sub invoke_visibility_change {
		1516	my ($self, $visible) = @_;
		1517
		1518	delete $self->{motion} unless $visible;
		1519
		1520	0
1157	}	1521	}
1158		1522
1159	sub _draw {	1523	sub _draw {
1160	my ($self) = @_;	1524	my ($self) = @_;
1161		1525
		1526	my $child = $self->{children}[0];
		1527
1162	my ($w, $h ) = ($self->{w}, $self->{h});	1528	my ($w, $h ) = ($self->{w}, $self->{h});
1163	my ($cw, $ch) = ($self->child->{w}, $self->child->{h});	1529	my ($cw, $ch) = ($child->{w}, $child->{h});
1164		1530
1165	glEnable GL_TEXTURE_2D;	1531	glEnable GL_TEXTURE_2D;
1166	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1532	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1167		1533
1168	my $border = $self->border;	1534	my $border = $self->border;
…		…
1183	$bg->draw_quad_alpha ($border, $border, $cw, $ch);	1549	$bg->draw_quad_alpha ($border, $border, $cw, $ch);
1184	}	1550	}
1185		1551
1186	glDisable GL_TEXTURE_2D;	1552	glDisable GL_TEXTURE_2D;
1187		1553
1188	$self->{title}->draw if $self->{title};
1189
1190	$self->child->draw;	1554	$child->draw;
		1555
		1556	if ($self->{title_widget}) {
		1557	glTranslate 0, $border - $self->{h};
		1558	$self->{title_widget}->_draw;
		1559
		1560	glTranslate 0, - ($border - $self->{h});
		1561	}
		1562
		1563	$self->{close_button}->draw
		1564	if $self->{close_button};
1191	}	1565	}
1192		1566
1193	#############################################################################	1567	#############################################################################
1194		1568
1195	package CFClient::UI::Table;	1569	package CFPlus::UI::Table;
1196		1570
1197	our @ISA = CFClient::UI::Base::;	1571	our @ISA = CFPlus::UI::Base::;
1198		1572
1199	use List::Util qw(max sum);	1573	use List::Util qw(max sum);
1200		1574
1201	use CFClient::OpenGL;	1575	use CFPlus::OpenGL;
1202		1576
1203	sub new {	1577	sub new {
1204	my $class = shift;	1578	my $class = shift;
1205		1579
1206	$class->SUPER::new (	1580	$class->SUPER::new (
		1581	children => [],
1207	col_expand => [],	1582	col_expand => [],
		1583	row_expand => [],
1208	@_,	1584	@_,
1209	)	1585	)
1210	}	1586	}
1211		1587
1212	sub children {	1588	sub children {
1213	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1214	}	1590	}
1215		1591
		1592	# TODO: store row/col info in child widget and use standard add/del
1216	sub add {	1593	sub add {
1217	my ($self, $x, $y, $child) = @_;	1594	my ($self) = shift;
1218		1595
		1596	while (@_) {
		1597	my ($x, $y, $child) = splice @_, 0, 3, ();
1219	$child->set_parent ($self);	1598	$child->set_parent ($self);
1220	$self->{children}[$y][$x] = $child;	1599	$self->{children}[$y][$x] = $child;
		1600	}
1221		1601
		1602	$self->{force_realloc} = 1;
		1603	$self->{force_size_alloc} = 1;
1222	$self->realloc;	1604	$self->realloc;
		1605	}
		1606
		1607	sub remove {
		1608	my ($self, $child) = @_;
		1609
		1610	for (@{ $self->{children} }) {
		1611	for (@{ $_ || [] }) {
		1612	$_ = undef if $_ == $child;
		1613	}
		1614	}
1223	}	1615	}
1224		1616
1225	# TODO: move to container class maybe? send children a signal on removal?	1617	# TODO: move to container class maybe? send children a signal on removal?
1226	sub clear {	1618	sub clear {
1227	my ($self) = @_;	1619	my ($self) = @_;
…		…
1268	(sum @$ws),	1660	(sum @$ws),
1269	(sum @$hs),	1661	(sum @$hs),
1270	)	1662	)
1271	}	1663	}
1272		1664
1273	sub size_allocate {	1665	sub invoke_size_allocate {
1274	my ($self, $w, $h) = @_;	1666	my ($self, $w, $h) = @_;
1275		1667
1276	my ($ws, $hs) = $self->get_wh;	1668	my ($ws, $hs) = $self->get_wh;
1277		1669
1278	my $req_w = (sum @$ws) || 1;	1670	my $req_w = (sum @$ws) || 1;
1279	my $req_h = (sum @$hs) || 1;	1671	my $req_h = (sum @$hs) || 1;
1280		1672
1281	# TODO: nicer code && do row_expand	1673	# TODO: nicer code
1282	my @col_expand = @{$self->{col_expand}};	1674	my @col_expand = @{$self->{col_expand}};
1283	@col_expand = (1) x @$ws unless @col_expand;	1675	@col_expand = (1) x @$ws unless @col_expand;
1284	my $col_expand = (sum @col_expand) || 1;	1676	my $col_expand = (sum @col_expand) || 1;
1285		1677
1286	# linearly scale sizes
1287	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1288	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1289		1679
1290	CFClient::UI::harmonize $ws;	1680	CFPlus::UI::harmonize $ws;
		1681
		1682	my @row_expand = @{$self->{row_expand}};
		1683	@row_expand = (1) x @$ws unless @row_expand;
		1684	my $row_expand = (sum @row_expand) || 1;
		1685
		1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1687
1291	CFClient::UI::harmonize $hs;	1688	CFPlus::UI::harmonize $hs;
1292		1689
1293	my $y;	1690	my $y;
1294		1691
1295	for my $r (0 .. $#{$self->{children}}) {	1692	for my $r (0 .. $#{$self->{children}}) {
1296	my $row = $self->{children}[$r]	1693	my $row = $self->{children}[$r]
…		…
1310	}	1707	}
1311		1708
1312	$y += $row_h;	1709	$y += $row_h;
1313	}	1710	}
1314		1711
		1712	1
1315	}	1713	}
1316		1714
1317	sub find_widget {	1715	sub find_widget {
1318	my ($self, $x, $y) = @_;	1716	my ($self, $x, $y) = @_;
1319		1717
…		…
1338	}	1736	}
1339	}	1737	}
1340		1738
1341	#############################################################################	1739	#############################################################################
1342		1740
1343	package CFClient::UI::Box;	1741	package CFPlus::UI::Fixed;
1344		1742
		1743	use List::Util qw(min max);
		1744
1345	our @ISA = CFClient::UI::Container::;	1745	our @ISA = CFPlus::UI::Container::;
		1746
		1747	sub add {
		1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1749
		1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1751	$self->SUPER::add ($child);
		1752	}
		1753
		1754	sub _scale($$$) {
		1755	my ($mode, $val, $max) = @_;
		1756
		1757	$mode eq "abs" ? $val
		1758	: $mode eq "rel" ? $val * $max
		1759	: 0
		1760	}
		1761
		1762	sub size_request {
		1763	my ($self) = @_;
		1764
		1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1766
		1767	# determine overall size by querying abs widgets
		1768	for my $child ($self->visible_children) {
		1769	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1770
		1771	if ($pos eq "abs") {
		1772	$w = _scale $size, $w, $child->{req_w};
		1773	$h = _scale $size, $h, $child->{req_h};
		1774
		1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1777	}
		1778	}
		1779
		1780	my $W = $x2 - $x1;
		1781	my $H = $y2 - $y1;
		1782
		1783	# now layout remaining widgets
		1784	for my $child ($self->visible_children) {
		1785	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1786
		1787	if ($pos ne "abs") {
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1795	}
		1796	}
		1797
		1798	my $W = $x2 - $x1;
		1799	my $H = $y2 - $y1;
		1800
		1801	($W, $H)
		1802	}
		1803
		1804	sub invoke_size_allocate {
		1805	my ($self, $W, $H) = @_;
		1806
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	$x = _scale $pos, $x, $W;
		1811	$y = _scale $pos, $x, $H;
		1812	$w = _scale $size, $w, $child->{req_w};
		1813	$h = _scale $size, $h, $child->{req_h};
		1814
		1815	$child->configure ($x, $y, $w, $h);
		1816	}
		1817
		1818	1
		1819	}
		1820
		1821	#############################################################################
		1822
		1823	package CFPlus::UI::Box;
		1824
		1825	our @ISA = CFPlus::UI::Container::;
1346		1826
1347	sub size_request {	1827	sub size_request {
1348	my ($self) = @_;	1828	my ($self) = @_;
1349		1829
1350	$self->{vertical}	1830	$self->{vertical}
…		…
1356	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1836	(List::Util::sum map $_->{req_w}, @{$self->{children}}),
1357	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1837	(List::Util::max map $_->{req_h}, @{$self->{children}}),
1358	)	1838	)
1359	}	1839	}
1360		1840
1361	sub size_allocate {	1841	sub invoke_size_allocate {
1362	my ($self, $w, $h) = @_;	1842	my ($self, $w, $h) = @_;
1363		1843
1364	my $space = $self->{vertical} ? $h : $w;	1844	my $space = $self->{vertical} ? $h : $w;
1365	my $children = $self->{children};	1845	my @children = $self->visible_children;
1366		1846
1367	my @req;	1847	my @req;
1368		1848
1369	if ($self->{homogeneous}) {	1849	if ($self->{homogeneous}) {
1370	@req = ($space / (@$children || 1)) x @$children;	1850	@req = ($space / (@children || 1)) x @children;
1371	} else {	1851	} else {
1372	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;	1852	@req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1373	my $req = List::Util::sum @req;	1853	my $req = List::Util::sum @req;
1374		1854
1375	if ($req > $space) {	1855	if ($req > $space) {
1376	# ah well, not enough space	1856	# ah well, not enough space
1377	$_ *= $space / $req for @req;	1857	$_ *= $space / $req for @req;
1378	} else {	1858	} else {
1379	my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;	1859	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1380		1860
1381	$space = ($space - $req) / $expand; # remaining space to give away	1861	$space = ($space - $req) / $expand; # remaining space to give away
1382		1862
1383	$req[$_] += $space * $children->[$_]{expand}	1863	$req[$_] += $space * $children[$_]{expand}
1384	for 0 .. $#$children;	1864	for 0 .. $#children;
1385	}	1865	}
1386	}	1866	}
1387		1867
1388	CFClient::UI::harmonize \@req;	1868	CFPlus::UI::harmonize \@req;
1389		1869
1390	my $pos = 0;	1870	my $pos = 0;
1391	for (0 .. $#$children) {	1871	for (0 .. $#children) {
1392	my $alloc = $req[$_];	1872	my $alloc = $req[$_];
1393	$children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1873	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1394		1874
1395	$pos += $alloc;	1875	$pos += $alloc;
1396	}	1876	}
1397		1877
1398	1	1878	1
1399	}	1879	}
1400		1880
1401	#############################################################################	1881	#############################################################################
1402		1882
1403	package CFClient::UI::HBox;	1883	package CFPlus::UI::HBox;
1404		1884
1405	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1406		1886
1407	sub new {	1887	sub new {
1408	my $class = shift;	1888	my $class = shift;
1409		1889
1410	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1413	)	1893	)
1414	}	1894	}
1415		1895
1416	#############################################################################	1896	#############################################################################
1417		1897
1418	package CFClient::UI::VBox;	1898	package CFPlus::UI::VBox;
1419		1899
1420	our @ISA = CFClient::UI::Box::;	1900	our @ISA = CFPlus::UI::Box::;
1421		1901
1422	sub new {	1902	sub new {
1423	my $class = shift;	1903	my $class = shift;
1424		1904
1425	$class->SUPER::new (	1905	$class->SUPER::new (
…		…
1428	)	1908	)
1429	}	1909	}
1430		1910
1431	#############################################################################	1911	#############################################################################
1432		1912
1433	package CFClient::UI::Label;	1913	package CFPlus::UI::Label;
1434		1914
1435	our @ISA = CFClient::UI::DrawBG::;	1915	our @ISA = CFPlus::UI::DrawBG::;
1436		1916
1437	use CFClient::OpenGL;	1917	use CFPlus::OpenGL;
1438		1918
1439	sub new {	1919	sub new {
1440	my ($class, %arg) = @_;	1920	my ($class, %arg) = @_;
1441		1921
1442	my $self = $class->SUPER::new (	1922	my $self = $class->SUPER::new (
…		…
1445	#active_bg => none	1925	#active_bg => none
1446	#font => default_font	1926	#font => default_font
1447	#text => initial text	1927	#text => initial text
1448	#markup => initial narkup	1928	#markup => initial narkup
1449	#max_w => maximum pixel width	1929	#max_w => maximum pixel width
		1930	#style => 0, # render flags
1450	ellipsise => 3, # end	1931	ellipsise => 3, # end
1451	layout => (new CFClient::Layout),	1932	layout => (new CFPlus::Layout),
1452	fontsize => 1,	1933	fontsize => 1,
1453	align => -1,	1934	align => -1,
1454	valign => -1,	1935	valign => -1,
1455	padding_x => 2,	1936	padding_x => 2,
1456	padding_y => 2,	1937	padding_y => 2,
1457	can_events => 0,	1938	can_events => 0,
1458	%arg	1939	%arg
1459	);	1940	);
1460		1941
1461	if (exists $self->{template}) {	1942	if (exists $self->{template}) {
1462	my $layout = new CFClient::Layout;	1943	my $layout = new CFPlus::Layout;
1463	$layout->set_text (delete $self->{template});	1944	$layout->set_text (delete $self->{template});
1464	$self->{template} = $layout;	1945	$self->{template} = $layout;
1465	}	1946	}
1466		1947
1467	if (exists $self->{markup}) {	1948	if (exists $self->{markup}) {
…		…
1471	}	1952	}
1472		1953
1473	$self	1954	$self
1474	}	1955	}
1475		1956
1476	sub escape($) {
1477	local $_ = $_[0];
1478
1479	s/&/&amp;/g;
1480	s/>/&gt;/g;
1481	s/</&lt;/g;
1482
1483	$_
1484	}
1485
1486	sub update {	1957	sub update {
1487	my ($self) = @_;	1958	my ($self) = @_;
1488		1959
1489	delete $self->{texture};	1960	delete $self->{texture};
1490	$self->SUPER::update;	1961	$self->SUPER::update;
1491	}	1962	}
1492		1963
		1964	sub realloc {
		1965	my ($self) = @_;
		1966
		1967	delete $self->{ox};
		1968	$self->SUPER::realloc;
		1969	}
		1970
1493	sub set_text {	1971	sub set_text {
1494	my ($self, $text) = @_;	1972	my ($self, $text) = @_;
1495		1973
1496	return if $self->{text} eq "T$text";	1974	return if $self->{text} eq "T$text";
1497	$self->{text} = "T$text";	1975	$self->{text} = "T$text";
1498		1976
1499	$self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1500	$self->{layout}->set_text ($text);	1977	$self->{layout}->set_text ($text);
1501		1978
		1979	delete $self->{size_req};
1502	$self->realloc;	1980	$self->realloc;
1503	$self->update;	1981	$self->update;
1504	}	1982	}
1505		1983
1506	sub set_markup {	1984	sub set_markup {
…		…
1509	return if $self->{text} eq "M$markup";	1987	return if $self->{text} eq "M$markup";
1510	$self->{text} = "M$markup";	1988	$self->{text} = "M$markup";
1511		1989
1512	my $rgba = $markup =~ /span.*(?:foreground|background)/;	1990	my $rgba = $markup =~ /span.*(?:foreground|background)/;
1513		1991
1514	$self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1515	$self->{layout}->set_markup ($markup);	1992	$self->{layout}->set_markup ($markup);
1516		1993
		1994	delete $self->{size_req};
1517	$self->realloc;	1995	$self->realloc;
1518	$self->update;	1996	$self->update;
1519	}	1997	}
1520		1998
1521	sub size_request {	1999	sub size_request {
1522	my ($self) = @_;	2000	my ($self) = @_;
1523		2001
		2002	$self->{size_req} ||= do {
1524	$self->{layout}->set_font ($self->{font}) if $self->{font};	2003	$self->{layout}->set_font ($self->{font}) if $self->{font};
1525	$self->{layout}->set_width ($self->{max_w} || -1);	2004	$self->{layout}->set_width ($self->{max_w} || -1);
1526	$self->{layout}->set_ellipsise ($self->{ellipsise});	2005	$self->{layout}->set_ellipsise ($self->{ellipsise});
1527	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2006	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1528	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2007	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1529		2008
1530	my ($w, $h) = $self->{layout}->size;	2009	my ($w, $h) = $self->{layout}->size;
1531		2010
1532	if (exists $self->{template}) {	2011	if (exists $self->{template}) {
1533	$self->{template}->set_font ($self->{font}) if $self->{font};	2012	$self->{template}->set_font ($self->{font}) if $self->{font};
		2013	$self->{template}->set_width ($self->{max_w} || -1);
1534	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2014	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1535		2015
1536	my ($w2, $h2) = $self->{template}->size;	2016	my ($w2, $h2) = $self->{template}->size;
1537		2017
1538	$w = List::Util::max $w, $w2;	2018	$w = List::Util::max $w, $w2;
1539	$h = List::Util::max $h, $h2;	2019	$h = List::Util::max $h, $h2;
		2020	}
		2021
		2022	[$w, $h]
1540	}	2023	};
1541		2024
1542	($w, $h)	2025	@{ $self->{size_req} }
1543	}	2026	}
1544		2027
		2028	sub baseline_shift {
		2029	$_[0]{layout}->descent
		2030	}
		2031
1545	sub size_allocate {	2032	sub invoke_size_allocate {
1546	my ($self, $w, $h) = @_;	2033	my ($self, $w, $h) = @_;
		2034
		2035	delete $self->{ox};
1547		2036
1548	delete $self->{texture}	2037	delete $self->{texture}
1549	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};	2038	unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
		2039
		2040	1
1550	}	2041	}
1551		2042
1552	sub set_fontsize {	2043	sub set_fontsize {
1553	my ($self, $fontsize) = @_;	2044	my ($self, $fontsize) = @_;
1554		2045
1555	$self->{fontsize} = $fontsize;	2046	$self->{fontsize} = $fontsize;
		2047	delete $self->{size_req};
1556	delete $self->{texture};	2048	delete $self->{texture};
1557		2049
1558	$self->realloc;	2050	$self->realloc;
1559	}	2051	}
1560		2052
		2053	sub reconfigure {
		2054	my ($self) = @_;
		2055
		2056	delete $self->{size_req};
		2057	delete $self->{texture};
		2058
		2059	$self->SUPER::reconfigure;
		2060	}
		2061
1561	sub _draw {	2062	sub _draw {
1562	my ($self) = @_;	2063	my ($self) = @_;
1563		2064
1564	$self->SUPER::_draw; # draw background, if applicable	2065	$self->SUPER::_draw; # draw background, if applicable
1565		2066
1566	my $tex = $self->{texture} ||= do {	2067	my $size = $self->{texture} ||= do {
1567	$self->{layout}->set_foreground (@{$self->{fg}});	2068	$self->{layout}->set_foreground (@{$self->{fg}});
1568	$self->{layout}->set_font ($self->{font}) if $self->{font};	2069	$self->{layout}->set_font ($self->{font}) if $self->{font};
1569	$self->{layout}->set_width ($self->{w});	2070	$self->{layout}->set_width ($self->{w});
1570	$self->{layout}->set_ellipsise ($self->{ellipsise});	2071	$self->{layout}->set_ellipsise ($self->{ellipsise});
1571	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	2072	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1572	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2073	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1573		2074
1574	my $tex = new_from_layout CFClient::Texture $self->{layout};	2075	[$self->{layout}->size]
		2076	};
1575		2077
		2078	unless (exists $self->{ox}) {
1576	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2079	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1577	: $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}	2080	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1578	: ($self->{w} - $tex->{w}) * 0.5);	2081	: ($self->{w} - $size->[0]) * 0.5);
1579		2082
1580	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2083	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1581	: $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}	2084	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1582	: ($self->{h} - $tex->{h}) * 0.5);	2085	: ($self->{h} - $size->[1]) * 0.5);
1583
1584	$tex
1585	};	2086	};
1586		2087
1587	glEnable GL_TEXTURE_2D;	2088	my $w = List::Util::min $self->{w} + 4, $size->[0];
1588	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2089	my $h = List::Util::min $self->{h} + 2, $size->[1];
1589		2090
1590	if ($tex->{format} == GL_ALPHA) {	2091	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1591	glColor @{$self->{fg}};
1592	$tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1593	} else {
1594	$tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1595	}
1596
1597	glDisable GL_TEXTURE_2D;
1598	}	2092	}
1599		2093
1600	#############################################################################	2094	#############################################################################
1601		2095
1602	package CFClient::UI::EntryBase;	2096	package CFPlus::UI::EntryBase;
1603		2097
1604	our @ISA = CFClient::UI::Label::;	2098	our @ISA = CFPlus::UI::Label::;
1605		2099
1606	use CFClient::OpenGL;	2100	use CFPlus::OpenGL;
1607		2101
1608	sub new {	2102	sub new {
1609	my $class = shift;	2103	my $class = shift;
1610		2104
1611	$class->SUPER::new (	2105	$class->SUPER::new (
…		…
1615	active_fg => [0, 0, 0],	2109	active_fg => [0, 0, 0],
1616	can_hover => 1,	2110	can_hover => 1,
1617	can_focus => 1,	2111	can_focus => 1,
1618	valign => 0,	2112	valign => 0,
1619	can_events => 1,	2113	can_events => 1,
		2114	ellipsise => 0,
1620	#text => ...	2115	#text => ...
		2116	#hidden => "*",
1621	@_	2117	@_
1622	)	2118	)
1623	}	2119	}
1624		2120
1625	sub _set_text {	2121	sub _set_text {
…		…
1627		2123
1628	delete $self->{cur_h};	2124	delete $self->{cur_h};
1629		2125
1630	return if $self->{text} eq $text;	2126	return if $self->{text} eq $text;
1631		2127
1632	delete $self->{texture};
1633
1634	$self->{last_activity} = $::NOW;	2128	$self->{last_activity} = $::NOW;
1635	$self->{text} = $text;	2129	$self->{text} = $text;
1636		2130
1637	$text =~ s/./*/g if $self->{hidden};	2131	$text =~ s/./*/g if $self->{hidden};
1638	$self->{layout}->set_text ("$text ");	2132	$self->{layout}->set_text ("$text ");
		2133	delete $self->{size_req};
1639		2134
1640	$self->_emit (changed => $self->{text});	2135	$self->emit (changed => $self->{text});
		2136
		2137	$self->realloc;
		2138	$self->update;
1641	}	2139	}
1642		2140
1643	sub set_text {	2141	sub set_text {
1644	my ($self, $text) = @_;	2142	my ($self, $text) = @_;
1645		2143
1646	$self->{cursor} = length $text;	2144	$self->{cursor} = length $text;
1647	$self->_set_text ($text);	2145	$self->_set_text ($text);
1648
1649	$self->realloc;
1650	}	2146	}
1651		2147
1652	sub get_text {	2148	sub get_text {
1653	$_[0]{text}	2149	$_[0]{text}
1654	}	2150	}
…		…
1659	my ($w, $h) = $self->SUPER::size_request;	2155	my ($w, $h) = $self->SUPER::size_request;
1660		2156
1661	($w + 1, $h) # add 1 for cursor	2157	($w + 1, $h) # add 1 for cursor
1662	}	2158	}
1663		2159
1664	sub key_down {	2160	sub invoke_key_down {
1665	my ($self, $ev) = @_;	2161	my ($self, $ev) = @_;
1666		2162
1667	my $mod = $ev->{mod};	2163	my $mod = $ev->{mod};
1668	my $sym = $ev->{sym};	2164	my $sym = $ev->{sym};
1669	my $uni = $ev->{unicode};	2165	my $uni = $ev->{unicode};
1670		2166
1671	my $text = $self->get_text;	2167	my $text = $self->get_text;
		2168
		2169	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
1672		2170
1673	if ($uni == 8) {	2171	if ($uni == 8) {
1674	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2172	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1675	} elsif ($uni == 127) {	2173	} elsif ($uni == 127) {
1676	substr $text, $self->{cursor}, 1, "";	2174	substr $text, $self->{cursor}, 1, "";
1677	} elsif ($sym == CFClient::SDLK_LEFT) {	2175	} elsif ($sym == CFPlus::SDLK_LEFT) {
1678	--$self->{cursor} if $self->{cursor};	2176	--$self->{cursor} if $self->{cursor};
1679	} elsif ($sym == CFClient::SDLK_RIGHT) {	2177	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1680	++$self->{cursor} if $self->{cursor} < length $self->{text};	2178	++$self->{cursor} if $self->{cursor} < length $self->{text};
1681	} elsif ($sym == CFClient::SDLK_HOME) {	2179	} elsif ($sym == CFPlus::SDLK_HOME) {
		2180	# what a hack
		2181	$self->{cursor} =
		2182	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2183	? length $1
		2184	: 0;
		2185	} elsif ($sym == CFPlus::SDLK_END) {
		2186	# uh, again
		2187	$self->{cursor} =
		2188	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2189	? $self->{cursor} + length $1
		2190	: length $self->{text};
		2191	} elsif ($uni == 21) { # ctrl-u
		2192	$text = "";
1682	$self->{cursor} = 0;	2193	$self->{cursor} = 0;
1683	} elsif ($sym == CFClient::SDLK_END) {
1684	$self->{cursor} = length $text;
1685	} elsif ($uni == 27) {	2194	} elsif ($uni == 27) {
1686	$self->_emit ('escape');	2195	$self->emit ('escape');
1687	} elsif ($uni) {	2196	} elsif ($uni == 0x0d) {
		2197	substr $text, $self->{cursor}++, 0, "\012";
		2198	} elsif ($uni >= 0x20) {
1688	substr $text, $self->{cursor}++, 0, chr $uni;	2199	substr $text, $self->{cursor}++, 0, chr $uni;
		2200	} else {
		2201	return 0;
1689	}	2202	}
1690		2203
1691	$self->_set_text ($text);	2204	$self->_set_text ($text);
1692		2205
1693	$self->realloc;	2206	$self->realloc;
1694	}	2207	$self->update;
1695		2208
		2209	1
		2210	}
		2211
1696	sub focus_in {	2212	sub invoke_focus_in {
1697	my ($self) = @_;	2213	my ($self) = @_;
1698		2214
1699	$self->{last_activity} = $::NOW;	2215	$self->{last_activity} = $::NOW;
1700		2216
1701	$self->SUPER::focus_in;	2217	$self->SUPER::invoke_focus_in
1702	}	2218	}
1703		2219
1704	sub button_down {	2220	sub invoke_button_down {
1705	my ($self, $ev, $x, $y) = @_;	2221	my ($self, $ev, $x, $y) = @_;
1706		2222
1707	$self->SUPER::button_down ($ev, $x, $y);	2223	$self->SUPER::invoke_button_down ($ev, $x, $y);
1708		2224
1709	my $idx = $self->{layout}->xy_to_index ($x, $y);	2225	my $idx = $self->{layout}->xy_to_index ($x, $y);
1710		2226
1711	# byte-index to char-index	2227	# byte-index to char-index
1712	my $text = $self->{text};	2228	my $text = $self->{text};
1713	utf8::encode $text;	2229	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1714	$self->{cursor} = length substr $text, 0, $idx;	2230	$self->{cursor} = length $text;
1715		2231
1716	$self->_set_text ($self->{text});	2232	$self->_set_text ($self->{text});
1717	$self->update;	2233	$self->update;
		2234
		2235	1
1718	}	2236	}
1719		2237
1720	sub mouse_motion {	2238	sub invoke_mouse_motion {
1721	my ($self, $ev, $x, $y) = @_;	2239	my ($self, $ev, $x, $y) = @_;
1722	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#	2240	# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
		2241
		2242	1
1723	}	2243	}
1724		2244
1725	sub _draw {	2245	sub _draw {
1726	my ($self) = @_;	2246	my ($self) = @_;
1727		2247
1728	local $self->{fg} = $self->{fg};	2248	local $self->{fg} = $self->{fg};
1729		2249
1730	if ($FOCUS == $self) {	2250	if ($FOCUS == $self) {
1731	glColor @{$self->{active_bg}};	2251	glColor_premultiply @{$self->{active_bg}};
1732	$self->{fg} = $self->{active_fg};	2252	$self->{fg} = $self->{active_fg};
1733	} else {	2253	} else {
1734	glColor @{$self->{bg}};	2254	glColor_premultiply @{$self->{bg}};
1735	}	2255	}
1736		2256
1737	glEnable GL_BLEND;	2257	glEnable GL_BLEND;
1738	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2258	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1739	glBegin GL_QUADS;	2259	glBegin GL_QUADS;
1740	glVertex 0 , 0;	2260	glVertex 0 , 0;
1741	glVertex 0 , $self->{h};	2261	glVertex 0 , $self->{h};
1742	glVertex $self->{w}, $self->{h};	2262	glVertex $self->{w}, $self->{h};
1743	glVertex $self->{w}, 0;	2263	glVertex $self->{w}, 0;
…		…
1754	utf8::encode $text;	2274	utf8::encode $text;
1755		2275
1756	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1757	}	2277	}
1758		2278
1759	glColor @{$self->{fg}};
1760	glBegin GL_LINES;	2279	glBegin GL_LINES;
1761	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2280	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1762	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2281	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1763	glEnd;	2282	glEnd;
1764	}	2283	}
1765	}	2284	}
1766		2285
		2286	#############################################################################
		2287
1767	package CFClient::UI::Entry;	2288	package CFPlus::UI::Entry;
1768		2289
1769	our @ISA = CFClient::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1770		2291
1771	use CFClient::OpenGL;	2292	use CFPlus::OpenGL;
1772		2293
1773	sub key_down {	2294	sub invoke_key_down {
1774	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1775		2296
1776	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1777		2298
1778	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1779	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1780	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
		2302
1781	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1782	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
1783	$self->_emit (activate => $txt);	2305	$self->emit (activate => $txt);
1784	$self->update;	2306	$self->update;
1785		2307
1786	} elsif ($sym == CFClient::SDLK_UP) {	2308	} elsif ($sym == CFPlus::SDLK_UP) {
1787	if ($self->{history_pointer} < 0) {	2309	if ($self->{history_pointer} < 0) {
1788	$self->{history_saveback} = $self->get_text;	2310	$self->{history_saveback} = $self->get_text;
1789	}	2311	}
1790	if (@{$self->{history} || []} > 0) {	2312	if (@{$self->{history} || []} > 0) {
1791	$self->{history_pointer}++;	2313	$self->{history_pointer}++;
…		…
1793	$self->{history_pointer} = @{$self->{history} || []} - 1;	2315	$self->{history_pointer} = @{$self->{history} || []} - 1;
1794	}	2316	}
1795	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1796	}	2318	}
1797		2319
1798	} elsif ($sym == CFClient::SDLK_DOWN) {	2320	} elsif ($sym == CFPlus::SDLK_DOWN) {
1799	$self->{history_pointer}--;	2321	$self->{history_pointer}--;
1800	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1801		2323
1802	if ($self->{history_pointer} >= 0) {	2324	if ($self->{history_pointer} >= 0) {
1803	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1804	} else {	2326	} else {
1805	$self->set_text ($self->{history_saveback});	2327	$self->set_text ($self->{history_saveback});
1806	}	2328	}
1807		2329
1808	} else {	2330	} else {
1809	$self->SUPER::key_down ($ev);	2331	return $self->SUPER::invoke_key_down ($ev)
		2332	}
		2333
1810	}	2334	1
1811
1812	}	2335	}
1813		2336
1814	#############################################################################	2337	#############################################################################
1815		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
1816	package CFClient::UI::Button;	2378	package CFPlus::UI::Button;
1817		2379
1818	our @ISA = CFClient::UI::Label::;	2380	our @ISA = CFPlus::UI::Label::;
1819		2381
1820	use CFClient::OpenGL;	2382	use CFPlus::OpenGL;
1821		2383
1822	my @tex =	2384	my @tex =
1823	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1824	qw(b1_button_active.png);	2386	qw(b1_button_active.png);
1825		2387
1826	sub new {	2388	sub new {
1827	my $class = shift;	2389	my $class = shift;
1828		2390
…		…
1837	can_events => 1,	2399	can_events => 1,
1838	@_	2400	@_
1839	)	2401	)
1840	}	2402	}
1841		2403
1842	sub activate { }
1843
1844	sub button_up {	2404	sub invoke_button_up {
1845	my ($self, $ev, $x, $y) = @_;	2405	my ($self, $ev, $x, $y) = @_;
1846		2406
1847	$self->emit ("activate")	2407	$self->emit ("activate")
1848	if $x >= 0 && $x < $self->{w}	2408	if $x >= 0 && $x < $self->{w}
1849	&& $y >= 0 && $y < $self->{h};	2409	&& $y >= 0 && $y < $self->{h};
		2410
		2411	1
1850	}	2412	}
1851		2413
1852	sub _draw {	2414	sub _draw {
1853	my ($self) = @_;	2415	my ($self) = @_;
1854		2416
1855	local $self->{fg} = $self->{fg};	2417	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1856
1857	if ($GRAB == $self) {
1858	$self->{fg} = $self->{active_fg};
1859	}
1860		2418
1861	glEnable GL_TEXTURE_2D;	2419	glEnable GL_TEXTURE_2D;
1862	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1863	glColor 0, 0, 0, 1;	2421	glColor 0, 0, 0, 1;
1864		2422
…		…
1869	$self->SUPER::_draw;	2427	$self->SUPER::_draw;
1870	}	2428	}
1871		2429
1872	#############################################################################	2430	#############################################################################
1873		2431
1874	package CFClient::UI::CheckBox;	2432	package CFPlus::UI::CheckBox;
1875		2433
1876	our @ISA = CFClient::UI::DrawBG::;	2434	our @ISA = CFPlus::UI::DrawBG::;
1877		2435
1878	my @tex =	2436	my @tex =
1879	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1880	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2438	qw(c1_checkbox_bg.png c1_checkbox_active.png);
1881		2439
1882	use CFClient::OpenGL;	2440	use CFPlus::OpenGL;
1883		2441
1884	sub new {	2442	sub new {
1885	my $class = shift;	2443	my $class = shift;
1886		2444
1887	$class->SUPER::new (	2445	$class->SUPER::new (
…		…
1901	my ($self) = @_;	2459	my ($self) = @_;
1902		2460
1903	(6) x 2	2461	(6) x 2
1904	}	2462	}
1905		2463
		2464	sub toggle {
		2465	my ($self) = @_;
		2466
		2467	$self->{state} = !$self->{state};
		2468	$self->emit (changed => $self->{state});
		2469	$self->update;
		2470	}
		2471
1906	sub button_down {	2472	sub invoke_button_down {
1907	my ($self, $ev, $x, $y) = @_;	2473	my ($self, $ev, $x, $y) = @_;
1908		2474
1909	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}	2475	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1910	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {	2476	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1911	$self->{state} = !$self->{state};	2477	$self->toggle;
1912	$self->_emit (changed => $self->{state});	2478	} else {
		2479	return 0
		2480	}
		2481
1913	}	2482	1
1914	}	2483	}
1915		2484
1916	sub _draw {	2485	sub _draw {
1917	my ($self) = @_;	2486	my ($self) = @_;
1918		2487
…		…
1933	glDisable GL_TEXTURE_2D;	2502	glDisable GL_TEXTURE_2D;
1934	}	2503	}
1935		2504
1936	#############################################################################	2505	#############################################################################
1937		2506
1938	package CFClient::UI::Image;	2507	package CFPlus::UI::Image;
1939		2508
1940	our @ISA = CFClient::UI::Base::;	2509	our @ISA = CFPlus::UI::Base::;
1941		2510
1942	use CFClient::OpenGL;	2511	use CFPlus::OpenGL;
1943	use Carp qw/confess/;
1944		2512
1945	our %loaded_images;	2513	our %texture_cache;
1946		2514
1947	sub new {	2515	sub new {
1948	my $class = shift;	2516	my $class = shift;
1949		2517
1950	my $self = $class->SUPER::new (can_events => 0, @_);	2518	my $self = $class->SUPER::new (
		2519	can_events => 0,
		2520	@_,
		2521	);
1951		2522
1952	$self->{image} or confess "Image has 'image' not set. This is a fatal error!";	2523	$self->{path} || $self->{tex}
		2524	or Carp::croak "'path' or 'tex' attributes required";
1953		2525
1954	$loaded_images{$self->{image}} ||=	2526	$self->{tex} ||= $texture_cache{$self->{path}} ||=
1955	new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;	2527	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1956		2528
1957	my $tex = $self->{tex} = $loaded_images{$self->{image}};	2529	CFPlus::weaken $texture_cache{$self->{path}};
1958		2530
1959	Scalar::Util::weaken $loaded_images{$self->{image}};	2531	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1960
1961	$self->{aspect} = $tex->{w} / $tex->{h};
1962		2532
1963	$self	2533	$self
1964	}	2534	}
1965		2535
		2536	sub STORABLE_freeze {
		2537	my ($self, $cloning) = @_;
		2538
		2539	$self->{path}
		2540	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2541
		2542	$self->{path}
		2543	}
		2544
		2545	sub STORABLE_attach {
		2546	my ($self, $cloning, $path) = @_;
		2547
		2548	$self->new (path => $path)
		2549	}
		2550
1966	sub size_request {	2551	sub size_request {
1967	my ($self) = @_;	2552	my ($self) = @_;
1968		2553
1969	($self->{tex}->{w}, $self->{tex}->{h})	2554	($self->{tex}{w}, $self->{tex}{h})
1970	}	2555	}
1971		2556
1972	sub _draw {	2557	sub _draw {
1973	my ($self) = @_;	2558	my ($self) = @_;
1974		2559
…		…
1984	}	2569	}
1985		2570
1986	glEnable GL_TEXTURE_2D;	2571	glEnable GL_TEXTURE_2D;
1987	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988		2573
1989	$tex->draw_quad_alpha (0, 0, $w, $h);	2574	$tex->draw_quad (0, 0, $w, $h);
1990		2575
1991	glDisable GL_TEXTURE_2D;	2576	glDisable GL_TEXTURE_2D;
1992	}	2577	}
1993		2578
1994	#############################################################################	2579	#############################################################################
1995		2580
		2581	package CFPlus::UI::ImageButton;
		2582
		2583	our @ISA = CFPlus::UI::Image::;
		2584
		2585	use CFPlus::OpenGL;
		2586
		2587	my %textures;
		2588
		2589	sub new {
		2590	my $class = shift;
		2591
		2592	my $self = $class->SUPER::new (
		2593	padding_x => 4,
		2594	padding_y => 4,
		2595	fg => [1, 1, 1],
		2596	active_fg => [0, 0, 1],
		2597	can_hover => 1,
		2598	align => 0,
		2599	valign => 0,
		2600	can_events => 1,
		2601	@_
		2602	);
		2603	}
		2604
		2605	sub invoke_button_up {
		2606	my ($self, $ev, $x, $y) = @_;
		2607
		2608	$self->emit ("activate")
		2609	if $x >= 0 && $x < $self->{w}
		2610	&& $y >= 0 && $y < $self->{h};
		2611
		2612	1
		2613	}
		2614
		2615	#############################################################################
		2616
1996	package CFClient::UI::VGauge;	2617	package CFPlus::UI::VGauge;
1997		2618
1998	our @ISA = CFClient::UI::Base::;	2619	our @ISA = CFPlus::UI::Base::;
1999		2620
2000	use List::Util qw(min max);	2621	use List::Util qw(min max);
2001		2622
2002	use CFClient::OpenGL;	2623	use CFPlus::OpenGL;
2003		2624
2004	my %tex = (	2625	my %tex = (
2005	food => [	2626	food => [
2006	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2627	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2007	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2628	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2008	],	2629	],
2009	grace => [	2630	grace => [
2010	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2631	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2011	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2632	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2012	],	2633	],
2013	hp => [	2634	hp => [
2014	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2635	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2015	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2636	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2016	],	2637	],
2017	mana => [	2638	mana => [
2018	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2639	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2019	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2640	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2020	],	2641	],
2021	);	2642	);
2022		2643
2023	# eg. VGauge->new (gauge => 'food'), default gauge: food	2644	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2083	my $ycut1 = max 0, min 1, $ycut;	2704	my $ycut1 = max 0, min 1, $ycut;
2084	my $ycut2 = max 0, min 1, $ycut - 1;	2705	my $ycut2 = max 0, min 1, $ycut - 1;
2085		2706
2086	my $h1 = $self->{h} * (1 - $ycut1);	2707	my $h1 = $self->{h} * (1 - $ycut1);
2087	my $h2 = $self->{h} * (1 - $ycut2);	2708	my $h2 = $self->{h} * (1 - $ycut2);
		2709	my $h3 = $self->{h};
		2710
		2711	$_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2088		2712
2089	glEnable GL_BLEND;	2713	glEnable GL_BLEND;
2090	glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;	2714	glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
		2715	GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2091	glEnable GL_TEXTURE_2D;	2716	glEnable GL_TEXTURE_2D;
2092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2717	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2093		2718
2094	glBindTexture GL_TEXTURE_2D, $t1->{name};	2719	glBindTexture GL_TEXTURE_2D, $t1->{name};
2095	glBegin GL_QUADS;	2720	glBegin GL_QUADS;
…		…
2110		2735
2111	if ($t3) {	2736	if ($t3) {
2112	glBindTexture GL_TEXTURE_2D, $t3->{name};	2737	glBindTexture GL_TEXTURE_2D, $t3->{name};
2113	glBegin GL_QUADS;	2738	glBegin GL_QUADS;
2114	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;	2739	glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2115	glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};	2740	glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2116	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};	2741	glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2117	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;	2742	glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2118	glEnd;	2743	glEnd;
2119	}	2744	}
2120		2745
2121	glDisable GL_BLEND;	2746	glDisable GL_BLEND;
2122	glDisable GL_TEXTURE_2D;	2747	glDisable GL_TEXTURE_2D;
2123	}	2748	}
2124		2749
2125	#############################################################################	2750	#############################################################################
2126		2751
2127	package CFClient::UI::Gauge;	2752	package CFPlus::UI::Gauge;
2128		2753
2129	our @ISA = CFClient::UI::VBox::;	2754	our @ISA = CFPlus::UI::VBox::;
2130		2755
2131	sub new {	2756	sub new {
2132	my ($class, %arg) = @_;	2757	my ($class, %arg) = @_;
2133		2758
2134	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
…		…
2136	can_hover => 1,	2761	can_hover => 1,
2137	can_events => 1,	2762	can_events => 1,
2138	%arg,	2763	%arg,
2139	);	2764	);
2140		2765
2141	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2766	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2142	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2767	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2143	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2768	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2144		2769
2145	$self	2770	$self
2146	}	2771	}
2147		2772
2148	sub set_fontsize {	2773	sub set_fontsize {
…		…
2169	$self->{value}->set_text ($val);	2794	$self->{value}->set_text ($val);
2170	}	2795	}
2171		2796
2172	#############################################################################	2797	#############################################################################
2173		2798
2174	package CFClient::UI::Slider;	2799	package CFPlus::UI::Slider;
2175		2800
2176	use strict;	2801	use strict;
2177		2802
2178	use CFClient::OpenGL;	2803	use CFPlus::OpenGL;
2179		2804
2180	our @ISA = CFClient::UI::DrawBG::;	2805	our @ISA = CFPlus::UI::DrawBG::;
2181		2806
2182	my @tex =	2807	my @tex =
2183	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2808	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2184	qw(s1_slider.png s1_slider_bg.png);	2809	qw(s1_slider.png s1_slider_bg.png);
2185		2810
2186	sub new {	2811	sub new {
2187	my $class = shift;	2812	my $class = shift;
2188		2813
…		…
2209	$self->update;	2834	$self->update;
2210		2835
2211	$self	2836	$self
2212	}	2837	}
2213		2838
2214	sub changed { }
2215
2216	sub set_range {	2839	sub set_range {
2217	my ($self, $range) = @_;	2840	my ($self, $range) = @_;
2218		2841
2219	($range, $self->{range}) = ($self->{range}, $range);	2842	($range, $self->{range}) = ($self->{range}, $range);
2220		2843
2221	$self->update
2222	if "@$range" ne "@{$self->{range}}";	2844	if ("@$range" ne "@{$self->{range}}") {
		2845	$self->update;
		2846	$self->set_value ($self->{range}[0]);
		2847	}
2223	}	2848	}
2224		2849
2225	sub set_value {	2850	sub set_value {
2226	my ($self, $value) = @_;	2851	my ($self, $value) = @_;
2227		2852
…		…
2238	if $unit;	2863	if $unit;
2239		2864
2240	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	2865	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2241		2866
2242	if ($value != $old_value) {	2867	if ($value != $old_value) {
2243	$self->_emit (changed => $value);	2868	$self->emit (changed => $value);
2244	$self->update;	2869	$self->update;
2245	}	2870	}
2246	}	2871	}
2247		2872
2248	sub size_request {	2873	sub size_request {
2249	my ($self) = @_;	2874	my ($self) = @_;
2250		2875
2251	($self->{req_w}, $self->{req_h})	2876	($self->{req_w}, $self->{req_h})
2252	}	2877	}
2253		2878
2254	sub button_down {	2879	sub invoke_button_down {
2255	my ($self, $ev, $x, $y) = @_;	2880	my ($self, $ev, $x, $y) = @_;
2256		2881
2257	$self->SUPER::button_down ($ev, $x, $y);	2882	$self->SUPER::invoke_button_down ($ev, $x, $y);
2258		2883
2259	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2884	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2260		2885
2261	$self->mouse_motion ($ev, $x, $y);	2886	$self->invoke_mouse_motion ($ev, $x, $y)
2262	}	2887	}
2263		2888
2264	sub mouse_motion {	2889	sub invoke_mouse_motion {
2265	my ($self, $ev, $x, $y) = @_;	2890	my ($self, $ev, $x, $y) = @_;
2266		2891
2267	if ($GRAB == $self) {	2892	if ($GRAB == $self) {
2268	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	2893	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2269		2894
2270	my (undef, $lo, $hi, $page) = @{$self->{range}};	2895	my (undef, $lo, $hi, $page) = @{$self->{range}};
2271		2896
2272	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	2897	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2273		2898
2274	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	2899	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
		2900	} else {
		2901	return 0;
		2902	}
		2903
2275	}	2904	1
		2905	}
		2906
		2907	sub invoke_mouse_wheel {
		2908	my ($self, $ev) = @_;
		2909
		2910	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
		2911
		2912	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2913
		2914	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
		2915
		2916	! ! $delta
2276	}	2917	}
2277		2918
2278	sub update {	2919	sub update {
2279	my ($self) = @_;	2920	my ($self) = @_;
2280		2921
2281	$CFClient::UI::ROOT->on_post_alloc ($self => sub {	2922	delete $self->{knob_w};
		2923	$self->SUPER::update;
		2924	}
		2925
		2926	sub _draw {
		2927	my ($self) = @_;
		2928
		2929	unless ($self->{knob_w}) {
2282	$self->set_value ($self->{range}[0]);	2930	$self->set_value ($self->{range}[0]);
2283		2931
2284	my ($value, $lo, $hi, $page) = @{$self->{range}};	2932	my ($value, $lo, $hi, $page) = @{$self->{range}};
2285	my $range = ($hi - $page - $lo) || 1e-100;	2933	my $range = ($hi - $page - $lo) || 1e-100;
2286		2934
…		…
2292	$value = ($value - $lo) / $range;	2940	$value = ($value - $lo) / $range;
2293	$value = $value * $self->{scale} + $self->{offset};	2941	$value = $value * $self->{scale} + $self->{offset};
2294		2942
2295	$self->{knob_x} = $value - $knob_w * 0.5;	2943	$self->{knob_x} = $value - $knob_w * 0.5;
2296	$self->{knob_w} = $knob_w;	2944	$self->{knob_w} = $knob_w;
2297	});	2945	}
2298
2299	$self->SUPER::update;
2300	}
2301
2302	sub _draw {
2303	my ($self) = @_;
2304		2946
2305	$self->SUPER::_draw ();	2947	$self->SUPER::_draw ();
2306		2948
2307	glScale $self->{w}, $self->{h};	2949	glScale $self->{w}, $self->{h};
2308		2950
…		…
2328	glDisable GL_TEXTURE_2D;	2970	glDisable GL_TEXTURE_2D;
2329	}	2971	}
2330		2972
2331	#############################################################################	2973	#############################################################################
2332		2974
2333	package CFClient::UI::ValSlider;	2975	package CFPlus::UI::ValSlider;
2334		2976
2335	our @ISA = CFClient::UI::HBox::;	2977	our @ISA = CFPlus::UI::HBox::;
2336		2978
2337	sub new {	2979	sub new {
2338	my ($class, %arg) = @_;	2980	my ($class, %arg) = @_;
2339		2981
2340	my $range = delete $arg{range};	2982	my $range = delete $arg{range};
2341		2983
2342	my $self = $class->SUPER::new (	2984	my $self = $class->SUPER::new (
2343	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2985	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2344	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2986	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2345	to_value => sub { shift },	2987	to_value => sub { shift },
2346	from_value => sub { shift },	2988	from_value => sub { shift },
2347	%arg,	2989	%arg,
2348	);	2990	);
2349		2991
…		…
2369	sub set_range { shift->{slider}->set_range (@_) }	3011	sub set_range { shift->{slider}->set_range (@_) }
2370	sub set_value { shift->{slider}->set_value (@_) }	3012	sub set_value { shift->{slider}->set_value (@_) }
2371		3013
2372	#############################################################################	3014	#############################################################################
2373		3015
2374	package CFClient::UI::TextView;	3016	package CFPlus::UI::TextScroller;
2375		3017
2376	our @ISA = CFClient::UI::HBox::;	3018	our @ISA = CFPlus::UI::HBox::;
2377		3019
2378	use CFClient::OpenGL;	3020	use CFPlus::OpenGL;
2379		3021
2380	sub new {	3022	sub new {
2381	my $class = shift;	3023	my $class = shift;
2382		3024
2383	my $self = $class->SUPER::new (	3025	my $self = $class->SUPER::new (
2384	fontsize => 1,	3026	fontsize => 1,
2385	can_events => 0,	3027	can_events => 1,
		3028	indent => 0,
2386	#font => default_font	3029	#font => default_font
2387	@_,	3030	@_,
2388		3031
2389	layout => (new CFClient::Layout 1),	3032	layout => (new CFPlus::Layout),
2390	par => [],	3033	par => [],
		3034	max_par => 0,
2391	height => 0,	3035	height => 0,
2392	children => [	3036	children => [
2393	(new CFClient::UI::Empty expand => 1),	3037	(new CFPlus::UI::Empty expand => 1),
2394	(new CFClient::UI::Slider vertical => 1),	3038	(new CFPlus::UI::Slider vertical => 1),
2395	],	3039	],
2396	);	3040	);
2397		3041
2398	$self->{children}[1]->connect (changed => sub { $self->update });	3042	$self->{children}[1]->connect (changed => sub { $self->update });
2399		3043
…		…
2405		3049
2406	$self->{fontsize} = $fontsize;	3050	$self->{fontsize} = $fontsize;
2407	$self->reflow;	3051	$self->reflow;
2408	}	3052	}
2409		3053
		3054	sub size_request {
		3055	my ($self) = @_;
		3056
		3057	my ($empty, $slider) = @{ $self->{children} };
		3058
		3059	local $self->{children} = [$empty, $slider];
		3060	$self->SUPER::size_request
		3061	}
		3062
2410	sub size_allocate {	3063	sub invoke_size_allocate {
2411	my ($self, $w, $h) = @_;	3064	my ($self, $w, $h) = @_;
2412		3065
2413	$self->SUPER::size_allocate ($w, $h);	3066	my ($empty, $slider, @other) = @{ $self->{children} };
		3067	$_->configure (@$_{qw(x y req_w req_h)}) for @other;
2414		3068
2415	$self->{layout}->set_font ($self->{font}) if $self->{font};	3069	$self->{layout}->set_font ($self->{font}) if $self->{font};
2416	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	3070	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2417	$self->{layout}->set_width ($self->{children}[0]{w});	3071	$self->{layout}->set_width ($empty->{w});
		3072	$self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2418		3073
2419	$self->reflow;	3074	$self->reflow;
2420	}
2421		3075
2422	sub text_size {	3076	local $self->{children} = [$empty, $slider];
		3077	$self->SUPER::invoke_size_allocate ($w, $h)
		3078	}
		3079
		3080	sub invoke_mouse_wheel {
2423	my ($self, $text, $indent) = @_;	3081	my ($self, $ev) = @_;
		3082
		3083	return 0 unless $ev->{dy}; # only vertical movements
		3084
		3085	$self->{children}[1]->emit (mouse_wheel => $ev);
		3086
		3087	1
		3088	}
		3089
		3090	sub get_layout {
		3091	my ($self, $para) = @_;
2424		3092
2425	my $layout = $self->{layout};	3093	my $layout = $self->{layout};
2426		3094
		3095	$layout->set_font ($self->{font}) if $self->{font};
		3096	$layout->set_foreground (@{$para->{fg}});
2427	$layout->set_height ($self->{fontsize} * $::FONTSIZE);	3097	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2428	$layout->set_width ($self->{children}[0]{w} - $indent);	3098	$layout->set_width ($self->{children}[0]{w} - $para->{indent});
		3099	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2429	$layout->set_markup ($text);	3100	$layout->set_markup ($para->{markup});
		3101
		3102	$layout->set_shapes (
		3103	map
		3104	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
		3105	@{$para->{widget}}
2430		3106	);
		3107
2431	$layout->size	3108	$layout
2432	}	3109	}
2433		3110
2434	sub reflow {	3111	sub reflow {
2435	my ($self) = @_;	3112	my ($self) = @_;
2436		3113
…		…
2443		3120
2444	# todo: base offset on lines or so, not on pixels	3121	# todo: base offset on lines or so, not on pixels
2445	$self->{children}[1]->set_value ($offset);	3122	$self->{children}[1]->set_value ($offset);
2446	}	3123	}
2447		3124
		3125	sub current_paragraph {
		3126	my ($self) = @_;
		3127
		3128	$self->{top_paragraph} - 1
		3129	}
		3130
		3131	sub scroll_to {
		3132	my ($self, $para) = @_;
		3133
		3134	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3135
		3136	$self->{scroll_to} = $para;
		3137	$self->update;
		3138	}
		3139
2448	sub clear {	3140	sub clear {
2449	my ($self) = @_;	3141	my ($self) = @_;
		3142
		3143	my (undef, undef, @other) = @{ $self->{children} };
		3144	$self->remove ($_) for @other;
2450		3145
2451	$self->{par} = [];	3146	$self->{par} = [];
2452	$self->{height} = 0;	3147	$self->{height} = 0;
2453	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3148	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2454	}	3149	}
2455		3150
2456	sub add_paragraph {	3151	sub add_paragraph {
2457	my ($self, $color, $text, $indent) = @_;	3152	my $self = shift;
2458		3153
2459	for my $line (split /\n/, $text) {	3154	for my $para (@_) {
2460	my ($w, $h) = $self->text_size ($line);	3155	$para = {
		3156	fg => [1, 1, 1, 1],
		3157	indent => 0,
		3158	markup => "",
		3159	widget => [],
		3160	ref $para ? %$para : (markup => $para),
		3161	w => 1e10,
		3162	wrapped => 1,
		3163	};
		3164
		3165	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
		3166	push @{$self->{par}}, $para;
		3167	}
		3168
		3169	if (my $max = $self->{max_par}) {
		3170	shift @{$self->{par}} while @{$self->{par}} > $max;
		3171	}
		3172
		3173	$self->{need_reflow}++;
		3174	$self->update;
		3175	}
		3176
		3177	sub scroll_to_bottom {
		3178	my ($self) = @_;
		3179
		3180	$self->{scroll_to} = $#{$self->{par}};
		3181	$self->update;
		3182	}
		3183
		3184	sub force_uptodate {
		3185	my ($self) = @_;
		3186
		3187	if (delete $self->{need_reflow}) {
		3188	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3189
		3190	my $height = 0;
		3191
		3192	for my $para (@{$self->{par}}) {
		3193	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3194	my $layout = $self->get_layout ($para);
		3195	my ($w, $h) = $layout->size;
		3196
		3197	$para->{w} = $w + $para->{indent};
		3198	$para->{h} = $h;
		3199	$para->{wrapped} = $layout->has_wrapped;
		3200	}
		3201
		3202	$para->{y} = $height;
		3203	$height += $para->{h};
		3204	}
		3205
2461	$self->{height} += $h;	3206	$self->{height} = $height;
2462	push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];	3207	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2463	}
2464		3208
2465	$self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);	3209	delete $self->{texture};
		3210	}
		3211
		3212	if (my $paridx = delete $self->{scroll_to}) {
		3213	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3214	}
2466	}	3215	}
2467		3216
2468	sub update {	3217	sub update {
2469	my ($self) = @_;	3218	my ($self) = @_;
2470		3219
…		…
2472		3221
2473	return unless $self->{h} > 0;	3222	return unless $self->{h} > 0;
2474		3223
2475	delete $self->{texture};	3224	delete $self->{texture};
2476		3225
2477	$ROOT->on_post_alloc ($self, sub {	3226	$ROOT->on_post_alloc ($self => sub {
		3227	$self->force_uptodate;
		3228
2478	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3229	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2479		3230
2480	if (delete $self->{need_reflow}) {
2481	my $height = 0;
2482
2483	my $layout = $self->{layout};
2484
2485	$layout->set_height ($self->{fontsize} * $::FONTSIZE);
2486
2487	for (@{$self->{par}}) {
2488	if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2489	$layout->set_width ($W - $_->[3]);
2490	$layout->set_markup ($_->[4]);
2491	my ($w, $h) = $layout->size;
2492	$_->[0] = $w + $_->[3];
2493	$_->[1] = $h;
2494	}
2495
2496	$height += $_->[1];
2497	}
2498
2499	$self->{height} = $height;
2500
2501	$self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2502
2503	delete $self->{texture};
2504	}
2505
2506	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3231	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2507	glClearColor 0.5, 0.5, 0.5, 0;	3232	glClearColor 0, 0, 0, 0;
2508	glClear GL_COLOR_BUFFER_BIT;	3233	glClear GL_COLOR_BUFFER_BIT;
2509		3234
		3235	package CFPlus::UI::Base;
		3236	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3237	(0, 0, $self->{w}, $self->{h});
		3238
		3239	my $top = int $self->{children}[1]{range}[0];
		3240
		3241	my $paridx = 0;
		3242	my $top_paragraph;
2510	my $top = int $self->{children}[1]{range}[0];	3243	my $top = int $self->{children}[1]{range}[0];
2511		3244
2512	my $y0 = $top;	3245	my $y0 = $top;
2513	my $y1 = $top + $H;	3246	my $y1 = $top + $H;
2514		3247
2515	my $y = 0;
2516
2517	my $layout = $self->{layout};
2518
2519	$layout->set_font ($self->{font}) if $self->{font};
2520
2521	glEnable GL_BLEND;
2522	#TODO# not correct in windows where rgba is forced off
2523	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2524
2525	for my $par (@{$self->{par}}) {	3248	for my $para (@{$self->{par}}) {
2526	my $h = $par->[1];	3249	my $h = $para->{h};
		3250	my $y = $para->{y};
2527		3251
2528	if ($y0 < $y + $h && $y < $y1) {	3252	if ($y0 < $y + $h && $y < $y1) {
2529	$layout->set_foreground (@{ $par->[2] });	3253	my $layout = $self->get_layout ($para);
2530	$layout->set_width ($W - $par->[3]);
2531	$layout->set_markup ($par->[4]);
2532		3254
2533	my ($w, $h, $data, $format, $internalformat) = $layout->render;	3255	$layout->render ($para->{indent}, $y - $y0);
2534		3256
2535	glRasterPos $par->[3], $y - $y0;	3257	if (my @w = @{ $para->{widget} }) {
2536	glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;	3258	my @s = $layout->get_shapes;
		3259
		3260	for (@w) {
		3261	my ($dx, $dy) = splice @s, 0, 2, ();
		3262
		3263	$_->{x} = $dx + $para->{indent};
		3264	$_->{y} = $dy + $y - $y0;
		3265
		3266	$_->draw;
		3267	}
		3268	}
2537	}	3269	}
2538		3270
2539	$y += $h;	3271	$paridx++;
		3272	$top_paragraph ||= $paridx if $y >= $top;
2540	}	3273	}
2541		3274
2542	glDisable GL_BLEND;	3275	$self->{top_paragraph} = $top_paragraph;
2543	};	3276	};
2544	});	3277	});
2545	}	3278	}
2546		3279
		3280	sub reconfigure {
		3281	my ($self) = @_;
		3282
		3283	$self->SUPER::reconfigure;
		3284
		3285	$_->{w} = 1e10 for @{ $self->{par} };
		3286	$self->reflow;
		3287	}
		3288
2547	sub _draw {	3289	sub _draw {
2548	my ($self) = @_;	3290	my ($self) = @_;
2549		3291
2550	glEnable GL_TEXTURE_2D;	3292	glEnable GL_TEXTURE_2D;
2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552	glColor 1, 1, 1, 1;	3294	glColor 0, 0, 0, 1;
2553	$self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});	3295	$self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2554	glDisable GL_TEXTURE_2D;	3296	glDisable GL_TEXTURE_2D;
2555		3297
2556	$self->{children}[1]->draw;	3298	$self->{children}[1]->draw;
2557
2558	}	3299	}
2559		3300
2560	#############################################################################	3301	#############################################################################
2561		3302
2562	package CFClient::UI::Animator;	3303	package CFPlus::UI::Animator;
2563		3304
2564	use CFClient::OpenGL;	3305	use CFPlus::OpenGL;
2565		3306
2566	our @ISA = CFClient::UI::Bin::;	3307	our @ISA = CFPlus::UI::Bin::;
2567		3308
2568	sub moveto {	3309	sub moveto {
2569	my ($self, $x, $y) = @_;	3310	my ($self, $x, $y) = @_;
2570		3311
2571	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3312	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2599	glPopMatrix;	3340	glPopMatrix;
2600	}	3341	}
2601		3342
2602	#############################################################################	3343	#############################################################################
2603		3344
2604	package CFClient::UI::Flopper;	3345	package CFPlus::UI::Flopper;
2605		3346
2606	our @ISA = CFClient::UI::Button::;	3347	our @ISA = CFPlus::UI::Button::;
2607		3348
2608	sub new {	3349	sub new {
2609	my $class = shift;	3350	my $class = shift;
2610		3351
2611	my $self = $class->SUPER::new (	3352	my $self = $class->SUPER::new (
…		…
2623	$self->{other}->toggle_visibility;	3364	$self->{other}->toggle_visibility;
2624	}	3365	}
2625		3366
2626	#############################################################################	3367	#############################################################################
2627		3368
2628	package CFClient::UI::Tooltip;	3369	package CFPlus::UI::Tooltip;
2629		3370
2630	our @ISA = CFClient::UI::Bin::;	3371	our @ISA = CFPlus::UI::Bin::;
2631		3372
2632	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
2633		3374
2634	sub new {	3375	sub new {
2635	my $class = shift;	3376	my $class = shift;
2636		3377
2637	$class->SUPER::new (	3378	$class->SUPER::new (
…		…
2640	)	3381	)
2641	}	3382	}
2642		3383
2643	sub set_tooltip_from {	3384	sub set_tooltip_from {
2644	my ($self, $widget) = @_;	3385	my ($self, $widget) = @_;
		3386
		3387	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3388	if $widget->{tooltip} =~ /^#(.*)$/;
2645		3389
2646	my $tooltip = $widget->{tooltip};	3390	my $tooltip = $widget->{tooltip};
2647		3391
2648	if ($ENV{CFPLUS_DEBUG} & 2) {	3392	if ($ENV{CFPLUS_DEBUG} & 2) {
2649	$tooltip .= "\n\n" . (ref $widget) . "\n"	3393	$tooltip .= "\n\n" . (ref $widget) . "\n"
2650	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3394	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2651	. "req $widget->{req_w} $widget->{req_h}\n"	3395	. "req $widget->{req_w} $widget->{req_h}\n"
2652	. "visible $widget->{visible}";	3396	. "visible $widget->{visible}";
2653	}	3397	}
2654		3398
		3399	$tooltip =~ s/^\n+//;
		3400	$tooltip =~ s/\n+$//;
		3401
2655	$self->add (new CFClient::UI::Label	3402	$self->add (new CFPlus::UI::Label
2656	markup => $tooltip,	3403	markup => $tooltip,
2657	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3404	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2658	fontsize => 0.8,	3405	fontsize => 0.8,
2659	fg => [0, 0, 0, 1],	3406	style => 1, # FLAG_INVERSE
2660	ellipsise => 0,	3407	ellipsise => 0,
2661	font => ($widget->{tooltip_font} || $::FONT_PROP),	3408	font => ($widget->{tooltip_font} || $::FONT_PROP),
2662	);	3409	);
2663	}	3410	}
2664		3411
…		…
2668	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	3415	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2669		3416
2670	($w + 4, $h + 4)	3417	($w + 4, $h + 4)
2671	}	3418	}
2672		3419
2673	sub size_allocate {	3420	sub invoke_size_allocate {
2674	my ($self, $w, $h) = @_;	3421	my ($self, $w, $h) = @_;
2675		3422
2676	$self->SUPER::size_allocate ($w - 4, $h - 4);	3423	$self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2677	}	3424	}
2678		3425
2679	sub visibility_change {	3426	sub invoke_visibility_change {
2680	my ($self, $visible) = @_;	3427	my ($self, $visible) = @_;
2681		3428
2682	return unless $visible;	3429	return unless $visible;
2683		3430
2684	$self->{root}->on_post_alloc ("move_$self" => sub {	3431	$self->{root}->on_post_alloc ("move_$self" => sub {
2685	my $widget = $self->{owner}	3432	my $widget = $self->{owner}
2686	or return;	3433	or return;
2687		3434
		3435	if ($widget->{visible}) {
2688	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3436	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2689		3437
2690	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3438	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2691	if $x + $self->{w} > $::WIDTH;	3439	if $x + $self->{w} > $self->{root}{w};
2692		3440
2693	$self->move_abs ($x, $y);	3441	$self->move_abs ($x, $y);
		3442	} else {
		3443	$self->hide;
		3444	}
2694	});	3445	});
2695	}	3446	}
2696		3447
2697	sub _draw {	3448	sub _draw {
2698	my ($self) = @_;	3449	my ($self) = @_;
…		…
2722	$self->SUPER::_draw;	3473	$self->SUPER::_draw;
2723	}	3474	}
2724		3475
2725	#############################################################################	3476	#############################################################################
2726		3477
2727	package CFClient::UI::Face;	3478	package CFPlus::UI::Face;
2728		3479
2729	our @ISA = CFClient::UI::Base::;	3480	our @ISA = CFPlus::UI::DrawBG::;
2730		3481
2731	use CFClient::OpenGL;	3482	use CFPlus::OpenGL;
2732		3483
2733	sub new {	3484	sub new {
2734	my $class = shift;	3485	my $class = shift;
2735		3486
2736	my $self = $class->SUPER::new (	3487	my $self = $class->SUPER::new (
		3488	size_w => 32,
		3489	size_h => 8,
2737	aspect => 1,	3490	aspect => 1,
2738	can_events => 0,	3491	can_events => 0,
2739	@_,	3492	@_,
2740	);	3493	);
2741		3494
2742	if ($self->{anim} && $self->{animspeed}) {	3495	if ($self->{anim} && $self->{animspeed}) {
2743	Scalar::Util::weaken (my $widget = $self);	3496	CFPlus::weaken (my $widget = $self);
2744		3497
		3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
2745	$self->{timer} = Event->timer (	3500	$self->{timer} = Event->timer (
2746	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2747	hard => 1,	3501	parked => 1,
2748	interval => $self->{animspeed},
2749	cb => sub {	3502	cb => sub {
		3503	return unless $::CONN;
		3504
		3505	if (!$widget) {#d#
		3506	warn "animation widget timer active but widgetd estroyed\n";#d#
		3507	warn $_[0]->w->active;#d#
		3508	}#d#
		3509
2750	++$widget->{frame};	3510	++$widget->{frame};
		3511	$widget->update_face;
2751	$widget->update;	3512	$widget->update;
		3513
		3514	$widget->update_timer;
2752	},	3515	},
2753	);	3516	);
		3517
		3518	$self->update_face;
		3519	$self->update_timer;
2754	}	3520	}
2755		3521
2756	$self	3522	$self
2757	}	3523	}
2758		3524
		3525	sub update_timer {
		3526	my ($self) = @_;
		3527
		3528	return unless $self->{timer};
		3529
		3530	if ($self->{visible}) {
		3531	$self->{timer}->at (
		3532	$self->{anim_start}
		3533	+ $self->{animspeed}
		3534	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3535	);
		3536	$self->{timer}->start;
		3537	} else {
		3538	$self->{timer}->stop;
		3539	}
		3540	}
		3541
		3542	sub update_face {
		3543	my ($self) = @_;
		3544
		3545	return unless $::CONN;
		3546
		3547	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3548	if ($anim && @$anim) {
		3549	delete $self->{wait_face};
		3550	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3551	}
		3552	}
		3553	}
		3554
2759	sub size_request {	3555	sub size_request {
2760	(32, 8)	3556	my ($self) = @_;
		3557
		3558	if ($::CONN) {
		3559	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3560	if (my $tex = $::CONN->{texture}[$faceid]) {
		3561	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3562	} else {
		3563	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3564	$self->realloc;
		3565	});
		3566	}
		3567	}
		3568	}
		3569
		3570	($self->{size_w} || 8, $self->{size_h} || 8)
2761	}	3571	}
2762		3572
2763	sub update {	3573	sub update {
2764	my ($self) = @_;	3574	my ($self) = @_;
2765		3575
2766	return unless $self->{visible};	3576	return unless $self->{visible};
2767		3577
2768	$self->SUPER::update;	3578	$self->SUPER::update;
2769	}	3579	}
2770		3580
		3581	sub invoke_visibility_change {
		3582	my ($self) = @_;
		3583
		3584	$self->update_timer;
		3585
		3586	0
		3587	}
		3588
2771	sub _draw {	3589	sub _draw {
2772	my ($self) = @_;	3590	my ($self) = @_;
2773		3591
2774	return unless $::CONN;	3592	return unless $::CONN;
2775		3593
2776	my $face;	3594	$self->SUPER::_draw;
2777		3595
2778	if ($self->{frame}) {
2779	my $anim = $::CONN->{anim}[$self->{anim}];	3596	my $faceid = $::CONN->{faceid}[$self->{face}]
2780		3597	or return;
2781	$face = $anim->[ $self->{frame} % @$anim ]
2782	if $anim && @$anim;
2783	}
2784		3598
2785	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3599	my $tex = $::CONN->{texture}[$faceid];
2786		3600
2787	if ($tex) {	3601	if ($tex) {
2788	glEnable GL_TEXTURE_2D;	3602	glEnable GL_TEXTURE_2D;
2789	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3603	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2790	glColor 1, 1, 1, 1;	3604	glColor 0, 0, 0, 1;
2791	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3605	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2792	glDisable GL_TEXTURE_2D;	3606	glDisable GL_TEXTURE_2D;
2793	}	3607	}
2794	}	3608	}
2795		3609
2796	sub DESTROY {	3610	sub destroy {
2797	my ($self) = @_;	3611	my ($self) = @_;
2798		3612
2799	$self->{timer}->cancel	3613	(delete $self->{timer})->cancel
2800	if $self->{timer};	3614	if $self->{timer};
2801		3615
2802	$self->SUPER::DESTROY;	3616	$self->SUPER::destroy;
2803	}	3617	}
2804		3618
2805	#############################################################################	3619	#############################################################################
2806		3620
		3621	package CFPlus::UI::Buttonbar;
		3622
		3623	our @ISA = CFPlus::UI::HBox::;
		3624
		3625	# TODO: should actually wrap buttons and other goodies.
		3626
		3627	#############################################################################
		3628
2807	package CFClient::UI::Menu;	3629	package CFPlus::UI::Menu;
2808		3630
2809	our @ISA = CFClient::UI::FancyFrame::;	3631	our @ISA = CFPlus::UI::Toplevel::;
2810		3632
2811	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
2812		3634
2813	sub new {	3635	sub new {
2814	my $class = shift;	3636	my $class = shift;
2815		3637
2816	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
2817	items => [],	3639	items => [],
2818	z => 100,	3640	z => 100,
2819	@_,	3641	@_,
2820	);	3642	);
2821		3643
2822	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3644	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
2823		3645
2824	for my $item (@{ $self->{items} }) {	3646	for my $item (@{ $self->{items} }) {
2825	my ($widget, $cb) = @$item;	3647	my ($widget, $cb, $tooltip) = @$item;
2826		3648
2827	# handle various types of items, only text for now	3649	# handle various types of items, only text for now
2828	if (!ref $widget) {	3650	if (!ref $widget) {
		3651	if ($widget =~ /\t/) {
		3652	my ($left, $right) = split /\t/, $widget, 2;
		3653
2829	$widget = new CFClient::UI::Label	3654	$widget = new CFPlus::UI::HBox
2830	can_hover => 1,	3655	can_hover => 1,
2831	can_events => 1,	3656	can_events => 1,
		3657	tooltip => $tooltip,
		3658	children => [
		3659	(new CFPlus::UI::Label markup => $left, expand => 1),
		3660	(new CFPlus::UI::Label markup => $right, align => +1),
		3661	],
		3662	;
		3663
		3664	} else {
		3665	$widget = new CFPlus::UI::Label
		3666	can_hover => 1,
		3667	can_events => 1,
2832	text => $widget;	3668	markup => $widget,
		3669	tooltip => $tooltip;
		3670	}
2833	}	3671	}
2834		3672
2835	$self->{item}{$widget} = $item;	3673	$self->{item}{$widget} = $item;
2836		3674
2837	$self->{vbox}->add ($widget);	3675	$self->{vbox}->add ($widget);
…		…
2842		3680
2843	# popup given the event (must be a mouse button down event currently)	3681	# popup given the event (must be a mouse button down event currently)
2844	sub popup {	3682	sub popup {
2845	my ($self, $ev) = @_;	3683	my ($self, $ev) = @_;
2846		3684
2847	$self->_emit ("popdown");	3685	$self->emit ("popdown");
2848		3686
2849	# maybe save $GRAB? must be careful about events...	3687	# maybe save $GRAB? must be careful about events...
2850	$GRAB = $self;	3688	$GRAB = $self;
2851	$self->{button} = $ev->{button};	3689	$self->{button} = $ev->{button};
2852		3690
2853	$self->show;	3691	$self->show;
2854	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3692	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2855	}	3693	}
2856		3694
2857	sub mouse_motion {	3695	sub invoke_mouse_motion {
2858	my ($self, $ev, $x, $y) = @_;	3696	my ($self, $ev, $x, $y) = @_;
2859		3697
2860	# TODO: should use vbox->find_widget or so	3698	# TODO: should use vbox->find_widget or so
2861	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});	3699	$HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2862	$self->{hover} = $self->{item}{$HOVER};	3700	$self->{hover} = $self->{item}{$HOVER};
2863	}
2864		3701
		3702	0
		3703	}
		3704
2865	sub button_up {	3705	sub invoke_button_up {
2866	my ($self, $ev, $x, $y) = @_;	3706	my ($self, $ev, $x, $y) = @_;
2867		3707
2868	if ($ev->{button} == $self->{button}) {	3708	if ($ev->{button} == $self->{button}) {
2869	undef $GRAB;	3709	undef $GRAB;
2870	$self->hide;	3710	$self->hide;
2871		3711
2872	$self->_emit ("popdown");	3712	$self->emit ("popdown");
2873	$self->{hover}[1]->() if $self->{hover};	3713	$self->{hover}[1]->() if $self->{hover};
		3714	} else {
		3715	return 0
		3716	}
		3717
2874	}	3718	1
2875	}	3719	}
2876		3720
2877	#############################################################################	3721	#############################################################################
2878		3722
2879	package CFClient::UI::Statusbox;	3723	package CFPlus::UI::Multiplexer;
2880		3724
2881	our @ISA = CFClient::UI::VBox::;	3725	our @ISA = CFPlus::UI::Container::;
2882		3726
2883	sub new {	3727	sub new {
2884	my $class = shift;	3728	my $class = shift;
2885		3729
2886	$class->SUPER::new (	3730	my $self = $class->SUPER::new (
		3731	@_,
		3732	);
		3733
		3734	$self->{current} = $self->{children}[0]
		3735	if @{ $self->{children} };
		3736
		3737	$self
		3738	}
		3739
		3740	sub add {
		3741	my ($self, @widgets) = @_;
		3742
		3743	$self->SUPER::add (@widgets);
		3744
		3745	$self->{current} = $self->{children}[0]
		3746	if @{ $self->{children} };
		3747	}
		3748
		3749	sub get_current_page {
		3750	my ($self) = @_;
		3751
		3752	$self->{current}
		3753	}
		3754
		3755	sub set_current_page {
		3756	my ($self, $page_or_widget) = @_;
		3757
		3758	my $widget = ref $page_or_widget
		3759	? $page_or_widget
		3760	: $self->{children}[$page_or_widget];
		3761
		3762	$self->{current} = $widget;
		3763	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
		3764
		3765	$self->emit (page_changed => $self->{current});
		3766
		3767	$self->realloc;
		3768	}
		3769
		3770	sub visible_children {
		3771	$_[0]{current}
		3772	}
		3773
		3774	sub size_request {
		3775	my ($self) = @_;
		3776
		3777	$self->{current}->size_request
		3778	}
		3779
		3780	sub invoke_size_allocate {
		3781	my ($self, $w, $h) = @_;
		3782
		3783	$self->{current}->configure (0, 0, $w, $h);
		3784
		3785	1
		3786	}
		3787
		3788	sub _draw {
		3789	my ($self) = @_;
		3790
		3791	$self->{current}->draw;
		3792	}
		3793
		3794	#############################################################################
		3795
		3796	package CFPlus::UI::Notebook;
		3797
		3798	our @ISA = CFPlus::UI::VBox::;
		3799
		3800	sub new {
		3801	my $class = shift;
		3802
		3803	my $self = $class->SUPER::new (
		3804	buttonbar => (new CFPlus::UI::Buttonbar),
		3805	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3806	# filter => # will be put between multiplexer and $self
		3807	@_,
		3808	);
		3809
		3810	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
		3811	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
		3812
		3813	$self
		3814	}
		3815
		3816	sub add {
		3817	my ($self, $title, $widget, $tooltip) = @_;
		3818
		3819	CFPlus::weaken $self;
		3820
		3821	$self->{buttonbar}->add (new CFPlus::UI::Button
		3822	markup => $title,
		3823	tooltip => $tooltip,
		3824	on_activate => sub { $self->set_current_page ($widget) },
		3825	);
		3826
		3827	$self->{multiplexer}->add ($widget);
		3828	}
		3829
		3830	sub get_current_page {
		3831	my ($self) = @_;
		3832
		3833	$self->{multiplexer}->get_current_page
		3834	}
		3835
		3836	sub set_current_page {
		3837	my ($self, $page) = @_;
		3838
		3839	$self->{multiplexer}->set_current_page ($page);
		3840	$self->emit (page_changed => $self->{multiplexer}{current});
		3841	}
		3842
		3843	#############################################################################
		3844
		3845	package CFPlus::UI::Selector;
		3846
		3847	use utf8;
		3848
		3849	our @ISA = CFPlus::UI::Button::;
		3850
		3851	sub new {
		3852	my $class = shift;
		3853
		3854	my $self = $class->SUPER::new (
		3855	options => [], # [value, title, longdesc], ...
		3856	value => undef,
		3857	@_,
		3858	);
		3859
		3860	$self->_set_value ($self->{value});
		3861
		3862	$self
		3863	}
		3864
		3865	sub invoke_button_down {
		3866	my ($self, $ev) = @_;
		3867
		3868	my @menu_items;
		3869
		3870	for (@{ $self->{options} }) {
		3871	my ($value, $title, $tooltip) = @$_;
		3872
		3873	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
		3874	}
		3875
		3876	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
		3877	}
		3878
		3879	sub _set_value {
		3880	my ($self, $value) = @_;
		3881
		3882	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
		3883	or return;
		3884
		3885	$self->{value} = $item->[0];
		3886	$self->set_markup ("$item->[1] ⇓");
		3887	$self->set_tooltip ($item->[2]);
		3888	}
		3889
		3890	sub set_value {
		3891	my ($self, $value) = @_;
		3892
		3893	return unless $self->{value} ne $value;
		3894
		3895	$self->_set_value ($value);
		3896	$self->emit (changed => $value);
		3897	}
		3898
		3899	#############################################################################
		3900
		3901	package CFPlus::UI::Statusbox;
		3902
		3903	our @ISA = CFPlus::UI::VBox::;
		3904
		3905	sub new {
		3906	my $class = shift;
		3907
		3908	my $self = $class->SUPER::new (
2887	fontsize => 0.8,	3909	fontsize => 0.8,
2888	@_,	3910	@_,
2889	)	3911	);
		3912
		3913	CFPlus::weaken (my $this = $self);
		3914
		3915	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
		3916
		3917	$self
2890	}	3918	}
2891		3919
2892	sub reorder {	3920	sub reorder {
2893	my ($self) = @_;	3921	my ($self) = @_;
2894	my $NOW = time;	3922	my $NOW = Time::HiRes::time;
		3923
		3924	# freeze display when hovering over any label
		3925	return if $CFPlus::UI::TOOLTIP->{owner}
		3926	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
		3927	values %{ $self->{item} };
2895		3928
2896	while (my ($k, $v) = each %{ $self->{item} }) {	3929	while (my ($k, $v) = each %{ $self->{item} }) {
2897	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3930	delete $self->{item}{$k} if $v->{timeout} < $NOW;
2898	}	3931	}
2899		3932
…		…
2902	my @items = sort {	3935	my @items = sort {
2903	$a->{pri} <=> $b->{pri}	3936	$a->{pri} <=> $b->{pri}
2904	or $b->{id} <=> $a->{id}	3937	or $b->{id} <=> $a->{id}
2905	} values %{ $self->{item} };	3938	} values %{ $self->{item} };
2906		3939
		3940	$self->{timer}->interval (1);
		3941
2907	my $count = 10 + 1;	3942	my $count = 10 + 1;
2908	for my $item (@items) {	3943	for my $item (@items) {
2909	last unless --$count;	3944	last unless --$count;
2910		3945
2911	push @widgets, $item->{label} ||= do {	3946	my $label = $item->{label} ||= do {
2912	# TODO: doesn't handle markup well (read as: at all)	3947	# TODO: doesn't handle markup well (read as: at all)
2913	my $short = $item->{count} > 1	3948	my $short = $item->{count} > 1
2914	? "<b>$item->{count} ×</b> $item->{text}"	3949	? "<b>$item->{count} ×</b> $item->{text}"
2915	: $item->{text};	3950	: $item->{text};
2916		3951
2917	for ($short) {	3952	for ($short) {
2918	s/^\s+//;	3953	s/^\s+//;
2919	s/\s+/ /g;	3954	s/\s+/ /g;
2920	}	3955	}
2921		3956
2922	new CFClient::UI::Label	3957	new CFPlus::UI::Label
2923	markup => $short,	3958	markup => $short,
2924	tooltip => $item->{tooltip},	3959	tooltip => $item->{tooltip},
2925	tooltip_font => $::FONT_PROP,	3960	tooltip_font => $::FONT_PROP,
2926	tooltip_width => 0.67,	3961	tooltip_width => 0.67,
2927	fontsize => $item->{fontsize} || $self->{fontsize},	3962	fontsize => $item->{fontsize} || $self->{fontsize},
2928	max_w => $::WIDTH * 0.44,	3963	max_w => $::WIDTH * 0.44,
2929	fg => $item->{fg},	3964	fg => [@{ $item->{fg} }],
2930	can_events => 1,	3965	can_events => 1,
2931	can_hover => 1	3966	can_hover => 1
2932	};	3967	};
		3968
		3969	if ((my $diff = $item->{timeout} - $NOW) < 2) {
		3970	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
		3971	$label->update;
		3972	$label->set_max_size (undef, $label->{req_h} * $diff)
		3973	if $diff < 1;
		3974	$self->{timer}->interval (1/30);
		3975	} else {
		3976	$label->{fg}[3] = $item->{fg}[3] || 1;
		3977	}
		3978
		3979	push @widgets, $label;
2933	}	3980	}
2934		3981
2935	$self->clear;	3982	$self->clear;
2936	$self->SUPER::add (reverse @widgets);	3983	$self->SUPER::add (reverse @widgets);
2937	}	3984	}
…		…
2942	$text =~ s/^\s+//;	3989	$text =~ s/^\s+//;
2943	$text =~ s/\s+$//;	3990	$text =~ s/\s+$//;
2944		3991
2945	return unless $text;	3992	return unless $text;
2946		3993
2947	my $timeout = time + ((delete $arg{timeout}) || 60);	3994	my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2948		3995
2949	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};	3996	my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2950		3997
2951	if (my $item = $self->{item}{$group}) {	3998	if (my $item = $self->{item}{$group}) {
2952	if ($item->{text} eq $text) {	3999	if ($item->{text} eq $text) {
2953	$item->{count}++;	4000	$item->{count}++;
2954	} else {	4001	} else {
2955	$item->{count} = 1;	4002	$item->{count} = 1;
2956	$item->{text} = $item->{tooltip} = $text;	4003	$item->{text} = $item->{tooltip} = $text;
2957	}	4004	}
2958	$item->{id} = ++$self->{id};	4005	$item->{id} += 0.2;#d#
2959	$item->{timeout} = $timeout;	4006	$item->{timeout} = $timeout;
2960	delete $item->{label};	4007	delete $item->{label};
2961	} else {	4008	} else {
2962	$self->{item}{$group} = {	4009	$self->{item}{$group} = {
2963	id => ++$self->{id},	4010	id => ++$self->{id},
…		…
2969	count => 1,	4016	count => 1,
2970	%arg,	4017	%arg,
2971	};	4018	};
2972	}	4019	}
2973		4020
		4021	$ROOT->on_refresh (reorder => sub {
2974	$self->reorder;	4022	$self->reorder;
		4023	});
2975	}	4024	}
2976		4025
2977	sub reconfigure {	4026	sub reconfigure {
2978	my ($self) = @_;	4027	my ($self) = @_;
2979		4028
…		…
2982		4031
2983	$self->reorder;	4032	$self->reorder;
2984	$self->SUPER::reconfigure;	4033	$self->SUPER::reconfigure;
2985	}	4034	}
2986		4035
		4036	sub destroy {
		4037	my ($self) = @_;
		4038
		4039	$self->{timer}->cancel;
		4040
		4041	$self->SUPER::destroy;
		4042	}
		4043
2987	#############################################################################	4044	#############################################################################
2988		4045
2989	package CFClient::UI::Inventory;
2990
2991	our @ISA = CFClient::UI::ScrolledWindow::;
2992
2993	sub new {
2994	my $class = shift;
2995
2996	my $self = $class->SUPER::new (
2997	scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2998	@_,
2999	);
3000
3001	$self
3002	}
3003
3004	sub set_items {
3005	my ($self, $items) = @_;
3006
3007	$self->{scrolled}->clear;
3008	return unless $items;
3009
3010	my @items = sort {
3011	($a->{type} <=> $b->{type})
3012	or ($a->{name} cmp $b->{name})
3013	} @$items;
3014
3015	$self->{real_items} = \@items;
3016
3017	my $row = 0;
3018	for my $item (@items) {
3019	CFClient::Item::update_widgets $item;
3020
3021	$self->{scrolled}->add (0, $row, $item->{face_widget});
3022	$self->{scrolled}->add (1, $row, $item->{desc_widget});
3023	$self->{scrolled}->add (2, $row, $item->{weight_widget});
3024
3025	$row++;
3026	}
3027	}
3028
3029	#############################################################################
3030
3031	package CFClient::UI::BindEditor;
3032
3033	our @ISA = CFClient::UI::FancyFrame::;
3034
3035	sub new {
3036	my $class = shift;
3037
3038	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3039
3040	$self->add (my $vb = new CFClient::UI::VBox);
3041
3042
3043	$vb->add ($self->{rec_btn} = new CFClient::UI::Button
3044	text => "start recording",
3045	tooltip => "Start/Stops recording of actions."
3046	."All subsequent actions after the recording started will be captured."
3047	."The actions are displayed after the record was stopped."
3048	."To bind the action you have to click on the 'Bind' button",
3049	on_activate => sub {
3050	unless ($self->{recording}) {
3051	$self->start;
3052	} else {
3053	$self->stop;
3054	}
3055	});
3056
3057	$vb->add (new CFClient::UI::Label text => "Actions:");
3058	$vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3059
3060	$vb->add (new CFClient::UI::Label text => "Bound to: ");
3061	$vb->add (my $hb = new CFClient::UI::HBox);
3062	$hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3063	$hb->add (new CFClient::UI::Button
3064	text => "bind",
3065	tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3066	on_activate => sub {
3067	$self->ask_for_bind;
3068	});
3069
3070	$vb->add (my $hb = new CFClient::UI::HBox);
3071	$hb->add (new CFClient::UI::Button
3072	text => "ok",
3073	expand => 1,
3074	tooltip => "This closes the binding editor and saves the binding",
3075	on_activate => sub {
3076	$self->hide;
3077	$self->commit;
3078	});
3079
3080	$hb->add (new CFClient::UI::Button
3081	text => "cancel",
3082	expand => 1,
3083	tooltip => "This closes the binding editor without saving",
3084	on_activate => sub {
3085	$self->hide;
3086	$self->{binding_cancel}->()
3087	if $self->{binding_cancel};
3088	});
3089
3090	$self->update_binding_widgets;
3091
3092	$self
3093	}
3094
3095	sub commit {
3096	my ($self) = @_;
3097	my ($mod, $sym, $cmds) = $self->get_binding;
3098	if ($sym != 0 && @$cmds > 0) {
3099	$::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3100	."'. Don't forget 'Save Config'!");
3101	$self->{binding_change}->($mod, $sym, $cmds)
3102	if $self->{binding_change};
3103	} else {
3104	$::STATUSBOX->add ("No action bound, no key or action specified!");
3105	$self->{binding_cancel}->()
3106	if $self->{binding_cancel};
3107	}
3108	}
3109
3110	sub start {
3111	my ($self) = @_;
3112
3113	$self->{rec_btn}->set_text ("stop recording");
3114	$self->{recording} = 1;
3115	$self->clear_command_list;
3116	$::CONN->start_record if $::CONN;
3117	}
3118
3119	sub stop {
3120	my ($self) = @_;
3121
3122	$self->{rec_btn}->set_text ("start recording");
3123	$self->{recording} = 0;
3124
3125	my $rec;
3126	$rec = $::CONN->stop_record if $::CONN;
3127	return unless ref $rec eq 'ARRAY';
3128	$self->set_command_list ($rec);
3129	}
3130
3131	# if $commit is true, the binding will be set after the user entered a key combo
3132	sub ask_for_bind {
3133	my ($self, $commit) = @_;
3134
3135	CFClient::Binder::open_binding_dialog (sub {
3136	my ($mod, $sym) = @_;
3137	$self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3138	$self->update_binding_widgets;
3139	$self->commit if $commit;
3140	});
3141	}
3142
3143	# $mod and $sym are the modifiers and key symbol
3144	# $cmds is a array ref of strings (the commands)
3145	# $cb is the callback that is executed on OK
3146	# $ccb is the callback that is executed on CANCEL and
3147	# when the binding was unsuccessful on OK
3148	sub set_binding {
3149	my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3150
3151	$self->clear_command_list;
3152	$self->{recording} = 0;
3153	$self->{rec_btn}->set_text ("start recording");
3154
3155	$self->{binding} = [$mod, $sym];
3156	$self->{commands} = $cmds;
3157
3158	$self->{binding_change} = $cb;
3159	$self->{binding_cancel} = $ccb;
3160
3161	$self->update_binding_widgets;
3162	}
3163
3164	# this is a shortcut method that asks for a binding
3165	# and then just binds it.
3166	sub do_quick_binding {
3167	my ($self, $cmds) = @_;
3168	$self->set_binding (undef, undef, $cmds, sub {
3169	$::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3170	});
3171	$self->ask_for_bind (1);
3172	}
3173
3174	sub update_binding_widgets {
3175	my ($self) = @_;
3176	my ($mod, $sym, $cmds) = $self->get_binding;
3177	$self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3178	$self->set_command_list ($cmds);
3179	}
3180
3181	sub get_binding {
3182	my ($self) = @_;
3183	return (
3184	$self->{binding}->[0],
3185	$self->{binding}->[1],
3186	[ grep { defined $_ } @{$self->{commands}} ]
3187	);
3188	}
3189
3190	sub clear_command_list {
3191	my ($self) = @_;
3192	$self->{cmdbox}->clear ();
3193	}
3194
3195	sub set_command_list {
3196	my ($self, $cmds) = @_;
3197
3198	$self->{cmdbox}->clear ();
3199	$self->{commands} = $cmds;
3200
3201	my $idx = 0;
3202
3203	for (@$cmds) {
3204	$self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3205
3206	my $i = $idx;
3207	$hb->add (new CFClient::UI::Label text => $_);
3208	$hb->add (new CFClient::UI::Button
3209	text => "delete",
3210	tooltip => "Deletes the action from the record",
3211	on_activate => sub {
3212	$self->{cmdbox}->remove ($hb);
3213	$cmds->[$i] = undef;
3214	});
3215
3216
3217	$idx++
3218	}
3219	}
3220
3221	#############################################################################
3222
3223	package CFClient::UI::SpellList;
3224
3225	our @ISA = CFClient::UI::FancyFrame::;
3226
3227	sub new {
3228	my $class = shift;
3229
3230	my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232	$self->add (new CFClient::UI::ScrolledWindow
3233	scrolled => $self->{spellbox} = new CFClient::UI::Table);
3234
3235	$self;
3236	}
3237
3238	# XXX: Do sorting? Argl...
3239	sub add_spell {
3240	my ($self, $spell) = @_;
3241	$self->{spells}->{$spell->{name}} = $spell;
3242
3243	$self->{spellbox}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3244	face => $spell->{face},
3245	can_hover => 1,
3246	can_events => 1,
3247	tooltip => $spell->{message});
3248
3249	$self->{spellbox}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3250	text => $spell->{name},
3251	can_hover => 1,
3252	can_events => 1,
3253	tooltip => $spell->{message},
3254	expand => 1);
3255
3256	$self->{spellbox}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3257	text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3258	$spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3259	expand => 1);
3260
3261	$self->{spellbox}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3262	text => "bind to key",
3263	on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3264	}
3265
3266	sub rebuild_spell_list {
3267	my ($self) = @_;
3268	$self->{tbl_idx} = 0;
3269	$self->add_spell ($_) for values %{$self->{spells}};
3270	}
3271
3272	sub remove_spell {
3273	my ($self, $spell) = @_;
3274	delete $self->{spells}->{$spell->{name}};
3275	$self->rebuild_spell_list;
3276	}
3277
3278	#############################################################################
3279
3280	package CFClient::UI::Root;	4046	package CFPlus::UI::Root;
3281		4047
3282	our @ISA = CFClient::UI::Container::;	4048	our @ISA = CFPlus::UI::Container::;
3283		4049
		4050	use List::Util qw(min max);
		4051
3284	use CFClient::OpenGL;	4052	use CFPlus::OpenGL;
3285		4053
3286	sub new {	4054	sub new {
3287	my $class = shift;	4055	my $class = shift;
3288		4056
3289	my $self = $class->SUPER::new (	4057	my $self = $class->SUPER::new (
3290	visible => 1,	4058	visible => 1,
3291	@_,	4059	@_,
3292	);	4060	);
3293		4061
3294	Scalar::Util::weaken ($self->{root} = $self);	4062	CFPlus::weaken ($self->{root} = $self);
3295		4063
3296	$self	4064	$self
3297	}	4065	}
3298		4066
3299	sub size_request {	4067	sub size_request {
…		…
3314	$coord = $max - $size if $coord > $max - $size;	4082	$coord = $max - $size if $coord > $max - $size;
3315		4083
3316	int $coord + 0.5	4084	int $coord + 0.5
3317	}	4085	}
3318		4086
3319	sub size_allocate {	4087	sub invoke_size_allocate {
3320	my ($self, $w, $h) = @_;	4088	my ($self, $w, $h) = @_;
3321		4089
3322	for my $child ($self->children) {	4090	for my $child ($self->children) {
3323	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};	4091	my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3324		4092
…		…
3328	$X = _to_pixel $X, $W, $self->{w};	4096	$X = _to_pixel $X, $W, $self->{w};
3329	$Y = _to_pixel $Y, $H, $self->{h};	4097	$Y = _to_pixel $Y, $H, $self->{h};
3330		4098
3331	$child->configure ($X, $Y, $W, $H);	4099	$child->configure ($X, $Y, $W, $H);
3332	}	4100	}
		4101
		4102	1
3333	}	4103	}
3334		4104
3335	sub coord2local {	4105	sub coord2local {
3336	my ($self, $x, $y) = @_;	4106	my ($self, $x, $y) = @_;
3337		4107
…		…
3422		4192
3423	delete $queue{$widget+0};	4193	delete $queue{$widget+0};
3424		4194
3425	my ($w, $h) = $widget->size_request;	4195	my ($w, $h) = $widget->size_request;
3426		4196
3427	$w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4197	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3428	$h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4198	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
		4199
		4200	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4201	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3429		4202
3430	$w = $widget->{force_w} if exists $widget->{force_w};	4203	$w = $widget->{force_w} if exists $widget->{force_w};
3431	$h = $widget->{force_h} if exists $widget->{force_h};	4204	$h = $widget->{force_h} if exists $widget->{force_h};
3432		4205
3433	if ($widget->{req_w} != $w || $widget->{req_h} != $h	4206	if ($widget->{req_w} != $w || $widget->{req_h} != $h
…		…
3459		4232
3460	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4233	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3461		4234
3462	$w = 0 if $w < 0;	4235	$w = 0 if $w < 0;
3463	$h = 0 if $h < 0;	4236	$h = 0 if $h < 0;
		4237
		4238	$w = max $widget->{min_w}, $w;
		4239	$h = max $widget->{min_h}, $h;
		4240
		4241	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4242	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4243
		4244	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
		4245	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3464		4246
3465	$w = int $w + 0.5;	4247	$w = int $w + 0.5;
3466	$h = int $h + 0.5;	4248	$h = int $h + 0.5;
3467		4249
3468	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4250	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
…		…
3492	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4274	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3493	glMatrixMode GL_MODELVIEW;	4275	glMatrixMode GL_MODELVIEW;
3494	glLoadIdentity;	4276	glLoadIdentity;
3495		4277
3496	{	4278	{
3497	package CFClient::UI::Base;	4279	package CFPlus::UI::Base;
3498		4280
3499	($draw_x, $draw_y, $draw_w, $draw_h) =	4281	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3500	(0, 0, $self->{w}, $self->{h});	4282	(0, 0, $self->{w}, $self->{h});
3501	}
3502		4283
3503	$self->_draw;	4284	$self->_draw;
		4285	}
3504	}	4286	}
3505		4287
3506	#############################################################################	4288	#############################################################################
3507		4289
3508	package CFClient::UI;	4290	package CFPlus::UI;
3509		4291
3510	$ROOT = new CFClient::UI::Root;	4292	$ROOT = new CFPlus::UI::Root;
3511	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4293	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3512		4294
3513	1	4295	1
3514		4296

Diff Legend

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