ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.269 by root, Fri Jun 2 06:22:55 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 2007 UTC

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

Diff Legend

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