ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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