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

Diff Legend

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