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.228 by root, Wed May 24 03:52:54 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)});
611 748
612 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
613} 750}
614 751
615sub _draw { 752sub size_allocate {
616 my ($self) = @_; 753 my ($self, $w, $h) = @_;
617 754
618 $self->{children}[1]->draw; 755 my ($cw, $ch) = @$self{qw(child_w child_h)};
756# $w = $self->{w};
757 $self->child->configure (0, 0, $cw, $ch);
758 $self->update;
619} 759}
620 760
761sub set_offset {
762 my ($self, $x, $y) = @_;
763
764 $self->{view_x} = int $x;
765 $self->{view_y} = int $y;
766
767 $self->update;
768}
769
770# hmm, this does not work for topleft of $self... but we should not ask for that
771sub coord2local {
772 my ($self, $x, $y) = @_;
773
774 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
775}
776
777sub coord2global {
778 my ($self, $x, $y) = @_;
779
780 $x = List::Util::min $self->{w}, $x - $self->{view_x};
781 $y = List::Util::min $self->{h}, $y - $self->{view_y};
782
783 $self->SUPER::coord2global ($x, $y)
784}
785
786sub find_widget {
787 my ($self, $x, $y) = @_;
788
789 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
790 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
791 ) {
792 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
793 } else {
794 $self->CFClient::UI::Base::find_widget ($x, $y)
795 }
796}
797
798sub _render {
799 my ($self) = @_;
800
801 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
802
803 $self->SUPER::_render;
804}
621 805
622############################################################################# 806#############################################################################
623 807
624package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
625 809
626our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
627
628use CFClient::OpenGL;
629 811
630sub new { 812sub new {
631 my $class = shift; 813 my $class = shift;
632 814
815 my $self;
816
817 my $slider = new CFClient::UI::Slider
818 vertical => 1,
819 range => [0, 0, 1, 0.01], # HACK fix
820 connect_changed => sub {
821 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
822 },
823 ;
824
633 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
634 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
635 border_bg => [1, 1, 1, 1], 827 slider => $slider,
636 border => 0.8,
637 @_ 828 @_,
638 ); 829 );
639 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
640 $self 835 $self
641} 836}
642 837
643sub set_size { 838#TODO# update range on size_allocate depending on child
644 my ($self, $w, $h) = @_; 839# update viewport offset on scroll
645 $self->{req_w} = $w;
646 $self->{req_h} = $h;
647 $self->check_size;
648}
649 840
650sub size_request { 841#############################################################################
651 my ($self) = @_;
652 ($self->{req_w}, $self->{req_h})
653}
654 842
655sub size_allocate { 843package CFClient::UI::Frame;
656 my ($self, $w, $h) = @_; 844
657 $self->{w} = $w; 845our @ISA = CFClient::UI::Bin::;
658 $self->{h} = $h; 846
659 $self->child->configure (0, 0, $w, $h); 847use CFClient::OpenGL;
848
849sub new {
850 my $class = shift;
851
852 $class->SUPER::new (
853 bg => undef,
854 @_,
855 )
660} 856}
661 857
662sub _draw { 858sub _draw {
663 my ($self) = @_; 859 my ($self) = @_;
664 860
665 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
666 863
667 glEnable GL_BLEND; 864 glEnable GL_BLEND;
668 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
669 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
670 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
671 867
672# glBegin GL_QUADS; 868 glBegin GL_QUADS;
673# glColor 0, 0, 0, 0;
674# glVertex 0 , 0; 869 glVertex 0 , 0;
675# glVertex 0 , $h; 870 glVertex 0 , $h;
676# glVertex $w, $h; 871 glVertex $w, $h;
677# glVertex $w, 0; 872 glVertex $w, 0;
678# glEnd; 873 glEnd;
679 874
680
681 $self->child->draw;
682 glDisable GL_BLEND; 875 glDisable GL_BLEND;
683 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
684} 879}
685 880
686############################################################################# 881#############################################################################
687 882
688package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
699 my $class = shift; 894 my $class = shift;
700 895
701 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
702 897
703 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
704 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
705 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
706 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
707 can_events => 1, 903 can_events => 1,
708 @_ 904 @_
709 ); 905 );
710 906
711 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
712 align => 0, 908 align => 0,
713 valign => 1, 909 valign => 1,
714 text => $self->{title}, 910 text => $self->{title},
715 fontsize => 1; 911 fontsize => $self->{border};
716 912
717 $self 913 $self
718} 914}
719 915
720sub border { 916sub border {
721 int $_[0]{border} * $::FONTSIZE 917 int $_[0]{border} * $::FONTSIZE
722} 918}
723 919
724sub size_request { 920sub size_request {
725 my ($self) = @_; 921 my ($self) = @_;
726
727 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
728 922
729 my ($w, $h) = $self->SUPER::size_request; 923 my ($w, $h) = $self->SUPER::size_request;
730 924
731 ( 925 (
732 $w + $self->border * 2, 926 $w + $self->border * 2,
… …
738 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
739 933
740 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
741 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
742 936
743 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 937 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
744 if $self->{title}; 938 if $self->{title};
745 939
746 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
747} 941}
748 942
749sub button_down { 943sub button_down {
750 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
751 945
946 my ($w, $h) = @$self{qw(w h)};
752 my $border = $self->border; 947 my $border = $self->border;
753 948
754 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
755 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
756 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
757 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
758 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
759 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
760 $self->{motion} = sub { 960 $self->{motion} = sub {
761 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
762 962
763 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
764 965
765 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
766 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
767 $self->check_size; 969 $self->check_size;
768 }; 970 };
769 971
770 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
771 && $y >= 0 && $y < $border) {
772
773 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
774 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
775 975
776 $self->{motion} = sub { 976 $self->{motion} = sub {
777 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
… …
800 my ($self) = @_; 1000 my ($self) = @_;
801 1001
802 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
803 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
804 1004
805 glEnable GL_BLEND;
806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
807 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
809 1007
810 my $border = $self->border; 1008 my $border = $self->border;
811 1009
812 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
813 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
814 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
815 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
816 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
817 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
818 my $bg = $tex[0]; 1017 my $bg = $tex[0];
819 1018
820 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
821 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
822 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
823 1022
824 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
825 1024
826 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
827 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
828 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
829 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
830 1030
831 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
832 glDisable GL_BLEND;
833 1032
834 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
835 $self->child->draw; 1035 $self->child->draw;
836} 1036}
837 1037
838############################################################################# 1038#############################################################################
839 1039
… …
861 $self->{children}[$y][$x] = $child; 1061 $self->{children}[$y][$x] = $child;
862 1062
863 $child->check_size; 1063 $child->check_size;
864} 1064}
865 1065
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
866# TODO: move to container class maybe? send childs a signal on removal? 1070# TODO: move to container class maybe? send childs a signal on removal?
867sub clear { 1071sub clear {
868 my ($self) = @_; 1072 my ($self) = @_;
869 1073
1074 my @children = $self->children;
870 delete $self->{children}; 1075 delete $self->{children};
1076
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081
871 $self->update; 1082 $self->update;
872} 1083}
873 1084
874sub get_wh { 1085sub get_wh {
875 my ($self) = @_; 1086 my ($self) = @_;
… …
1052} 1263}
1053 1264
1054sub size_allocate { 1265sub size_allocate {
1055 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1056 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1057 my $children = $self->{children}; 1270 my $children = $self->{children};
1058 1271
1059 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1060 1273
1061 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
… …
1090 1303
1091############################################################################# 1304#############################################################################
1092 1305
1093package CFClient::UI::Label; 1306package CFClient::UI::Label;
1094 1307
1095our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1096 1309
1097use CFClient::OpenGL; 1310use CFClient::OpenGL;
1098 1311
1099sub new { 1312sub new {
1100 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1101 1314
1102 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1103 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1317 #bg => none
1318 #active_bg => none
1319 #font => default_font
1320 #text => initial text
1321 #markup => initial narkup
1322 #max_w => maximum pixel width
1323 ellipsise => 3, # end
1324 layout => (new CFClient::Layout),
1104 fontsize => 1, 1325 fontsize => 1,
1105 text => "",
1106 align => -1, 1326 align => -1,
1107 valign => -1, 1327 valign => -1,
1108 padding => 2, 1328 padding => 2,
1109 layout => new CFClient::Layout,
1110 can_events => 0, 1329 can_events => 0,
1111 %arg 1330 %arg
1112 ); 1331 );
1113 1332
1114 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1115 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1116 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1117 $self->{template} = $layout; 1336 $self->{template} = $layout;
1118 } 1337 }
1119 1338
1120 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1121 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1340 $self->set_markup (delete $self->{markup});
1341 } else {
1342 $self->set_text (delete $self->{text});
1343 }
1122 1344
1123 $self 1345 $self
1124} 1346}
1125 1347
1126sub escape_text { 1348sub escape($) {
1127 local $_ = $_[1]; 1349 local $_ = $_[0];
1128 1350
1129 s/&/&amp;/g; 1351 s/&/&amp;/g;
1130 s/>/&gt;/g; 1352 s/>/&gt;/g;
1131 s/</&lt;/g; 1353 s/</&lt;/g;
1132 1354
1133 $_[1] 1355 $_
1356}
1357
1358sub update {
1359 my ($self) = @_;
1360
1361 delete $self->{texture};
1362 $self->SUPER::update;
1134} 1363}
1135 1364
1136sub set_text { 1365sub set_text {
1137 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1138 1367
1368 return if $self->{text} eq "T$text";
1369 $self->{text} = "T$text";
1370
1371 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1139 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1140 1373
1141 delete $self->{texture}; 1374 $self->update;
1142 $self->check_size; 1375 $self->check_size;
1143 $self->update;
1144} 1376}
1145 1377
1146sub set_markup { 1378sub set_markup {
1147 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1148 1380
1381 return if $self->{text} eq "M$markup";
1382 $self->{text} = "M$markup";
1383
1384 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1385
1386 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1149 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1150 1388
1151 delete $self->{texture}; 1389 $self->update;
1152 $self->check_size; 1390 $self->check_size;
1153 $self->update;
1154} 1391}
1155 1392
1156sub size_request { 1393sub size_request {
1157 my ($self) = @_; 1394 my ($self) = @_;
1158 1395
1159 $self->{layout}->set_width; 1396 $self->{layout}->set_font ($self->{font}) if $self->{font};
1397 $self->{layout}->set_width ($self->{max_w} || -1);
1398 $self->{layout}->set_ellipsise ($self->{ellipsise});
1399 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1160 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1401
1162 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1163 1403
1164 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font};
1165 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1166 1407
1167 my ($w2, $h2) = $self->{template}->size; 1408 my ($w2, $h2) = $self->{template}->size;
1168 1409
1169 $w = List::Util::max $w, $w2; 1410 $w = List::Util::max $w, $w2;
… …
1185sub set_fontsize { 1426sub set_fontsize {
1186 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1187 1428
1188 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1189 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1190 $self->check_size; 1433 $self->check_size;
1191 $self->update;
1192} 1434}
1193 1435
1194sub _draw { 1436sub _draw {
1195 my ($self) = @_; 1437 my ($self) = @_;
1196 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1197 my $tex = $self->{texture} ||= do { 1441 my $tex = $self->{texture} ||= do {
1442 $self->{layout}->set_foreground (@{$self->{fg}});
1443 $self->{layout}->set_font ($self->{font}) if $self->{font};
1198 $self->{layout}->set_width ($self->{w}); 1444 $self->{layout}->set_width ($self->{w});
1445 $self->{layout}->set_ellipsise ($self->{ellipsise});
1446 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1199 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1200 new_from_layout CFClient::Texture $self->{layout} 1449 my $tex = new_from_layout CFClient::Texture $self->{layout};
1450
1451 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1452 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1453 : ($self->{w} - $tex->{w}) * 0.5);
1454
1455 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5);
1458
1459 $tex
1201 }; 1460 };
1202 1461
1203 glEnable GL_BLEND;
1204 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1205 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1206 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1207 1464
1465 if ($tex->{format} == GL_ALPHA) {
1208 glColor @{$self->{fg}}; 1466 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}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1223 1471
1224 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1225 glDisable GL_BLEND;
1226} 1473}
1227 1474
1228############################################################################# 1475#############################################################################
1229 1476
1230package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
… …
1235 1482
1236sub new { 1483sub new {
1237 my $class = shift; 1484 my $class = shift;
1238 1485
1239 $class->SUPER::new ( 1486 $class->SUPER::new (
1240 fg => [1, 1, 1], 1487 fg => [1, 1, 1],
1241 bg => [0, 0, 0, 0.2], 1488 bg => [0, 0, 0, 0.2],
1242 active_bg => [1, 1, 1, 0.5], 1489 active_bg => [1, 1, 1, 0.5],
1243 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1244 can_hover => 1, 1491 can_hover => 1,
1245 can_focus => 1, 1492 can_focus => 1,
1246 valign => 0, 1493 valign => 0,
1247 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1248 @_ 1496 @_
1249 ) 1497 )
1250} 1498}
1251 1499
1252sub _set_text { 1500sub _set_text {
… …
1263 1511
1264 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1265 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1266 1514
1267 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1268}
1269
1270sub get_text {
1271 $_[0]{text}
1272}
1273
1274sub size_request {
1275 my ($self) = @_;
1276
1277 my ($w, $h) = $self->SUPER::size_request;
1278
1279 ($w + 1, $h) # add 1 for cursor
1280}
1281
1282sub size_allocate {
1283 my ($self, $w, $h) = @_;
1284
1285 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1286} 1516}
1287 1517
1288sub set_text { 1518sub set_text {
1289 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1290 1520
1291 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1292 $self->_set_text ($text); 1522 $self->_set_text ($text);
1293 $self->update; 1523 $self->update;
1524 $self->check_size;
1525}
1526
1527sub get_text {
1528 $_[0]{text}
1529}
1530
1531sub size_request {
1532 my ($self) = @_;
1533
1534 my ($w, $h) = $self->SUPER::size_request;
1535
1536 ($w + 1, $h) # add 1 for cursor
1537}
1538
1539sub size_allocate {
1540 my ($self, $w, $h) = @_;
1541
1542 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1294} 1543}
1295 1544
1296sub key_down { 1545sub key_down {
1297 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1298 1547
… …
1300 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1301 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1302 1551
1303 my $text = $self->get_text; 1552 my $text = $self->get_text;
1304 1553
1305 if ($sym == 8) { 1554 if ($uni == 8) {
1306 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1307 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1308 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1309 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1310 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1311 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1312 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1313 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1314 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1315 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1316 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1317 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1318 $self->emit ('escape'); 1567 $self->emit ('escape');
1319 } elsif ($uni) { 1568 } elsif ($uni) {
1320 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1321 } 1570 }
1322 1571
1323 $self->_set_text ($text); 1572 $self->_set_text ($text);
1324 $self->update; 1573 $self->update;
1574 $self->check_size;
1325} 1575}
1326 1576
1327sub focus_in { 1577sub focus_in {
1328 my ($self) = @_; 1578 my ($self) = @_;
1329 1579
… …
1405 my ($self, $ev) = @_; 1655 my ($self, $ev) = @_;
1406 1656
1407 my $sym = $ev->{sym}; 1657 my $sym = $ev->{sym};
1408 1658
1409 if ($sym == 13) { 1659 if ($sym == 13) {
1660 unshift @{$self->{history}},
1661 my $txt = $self->get_text;
1662 $self->{history_pointer} = -1;
1663 $self->{history_saveback} = '';
1410 $self->emit (activate => $self->get_text); 1664 $self->emit (activate => $txt);
1411 $self->update; 1665 $self->update;
1666
1667 } elsif ($sym == CFClient::SDLK_UP) {
1668 if ($self->{history_pointer} < 0) {
1669 $self->{history_saveback} = $self->get_text;
1670 }
1671 if (@{$self->{history} || []} > 0) {
1672 $self->{history_pointer}++;
1673 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1674 $self->{history_pointer} = @{$self->{history} || []} - 1;
1675 }
1676 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1677 }
1678
1679 } elsif ($sym == CFClient::SDLK_DOWN) {
1680 $self->{history_pointer}--;
1681 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1682
1683 if ($self->{history_pointer} >= 0) {
1684 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1685 } else {
1686 $self->set_text ($self->{history_saveback});
1687 }
1412 1688
1413 } else { 1689 } else {
1414 $self->SUPER::key_down ($ev); 1690 $self->SUPER::key_down ($ev);
1415 } 1691 }
1416 1692
… …
1430 1706
1431sub new { 1707sub new {
1432 my $class = shift; 1708 my $class = shift;
1433 1709
1434 $class->SUPER::new ( 1710 $class->SUPER::new (
1435 padding => 4, 1711 padding => 4,
1436 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1437 bg => [1, 1, 1, 0.2],
1438 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1439 can_hover => 1, 1714 can_hover => 1,
1440 align => 0, 1715 align => 0,
1441 valign => 0, 1716 valign => 0,
1442 can_events => 1, 1717 can_events => 1,
1443 @_ 1718 @_
1444 ) 1719 )
1445} 1720}
1446 1721
… …
1460 1735
1461 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1462 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1463 } 1738 }
1464 1739
1465 glEnable GL_BLEND;
1466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1467 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1468 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1469 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1470 1743
1471 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1472 1745
1473 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1474 glDisable GL_BLEND;
1475 1747
1476 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1477} 1749}
1478 1750
1479############################################################################# 1751#############################################################################
… …
1493 1765
1494 $class->SUPER::new ( 1766 $class->SUPER::new (
1495 padding => 2, 1767 padding => 2,
1496 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1497 active_fg => [1, 1, 0], 1769 active_fg => [1, 1, 0],
1770 bg => [0, 0, 0, 0.2],
1771 active_bg => [1, 1, 1, 0.5],
1498 state => 0, 1772 state => 0,
1499 can_hover => 1, 1773 can_hover => 1,
1500 @_ 1774 @_
1501 ) 1775 )
1502} 1776}
… …
1526 1800
1527 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1801 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1528 1802
1529 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1530 1804
1531 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1532 glEnable GL_TEXTURE_2D; 1807 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); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1538
1539 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1540 glDisable GL_BLEND;
1541} 1810}
1542 1811
1543############################################################################# 1812#############################################################################
1544 1813
1545package CFClient::UI::Image; 1814package CFClient::UI::Image;
… …
1588 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1589 1858
1590 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1591 } 1860 }
1592 1861
1593 glEnable GL_BLEND;
1594 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1595 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1596 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1597 1864
1598 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1599 1866
1600 glDisable GL_BLEND;
1601 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1602} 1868}
1603 1869
1604############################################################################# 1870#############################################################################
1605 1871
1606package CFClient::UI::VGauge; 1872package CFClient::UI::VGauge;
1607 1873
1608our @ISA = CFClient::UI::Base::; 1874our @ISA = CFClient::UI::Base::;
1875
1876use List::Util qw(min max);
1609 1877
1610use CFClient::OpenGL; 1878use CFClient::OpenGL;
1611 1879
1612my %tex = ( 1880my %tex = (
1613 food => [ 1881 food => [
1614 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1615 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1883 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1616 ], 1884 ],
1617 grace => [ 1885 grace => [
1618 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1886 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1619 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1887 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1620 ], 1888 ],
1621 hp => [ 1889 hp => [
1622 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1623 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1891 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1624 ], 1892 ],
1625 mana => [ 1893 mana => [
1626 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1894 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1627 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1895 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1628 ], 1896 ],
1629); 1897);
1630 1898
1631# eg. VGauge->new (gauge => 'food'), default gauge: food 1899# eg. VGauge->new (gauge => 'food'), default gauge: food
1632sub new { 1900sub new {
… …
1651} 1919}
1652 1920
1653sub set_max { 1921sub set_max {
1654 my ($self, $max) = @_; 1922 my ($self, $max) = @_;
1655 1923
1924 return if $self->{max_val} == $max;
1925
1656 $self->{max_val} = $max; 1926 $self->{max_val} = $max;
1927 $self->update;
1657} 1928}
1658 1929
1659sub set_value { 1930sub set_value {
1660 my ($self, $val, $max) = @_; 1931 my ($self, $val, $max) = @_;
1661 1932
1662 $self->set_max ($max) 1933 $self->set_max ($max)
1663 if defined $max; 1934 if defined $max;
1664 1935
1665 $max = $self->{max_val}; 1936 return if $self->{val} == $val;
1937
1666 $self->{val} = $val; 1938 $self->{val} = $val;
1667
1668 $self->update; 1939 $self->update;
1669} 1940}
1670 1941
1671sub _draw { 1942sub _draw {
1672 my ($self) = @_; 1943 my ($self) = @_;
1673 1944
1674 my $tex = $tex{$self->{type}}; 1945 my $tex = $tex{$self->{type}};
1946 my ($t1, $t2, $t3) = @$tex;
1675 1947
1676 my ($w, $h) = ($self->{w}, $self->{h}); 1948 my ($w, $h) = ($self->{w}, $self->{h});
1677 1949
1678 if ($self->{vertical}) { 1950 if ($self->{vertical}) {
1679 glRotate 90, 0, 0, 1; 1951 glRotate 90, 0, 0, 1;
… …
1681 1953
1682 ($w, $h) = ($h, $w); 1954 ($w, $h) = ($h, $w);
1683 } 1955 }
1684 1956
1685 my $ycut = $self->{val} / ($self->{max_val} || 1); 1957 my $ycut = $self->{val} / ($self->{max_val} || 1);
1686 $ycut = 1 if $self->{val} > $self->{max_val};
1687 1958
1688 my $t1 = $tex->[0]; 1959 my $ycut1 = max 0, min 1, $ycut;
1689 my $t2 = $tex->[1]; 1960 my $ycut2 = max 0, min 1, $ycut - 1;
1961
1962 my $h1 = $self->{h} * (1 - $ycut1);
1963 my $h2 = $self->{h} * (1 - $ycut2);
1690 1964
1691 glEnable GL_BLEND; 1965 glEnable GL_BLEND;
1692 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1693 glEnable GL_TEXTURE_2D; 1967 glEnable GL_TEXTURE_2D;
1694 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1695 1969
1696 my $h1 = $self->{h} - $ycut * $self->{h};
1697 my $h2 = $ycut * $self->{h};
1698
1699 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1970 glBindTexture GL_TEXTURE_2D, $t1->{name};
1700 glBegin GL_QUADS; 1971 glBegin GL_QUADS;
1701 glTexCoord 0 , 0; glVertex 0 , 0; 1972 glTexCoord 0 , 0; glVertex 0 , 0;
1702 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1973 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1703 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1974 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1704 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1975 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1705 glEnd; 1976 glEnd;
1706 1977
1978 my $ycut1 = List::Util::min 1, $ycut;
1707 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1979 glBindTexture GL_TEXTURE_2D, $t2->{name};
1708 glBegin GL_QUADS; 1980 glBegin GL_QUADS;
1709 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1981 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1710 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1982 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1711 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1983 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1712 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1984 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1713 glEnd; 1985 glEnd;
1986
1987 if ($t3) {
1988 glBindTexture GL_TEXTURE_2D, $t3->{name};
1989 glBegin GL_QUADS;
1990 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1991 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1992 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1993 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1994 glEnd;
1995 }
1714 1996
1715 glDisable GL_BLEND; 1997 glDisable GL_BLEND;
1716 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1717} 1999}
1718 2000
… …
1724 2006
1725sub new { 2007sub new {
1726 my ($class, %arg) = @_; 2008 my ($class, %arg) = @_;
1727 2009
1728 my $self = $class->SUPER::new ( 2010 my $self = $class->SUPER::new (
1729 tooltip => $arg{type}, 2011 tooltip => $arg{type},
2012 can_hover => 1,
2013 can_events => 1,
1730 %arg, 2014 %arg,
1731 ); 2015 );
1732 2016
1733 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2017 $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); 2018 $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"); 2019 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1736 2020
1737 $self 2021 $self
1738} 2022}
1739 2023
… …
1742 2026
1743 $self->{value}->set_fontsize ($fsize); 2027 $self->{value}->set_fontsize ($fsize);
1744 $self->{max} ->set_fontsize ($fsize); 2028 $self->{max} ->set_fontsize ($fsize);
1745} 2029}
1746 2030
2031sub set_max {
2032 my ($self, $max) = @_;
2033
2034 $self->{gauge}->set_max ($max);
2035 $self->{max}->set_text ($max);
2036}
2037
1747sub set_value { 2038sub set_value {
1748 my ($self, $val, $max) = @_; 2039 my ($self, $val, $max) = @_;
1749 2040
1750 $self->set_max ($max) 2041 $self->set_max ($max)
1751 if defined $max; 2042 if defined $max;
1752 2043
1753 $self->{gauge}->set_value ($val, $max); 2044 $self->{gauge}->set_value ($val, $max);
1754 $self->{value}->set_text ($val); 2045 $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} 2046}
1763 2047
1764############################################################################# 2048#############################################################################
1765 2049
1766package CFClient::UI::Slider; 2050package CFClient::UI::Slider;
… …
1776 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1777 2061
1778sub new { 2062sub new {
1779 my $class = shift; 2063 my $class = shift;
1780 2064
1781 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1782 2066
1783 # TODO: 0-width page 2067 # TODO: 0-width page
1784 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1785 # TODO: calculations are off 2069 # TODO: calculations are off
1786 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1787 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1788 active_fg => [0, 0, 0], 2072 active_fg => [0, 0, 0],
2073 bg => [0, 0, 0, 0.2],
2074 active_bg => [1, 1, 1, 0.5],
1789 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
1790 req_w => 20, 2076 req_w => $::WIDTH / 80,
1791 req_h => 20, 2077 req_h => $::WIDTH / 80,
1792 vertical => 0, 2078 vertical => 0,
1793 can_hover => 1, 2079 can_hover => 1,
1794 inner_pad => 5, 2080 inner_pad => 0.02,
1795 @_ 2081 @_
1796 ); 2082 );
1797 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1798 $self 2087 $self
2088}
2089
2090sub set_range {
2091 my ($self, $range) = @_;
2092
2093 $self->{range} = $range;
2094
2095 $self->update;
2096}
2097
2098sub set_value {
2099 my ($self, $value) = @_;
2100
2101 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2102
2103 $hi = $lo + 1 if $hi <= $lo;
2104
2105 $page = $hi - $lo if $page > $hi - $lo;
2106
2107 $value = $lo if $value < $lo;
2108 $value = $hi - $page if $value > $hi - $page;
2109
2110 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2111 if $unit;
2112
2113 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2114
2115 if ($value != $old_value) {
2116 $self->emit (changed => $value);
2117 $self->update;
2118 }
1799} 2119}
1800 2120
1801sub size_request { 2121sub size_request {
1802 my ($self) = @_; 2122 my ($self) = @_;
1803 2123
… …
1809 2129
1810sub button_down { 2130sub button_down {
1811 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
1812 2132
1813 $self->SUPER::button_down ($ev, $x, $y); 2133 $self->SUPER::button_down ($ev, $x, $y);
2134
2135 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2136
1814 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
1815} 2138}
1816 2139
1817sub mouse_motion { 2140sub mouse_motion {
1818 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1819 2142
1820 if ($GRAB == $self) { 2143 if ($GRAB == $self) {
2144 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2145
2146 my (undef, $lo, $hi, $page) = @{$self->{range}};
2147
2148 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2149
2150 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2151 }
2152}
2153
2154sub update {
2155 my ($self) = @_;
2156
2157 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2158 $self->set_value ($self->{range}[0]);
2159
1821 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
1822 2162
1823 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1824 2164
1825 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1826 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1827 2167
1828 $x -= $inner_pad_px; # substract the padding 2168 $value = ($value - $lo) / $range;
1829 $x = $x * ($hi - $lo) / $inner_w + $lo; 2169 $value = $value * $self->{scale} + $self->{offset};
1830 $x = $lo if $x < $lo;
1831 $x = $hi - $page if $x > $hi - $page;
1832 $self->{range}[0] = $x;
1833 2170
1834 $self->emit (changed => $x); 2171 $self->{knob_x} = $value - $knob_w * 0.5;
1835 $self->update; 2172 $self->{knob_w} = $knob_w;
1836 } 2173 });
1837}
1838 2174
1839# the inner_* stuff is for generating a padding for the slider handle, 2175 $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} 2176}
1846 2177
1847sub _draw { 2178sub _draw {
1848 my ($self) = @_; 2179 my ($self) = @_;
1849 2180
1850 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
1851 2182
1852 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
1853 2184
1854 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
1855 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
1856 2187
2188 glTranslate 1, 0, 0;
1857 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
1858 glTranslate 0, -$self->{w}, 0;
1859
1860 ($w, $h) = ($h, $w);
1861 } 2190 }
1862 2191
1863 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1864 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1865 2194
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; 2195 glEnable GL_TEXTURE_2D;
1887 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1888 2197
1889 # draw background 2198 # draw background
1890 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1891 2200
1892 # draw handle 2201 # draw handle
1893 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2202 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1894 2203
1895 glDisable GL_BLEND;
1896 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
1897} 2205}
2206
2207#############################################################################
2208
2209package CFClient::UI::ValSlider;
2210
2211our @ISA = CFClient::UI::HBox::;
2212
2213sub new {
2214 my ($class, %arg) = @_;
2215
2216 my $range = delete $arg{range};
2217
2218 my $self = $class->SUPER::new (
2219 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2220 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2221 to_value => sub { shift },
2222 from_value => sub { shift },
2223 %arg,
2224 );
2225
2226 $self->{slider}->connect (changed => sub {
2227 my ($self, $value) = @_;
2228 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2229 $self->{parent}->emit (changed => $value);
2230 });
2231
2232# $self->{entry}->connect (changed => sub {
2233# my ($self, $value) = @_;
2234# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2235# $self->{parent}->emit (changed => $value);
2236# });
2237
2238 $self->add ($self->{slider}, $self->{entry});
2239
2240 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2241
2242 $self
2243}
2244
2245sub set_range { shift->{slider}->set_range (@_) }
2246sub set_value { shift->{slider}->set_value (@_) }
1898 2247
1899############################################################################# 2248#############################################################################
1900 2249
1901package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
1902 2251
… …
1906 2255
1907sub new { 2256sub new {
1908 my $class = shift; 2257 my $class = shift;
1909 2258
1910 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1911 fontsize => 1, 2260 fontsize => 1,
2261 can_events => 0,
2262 #font => default_font
1912 @_, 2263 @_,
1913 2264
1914 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
1915 par => [], 2266 par => [],
1916 height => 0, 2267 height => 0,
1917 children => [ 2268 children => [
1918 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
1919 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
1920 ], 2271 ],
1921 ); 2272 );
1922 2273
1923 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
1924 $self->update;
1925 });
1926 2275
1927 $self 2276 $self
1928} 2277}
1929 2278
1930sub set_fontsize { 2279sub set_fontsize {
… …
1932 2281
1933 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
1934 $self->reflow; 2283 $self->reflow;
1935} 2284}
1936 2285
2286sub size_allocate {
2287 my ($self, $w, $h) = @_;
2288
2289 $self->SUPER::size_allocate ($w, $h);
2290
2291 $self->{layout}->set_font ($self->{font}) if $self->{font};
2292 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2293 $self->{layout}->set_width ($self->{children}[0]{w});
2294
2295 $self->reflow;
2296}
2297
1937sub text_height { 2298sub text_size {
1938 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
1939 2300
1940 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
1941 2302
1942 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1943 $layout->set_width ($self->{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
1944 $layout->set_text ($text); 2305 $layout->set_markup ($text);
1945 2306
1946 ($layout->size)[1] 2307 $layout->size
1947} 2308}
1948 2309
1949sub reflow { 2310sub reflow {
1950 my ($self) = @_; 2311 my ($self) = @_;
1951 2312
1952 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
1953 $self->update; 2314 $self->update;
1954} 2315}
1955 2316
1956sub size_allocate { 2317sub set_offset {
2318 my ($self, $offset) = @_;
2319
2320 # todo: base offset on lines or so, not on pixels
2321 $self->{children}[1]->set_value ($offset);
2322}
2323
2324sub clear {
1957 my ($self, $w, $h) = @_; 2325 my ($self) = @_;
1958 2326
1959 $self->SUPER::size_allocate ($w, $h); 2327 $self->{par} = [];
1960 2328 $self->{height} = 0;
1961 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1962 $self->{layout}->set_width ($self->{children}[0]{w});
1963
1964 $self->reflow;
1965} 2330}
1966 2331
1967sub add_paragraph { 2332sub add_paragraph {
1968 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
1969 2334
1970 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
1971 2336 my ($w, $h) = $self->text_size ($line);
1972 my $height = $self->text_height ($text);
1973
1974 $self->{height} += $height; 2337 $self->{height} += $h;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 }
1975 2340
1976 push @{$self->{par}}, [$height, $color, $text];
1977
1978 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2341 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1979 $self->{children}[1]->update;
1980} 2342}
1981 2343
1982sub update { 2344sub update {
1983 my ($self) = @_; 2345 my ($self) = @_;
1984 2346
… …
1986 2348
1987 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
1988 2350
1989 delete $self->{texture}; 2351 delete $self->{texture};
1990 2352
1991 $ROOT->on_refresh ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
1992 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
1993 my $height = 0; 2357 my $height = 0;
1994 2358
1995 $height += $_->[0] = $self->text_height ($_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
1996 for @{$self->{par}}; 2363 for (@{$self->{par}}) {
2364 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2365 $layout->set_width ($W - $_->[3]);
2366 $layout->set_markup ($_->[4]);
2367 my ($w, $h) = $layout->size;
2368 $_->[0] = $w + $_->[3];
2369 $_->[1] = $h;
2370 }
2371
2372 $height += $_->[1];
2373 }
1997 2374
1998 $self->{height} = $height; 2375 $self->{height} = $height;
1999 2376
2000 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2001 2378
2002 delete $self->{texture}; 2379 delete $self->{texture};
2003 } 2380 }
2004 2381
2005 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2006 glClearColor 0, 0, 0, 1; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2007 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2008 2385
2386 my $top = int $self->{children}[1]{range}[0];
2387
2388 my $y0 = $top;
2389 my $y1 = $top + $H;
2390
2391 my $y = 0;
2392
2393 my $layout = $self->{layout};
2394
2395 $layout->set_font ($self->{font}) if $self->{font};
2396
2009 glEnable GL_BLEND; 2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013
2014 my $top = int $self->{children}[1]{range}[0];
2015
2016 my $y0 = $top;
2017 my $y1 = $top + $self->{h};
2018
2019 my $y = 0;
2020
2021 my $layout = $self->{layout};
2022 2400
2023 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2024 my $h = $par->[0]; 2402 my $h = $par->[1];
2025 2403
2026 if ($y0 < $y + $h && $y < $y1) { 2404 if ($y0 < $y + $h && $y < $y1) {
2405 $layout->set_foreground (@{ $par->[2] });
2406 $layout->set_width ($W - $par->[3]);
2027 $layout->set_text ($par->[2]); 2407 $layout->set_markup ($par->[4]);
2028 2408
2029 glColor @{ $par->[1] }; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2030 my ($W, $H) = $layout->size; 2410
2031 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2411 glRasterPos $par->[3], $y - $y0;
2412 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2032 } 2413 }
2033 2414
2034 $y += $h; 2415 $y += $h;
2035 } 2416 }
2036 2417
2037 glDisable GL_TEXTURE_2D;
2038 glDisable GL_BLEND; 2418 glDisable GL_BLEND;
2039 }; 2419 };
2040 }); 2420 });
2041} 2421}
2042 2422
2043sub _draw { 2423sub _draw {
2044 my ($self) = @_; 2424 my ($self) = @_;
2045 2425
2046 if ($self->{texture}) {
2047 glEnable GL_TEXTURE_2D; 2426 glEnable GL_TEXTURE_2D;
2048 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2427 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2428 glColor 1, 1, 1, 1;
2049 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2429 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2050 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2051 }
2052 2431
2053 $self->{children}[1]->draw; 2432 $self->{children}[1]->draw;
2054 2433
2055} 2434}
2056 2435
… …
2104 2483
2105sub new { 2484sub new {
2106 my $class = shift; 2485 my $class = shift;
2107 2486
2108 my $self = $class->SUPER::new ( 2487 my $self = $class->SUPER::new (
2109 state => 0, 2488 state => 0,
2110 connect_activate => \&toggle_flopper, 2489 connect_activate => \&toggle_flopper,
2111 can_events => 1,
2112 @_ 2490 @_
2113 ); 2491 );
2114 2492
2115 if ($self->{state}) { 2493 if ($self->{state}) {
2116 $self->{state} = 0; 2494 $self->{state} = 0;
… …
2151 @_, 2529 @_,
2152 can_events => 0, 2530 can_events => 0,
2153 ) 2531 )
2154} 2532}
2155 2533
2156sub set_text { 2534sub set_tooltip_from {
2157 my ($self, $text) = @_; 2535 my ($self, $widget) = @_;
2158 2536
2159 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2537 $self->add (new CFClient::UI::Label
2160 $self->{label}->set_text ($text); 2538 markup => $widget->{tooltip},
2161 $self->add ($self->{label}); 2539 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2540 fontsize => 0.8,
2541 fg => [0, 0, 0, 1],
2542 ellipsise => 0,
2543 font => ($widget->{tooltip_font} || $::FONT_PROP),
2544 );
2162} 2545}
2163 2546
2164sub size_request { 2547sub size_request {
2165 my ($self) = @_; 2548 my ($self) = @_;
2166 2549
2167 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2168 2551
2169 $w = List::Util::min $::WIDTH * 0.2, $w;
2170 $h = List::Util::max $::HEIGHT * 0.2, $h;
2171
2172 ($w + 4, $h + 4) 2552 ($w + 4, $h + 4)
2173} 2553}
2174 2554
2555sub size_allocate {
2556 my ($self, $w, $h) = @_;
2557
2558 $self->SUPER::size_allocate ($w - 4, $h - 4);
2559}
2560
2175sub _draw { 2561sub _draw {
2176 my ($self) = @_; 2562 my ($self) = @_;
2177 2563
2178 glPushMatrix;
2179 glTranslate 0.375, 0.375; 2564 glTranslate 0.375, 0.375;
2180 2565
2181 my ($w, $h) = @$self{qw(w h)}; 2566 my ($w, $h) = @$self{qw(w h)};
2182 2567
2183 glColor 1, 0.8, 0.4; 2568 glColor 1, 0.8, 0.4;
… …
2194 glVertex 0 , $h; 2579 glVertex 0 , $h;
2195 glVertex $w, $h; 2580 glVertex $w, $h;
2196 glVertex $w, 0; 2581 glVertex $w, 0;
2197 glEnd; 2582 glEnd;
2198 2583
2199 glPopMatrix; 2584 glTranslate 2 - 0.375, 2 - 0.375;
2200
2201 glTranslate 2, 2;
2202 $self->SUPER::_draw; 2585 $self->SUPER::_draw;
2203} 2586}
2204 2587
2205############################################################################# 2588#############################################################################
2206 2589
2590package CFClient::UI::Face;
2591
2592our @ISA = CFClient::UI::Base::;
2593
2594use CFClient::OpenGL;
2595
2596sub new {
2597 my $class = shift;
2598
2599 my $self = $class->SUPER::new (
2600 aspect => 1,
2601 @_,
2602 );
2603
2604 if ($self->{anim} && $self->{animspeed}) {
2605 Scalar::Util::weaken (my $widget = $self);
2606
2607 $self->{timer} = Event->timer (
2608 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2609 hard => 1,
2610 interval => $self->{animspeed},
2611 cb => sub {
2612 ++$widget->{frame};
2613 $widget->update;
2614 },
2615 );
2616 }
2617
2618 $self
2619}
2620
2621sub size_request {
2622 (32, 8)
2623}
2624
2625sub update {
2626 my ($self) = @_;
2627
2628 return unless $self->{visible};
2629
2630 $self->SUPER::update;
2631}
2632
2633sub _draw {
2634 my ($self) = @_;
2635
2636 return unless $::CONN;
2637
2638 my $face;
2639
2640 if ($self->{frame}) {
2641 my $anim = $::CONN->{anim}[$self->{anim}];
2642
2643 $face = $anim->[ $self->{frame} % @$anim ]
2644 if $anim && @$anim;
2645 }
2646
2647 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2648
2649 if ($tex) {
2650 glEnable GL_TEXTURE_2D;
2651 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2652 glColor 1, 1, 1, 1;
2653 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2654 glDisable GL_TEXTURE_2D;
2655 }
2656}
2657
2658sub DESTROY {
2659 my ($self) = @_;
2660
2661 $self->{timer}->cancel
2662 if $self->{timer};
2663
2664 $self->SUPER::DESTROY;
2665}
2666
2667#############################################################################
2668
2669package CFClient::UI::InventoryItem;
2670
2671our @ISA = CFClient::UI::HBox::;
2672
2673sub _item_to_desc {
2674 my ($item) = @_;
2675
2676 my $desc =
2677 $item->{nrof} < 2
2678 ? $item->{name}
2679 : "$item->{nrof} × $item->{name_pl}";
2680
2681 $item->{flags} & Crossfire::Protocol::F_OPEN
2682 and $desc .= " (open)";
2683 $item->{flags} & Crossfire::Protocol::F_APPLIED
2684 and $desc .= " (applied)";
2685 $item->{flags} & Crossfire::Protocol::F_UNPAID
2686 and $desc .= " (unpaid)";
2687 $item->{flags} & Crossfire::Protocol::F_MAGIC
2688 and $desc .= " (magic)";
2689 $item->{flags} & Crossfire::Protocol::F_CURSED
2690 and $desc .= " (cursed)";
2691 $item->{flags} & Crossfire::Protocol::F_DAMNED
2692 and $desc .= " (damned)";
2693 $item->{flags} & Crossfire::Protocol::F_LOCKED
2694 and $desc .= " *";
2695
2696 $desc
2697}
2698
2699sub new {
2700 my $class = shift;
2701
2702 my %args = @_;
2703
2704 my $item = delete $args{item};
2705
2706 my $desc = _item_to_desc ($item);
2707
2708 my $self = $class->SUPER::new (
2709 can_hover => 1,
2710 can_events => 1,
2711 tooltip => ((CFClient::UI::Label::escape $desc)
2712 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2713 connect_button_down => sub {
2714 my ($self, $ev, $x, $y) = @_;
2715
2716 # todo: maybe put examine on 1? but should just be a tooltip :(
2717 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2718 my $targ = $::CONN->{player}{tag};
2719
2720 if ($item->{container} == $::CONN->{player}{tag}) {
2721 $targ = $main::OPENCONT;
2722 }
2723
2724 $::CONN->send ("move $targ $item->{tag} 0");
2725 } elsif ($ev->{button} == 1) {
2726 $::CONN->send ("examine $item->{tag}");
2727 } elsif ($ev->{button} == 2) {
2728 $::CONN->send ("apply $item->{tag}");
2729 } elsif ($ev->{button} == 3) {
2730 my @menu_items = (
2731 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2732 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2733 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2734 (
2735 $item->{flags} & Crossfire::Protocol::F_LOCKED
2736 ? (
2737 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2738 )
2739 : (
2740 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2741 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2742 )
2743 ),
2744 );
2745
2746 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2747 }
2748
2749 1
2750 },
2751 %args
2752 );
2753
2754
2755 $self->add (new CFClient::UI::Face
2756 can_events => 0,
2757 face => $item->{face},
2758 anim => $item->{anim},
2759 animspeed => $item->{animspeed},
2760 );
2761
2762 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2763
2764 $self->{item} = $item;
2765
2766 $self->update_item;
2767
2768 $self
2769}
2770
2771sub update_item {
2772 my ($self) = @_;
2773
2774 my $desc = _item_to_desc ($self->{item});
2775
2776 $self->{name_lbl}->set_text ($desc);
2777}
2778
2779#############################################################################
2780
2781package CFClient::UI::Inventory;
2782
2783our @ISA = CFClient::UI::ScrolledWindow::;
2784
2785sub new {
2786 my $class = shift;
2787
2788 my $self = $class->SUPER::new (
2789 scrolled => (new CFClient::UI::Table),
2790 @_,
2791 );
2792
2793 $self
2794}
2795
2796sub set_items {
2797 my ($self, $items) = @_;
2798
2799 $self->{scrolled}->clear;
2800 return unless $items;
2801
2802 my @items = sort {
2803 ($a->{type} <=> $b->{type})
2804 or ($a->{name} cmp $b->{name})
2805 } @$items;
2806
2807 $self->{real_items} = \@items;
2808
2809 for my $item (@items) {
2810 $item->{item} = $item;
2811 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2812 $item->update_item ();
2813 }
2814
2815 my $i = 0;
2816 for (@items) {
2817 $self->{scrolled}->add (0, $i, $_);
2818 my $nrof = $_->{item}->{nrof} || 1;
2819 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2820 }
2821
2822# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2823}
2824
2825sub size_request {
2826 my ($self) = @_;
2827 ($self->{req_w}, $self->{req_h});
2828}
2829
2830#############################################################################
2831
2832package CFClient::UI::Menu;
2833
2834our @ISA = CFClient::UI::FancyFrame::;
2835
2836use CFClient::OpenGL;
2837
2838sub new {
2839 my $class = shift;
2840
2841 my $self = $class->SUPER::new (
2842 items => [],
2843 z => 100,
2844 @_,
2845 );
2846
2847 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2848
2849 for my $item (@{ $self->{items} }) {
2850 my ($widget, $cb) = @$item;
2851
2852 # handle various types of items, only text for now
2853 if (!ref $widget) {
2854 $widget = new CFClient::UI::Label
2855 can_hover => 1,
2856 can_events => 1,
2857 text => $widget;
2858 }
2859
2860 $self->{item}{$widget} = $item;
2861
2862 $self->{vbox}->add ($widget);
2863 }
2864
2865 $self
2866}
2867
2868# popup given the event (must be a mouse button down event currently)
2869sub popup {
2870 my ($self, $ev) = @_;
2871
2872 $self->emit ("popdown");
2873
2874 # maybe save $GRAB? must be careful about events...
2875 $GRAB = $self;
2876 $self->{button} = $ev->{button};
2877
2878 $self->show;
2879 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2880}
2881
2882sub mouse_motion {
2883 my ($self, $ev, $x, $y) = @_;
2884
2885 # TODO: should use vbox->find_widget or so
2886 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2887 $self->{hover} = $self->{item}{$HOVER};
2888}
2889
2890sub button_up {
2891 my ($self, $ev, $x, $y) = @_;
2892
2893 if ($ev->{button} == $self->{button}) {
2894 undef $GRAB;
2895 $self->hide;
2896
2897 $self->emit ("popdown");
2898 $self->{hover}[1]->() if $self->{hover};
2899 }
2900}
2901
2902#############################################################################
2903
2904package CFClient::UI::Statusbox;
2905
2906our @ISA = CFClient::UI::VBox::;
2907
2908sub new {
2909 my $class = shift;
2910
2911 $class->SUPER::new (
2912 fontsize => 0.8,
2913 @_,
2914 )
2915}
2916
2917sub reorder {
2918 my ($self) = @_;
2919 my $NOW = time;
2920
2921 while (my ($k, $v) = each %{ $self->{item} }) {
2922 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2923 }
2924
2925 my @widgets;
2926
2927 my @items = sort {
2928 $a->{pri} <=> $b->{pri}
2929 or $b->{id} <=> $a->{id}
2930 } values %{ $self->{item} };
2931
2932 my $count = 10 + 1;
2933 for my $item (@items) {
2934 last unless --$count;
2935
2936 push @widgets, $item->{label} ||= do {
2937 # TODO: doesn't handle markup well (read as: at all)
2938 my $short = $item->{count} > 1
2939 ? "<b>$item->{count} ×</b> $item->{text}"
2940 : $item->{text};
2941
2942 for ($short) {
2943 s/^\s+//;
2944 s/\s+/ /g;
2945 }
2946
2947 new CFClient::UI::Label
2948 markup => $short,
2949 tooltip => $item->{tooltip},
2950 tooltip_font => $::FONT_PROP,
2951 tooltip_width => 0.67,
2952 fontsize => $item->{fontsize} || $self->{fontsize},
2953 max_w => $::WIDTH * 0.44,
2954 fg => $item->{fg},
2955 can_events => 1,
2956 can_hover => 1
2957 };
2958 }
2959
2960 $self->clear;
2961 $self->SUPER::add (reverse @widgets);
2962}
2963
2964sub add {
2965 my ($self, $text, %arg) = @_;
2966
2967 $text =~ s/^\s+//;
2968 $text =~ s/\s+$//;
2969
2970 my $timeout = time + ((delete $arg{timeout}) || 60);
2971
2972 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2973
2974 if (my $item = $self->{item}{$group}) {
2975 if ($item->{text} eq $text) {
2976 $item->{count}++;
2977 } else {
2978 $item->{count} = 1;
2979 $item->{text} = $item->{tooltip} = $text;
2980 }
2981 $item->{id} = ++$self->{id};
2982 $item->{timeout} = $timeout;
2983 delete $item->{label};
2984 } else {
2985 $self->{item}{$group} = {
2986 id => ++$self->{id},
2987 text => $text,
2988 timeout => $timeout,
2989 tooltip => $text,
2990 fg => [0.8, 0.8, 0.8, 0.8],
2991 pri => 0,
2992 count => 1,
2993 %arg,
2994 };
2995 }
2996
2997 $self->reorder;
2998}
2999
3000sub reconfigure {
3001 my ($self) = @_;
3002
3003 delete $_->{label}
3004 for values %{ $self->{item} || {} };
3005
3006 $self->reorder;
3007 $self->SUPER::reconfigure;
3008}
3009
3010#############################################################################
3011
2207package CFClient::UI::Root; 3012package CFClient::UI::Root;
2208 3013
2209our @ISA = CFClient::UI::Container::; 3014our @ISA = CFClient::UI::Container::;
2210 3015
2211use CFClient::OpenGL; 3016use CFClient::OpenGL;
2212 3017
2213sub check_size { 3018sub new {
2214 my ($self) = @_; 3019 my $class = shift;
2215 3020
2216 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3021 $class->SUPER::new (
2217} 3022 @_,
2218 3023 )
2219sub size_request {
2220 ($::WIDTH, $::HEIGHT)
2221} 3024}
2222 3025
2223sub configure { 3026sub configure {
2224 my ($self, $x, $y, $w, $h) = @_; 3027 my ($self, $x, $y, $w, $h) = @_;
2225 3028
2226 $self->SUPER::configure ($x, $y, $w, $h); 3029 $self->{w} = $w;
3030 $self->{h} = $h;
3031}
2227 3032
3033sub check_size {
3034 my ($self) = @_;
3035
3036 $self->size_allocate ($self->{w}, $self->{h})
3037 if $self->{w};
3038}
3039
3040sub size_request {
3041 my ($self) = @_;
3042
3043 ($self->{w}, $self->{h})
3044}
3045
3046sub size_allocate {
3047 my ($self, $w, $h) = @_;
3048
3049 my $old_w = $self->{old_w}; $self->{old_w} = $w;
3050 my $old_h = $self->{old_h}; $self->{old_h} = $h;
3051
3052 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
3053 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
3054
2228 for my $child (@{$self->{children}}) { 3055 for my $child ($self->children) {
2229 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3056 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2230 3057
3058 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3059 if exists $child->{req_x};
3060
3061 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3062 if exists $child->{req_y};
3063
2231 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3064 $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; 3065 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3066
2233 $child->configure ($X, $Y, $W,$H); 3067 $child->configure ($X, $Y, $W, $H);
2234 } 3068 }
2235} 3069}
2236 3070
2237sub _topleft { 3071sub coord2local {
2238 my ($self, $x, $y) = @_; 3072 my ($self, $x, $y) = @_;
2239 3073
2240 ($x, $y) 3074 ($x, $y)
2241} 3075}
2242 3076
3077sub coord2global {
3078 my ($self, $x, $y) = @_;
3079
3080 ($x, $y)
3081}
3082
2243sub update { 3083sub update {
2244 my ($self) = @_; 3084 my ($self) = @_;
2245 3085
2246 $self->check_size; 3086 $self->check_size;
2247 ::refresh (); 3087 $::WANT_REFRESH++;
2248} 3088}
2249 3089
2250sub add { 3090sub add {
2251 my ($self, $child) = @_; 3091 my ($self, @children) = @_;
2252 3092
3093 for my $child (@children) {
3094 $child->{toplevel} = 1;
3095
2253 # integerize window positions 3096 # integerise window positions
2254 $child->{x} = int $child->{x}; 3097 $child->{x} = int $child->{x};
2255 $child->{y} = int $child->{y}; 3098 $child->{y} = int $child->{y};
3099 }
2256 3100
2257 $self->SUPER::add ($child); 3101 $self->SUPER::add (@children);
3102
3103 while (@children) {
3104 my $w = pop @children;
3105 push @children, $w->children;
3106 $w->{visible} = 1;
3107 }
3108}
3109
3110sub remove {
3111 my ($self, @children) = @_;
3112
3113 $self->SUPER::remove (@children);
3114
3115 while (@children) {
3116 my $w = pop @children;
3117 push @children, $w->children;
3118 delete $w->{visible};
3119 }
2258} 3120}
2259 3121
2260sub on_refresh { 3122sub on_refresh {
2261 my ($self, $id, $cb) = @_; 3123 my ($self, $id, $cb) = @_;
2262 3124
2263 $self->{refresh_hook}{$id} = $cb; 3125 $self->{refresh_hook}{$id} = $cb;
2264} 3126}
2265 3127
3128sub on_post_alloc {
3129 my ($self, $id, $cb) = @_;
3130
3131 $self->{post_alloc_hook}{$id} = $cb;
3132}
3133
2266sub draw { 3134sub draw {
2267 my ($self) = @_; 3135 my ($self) = @_;
2268 3136
2269 while (my $rcb = delete $self->{refresh_hook}) { 3137 while ($self->{refresh_hook}) {
2270 $_->() for values %$rcb; 3138 $_->()
3139 for values %{delete $self->{refresh_hook}};
3140 }
3141
3142 if ($self->{check_size}) {
3143 my @queue = ([], []);
3144
3145 for (;;) {
3146 if ($self->{check_size}) {
3147 # heuristic: check containers last
3148 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3149 for values %{delete $self->{check_size}}
3150 }
3151
3152 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3153
3154 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3155 ? @$widget{qw(user_w user_h)}
3156 : $widget->size_request;
3157
3158 if (delete $widget->{force_alloc}
3159 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3160 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3161
3162 $widget->{req_w} = $w;
3163 $widget->{req_h} = $h;
3164
3165 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3166
3167 $widget->{parent}->check_size
3168 if $widget->{parent};
3169 }
3170 }
3171 }
3172
3173 while ($self->{size_alloc}) {
3174 for (values %{delete $self->{size_alloc}}) {
3175 my ($widget, $w, $h) = @$_;
3176
3177 $w = 0 if $w < 0;
3178 $h = 0 if $h < 0;
3179
3180 $widget->{w} = $w;
3181 $widget->{h} = $h;
3182 $widget->size_allocate ($w, $h);
3183 $widget->emit (size_allocate => $w, $h);
3184 }
3185 }
3186
3187 while ($self->{post_alloc_hook}) {
3188 $_->()
3189 for values %{delete $self->{post_alloc_hook}};
2271 } 3190 }
2272 3191
2273 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3192 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2274 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2275 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2276 3195
2277 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2278 glLoadIdentity; 3197 glLoadIdentity;
2279 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2280 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2281 glLoadIdentity; 3200 glLoadIdentity;
2282 3201
2283 $self->_draw; 3202 $self->_draw;
2284} 3203}
… …
2286############################################################################# 3205#############################################################################
2287 3206
2288package CFClient::UI; 3207package CFClient::UI;
2289 3208
2290$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2291$TOOLTIP = new CFClient::UI::Tooltip; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2292 3211
22931 32121
2294 3213

Diff Legend

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