ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.156 by elmex, Sun Apr 23 02:50:42 2006 UTC vs.
Revision 1.244 by root, Sat May 27 21:06:09 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
15 18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
31 } 62 }
32 63
33 return; 64 return;
34 } 65 }
35 } 66 }
… …
39 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 94 check_tooltip;
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 check_tooltip;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
184 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
185 }
186 }
187
188 reconfigure_widgets;
189}
190
119############################################################################# 191#############################################################################
120 192
121package CFClient::UI::Base; 193package CFClient::UI::Base;
122 194
123use strict; 195use strict;
… …
126 198
127sub new { 199sub new {
128 my $class = shift; 200 my $class = shift;
129 201
130 my $self = bless { 202 my $self = bless {
131 x => 0, 203 x => 0,
132 y => 0, 204 y => 0,
133 z => 0, 205 z => 0,
134 can_events => 1, 206 can_events => 1,
135 @_ 207 @_
136 }, $class; 208 }, $class;
137 209
138 for (keys %$self) { 210 for (keys %$self) {
139 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
141 } 213 }
142 } 214 }
143 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH;
220 $self->{user_y} = $layout->{y} * $::HEIGHT;
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
223 }
224
144 $self 225 $self
145} 226}
146 227
228sub destroy {
229 my ($self) = @_;
230
231 $self->hide;
232 %$self = ();
233}
234
147sub show { 235sub show {
148 my ($self) = @_; 236 my ($self) = @_;
149
150 return if $self->{parent}; 237 return if $self->{parent};
151 238
152 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
153} 240}
154 241
242sub show_centered {
243 my ($self) = @_;
244 return if $self->{parent};
245
246 $self->show;
247
248 $CFClient::UI::ROOT->on_post_alloc (
249 "centered $self" => sub {
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
251 },
252 );
253}
254
255sub set_invisible {
256 my ($self) = @_;
257
258 return unless $self->{visible};
259
260 # broken show/hide model
261
262 delete $self->{root};
263 delete $self->{visible};
264
265 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self;
267
268 CFClient::UI::check_tooltip
269 if $CFClient::UI::TOOLTIP->{owner} == $self;
270
271 $self->focus_out;
272
273 $self->emit (visibility_change => 0);
274}
275
155sub hide { 276sub hide {
156 my ($self) = @_; 277 my ($self) = @_;
157 278
158 return unless $self->{parent}; 279 $self->set_invisible;
159 280
160 $self->{parent}->remove ($self); 281 $self->{parent}->remove ($self)
282 if $self->{parent};
161} 283}
162 284
163sub move { 285sub move {
164 my ($self, $x, $y, $z) = @_; 286 my ($self, $x, $y, $z) = @_;
165 287
… …
168 $self->{z} = $z if defined $z; 290 $self->{z} = $z if defined $z;
169 291
170 $self->update; 292 $self->update;
171} 293}
172 294
173sub needs_redraw { 295sub set_size {
174 0 296 my ($self, $w, $h) = @_;
297
298 $self->{user_w} = $w;
299 $self->{user_h} = $h;
300
301 $self->check_size;
175} 302}
176 303
177sub size_request { 304sub size_request {
178 require Carp; 305 require Carp;
179 Carp::confess "size_request is abstract"; 306 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 326 $self->{y} = $y;
200 $self->update; 327 $self->update;
201 } 328 }
202 329
203 if ($self->{w} != $w || $self->{h} != $h) { 330 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 331 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 332 }
210} 333}
211 334
212sub size_allocate { 335sub size_allocate {
213 # nothing to be done 336 # nothing to be done
214} 337}
215 338
216# return top left coordinates 339sub reconfigure {
217sub _topleft { 340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children {
347}
348
349sub set_max_size {
218 my ($self, $x, $y) = @_; 350 my ($self, $w, $h) = @_;
219 351
220 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 352 delete $self->{max_w}; $self->{max_w} = $w if $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h;
354}
355
356sub set_tooltip {
357 my ($self, $tooltip) = @_;
358
359 $tooltip =~ s/^\s+//;
360 $tooltip =~ s/\s+$//;
361
362 return if $self->{tooltip} eq $tooltip;
363
364 $self->{tooltip} = $tooltip;
365
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip;
369 }
221} 370}
222 371
223# translate global coordinates to local coordinate system 372# translate global coordinates to local coordinate system
224sub coord2local { 373sub coord2local {
225 my ($self, $x, $y) = @_; 374 my ($self, $x, $y) = @_;
226 375
227 my ($X, $Y) = $self->_topleft; 376 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
228 ($x - $X, $y - $Y)
229} 377}
230 378
231# translate local coordinates to global coordinate system 379# translate local coordinates to global coordinate system
232sub coord2global { 380sub coord2global {
233 my ($self, $x, $y) = @_; 381 my ($self, $x, $y) = @_;
234 382
235 my ($X, $Y) = $self->_topleft; 383 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
236 ($x + $X, $y + $Y)
237} 384}
238 385
239sub focus_in { 386sub focus_in {
240 my ($self) = @_; 387 my ($self) = @_;
241 388
242 return if $FOCUS == $self; 389 return if $FOCUS == $self;
243 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
244 391
245 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
246 393
247 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
248 395
249 $focus->update if $focus; 396 $focus->update if $focus;
250 $FOCUS->update; 397 $FOCUS->update;
251} 398}
252 399
… …
255 402
256 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
257 404
258 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
259 406
260 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
261 408
262 $focus->update if $focus; #? 409 $focus->update if $focus; #?
410
411 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
412 unless $FOCUS;
263} 413}
264 414
265sub mouse_motion { } 415sub mouse_motion { }
266sub button_up { } 416sub button_up { }
267sub key_down { } 417sub key_down { }
268sub key_up { } 418sub key_up { }
269 419
270sub button_down { 420sub button_down {
271 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
272 422
273 $self->focus_in; 423 $self->focus_in;
… …
301 glVertex $x + $self->{w}, $y + $self->{h}; 451 glVertex $x + $self->{w}, $y + $self->{h};
302 glVertex $x , $y + $self->{h}; 452 glVertex $x , $y + $self->{h};
303 glEnd; 453 glEnd;
304 glDisable GL_BLEND; 454 glDisable GL_BLEND;
305 } 455 }
456
457 if ($ENV{PCLIENT_DEBUG}) {
458 glPushMatrix;
459 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
461 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1;
466 glEnd;
467 glPopMatrix;
468 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
469 }
306} 470}
307 471
308sub _draw { 472sub _draw {
309 my ($self) = @_; 473 my ($self) = @_;
310 474
… …
325 489
326sub set_parent { 490sub set_parent {
327 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
328 492
329 Scalar::Util::weaken ($self->{parent} = $parent); 493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
330} 508}
331 509
332sub check_size { 510sub check_size {
333 my ($self) = @_; 511 my ($self, $forced) = @_;
334 512
335 return unless $self->{parent}; 513 $self->{force_alloc} = 1 if $forced;
336 514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
337 my ($w, $h) = $self->size_request;
338
339 if ($w != $self->{req_w} || $h != $self->{req_h}) {
340 $self->{req_w} = $w;
341 $self->{req_h} = $h;
342
343 $self->{parent}->check_size;
344 }
345} 515}
346 516
347sub update { 517sub update {
348 my ($self) = @_; 518 my ($self) = @_;
349 519
… …
355 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
356 526
357 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
358} 528}
359 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
360sub emit { 536sub emit {
361 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
362 538
363 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 539 $self->_emit ($signal, @args)
364 $cb->($self, @args); 540 || $self->$signal (@args);
365 } 541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
366} 545}
367 546
368sub DESTROY { 547sub DESTROY {
369 my ($self) = @_; 548 my ($self) = @_;
370 549
550 delete $WIDGET{$self+0};
371 #$self->deactivate; 551 #$self->deactivate;
372} 552}
373 553
374############################################################################# 554#############################################################################
375 555
… …
384 my $class = shift; 564 my $class = shift;
385 565
386 # range [value, low, high, page] 566 # range [value, low, high, page]
387 567
388 $class->SUPER::new ( 568 $class->SUPER::new (
389 bg => [0, 0, 0, 0.2], 569 #bg => [0, 0, 0, 0.2],
390 active_bg => [1, 1, 1, 0.5], 570 #active_bg => [1, 1, 1, 0.5],
391 @_ 571 @_
392 ) 572 )
393} 573}
394 574
395sub _draw { 575sub _draw {
396 my ($self) = @_; 576 my ($self) = @_;
397 577
578 my $color = $FOCUS == $self && $self->{active_bg}
579 ? $self->{active_bg}
580 : $self->{bg};
581
582 if ($color && (@$color < 4 || $color->[3])) {
398 my ($w, $h) = @$self{qw(w h)}; 583 my ($w, $h) = @$self{qw(w h)};
399 584
400 glEnable GL_BLEND; 585 glEnable GL_BLEND;
401 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
402 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 587 glColor @$color;
403 588
404 glBegin GL_QUADS; 589 glBegin GL_QUADS;
405 glVertex 0 , 0; 590 glVertex 0 , 0;
406 glVertex 0 , $h; 591 glVertex 0 , $h;
407 glVertex $w, $h; 592 glVertex $w, $h;
408 glVertex $w, 0; 593 glVertex $w, 0;
409 glEnd; 594 glEnd;
410 595
411 glDisable GL_BLEND; 596 glDisable GL_BLEND;
597 }
412} 598}
413 599
414############################################################################# 600#############################################################################
415 601
416package CFClient::UI::Empty; 602package CFClient::UI::Empty;
… …
437sub new { 623sub new {
438 my ($class, %arg) = @_; 624 my ($class, %arg) = @_;
439 625
440 my $children = delete $arg{children} || []; 626 my $children = delete $arg{children} || [];
441 627
442 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 628 my $self = $class->SUPER::new (
629 children => [],
630 can_events => 0,
631 %arg,
632 );
443 $self->add ($_) for @$children; 633 $self->add ($_) for @$children;
444 634
445 $self 635 $self
446} 636}
447 637
448sub add { 638sub add {
449 my ($self, $child) = @_; 639 my ($self, @widgets) = @_;
450 640
451 $child->set_parent ($self); 641 $_->set_parent ($self)
642 for @widgets;
452 643
453 use sort 'stable'; 644 use sort 'stable';
454 645
455 $self->{children} = [ 646 $self->{children} = [
456 sort { $a->{z} <=> $b->{z} } 647 sort { $a->{z} <=> $b->{z} }
457 @{$self->{children}}, $child 648 @{$self->{children}}, @widgets
458 ]; 649 ];
459 650
460 $child->check_size; 651 $self->check_size (1);
652 $self->update;
653}
654
655sub children {
656 @{ $_[0]{children} }
461} 657}
462 658
463sub remove { 659sub remove {
464 my ($self, $child) = @_; 660 my ($self, $child) = @_;
465 661
466 delete $child->{parent}; 662 delete $child->{parent};
663 $child->hide;
467 664
468 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666
667 $self->check_size (1);
668 $self->update;
669}
670
671sub clear {
672 my ($self) = @_;
673
674 my $children = delete $self->{children};
675 $self->{children} = [];
676
677 for (@$children) {
678 delete $_->{parent};
679 $_->hide;
680 }
469 681
470 $self->check_size; 682 $self->check_size;
471 $self->update; 683 $self->update;
472} 684}
473 685
… …
551} 763}
552 764
553sub update { 765sub update {
554 my ($self) = @_; 766 my ($self) = @_;
555 767
556 # we want to do this delayed... 768 $ROOT->on_post_alloc ($self => sub { $self->render_child });
557 $self->render_chld;
558 $self->SUPER::update; 769 $self->SUPER::update;
559}
560
561sub render_chld {
562 my ($self) = @_;
563
564 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
565 glClearColor 0, 0, 0, 1;
566 glClear GL_COLOR_BUFFER_BIT;
567 $self->child->draw;
568 };
569} 770}
570 771
571sub size_allocate { 772sub size_allocate {
572 my ($self, $w, $h) = @_; 773 my ($self, $w, $h) = @_;
573 774
574 $self->child->configure (0, 0, $w, $h); 775 $self->SUPER::size_allocate ($w, $h);
776 $self->update;
777}
575 778
779sub _render {
780 $_[0]{children}[0]->draw;
781}
782
783sub render_child {
784 my ($self) = @_;
785
786 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
787 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT;
789
576 $self->render_chld; 790 $self->_render;
791 };
577} 792}
578 793
579sub _draw { 794sub _draw {
580 my ($self) = @_; 795 my ($self) = @_;
581 796
582 my ($w, $h) = ($self->w, $self->h); 797 my ($w, $h) = ($self->w, $self->h);
583 798
584 my $tex = $self->{texture} 799 my $tex = $self->{texture}
585 or return; 800 or return;
586 801
587 glEnable GL_BLEND;
588 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
589 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
590 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1;
591 805
592 $tex->draw_quad (0, 0, $w, $h); 806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
593 807
594 glDisable GL_BLEND;
595 glDisable GL_TEXTURE_2D; 808 glDisable GL_TEXTURE_2D;
596} 809}
597 810
598############################################################################# 811#############################################################################
599 812
600package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
601 814
602our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
603
604sub new { die }
605
606sub size_request {
607 my ($self) = @_;
608
609 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
610 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
611
612 @$self{qw(child_w child_h)}
613}
614
615sub _draw {
616 my ($self) = @_;
617
618 $self->{children}[1]->draw;
619}
620
621
622#############################################################################
623
624package CFClient::UI::Frame;
625
626our @ISA = CFClient::UI::Bin::;
627
628use CFClient::OpenGL;
629 816
630sub new { 817sub new {
631 my $class = shift; 818 my $class = shift;
632 819
633 my $self = $class->SUPER::new ( 820 $class->SUPER::new (
634 bg => [1, 1, 1, 1], 821 scroll_x => 0,
635 border_bg => [1, 1, 1, 1], 822 scroll_y => 1,
636 border => 0.8,
637 @_ 823 @_,
638 ); 824 )
639
640 $self
641}
642
643sub set_size {
644 my ($self, $w, $h) = @_;
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648} 825}
649 826
650sub size_request { 827sub size_request {
651 my ($self) = @_; 828 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h}) 829
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
831
832 @$self{qw(child_w child_h)}
653} 833}
654 834
655sub size_allocate { 835sub size_allocate {
656 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
657 $self->{w} = $w; 837
658 $self->{h} = $h; 838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
840
659 $self->child->configure (0, 0, $w, $h); 841 $self->child->configure (0, 0, $w, $h);
842 $self->update;
843}
844
845sub set_offset {
846 my ($self, $x, $y) = @_;
847
848 $self->{view_x} = int $x;
849 $self->{view_y} = int $y;
850
851 $self->update;
852}
853
854# hmm, this does not work for topleft of $self... but we should not ask for that
855sub coord2local {
856 my ($self, $x, $y) = @_;
857
858 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
859}
860
861sub coord2global {
862 my ($self, $x, $y) = @_;
863
864 $x = List::Util::min $self->{w}, $x - $self->{view_x};
865 $y = List::Util::min $self->{h}, $y - $self->{view_y};
866
867 $self->SUPER::coord2global ($x, $y)
868}
869
870sub find_widget {
871 my ($self, $x, $y) = @_;
872
873 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
874 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
875 ) {
876 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
877 } else {
878 $self->CFClient::UI::Base::find_widget ($x, $y)
879 }
880}
881
882sub _render {
883 my ($self) = @_;
884
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886
887 $self->SUPER::_render;
888}
889
890#############################################################################
891
892package CFClient::UI::ScrolledWindow;
893
894our @ISA = CFClient::UI::HBox::;
895
896sub new {
897 my $class = shift;
898
899 my $self;
900
901 my $slider = new CFClient::UI::Slider
902 vertical => 1,
903 range => [0, 0, 1, 0.01], # HACK fix
904 on_changed => sub {
905 $self->{vp}->set_offset (0, $_[1]);
906 },
907 ;
908
909 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider,
912 @_,
913 );
914
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider});
918
919 $self
920}
921
922sub update {
923 my ($self) = @_;
924
925 $self->SUPER::update;
926
927 # todo: overwrite size_allocate of child
928 my $child = $self->{vp}->child;
929 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
930}
931
932sub size_allocate {
933 my ($self, $w, $h) = @_;
934
935 $self->SUPER::size_allocate ($w, $h);
936
937 my $child = $self->{vp}->child;
938 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
939}
940
941#TODO# update range on size_allocate depending on child
942# update viewport offset on scroll
943
944#############################################################################
945
946package CFClient::UI::Frame;
947
948our @ISA = CFClient::UI::Bin::;
949
950use CFClient::OpenGL;
951
952sub new {
953 my $class = shift;
954
955 $class->SUPER::new (
956 bg => undef,
957 @_,
958 )
660} 959}
661 960
662sub _draw { 961sub _draw {
663 my ($self) = @_; 962 my ($self) = @_;
664 963
665 my ($w, $h) = ($self->{w}, $self->{h}); 964 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)};
666 966
667 glEnable GL_BLEND; 967 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D; 969 glColor @{ $self->{bg} };
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 970
672# glBegin GL_QUADS; 971 glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0; 972 glVertex 0 , 0;
675# glVertex 0 , $h; 973 glVertex 0 , $h;
676# glVertex $w, $h; 974 glVertex $w, $h;
677# glVertex $w, 0; 975 glVertex $w, 0;
678# glEnd; 976 glEnd;
679 977
680
681 $self->child->draw;
682 glDisable GL_BLEND; 978 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D; 979 }
980
981 $self->SUPER::_draw;
684} 982}
685 983
686############################################################################# 984#############################################################################
687 985
688package CFClient::UI::FancyFrame; 986package CFClient::UI::FancyFrame;
… …
699 my $class = shift; 997 my $class = shift;
700 998
701 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
702 1000
703 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
706 border => 0.8, 1004 border => 0.6,
1005 is_toplevel => 1,
707 can_events => 1, 1006 can_events => 1,
708 @_ 1007 @_
709 ); 1008 );
710 1009
711 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 1011 align => 0,
713 valign => 1, 1012 valign => 1,
714 text => $self->{title}, 1013 text => $self->{title},
715 fontsize => 1; 1014 fontsize => $self->{border};
716 1015
717 $self 1016 $self
718} 1017}
719 1018
720sub border { 1019sub border {
721 int $_[0]{border} * $::FONTSIZE 1020 int $_[0]{border} * $::FONTSIZE
722} 1021}
723 1022
724sub size_request { 1023sub size_request {
725 my ($self) = @_; 1024 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 1025
729 my ($w, $h) = $self->SUPER::size_request; 1026 my ($w, $h) = $self->SUPER::size_request;
730 1027
731 ( 1028 (
732 $w + $self->border * 2, 1029 $w + $self->border * 2,
… …
738 my ($self, $w, $h) = @_; 1035 my ($self, $w, $h) = @_;
739 1036
740 $h -= List::Util::max 0, $self->border * 2; 1037 $h -= List::Util::max 0, $self->border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 1038 $w -= List::Util::max 0, $self->border * 2;
742 1039
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
744 if $self->{title}; 1041 if $self->{title};
745 1042
746 $self->child->configure ($self->border, $self->border, $w, $h); 1043 $self->child->configure ($self->border, $self->border, $w, $h);
747} 1044}
748 1045
749sub button_down { 1046sub button_down {
750 my ($self, $ev, $x, $y) = @_; 1047 my ($self, $ev, $x, $y) = @_;
751 1048
1049 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 1050 my $border = $self->border;
753 1051
754 if ($x < $self->{w} && $x >= $self->{w} - $border 1052 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 1053 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 1054
1055 if ($lr & $td) {
1056 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1057 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 1058 my ($bw, $bh) = ($self->{w}, $self->{h});
759 1059
1060 my $mx = $x < $border;
1061 my $my = $y < $border;
1062
760 $self->{motion} = sub { 1063 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
762 1065
763 ($x, $y) = ($ev->{x}, $ev->{y}); 1066 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy;
764 1068
765 $self->{user_w} = $bw + $x - $ox; 1069 $self->{user_x} = $wx + $dx * $mx;
766 $self->{user_h} = $bh + $y - $oy; 1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y});
767 $self->check_size; 1074 $self->check_size;
768 }; 1075 };
769 1076
770 } elsif ($x >= 0 && $x < $self->{w} 1077 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 1079 my ($bx, $by) = ($self->{x}, $self->{y});
775 1080
776 $self->{motion} = sub { 1081 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
778 1083
779 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
780 1085
781 $self->move ($bx + $x - $ox, $by + $y - $oy); 1086 $self->{user_x} = $bx + $x - $ox;
1087 $self->{user_y} = $by + $y - $oy;
1088 $self->move ($self->{user_x}, $self->{user_y});
782 $self->update; 1089 $self->update;
783 }; 1090 };
784 } 1091 }
785} 1092}
786 1093
… …
800 my ($self) = @_; 1107 my ($self) = @_;
801 1108
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1109 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 1111
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1112 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1114
810 my $border = $self->border; 1115 my $border = $self->border;
811 1116
812 glColor @{ $self->{border_bg} }; 1117 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1122
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 1124 my $bg = $tex[0];
819 1125
820 # TODO: repeat texture not scale 1126 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1127 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 1128 my $rep_y = $ch / $bg->{h};
823 1129
824 glColor @{ $self->{bg} }; 1130 glColor @{ $self->{bg} };
825 1131
826 $bg->{s} = $rep_x; 1132 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 1133 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1134 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 }
830 1137
831 glDisable GL_TEXTURE_2D; 1138 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1139
834 $self->{title}->draw if $self->{title}; 1140 $self->{title}->draw if $self->{title};
1141
835 $self->child->draw; 1142 $self->child->draw;
836} 1143}
837 1144
838############################################################################# 1145#############################################################################
839 1146
… …
848sub new { 1155sub new {
849 my $class = shift; 1156 my $class = shift;
850 1157
851 $class->SUPER::new ( 1158 $class->SUPER::new (
852 col_expand => [], 1159 col_expand => [],
853 @_ 1160 @_,
854 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
855} 1166}
856 1167
857sub add { 1168sub add {
858 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
859 1170
860 $child->set_parent ($self); 1171 $child->set_parent ($self);
861 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
862 1173
863 $child->check_size; 1174 $self->check_size (1);
864} 1175}
865 1176
866# TODO: move to container class maybe? send childs a signal on removal? 1177# TODO: move to container class maybe? send children a signal on removal?
867sub clear { 1178sub clear {
868 my ($self) = @_; 1179 my ($self) = @_;
869 1180
1181 my @children = $self->children;
870 delete $self->{children}; 1182 delete $self->{children};
1183
1184 for (@children) {
1185 delete $_->{parent};
1186 $_->hide;
1187 }
1188
1189 $self->check_size (1);
871 $self->update; 1190 $self->update;
872} 1191}
873 1192
874sub get_wh { 1193sub get_wh {
875 my ($self) = @_; 1194 my ($self) = @_;
… …
907sub size_allocate { 1226sub size_allocate {
908 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
909 1228
910 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
911 1230
912 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
913 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
914 1233
915 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
916 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
917 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
918 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1052} 1371}
1053 1372
1054sub size_allocate { 1373sub size_allocate {
1055 my ($self, $w, $h) = @_; 1374 my ($self, $w, $h) = @_;
1056 1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1057 my $children = $self->{children}; 1378 my $children = $self->{children};
1058 1379
1059 my @h = map $_->{req_h}, @$children; 1380 my @h = map $_->{req_h}, @$children;
1060 1381
1061 my $req_h = List::Util::sum @h; 1382 my $req_h = List::Util::sum @h;
… …
1090 1411
1091############################################################################# 1412#############################################################################
1092 1413
1093package CFClient::UI::Label; 1414package CFClient::UI::Label;
1094 1415
1095our @ISA = CFClient::UI::Base::; 1416our @ISA = CFClient::UI::DrawBG::;
1096 1417
1097use CFClient::OpenGL; 1418use CFClient::OpenGL;
1098 1419
1099sub new { 1420sub new {
1100 my ($class, %arg) = @_; 1421 my ($class, %arg) = @_;
1101 1422
1102 my $self = $class->SUPER::new ( 1423 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1424 fg => [1, 1, 1],
1425 #bg => none
1426 #active_bg => none
1427 #font => default_font
1428 #text => initial text
1429 #markup => initial narkup
1430 #max_w => maximum pixel width
1431 ellipsise => 3, # end
1432 layout => (new CFClient::Layout),
1104 fontsize => 1, 1433 fontsize => 1,
1105 text => "",
1106 align => -1, 1434 align => -1,
1107 valign => -1, 1435 valign => -1,
1108 padding => 2, 1436 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1437 can_events => 0,
1111 %arg 1438 %arg
1112 ); 1439 );
1113 1440
1114 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1444 $self->{template} = $layout;
1118 } 1445 }
1119 1446
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1448 $self->set_markup (delete $self->{markup});
1449 } else {
1450 $self->set_text (delete $self->{text});
1451 }
1122 1452
1123 $self 1453 $self
1124} 1454}
1125 1455
1126sub escape_text { 1456sub escape($) {
1127 local $_ = $_[1]; 1457 local $_ = $_[0];
1128 1458
1129 s/&/&amp;/g; 1459 s/&/&amp;/g;
1130 s/>/&gt;/g; 1460 s/>/&gt;/g;
1131 s/</&lt;/g; 1461 s/</&lt;/g;
1132 1462
1133 $_[1] 1463 $_
1464}
1465
1466sub update {
1467 my ($self) = @_;
1468
1469 delete $self->{texture};
1470 $self->SUPER::update;
1134} 1471}
1135 1472
1136sub set_text { 1473sub set_text {
1137 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1138 1475
1476 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text";
1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1140 1481
1141 delete $self->{texture}; 1482 $self->update;
1142 $self->check_size; 1483 $self->check_size;
1143 $self->update;
1144} 1484}
1145 1485
1146sub set_markup { 1486sub set_markup {
1147 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1148 1488
1489 return if $self->{text} eq "M$markup";
1490 $self->{text} = "M$markup";
1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1150 1496
1151 delete $self->{texture}; 1497 $self->update;
1152 $self->check_size; 1498 $self->check_size;
1153 $self->update;
1154} 1499}
1155 1500
1156sub size_request { 1501sub size_request {
1157 my ($self) = @_; 1502 my ($self) = @_;
1158 1503
1159 $self->{layout}->set_width; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1509
1162 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1163 1511
1164 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1515
1167 my ($w2, $h2) = $self->{template}->size; 1516 my ($w2, $h2) = $self->{template}->size;
1168 1517
1169 $w = List::Util::max $w, $w2; 1518 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1534sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1535 my ($self, $fontsize) = @_;
1187 1536
1188 $self->{fontsize} = $fontsize; 1537 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1538 delete $self->{texture};
1539
1540 $self->update;
1190 $self->check_size; 1541 $self->check_size;
1191 $self->update;
1192} 1542}
1193 1543
1194sub _draw { 1544sub _draw {
1195 my ($self) = @_; 1545 my ($self) = @_;
1196 1546
1547 $self->SUPER::_draw; # draw background, if applicable
1548
1197 my $tex = $self->{texture} ||= do { 1549 my $tex = $self->{texture} ||= do {
1550 $self->{layout}->set_foreground (@{$self->{fg}});
1551 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1552 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556
1200 new_from_layout CFClient::Texture $self->{layout} 1557 my $tex = new_from_layout CFClient::Texture $self->{layout};
1558
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1561 : ($self->{w} - $tex->{w}) * 0.5);
1562
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1565 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1201 }; 1568 };
1202 1569
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1570 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1572
1573 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1574 glColor @{$self->{fg}};
1209
1210 $self->{ox} = int (
1211 $self->{align} < 0 ? $self->{padding}
1212 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1213 : ($self->{w} - $tex->{w}) * 0.5
1214 );
1215
1216 $self->{oy} = int (
1217 $self->{valign} < 0 ? $self->{padding}
1218 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1219 : ($self->{h} - $tex->{h}) * 0.5
1220 );
1221
1222 $tex->draw_quad ($self->{ox}, $self->{oy}); 1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else {
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 }
1223 1579
1224 glDisable GL_TEXTURE_2D; 1580 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1581}
1227 1582
1228############################################################################# 1583#############################################################################
1229 1584
1230package CFClient::UI::EntryBase; 1585package CFClient::UI::EntryBase;
… …
1235 1590
1236sub new { 1591sub new {
1237 my $class = shift; 1592 my $class = shift;
1238 1593
1239 $class->SUPER::new ( 1594 $class->SUPER::new (
1240 fg => [1, 1, 1], 1595 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1596 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1597 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1598 active_fg => [0, 0, 0],
1244 can_hover => 1, 1599 can_hover => 1,
1245 can_focus => 1, 1600 can_focus => 1,
1246 valign => 0, 1601 valign => 0,
1247 can_events => 1, 1602 can_events => 1,
1603 #text => ...
1248 @_ 1604 @_
1249 ) 1605 )
1250} 1606}
1251 1607
1252sub _set_text { 1608sub _set_text {
… …
1262 $self->{text} = $text; 1618 $self->{text} = $text;
1263 1619
1264 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1266 1622
1267 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1268}
1269
1270sub get_text {
1271 $_[0]{text}
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 my ($w, $h) = $self->SUPER::size_request;
1278
1279 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286} 1624}
1287 1625
1288sub set_text { 1626sub set_text {
1289 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1290 1628
1291 $self->{cursor} = length $text; 1629 $self->{cursor} = length $text;
1292 $self->_set_text ($text); 1630 $self->_set_text ($text);
1293 $self->update; 1631 $self->update;
1632 $self->check_size;
1633}
1634
1635sub get_text {
1636 $_[0]{text}
1637}
1638
1639sub size_request {
1640 my ($self) = @_;
1641
1642 my ($w, $h) = $self->SUPER::size_request;
1643
1644 ($w + 1, $h) # add 1 for cursor
1294} 1645}
1295 1646
1296sub key_down { 1647sub key_down {
1297 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1298 1649
… …
1300 my $sym = $ev->{sym}; 1651 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1652 my $uni = $ev->{unicode};
1302 1653
1303 my $text = $self->get_text; 1654 my $text = $self->get_text;
1304 1655
1305 if ($sym == 8) { 1656 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1657 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1658 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1659 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1660 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1661 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1662 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1663 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1668 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1669 $self->_emit ('escape');
1319 } elsif ($uni) { 1670 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1672 }
1322 1673
1323 $self->_set_text ($text); 1674 $self->_set_text ($text);
1324 $self->update; 1675 $self->update;
1676 $self->check_size;
1325} 1677}
1326 1678
1327sub focus_in { 1679sub focus_in {
1328 my ($self) = @_; 1680 my ($self) = @_;
1329 1681
… …
1405 my ($self, $ev) = @_; 1757 my ($self, $ev) = @_;
1406 1758
1407 my $sym = $ev->{sym}; 1759 my $sym = $ev->{sym};
1408 1760
1409 if ($sym == 13) { 1761 if ($sym == 13) {
1762 unshift @{$self->{history}},
1763 my $txt = $self->get_text;
1764 $self->{history_pointer} = -1;
1765 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1766 $self->_emit (activate => $txt);
1411 $self->update; 1767 $self->update;
1768
1769 } elsif ($sym == CFClient::SDLK_UP) {
1770 if ($self->{history_pointer} < 0) {
1771 $self->{history_saveback} = $self->get_text;
1772 }
1773 if (@{$self->{history} || []} > 0) {
1774 $self->{history_pointer}++;
1775 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1776 $self->{history_pointer} = @{$self->{history} || []} - 1;
1777 }
1778 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1779 }
1780
1781 } elsif ($sym == CFClient::SDLK_DOWN) {
1782 $self->{history_pointer}--;
1783 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1784
1785 if ($self->{history_pointer} >= 0) {
1786 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1787 } else {
1788 $self->set_text ($self->{history_saveback});
1789 }
1412 1790
1413 } else { 1791 } else {
1414 $self->SUPER::key_down ($ev); 1792 $self->SUPER::key_down ($ev);
1415 } 1793 }
1416 1794
… …
1430 1808
1431sub new { 1809sub new {
1432 my $class = shift; 1810 my $class = shift;
1433 1811
1434 $class->SUPER::new ( 1812 $class->SUPER::new (
1435 padding => 4, 1813 padding => 4,
1436 fg => [1, 1, 1], 1814 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1815 active_fg => [0, 0, 1],
1439 can_hover => 1, 1816 can_hover => 1,
1440 align => 0, 1817 align => 0,
1441 valign => 0, 1818 valign => 0,
1442 can_events => 1, 1819 can_events => 1,
1443 @_ 1820 @_
1444 ) 1821 )
1445} 1822}
1446 1823
1824sub activate { }
1825
1447sub button_up { 1826sub button_up {
1448 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1449 1828
1829 $self->emit ("activate")
1450 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1451 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1452 $self->emit ("activate");
1453 }
1454} 1832}
1455 1833
1456sub _draw { 1834sub _draw {
1457 my ($self) = @_; 1835 my ($self) = @_;
1458 1836
… …
1460 1838
1461 if ($GRAB == $self) { 1839 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1840 $self->{fg} = $self->{active_fg};
1463 } 1841 }
1464 1842
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1843 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1845 glColor 0, 0, 0, 1;
1470 1846
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1847 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1848
1473 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1850
1476 $self->SUPER::_draw; 1851 $self->SUPER::_draw;
1477} 1852}
1478 1853
1479############################################################################# 1854#############################################################################
… …
1493 1868
1494 $class->SUPER::new ( 1869 $class->SUPER::new (
1495 padding => 2, 1870 padding => 2,
1496 fg => [1, 1, 1], 1871 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1872 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1875 state => 0,
1499 can_hover => 1, 1876 can_hover => 1,
1500 @_ 1877 @_
1501 ) 1878 )
1502} 1879}
… …
1511 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1512 1889
1513 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1514 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1515 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1516 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1517 } 1894 }
1518} 1895}
1519 1896
1520sub _draw { 1897sub _draw {
1521 my ($self) = @_; 1898 my ($self) = @_;
… …
1526 1903
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1528 1905
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1907
1531 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1532 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1533 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1534
1535 my $tex = $self->{state} ? $tex[1] : $tex[0];
1536
1537 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1913}
1542 1914
1543############################################################################# 1915#############################################################################
1544 1916
1545package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1589 1961
1590 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1591 } 1963 }
1592 1964
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1967
1598 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1969
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1602} 1971}
1603 1972
1604############################################################################# 1973#############################################################################
1605 1974
1606package CFClient::UI::VGauge; 1975package CFClient::UI::VGauge;
1607 1976
1608our @ISA = CFClient::UI::Base::; 1977our @ISA = CFClient::UI::Base::;
1978
1979use List::Util qw(min max);
1609 1980
1610use CFClient::OpenGL; 1981use CFClient::OpenGL;
1611 1982
1612my %tex = ( 1983my %tex = (
1613 food => [ 1984 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1985 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1986 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1987 ],
1617 grace => [ 1988 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1989 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1990 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1991 ],
1621 hp => [ 1992 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1994 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1995 ],
1625 mana => [ 1996 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1997 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1998 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1999 ],
1629); 2000);
1630 2001
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 2002# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 2003sub new {
… …
1651} 2022}
1652 2023
1653sub set_max { 2024sub set_max {
1654 my ($self, $max) = @_; 2025 my ($self, $max) = @_;
1655 2026
2027 return if $self->{max_val} == $max;
2028
1656 $self->{max_val} = $max; 2029 $self->{max_val} = $max;
2030 $self->update;
1657} 2031}
1658 2032
1659sub set_value { 2033sub set_value {
1660 my ($self, $val, $max) = @_; 2034 my ($self, $val, $max) = @_;
1661 2035
1662 $self->set_max ($max) 2036 $self->set_max ($max)
1663 if defined $max; 2037 if defined $max;
1664 2038
1665 $max = $self->{max_val}; 2039 return if $self->{val} == $val;
2040
1666 $self->{val} = $val; 2041 $self->{val} = $val;
1667
1668 $self->update; 2042 $self->update;
1669} 2043}
1670 2044
1671sub _draw { 2045sub _draw {
1672 my ($self) = @_; 2046 my ($self) = @_;
1673 2047
1674 my $tex = $tex{$self->{type}}; 2048 my $tex = $tex{$self->{type}};
2049 my ($t1, $t2, $t3) = @$tex;
1675 2050
1676 my ($w, $h) = ($self->{w}, $self->{h}); 2051 my ($w, $h) = ($self->{w}, $self->{h});
1677 2052
1678 if ($self->{vertical}) { 2053 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 2054 glRotate 90, 0, 0, 1;
… …
1681 2056
1682 ($w, $h) = ($h, $w); 2057 ($w, $h) = ($h, $w);
1683 } 2058 }
1684 2059
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 2060 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 2061
1688 my $t1 = $tex->[0]; 2062 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 2063 my $ycut2 = max 0, min 1, $ycut - 1;
2064
2065 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2);
1690 2067
1691 glEnable GL_BLEND; 2068 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 2070 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 2072
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2073 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 2074 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 2075 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2076 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2077 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2078 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 2079 glEnd;
1706 2080
2081 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2082 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 2083 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2084 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2085 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2087 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 2088 glEnd;
2089
2090 if ($t3) {
2091 glBindTexture GL_TEXTURE_2D, $t3->{name};
2092 glBegin GL_QUADS;
2093 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2094 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2096 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2097 glEnd;
2098 }
1714 2099
1715 glDisable GL_BLEND; 2100 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 2101 glDisable GL_TEXTURE_2D;
1717} 2102}
1718 2103
… …
1724 2109
1725sub new { 2110sub new {
1726 my ($class, %arg) = @_; 2111 my ($class, %arg) = @_;
1727 2112
1728 my $self = $class->SUPER::new ( 2113 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2114 tooltip => $arg{type},
2115 can_hover => 1,
2116 can_events => 1,
1730 %arg, 2117 %arg,
1731 ); 2118 );
1732 2119
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2120 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1734 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2121 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1735 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2122 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2123
1737 $self 2124 $self
1738} 2125}
1739 2126
1740sub set_fontsize { 2127sub set_fontsize {
… …
1742 2129
1743 $self->{value}->set_fontsize ($fsize); 2130 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2131 $self->{max} ->set_fontsize ($fsize);
1745} 2132}
1746 2133
2134sub set_max {
2135 my ($self, $max) = @_;
2136
2137 $self->{gauge}->set_max ($max);
2138 $self->{max}->set_text ($max);
2139}
2140
1747sub set_value { 2141sub set_value {
1748 my ($self, $val, $max) = @_; 2142 my ($self, $val, $max) = @_;
1749 2143
1750 $self->set_max ($max) 2144 $self->set_max ($max)
1751 if defined $max; 2145 if defined $max;
1752 2146
1753 $self->{gauge}->set_value ($val, $max); 2147 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2148 $self->{value}->set_text ($val);
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{gauge}->set_max ($max);
1761 $self->{max}->set_text ($max);
1762} 2149}
1763 2150
1764############################################################################# 2151#############################################################################
1765 2152
1766package CFClient::UI::Slider; 2153package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
1777 2164
1778sub new { 2165sub new {
1779 my $class = shift; 2166 my $class = shift;
1780 2167
1781 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
1782 2169
1783 # TODO: 0-width page 2170 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2172 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2175 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2179 req_w => $::WIDTH / 80,
1791 req_h => 20, 2180 req_h => $::WIDTH / 80,
1792 vertical => 0, 2181 vertical => 0,
1793 can_hover => 1, 2182 can_hover => 1,
1794 inner_pad => 5, 2183 inner_pad => 0.02,
1795 @_ 2184 @_
1796 ); 2185 );
1797 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
1798 $self 2190 $self
2191}
2192
2193sub set_range {
2194 my ($self, $range) = @_;
2195
2196 ($range, $self->{range}) = ($self->{range}, $range);
2197
2198 $self->update
2199 if "@$range" ne "@{$self->{range}}";
2200}
2201
2202sub set_value {
2203 my ($self, $value) = @_;
2204
2205 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2206
2207 $hi = $lo + 1 if $hi <= $lo;
2208
2209 $page = $hi - $lo if $page > $hi - $lo;
2210
2211 $value = $lo if $value < $lo;
2212 $value = $hi - $page if $value > $hi - $page;
2213
2214 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2215 if $unit;
2216
2217 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2218
2219 if ($value != $old_value) {
2220 $self->_emit (changed => $value);
2221 $self->update;
2222 }
1799} 2223}
1800 2224
1801sub size_request { 2225sub size_request {
1802 my ($self) = @_; 2226 my ($self) = @_;
1803 2227
… …
1809 2233
1810sub button_down { 2234sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1812 2236
1813 $self->SUPER::button_down ($ev, $x, $y); 2237 $self->SUPER::button_down ($ev, $x, $y);
2238
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240
1814 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
1815} 2242}
1816 2243
1817sub mouse_motion { 2244sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1819 2246
1820 if ($GRAB == $self) { 2247 if ($GRAB == $self) {
2248 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2249
2250 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2255 }
2256}
2257
2258sub update {
2259 my ($self) = @_;
2260
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2262 $self->set_value ($self->{range}[0]);
2263
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
1822 2266
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2268
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2271
1828 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2274
1834 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2276 $self->{knob_w} = $knob_w;
1836 } 2277 });
1837}
1838 2278
1839# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
1840# so that the handle doesn't leave the texture. This calculation isn't 100%
1841# correct propably, but it does the job for now
1842sub _calc_inner_pad_px {
1843 my ($self, $w) = @_;
1844 ($w / 100) * $self->{inner_pad} # % to pixels
1845} 2280}
1846 2281
1847sub _draw { 2282sub _draw {
1848 my ($self) = @_; 2283 my ($self) = @_;
1849 2284
1850 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
1851 2286
1852 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
1853 2288
1854 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
1856 2291
2292 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2294 }
1862 2295
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2298
1866 my ($value, $lo, $hi, $page) = @{$self->{range}};
1867
1868 $hi = $value + 1 if $lo == $hi;
1869
1870 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1871 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1872
1873 $page = int $page * $inner_w / ($hi - $lo);
1874 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1875
1876 $w -= $page;
1877 $page &= ~1;
1878 glTranslate $page * 0.5, 0, 0;
1879 $page ||= 2;
1880
1881 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1882 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1883
1884 glEnable GL_BLEND;
1885 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1886 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2301
1889 # draw background 2302 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2304
1892 # draw handle 2305 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2306 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2307
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
1897} 2309}
2310
2311#############################################################################
2312
2313package CFClient::UI::ValSlider;
2314
2315our @ISA = CFClient::UI::HBox::;
2316
2317sub new {
2318 my ($class, %arg) = @_;
2319
2320 my $range = delete $arg{range};
2321
2322 my $self = $class->SUPER::new (
2323 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2324 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2325 to_value => sub { shift },
2326 from_value => sub { shift },
2327 %arg,
2328 );
2329
2330 $self->{slider}->connect (changed => sub {
2331 my ($self, $value) = @_;
2332 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2333 $self->{parent}->emit (changed => $value);
2334 });
2335
2336# $self->{entry}->connect (changed => sub {
2337# my ($self, $value) = @_;
2338# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2339# $self->{parent}->emit (changed => $value);
2340# });
2341
2342 $self->add ($self->{slider}, $self->{entry});
2343
2344 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2345
2346 $self
2347}
2348
2349sub set_range { shift->{slider}->set_range (@_) }
2350sub set_value { shift->{slider}->set_value (@_) }
1898 2351
1899############################################################################# 2352#############################################################################
1900 2353
1901package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
1902 2355
… …
1906 2359
1907sub new { 2360sub new {
1908 my $class = shift; 2361 my $class = shift;
1909 2362
1910 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1911 fontsize => 1, 2364 fontsize => 1,
2365 can_events => 0,
2366 #font => default_font
1912 @_, 2367 @_,
1913 2368
1914 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
1915 par => [], 2370 par => [],
1916 height => 0, 2371 height => 0,
1917 children => [ 2372 children => [
1918 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
1920 ], 2375 ],
1921 ); 2376 );
1922 2377
1923 $self->{children}[1]->connect (changed => sub { 2378 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2379
1927 $self 2380 $self
1928} 2381}
1929 2382
1930sub set_fontsize { 2383sub set_fontsize {
… …
1932 2385
1933 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2387 $self->reflow;
1935} 2388}
1936 2389
2390sub size_allocate {
2391 my ($self, $w, $h) = @_;
2392
2393 $self->SUPER::size_allocate ($w, $h);
2394
2395 $self->{layout}->set_font ($self->{font}) if $self->{font};
2396 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $self->{layout}->set_width ($self->{children}[0]{w});
2398
2399 $self->reflow;
2400}
2401
1937sub text_height { 2402sub text_size {
1938 my ($self, $text) = @_; 2403 my ($self, $text, $indent) = @_;
1939 2404
1940 my $layout = $self->{layout}; 2405 my $layout = $self->{layout};
1941 2406
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2407 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2408 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2409 $layout->set_markup ($text);
1945 2410
1946 ($layout->size)[1] 2411 $layout->size
1947} 2412}
1948 2413
1949sub reflow { 2414sub reflow {
1950 my ($self) = @_; 2415 my ($self) = @_;
1951 2416
1952 $self->{need_reflow}++; 2417 $self->{need_reflow}++;
1953 $self->update; 2418 $self->update;
1954} 2419}
1955 2420
1956sub size_allocate { 2421sub set_offset {
2422 my ($self, $offset) = @_;
2423
2424 # todo: base offset on lines or so, not on pixels
2425 $self->{children}[1]->set_value ($offset);
2426}
2427
2428sub clear {
1957 my ($self, $w, $h) = @_; 2429 my ($self) = @_;
1958 2430
1959 $self->SUPER::size_allocate ($w, $h); 2431 $self->{par} = [];
1960 2432 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2433 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2434}
1966 2435
1967sub add_paragraph { 2436sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
1969 2438
1970 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
1971 2440 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
1975 2444
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2445 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2446}
1981 2447
1982sub update { 2448sub update {
1983 my ($self) = @_; 2449 my ($self) = @_;
1984 2450
… …
1986 2452
1987 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
1988 2454
1989 delete $self->{texture}; 2455 delete $self->{texture};
1990 2456
1991 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
1992 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2461 my $height = 0;
1994 2462
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
1996 for @{$self->{par}}; 2467 for (@{$self->{par}}) {
2468 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2469 $layout->set_width ($W - $_->[3]);
2470 $layout->set_markup ($_->[4]);
2471 my ($w, $h) = $layout->size;
2472 $_->[0] = $w + $_->[3];
2473 $_->[1] = $h;
2474 }
2475
2476 $height += $_->[1];
2477 }
1997 2478
1998 $self->{height} = $height; 2479 $self->{height} = $height;
1999 2480
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2482
2002 delete $self->{texture}; 2483 delete $self->{texture};
2003 } 2484 }
2004 2485
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2008 2489
2490 my $top = int $self->{children}[1]{range}[0];
2491
2492 my $y0 = $top;
2493 my $y1 = $top + $H;
2494
2495 my $y = 0;
2496
2497 my $layout = $self->{layout};
2498
2499 $layout->set_font ($self->{font}) if $self->{font};
2500
2009 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013
2014 my $top = int $self->{children}[1]{range}[0];
2015
2016 my $y0 = $top;
2017 my $y1 = $top + $self->{h};
2018
2019 my $y = 0;
2020
2021 my $layout = $self->{layout};
2022 2504
2023 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2506 my $h = $par->[1];
2025 2507
2026 if ($y0 < $y + $h && $y < $y1) { 2508 if ($y0 < $y + $h && $y < $y1) {
2509 $layout->set_foreground (@{ $par->[2] });
2510 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2028 2512
2029 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2514
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2515 glRasterPos $par->[3], $y - $y0;
2516 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2517 }
2033 2518
2034 $y += $h; 2519 $y += $h;
2035 } 2520 }
2036 2521
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2039 }; 2523 };
2040 }); 2524 });
2041} 2525}
2042 2526
2043sub _draw { 2527sub _draw {
2044 my ($self) = @_; 2528 my ($self) = @_;
2045 2529
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2051 }
2052 2535
2053 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2054 2537
2055} 2538}
2056 2539
… …
2104 2587
2105sub new { 2588sub new {
2106 my $class = shift; 2589 my $class = shift;
2107 2590
2108 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2109 state => 0, 2592 state => 0,
2110 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2594 @_
2113 ); 2595 );
2114 2596
2115 if ($self->{state}) { 2597 if ($self->{state}) {
2116 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2125 2607
2126 # TODO: use animation 2608 # TODO: use animation
2127 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2128 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2129 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2130 $self->emit ("open"); 2612 $self->_emit ("open");
2131 } else { 2613 } else {
2132 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2133 $self->emit ("close"); 2615 $self->_emit ("close");
2134 } 2616 }
2135 2617
2136 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2137} 2619}
2138 2620
2139############################################################################# 2621#############################################################################
2140 2622
2141package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2151 @_, 2633 @_,
2152 can_events => 0, 2634 can_events => 0,
2153 ) 2635 )
2154} 2636}
2155 2637
2156sub set_text { 2638sub set_tooltip_from {
2157 my ($self, $text) = @_; 2639 my ($self, $widget) = @_;
2158 2640
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2641 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2642 markup => $widget->{tooltip},
2161 $self->add ($self->{label}); 2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8,
2645 fg => [0, 0, 0, 1],
2646 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP),
2648 );
2162} 2649}
2163 2650
2164sub size_request { 2651sub size_request {
2165 my ($self) = @_; 2652 my ($self) = @_;
2166 2653
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2654 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2655
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2656 ($w + 4, $h + 4)
2173} 2657}
2174 2658
2659sub size_allocate {
2660 my ($self, $w, $h) = @_;
2661
2662 $self->SUPER::size_allocate ($w - 4, $h - 4);
2663}
2664
2175sub _draw { 2665sub _draw {
2176 my ($self) = @_; 2666 my ($self) = @_;
2177 2667
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2668 glTranslate 0.375, 0.375;
2180 2669
2181 my ($w, $h) = @$self{qw(w h)}; 2670 my ($w, $h) = @$self{qw(w h)};
2182 2671
2183 glColor 1, 0.8, 0.4; 2672 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2683 glVertex 0 , $h;
2195 glVertex $w, $h; 2684 glVertex $w, $h;
2196 glVertex $w, 0; 2685 glVertex $w, 0;
2197 glEnd; 2686 glEnd;
2198 2687
2199 glPopMatrix; 2688 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2203} 2690}
2204 2691
2205############################################################################# 2692#############################################################################
2206 2693
2694package CFClient::UI::Face;
2695
2696our @ISA = CFClient::UI::Base::;
2697
2698use CFClient::OpenGL;
2699
2700sub new {
2701 my $class = shift;
2702
2703 my $self = $class->SUPER::new (
2704 aspect => 1,
2705 can_events => 0,
2706 @_,
2707 );
2708
2709 if ($self->{anim} && $self->{animspeed}) {
2710 Scalar::Util::weaken (my $widget = $self);
2711
2712 $self->{timer} = Event->timer (
2713 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2714 hard => 1,
2715 interval => $self->{animspeed},
2716 cb => sub {
2717 ++$widget->{frame};
2718 $widget->update;
2719 },
2720 );
2721 }
2722
2723 $self
2724}
2725
2726sub size_request {
2727 (32, 8)
2728}
2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2738sub _draw {
2739 my ($self) = @_;
2740
2741 return unless $::CONN;
2742
2743 my $face;
2744
2745 if ($self->{frame}) {
2746 my $anim = $::CONN->{anim}[$self->{anim}];
2747
2748 $face = $anim->[ $self->{frame} % @$anim ]
2749 if $anim && @$anim;
2750 }
2751
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753
2754 if ($tex) {
2755 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D;
2760 }
2761}
2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2770}
2771
2772#############################################################################
2773
2774package CFClient::UI::Inventory;
2775
2776our @ISA = CFClient::UI::ScrolledWindow::;
2777
2778sub new {
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818
2819#############################################################################
2820
2821package CFClient::UI::Menu;
2822
2823our @ISA = CFClient::UI::FancyFrame::;
2824
2825use CFClient::OpenGL;
2826
2827sub new {
2828 my $class = shift;
2829
2830 my $self = $class->SUPER::new (
2831 items => [],
2832 z => 100,
2833 @_,
2834 );
2835
2836 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2837
2838 for my $item (@{ $self->{items} }) {
2839 my ($widget, $cb) = @$item;
2840
2841 # handle various types of items, only text for now
2842 if (!ref $widget) {
2843 $widget = new CFClient::UI::Label
2844 can_hover => 1,
2845 can_events => 1,
2846 text => $widget;
2847 }
2848
2849 $self->{item}{$widget} = $item;
2850
2851 $self->{vbox}->add ($widget);
2852 }
2853
2854 $self
2855}
2856
2857# popup given the event (must be a mouse button down event currently)
2858sub popup {
2859 my ($self, $ev) = @_;
2860
2861 $self->_emit ("popdown");
2862
2863 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self;
2865 $self->{button} = $ev->{button};
2866
2867 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869}
2870
2871sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_;
2873
2874 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER};
2877}
2878
2879sub button_up {
2880 my ($self, $ev, $x, $y) = @_;
2881
2882 if ($ev->{button} == $self->{button}) {
2883 undef $GRAB;
2884 $self->hide;
2885
2886 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover};
2888 }
2889}
2890
2891#############################################################################
2892
2893package CFClient::UI::Statusbox;
2894
2895our @ISA = CFClient::UI::VBox::;
2896
2897sub new {
2898 my $class = shift;
2899
2900 $class->SUPER::new (
2901 fontsize => 0.8,
2902 @_,
2903 )
2904}
2905
2906sub reorder {
2907 my ($self) = @_;
2908 my $NOW = time;
2909
2910 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 }
2913
2914 my @widgets;
2915
2916 my @items = sort {
2917 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} };
2920
2921 my $count = 10 + 1;
2922 for my $item (@items) {
2923 last unless --$count;
2924
2925 push @widgets, $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text};
2930
2931 for ($short) {
2932 s/^\s+//;
2933 s/\s+/ /g;
2934 }
2935
2936 new CFClient::UI::Label
2937 markup => $short,
2938 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg},
2944 can_events => 1,
2945 can_hover => 1
2946 };
2947 }
2948
2949 $self->clear;
2950 $self->SUPER::add (reverse @widgets);
2951}
2952
2953sub add {
2954 my ($self, $text, %arg) = @_;
2955
2956 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//;
2958
2959 return unless $text;
2960
2961 my $timeout = time + ((delete $arg{timeout}) || 60);
2962
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964
2965 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) {
2967 $item->{count}++;
2968 } else {
2969 $item->{count} = 1;
2970 $item->{text} = $item->{tooltip} = $text;
2971 }
2972 $item->{id} = ++$self->{id};
2973 $item->{timeout} = $timeout;
2974 delete $item->{label};
2975 } else {
2976 $self->{item}{$group} = {
2977 id => ++$self->{id},
2978 text => $text,
2979 timeout => $timeout,
2980 tooltip => $text,
2981 fg => [0.8, 0.8, 0.8, 0.8],
2982 pri => 0,
2983 count => 1,
2984 %arg,
2985 };
2986 }
2987
2988 $self->reorder;
2989}
2990
2991sub reconfigure {
2992 my ($self) = @_;
2993
2994 delete $_->{label}
2995 for values %{ $self->{item} || {} };
2996
2997 $self->reorder;
2998 $self->SUPER::reconfigure;
2999}
3000
3001#############################################################################
3002
2207package CFClient::UI::Root; 3003package CFClient::UI::Root;
2208 3004
2209our @ISA = CFClient::UI::Container::; 3005our @ISA = CFClient::UI::Container::;
2210 3006
2211use CFClient::OpenGL; 3007use CFClient::OpenGL;
2212 3008
2213sub check_size { 3009sub new {
2214 my ($self) = @_; 3010 my $class = shift;
2215 3011
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3012 $class->SUPER::new (
2217} 3013 visible => 1,
2218 3014 @_,
2219sub size_request { 3015 )
2220 ($::WIDTH, $::HEIGHT)
2221} 3016}
2222 3017
2223sub configure { 3018sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 3019 my ($self, $x, $y, $w, $h) = @_;
2225 3020
2226 $self->SUPER::configure ($x, $y, $w, $h); 3021 $self->{w} = $w;
3022 $self->{h} = $h;
3023}
2227 3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030}
3031
3032sub size_request {
3033 my ($self) = @_;
3034
3035 ($self->{w}, $self->{h})
3036}
3037
3038sub size_allocate {
3039 my ($self, $w, $h) = @_;
3040
2228 for my $child (@{$self->{children}}) { 3041 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3043
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3045 if exists $child->{req_x};
3046
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3048 if exists $child->{req_y};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2232 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055
2233 $child->configure ($X, $Y, $W,$H); 3056 $child->configure ($X, $Y, $W, $H);
2234 } 3057 }
2235} 3058}
2236 3059
2237sub _topleft { 3060sub coord2local {
2238 my ($self, $x, $y) = @_; 3061 my ($self, $x, $y) = @_;
2239 3062
2240 ($x, $y) 3063 ($x, $y)
2241} 3064}
2242 3065
3066sub coord2global {
3067 my ($self, $x, $y) = @_;
3068
3069 ($x, $y)
3070}
3071
2243sub update { 3072sub update {
2244 my ($self) = @_; 3073 my ($self) = @_;
2245 3074
2246 $self->check_size; 3075 $self->check_size;
2247 ::refresh (); 3076 $::WANT_REFRESH++;
2248} 3077}
2249 3078
2250sub add { 3079sub add {
2251 my ($self, $child) = @_; 3080 my ($self, @children) = @_;
2252 3081
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1;
3090
2253 # integerize window positions 3091 # integerise window positions
2254 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
3094 }
2256 3095
2257 $self->SUPER::add ($child); 3096 $self->SUPER::add (@children);
3097}
3098
3099sub remove {
3100 my ($self, @children) = @_;
3101
3102 $self->SUPER::remove (@children);
3103
3104 while (@children) {
3105 my $w = pop @children;
3106 push @children, $w->children;
3107 $w->set_invisible;
3108 }
2258} 3109}
2259 3110
2260sub on_refresh { 3111sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2262 3113
2263 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2264} 3115}
2265 3116
3117sub on_post_alloc {
3118 my ($self, $id, $cb) = @_;
3119
3120 $self->{post_alloc_hook}{$id} = $cb;
3121}
3122
2266sub draw { 3123sub draw {
2267 my ($self) = @_; 3124 my ($self) = @_;
2268 3125
2269 while (my $rcb = delete $self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3127 $_->()
3128 for values %{delete $self->{refresh_hook}};
3129 }
3130
3131 if ($self->{check_size}) {
3132 my @queue;
3133
3134 for (;;) {
3135 if ($self->{check_size}) {
3136 #TODO use array-of-depth approach
3137
3138 @queue = sort { $a->{visible} <=> $b->{visible} }
3139 @queue, values %{delete $self->{check_size}};
3140 }
3141
3142 my $widget = pop @queue || last;
3143
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153
3154 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h;
3156
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3158
3159 $widget->{parent}->check_size
3160 if $widget->{parent};
3161 }
3162 }
3163 }
3164
3165 while ($self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) {
3167 my ($widget, $w, $h) = @$_;
3168
3169 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0;
3171
3172 $widget->{w} = $w;
3173 $widget->{h} = $h;
3174 $widget->emit (size_allocate => $w, $h);
3175 }
3176 }
3177
3178 while ($self->{post_alloc_hook}) {
3179 $_->()
3180 for values %{delete $self->{post_alloc_hook}};
2271 } 3181 }
2272 3182
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3183 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2276 3186
2277 glMatrixMode GL_PROJECTION; 3187 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3188 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3190 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3191 glLoadIdentity;
2282 3192
2283 $self->_draw; 3193 $self->_draw;
2284} 3194}
… …
2286############################################################################# 3196#############################################################################
2287 3197
2288package CFClient::UI; 3198package CFClient::UI;
2289 3199
2290$ROOT = new CFClient::UI::Root; 3200$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3201$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3202
22931 32031
2294 3204

Diff Legend

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