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

Diff Legend

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