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

Diff Legend

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