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.152 by root, Sun Apr 23 01:05:03 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;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
23 $TOOLTIP->set_text ($widget->{tooltip}); 31 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $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;
26 } 42 }
27 43
28 return; 44 return;
29 } 45 }
30 } 46 }
… …
34 delete $TOOLTIP->{owner}; 50 delete $TOOLTIP->{owner};
35} 51}
36 52
37# class methods for events 53# class methods for events
38sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
40} 57}
41 58
42sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
44} 62}
45 63
46sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
47 my ($ev) = @_; 65 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 74 check_tooltip;
57 } 75 }
58 76
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 78
61 $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 }
62} 83}
63 84
64sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
65 my ($ev) = @_; 86 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
67 88
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 90
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 92
72 $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 }
73 97
74 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 100 $grab->update if $grab;
77 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 118
95 check_tooltip; 119 check_tooltip;
96 } 120 }
97 121
98 $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 }
99} 126}
100 127
101# convert position array to integers 128# convert position array to integers
102sub harmonize { 129sub harmonize {
103 my ($vals) = @_; 130 my ($vals) = @_;
… …
109 $rem += $_ - $i; 136 $rem += $_ - $i;
110 $_ = $i; 137 $_ = $i;
111 } 138 }
112} 139}
113 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
114############################################################################# 172#############################################################################
115 173
116package CFClient::UI::Base; 174package CFClient::UI::Base;
117 175
118use strict; 176use strict;
… …
121 179
122sub new { 180sub new {
123 my $class = shift; 181 my $class = shift;
124 182
125 my $self = bless { 183 my $self = bless {
126 x => 0, 184 x => 0,
127 y => 0, 185 y => 0,
128 z => 0, 186 z => 0,
129 can_events => 1, 187 can_events => 1,
130 @_ 188 @_
131 }, $class; 189 }, $class;
132 190
133 for (keys %$self) { 191 for (keys %$self) {
134 if (/^connect_(.*)$/) { 192 if (/^connect_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 193 $self->connect ($1 => delete $self->{$_});
136 } 194 }
137 } 195 }
138 196
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
198
139 $self 199 $self
140} 200}
141 201
202sub destroy {
203 my ($self) = @_;
204
205 $self->hide;
206 %$self = ();
207}
208
142sub show { 209sub show {
143 my ($self) = @_; 210 my ($self) = @_;
144
145 return if $self->{parent}; 211 return if $self->{parent};
146 212
147 $CFClient::UI::ROOT->add ($self); 213 $CFClient::UI::ROOT->add ($self);
148} 214}
149 215
216sub show_centered {
217 my ($self) = @_;
218 return if $self->{parent};
219
220 $self->show;
221
222 $CFClient::UI::ROOT->on_post_alloc (
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228
150sub hide { 229sub hide {
151 my ($self) = @_; 230 my ($self) = @_;
152 231
153 return unless $self->{parent}; 232 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self;
154 234
155 $self->{parent}->remove ($self); 235 $self->{parent}->remove ($self)
236 if $self->{parent};
156} 237}
157 238
158sub move { 239sub move {
159 my ($self, $x, $y, $z) = @_; 240 my ($self, $x, $y, $z) = @_;
160 241
… …
163 $self->{z} = $z if defined $z; 244 $self->{z} = $z if defined $z;
164 245
165 $self->update; 246 $self->update;
166} 247}
167 248
168sub needs_redraw { 249sub set_size {
169 0 250 my ($self, $w, $h) = @_;
251
252 $self->{user_w} = $w;
253 $self->{user_h} = $h;
254
255 $self->check_size;
170} 256}
171 257
172sub size_request { 258sub size_request {
173 require Carp; 259 require Carp;
174 Carp::confess "size_request is abstract"; 260 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 280 $self->{y} = $y;
195 $self->update; 281 $self->update;
196 } 282 }
197 283
198 if ($self->{w} != $w || $self->{h} != $h) { 284 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 285 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 286 }
205} 287}
206 288
207sub size_allocate { 289sub size_allocate {
208 # nothing to be done 290 # nothing to be done
209} 291}
210 292
211# return top left coordinates 293sub reconfigure {
212sub _topleft { 294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children {
301}
302
303sub set_max_size {
213 my ($self, $x, $y) = @_; 304 my ($self, $w, $h) = @_;
214 305
215 $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 }
216} 319}
217 320
218# translate global coordinates to local coordinate system 321# translate global coordinates to local coordinate system
219sub coord2local { 322sub coord2local {
220 my ($self, $x, $y) = @_; 323 my ($self, $x, $y) = @_;
221 324
222 my ($X, $Y) = $self->_topleft; 325 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 326}
225 327
226# translate local coordinates to global coordinate system 328# translate local coordinates to global coordinate system
227sub coord2global { 329sub coord2global {
228 my ($self, $x, $y) = @_; 330 my ($self, $x, $y) = @_;
229 331
230 my ($X, $Y) = $self->_topleft; 332 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 333}
233 334
234sub focus_in { 335sub focus_in {
235 my ($self) = @_; 336 my ($self) = @_;
236 337
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 397 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 398 glVertex $x , $y + $self->{h};
298 glEnd; 399 glEnd;
299 glDisable GL_BLEND; 400 glDisable GL_BLEND;
300 } 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 }
301} 416}
302 417
303sub _draw { 418sub _draw {
304 my ($self) = @_; 419 my ($self) = @_;
305 420
… …
320 435
321sub set_parent { 436sub set_parent {
322 my ($self, $parent) = @_; 437 my ($self, $parent) = @_;
323 438
324 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;
325} 446}
326 447
327sub check_size { 448sub check_size {
328 my ($self) = @_; 449 my ($self, $forced) = @_;
329 450
330 return unless $self->{parent}; 451 $self->{force_alloc} = 1 if $forced;
331 452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 453}
341 454
342sub update { 455sub update {
343 my ($self) = @_; 456 my ($self) = @_;
344 457
… …
353} 466}
354 467
355sub emit { 468sub emit {
356 my ($self, $signal, @args) = @_; 469 my ($self, $signal, @args) = @_;
357 470
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
359 $cb->($self, @args);
360 }
361} 472}
362 473
363sub DESTROY { 474sub DESTROY {
364 my ($self) = @_; 475 my ($self) = @_;
365 476
477 delete $WIDGET{$self+0};
366 #$self->deactivate; 478 #$self->deactivate;
367} 479}
368 480
369############################################################################# 481#############################################################################
370 482
… …
379 my $class = shift; 491 my $class = shift;
380 492
381 # range [value, low, high, page] 493 # range [value, low, high, page]
382 494
383 $class->SUPER::new ( 495 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 496 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 497 #active_bg => [1, 1, 1, 0.5],
386 @_ 498 @_
387 ) 499 )
388} 500}
389 501
390sub _draw { 502sub _draw {
391 my ($self) = @_; 503 my ($self) = @_;
392 504
505 my $color = $FOCUS == $self && $self->{active_bg}
506 ? $self->{active_bg}
507 : $self->{bg};
508
509 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 510 my ($w, $h) = @$self{qw(w h)};
394 511
395 glEnable GL_BLEND; 512 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 514 glColor @$color;
398 515
399 glBegin GL_QUADS; 516 glBegin GL_QUADS;
400 glVertex 0 , 0; 517 glVertex 0 , 0;
401 glVertex 0 , $h; 518 glVertex 0 , $h;
402 glVertex $w, $h; 519 glVertex $w, $h;
403 glVertex $w, 0; 520 glVertex $w, 0;
404 glEnd; 521 glEnd;
405 522
406 glDisable GL_BLEND; 523 glDisable GL_BLEND;
524 }
407} 525}
408 526
409############################################################################# 527#############################################################################
410 528
411package CFClient::UI::Empty; 529package CFClient::UI::Empty;
… …
432sub new { 550sub new {
433 my ($class, %arg) = @_; 551 my ($class, %arg) = @_;
434 552
435 my $children = delete $arg{children} || []; 553 my $children = delete $arg{children} || [];
436 554
437 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 );
438 $self->add ($_) for @$children; 560 $self->add ($_) for @$children;
439 561
440 $self 562 $self
441} 563}
442 564
443sub add { 565sub add {
444 my ($self, $child) = @_; 566 my ($self, @widgets) = @_;
445 567
446 $child->set_parent ($self); 568 $_->set_parent ($self)
569 for @widgets;
447 570
448 use sort 'stable'; 571 use sort 'stable';
449 572
450 $self->{children} = [ 573 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 574 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 575 @{$self->{children}}, @widgets
453 ]; 576 ];
454 577
455 $child->check_size; 578 $self->check_size (1);
579 $self->update;
580}
581
582sub children {
583 @{ $_[0]{children} }
456} 584}
457 585
458sub remove { 586sub remove {
459 my ($self, $child) = @_; 587 my ($self, $child) = @_;
460 588
461 delete $child->{parent}; 589 delete $child->{parent};
590 $child->hide;
462 591
463 $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 }
464 608
465 $self->check_size; 609 $self->check_size;
466 $self->update; 610 $self->update;
467} 611}
468 612
… …
546} 690}
547 691
548sub update { 692sub update {
549 my ($self) = @_; 693 my ($self) = @_;
550 694
551 # we want to do this delayed... 695 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 696 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 697}
565 698
566sub size_allocate { 699sub size_allocate {
567 my ($self, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
568 701
569 $self->child->configure (0, 0, $w, $h); 702 $self->SUPER::size_allocate ($w, $h);
703 $self->update;
704}
570 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
571 $self->render_chld; 717 $self->_render;
718 };
572} 719}
573 720
574sub _draw { 721sub _draw {
575 my ($self) = @_; 722 my ($self) = @_;
576 723
577 my ($w, $h) = ($self->w, $self->h); 724 my ($w, $h) = ($self->w, $self->h);
578 725
579 my $tex = $self->{texture} 726 my $tex = $self->{texture}
580 or return; 727 or return;
581 728
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 729 glEnable GL_TEXTURE_2D;
585 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;
586 732
587 $tex->draw_quad (0, 0, $w, $h); 733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 734
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 735 glDisable GL_TEXTURE_2D;
591} 736}
592 737
593############################################################################# 738#############################################################################
594 739
595package CFClient::UI::ViewPort; 740package CFClient::UI::ViewPort;
596 741
597our @ISA = CFClient::UI::Window::; 742our @ISA = CFClient::UI::Window::;
598 743
599sub new { die }
600
601sub size_request { 744sub size_request {
602 my ($self) = @_; 745 my ($self) = @_;
603 746
604 @$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)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606 748
607 @$self{qw(child_w child_h)} 749 @$self{qw(child_w child_h)}
608} 750}
609 751
610sub _draw { 752sub size_allocate {
611 my ($self) = @_; 753 my ($self, $w, $h) = @_;
612 754
613 $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;
614} 759}
615 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}
616 805
617############################################################################# 806#############################################################################
618 807
619package CFClient::UI::Frame; 808package CFClient::UI::ScrolledWindow;
620 809
621our @ISA = CFClient::UI::Bin::; 810our @ISA = CFClient::UI::HBox::;
622
623use CFClient::OpenGL;
624 811
625sub new { 812sub new {
626 my $class = shift; 813 my $class = shift;
627 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
628 my $self = $class->SUPER::new ( 825 $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 826 vp => (new CFClient::UI::ViewPort expand => 1),
630 border_bg => [1, 1, 1, 1], 827 slider => $slider,
631 border => 0.8,
632 @_ 828 @_,
633 ); 829 );
634 830
831 $self->{vp}->add ($self->{scrolled});
832 $self->add ($self->{vp});
833 $self->add ($self->{slider});
834
635 $self 835 $self
636} 836}
637 837
638sub set_size { 838#TODO# update range on size_allocate depending on child
639 my ($self, $w, $h) = @_; 839# update viewport offset on scroll
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643}
644 840
645sub size_request { 841#############################################################################
646 my ($self) = @_;
647 ($self->{req_w}, $self->{req_h})
648}
649 842
650sub size_allocate { 843package CFClient::UI::Frame;
651 my ($self, $w, $h) = @_; 844
652 $self->{w} = $w; 845our @ISA = CFClient::UI::Bin::;
653 $self->{h} = $h; 846
654 $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 )
655} 856}
656 857
657sub _draw { 858sub _draw {
658 my ($self) = @_; 859 my ($self) = @_;
659 860
660 my ($w, $h) = ($self->{w}, $self->{h}); 861 if ($self->{bg}) {
862 my ($w, $h) = @$self{qw(w h)};
661 863
662 glEnable GL_BLEND; 864 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 865 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 866 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 867
667# glBegin GL_QUADS; 868 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 869 glVertex 0 , 0;
670# glVertex 0 , $h; 870 glVertex 0 , $h;
671# glVertex $w, $h; 871 glVertex $w, $h;
672# glVertex $w, 0; 872 glVertex $w, 0;
673# glEnd; 873 glEnd;
674 874
675
676 $self->child->draw;
677 glDisable GL_BLEND; 875 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 876 }
877
878 $self->SUPER::_draw;
679} 879}
680 880
681############################################################################# 881#############################################################################
682 882
683package CFClient::UI::FancyFrame; 883package CFClient::UI::FancyFrame;
… …
694 my $class = shift; 894 my $class = shift;
695 895
696 # TODO: user_x, user_y, overwrite moveto? 896 # TODO: user_x, user_y, overwrite moveto?
697 897
698 my $self = $class->SUPER::new ( 898 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 899 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 900 border_bg => [1, 1, 1, 1],
701 border => 0.8, 901 border => 0.6,
902 toplevel => 1,
702 can_events => 1, 903 can_events => 1,
703 @_ 904 @_
704 ); 905 );
705 906
706 $self->{title} &&= new CFClient::UI::Label 907 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 908 align => 0,
708 valign => 1, 909 valign => 1,
709 text => $self->{title}, 910 text => $self->{title},
710 fontsize => 1; 911 fontsize => $self->{border};
711 912
712 $self 913 $self
713} 914}
714 915
715sub border { 916sub border {
716 int $_[0]{border} * $::FONTSIZE 917 int $_[0]{border} * $::FONTSIZE
717} 918}
718 919
719sub size_request { 920sub size_request {
720 my ($self) = @_; 921 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 922
724 my ($w, $h) = $self->SUPER::size_request; 923 my ($w, $h) = $self->SUPER::size_request;
725 924
726 ( 925 (
727 $w + $self->border * 2, 926 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 932 my ($self, $w, $h) = @_;
734 933
735 $h -= List::Util::max 0, $self->border * 2; 934 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 935 $w -= List::Util::max 0, $self->border * 2;
737 936
738 $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)
739 if $self->{title}; 938 if $self->{title};
740 939
741 $self->child->configure ($self->border, $self->border, $w, $h); 940 $self->child->configure ($self->border, $self->border, $w, $h);
742} 941}
743 942
744sub button_down { 943sub button_down {
745 my ($self, $ev, $x, $y) = @_; 944 my ($self, $ev, $x, $y) = @_;
746 945
946 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 947 my $border = $self->border;
748 948
749 if ($x < $self->{w} && $x >= $self->{w} - $border 949 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 950 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 951
952 if ($lr & $td) {
953 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 954 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 955 my ($bw, $bh) = ($self->{w}, $self->{h});
754 956
957 my $mx = $x < $border;
958 my $my = $y < $border;
959
755 $self->{motion} = sub { 960 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 961 my ($ev, $x, $y) = @_;
757 962
758 ($x, $y) = ($ev->{x}, $ev->{y}); 963 my $dx = $ev->{x} - $ox;
964 my $dy = $ev->{y} - $oy;
759 965
760 $self->{user_w} = $bw + $x - $ox; 966 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
761 $self->{user_h} = $bh + $y - $oy; 967 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
968 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
762 $self->check_size; 969 $self->check_size;
763 }; 970 };
764 971
765 } elsif ($x >= 0 && $x < $self->{w} 972 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 973 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 974 my ($bx, $by) = ($self->{x}, $self->{y});
770 975
771 $self->{motion} = sub { 976 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 977 my ($ev, $x, $y) = @_;
… …
795 my ($self) = @_; 1000 my ($self) = @_;
796 1001
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1002 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1003 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 1004
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1005 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1006 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1007
805 my $border = $self->border; 1008 my $border = $self->border;
806 1009
807 glColor @{ $self->{border_bg} }; 1010 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1011 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1012 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1013 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1014 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1015
1016 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1017 my $bg = $tex[0];
814 1018
815 # TODO: repeat texture not scale 1019 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1020 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1021 my $rep_y = $ch / $bg->{h};
818 1022
819 glColor @{ $self->{bg} }; 1023 glColor @{ $self->{bg} };
820 1024
821 $bg->{s} = $rep_x; 1025 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1026 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1027 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1028 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1029 }
825 1030
826 glDisable GL_TEXTURE_2D; 1031 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1032
829 $self->{title}->draw if $self->{title}; 1033 $self->{title}->draw if $self->{title};
1034
830 $self->child->draw; 1035 $self->child->draw;
831} 1036}
832 1037
833############################################################################# 1038#############################################################################
834 1039
… …
856 $self->{children}[$y][$x] = $child; 1061 $self->{children}[$y][$x] = $child;
857 1062
858 $child->check_size; 1063 $child->check_size;
859} 1064}
860 1065
1066sub children {
1067 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1068}
1069
861# 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?
862sub clear { 1071sub clear {
863 my ($self) = @_; 1072 my ($self) = @_;
864 1073
1074 my @children = $self->children;
865 delete $self->{children}; 1075 delete $self->{children};
1076
1077 for (@children) {
1078 delete $_->{parent};
1079 $_->hide;
1080 }
1081
866 $self->update; 1082 $self->update;
867} 1083}
868 1084
869sub get_wh { 1085sub get_wh {
870 my ($self) = @_; 1086 my ($self) = @_;
… …
1047} 1263}
1048 1264
1049sub size_allocate { 1265sub size_allocate {
1050 my ($self, $w, $h) = @_; 1266 my ($self, $w, $h) = @_;
1051 1267
1268 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1269
1052 my $children = $self->{children}; 1270 my $children = $self->{children};
1053 1271
1054 my @h = map $_->{req_h}, @$children; 1272 my @h = map $_->{req_h}, @$children;
1055 1273
1056 my $req_h = List::Util::sum @h; 1274 my $req_h = List::Util::sum @h;
… …
1085 1303
1086############################################################################# 1304#############################################################################
1087 1305
1088package CFClient::UI::Label; 1306package CFClient::UI::Label;
1089 1307
1090our @ISA = CFClient::UI::Base::; 1308our @ISA = CFClient::UI::DrawBG::;
1091 1309
1092use CFClient::OpenGL; 1310use CFClient::OpenGL;
1093 1311
1094sub new { 1312sub new {
1095 my ($class, %arg) = @_; 1313 my ($class, %arg) = @_;
1096 1314
1097 my $self = $class->SUPER::new ( 1315 my $self = $class->SUPER::new (
1098 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),
1099 fontsize => 1, 1325 fontsize => 1,
1100 text => "",
1101 align => -1, 1326 align => -1,
1102 valign => -1, 1327 valign => -1,
1103 padding => 2, 1328 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1329 can_events => 0,
1106 %arg 1330 %arg
1107 ); 1331 );
1108 1332
1109 if (exists $self->{template}) { 1333 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1334 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1335 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1336 $self->{template} = $layout;
1113 } 1337 }
1114 1338
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1339 if (exists $self->{markup}) {
1116 $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 }
1117 1344
1118 $self 1345 $self
1119} 1346}
1120 1347
1121sub escape_text { 1348sub escape($) {
1122 local $_ = $_[1]; 1349 local $_ = $_[0];
1123 1350
1124 s/&/&amp;/g; 1351 s/&/&amp;/g;
1125 s/>/&gt;/g; 1352 s/>/&gt;/g;
1126 s/</&lt;/g; 1353 s/</&lt;/g;
1127 1354
1128 $_[1] 1355 $_
1356}
1357
1358sub update {
1359 my ($self) = @_;
1360
1361 delete $self->{texture};
1362 $self->SUPER::update;
1129} 1363}
1130 1364
1131sub set_text { 1365sub set_text {
1132 my ($self, $text) = @_; 1366 my ($self, $text) = @_;
1133 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;
1134 $self->{layout}->set_text ($text); 1372 $self->{layout}->set_text ($text);
1135 1373
1136 delete $self->{texture}; 1374 $self->update;
1137 $self->check_size; 1375 $self->check_size;
1138 $self->update;
1139} 1376}
1140 1377
1141sub set_markup { 1378sub set_markup {
1142 my ($self, $markup) = @_; 1379 my ($self, $markup) = @_;
1143 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;
1144 $self->{layout}->set_markup ($markup); 1387 $self->{layout}->set_markup ($markup);
1145 1388
1146 delete $self->{texture}; 1389 $self->update;
1147 $self->check_size; 1390 $self->check_size;
1148 $self->update;
1149} 1391}
1150 1392
1151sub size_request { 1393sub size_request {
1152 my ($self) = @_; 1394 my ($self) = @_;
1153 1395
1154 $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});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1401
1157 my ($w, $h) = $self->{layout}->size; 1402 my ($w, $h) = $self->{layout}->size;
1158 1403
1159 if (exists $self->{template}) { 1404 if (exists $self->{template}) {
1405 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1406 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1407
1162 my ($w2, $h2) = $self->{template}->size; 1408 my ($w2, $h2) = $self->{template}->size;
1163 1409
1164 $w = List::Util::max $w, $w2; 1410 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1426sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1427 my ($self, $fontsize) = @_;
1182 1428
1183 $self->{fontsize} = $fontsize; 1429 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1430 delete $self->{texture};
1431
1432 $self->update;
1185 $self->check_size; 1433 $self->check_size;
1186 $self->update;
1187} 1434}
1188 1435
1189sub _draw { 1436sub _draw {
1190 my ($self) = @_; 1437 my ($self) = @_;
1191 1438
1439 $self->SUPER::_draw; # draw background, if applicable
1440
1192 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};
1193 $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});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1447 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1448
1195 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
1196 }; 1460 };
1197 1461
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1462 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1464
1465 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1466 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1467 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1468 } else {
1469 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1470 }
1218 1471
1219 glDisable GL_TEXTURE_2D; 1472 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1473}
1222 1474
1223############################################################################# 1475#############################################################################
1224 1476
1225package CFClient::UI::EntryBase; 1477package CFClient::UI::EntryBase;
… …
1230 1482
1231sub new { 1483sub new {
1232 my $class = shift; 1484 my $class = shift;
1233 1485
1234 $class->SUPER::new ( 1486 $class->SUPER::new (
1235 fg => [1, 1, 1], 1487 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1488 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1489 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1490 active_fg => [0, 0, 0],
1239 can_hover => 1, 1491 can_hover => 1,
1240 can_focus => 1, 1492 can_focus => 1,
1241 valign => 0, 1493 valign => 0,
1242 can_events => 1, 1494 can_events => 1,
1495 #text => ...
1243 @_ 1496 @_
1244 ) 1497 )
1245} 1498}
1246 1499
1247sub _set_text { 1500sub _set_text {
… …
1258 1511
1259 $text =~ s/./*/g if $self->{hidden}; 1512 $text =~ s/./*/g if $self->{hidden};
1260 $self->{layout}->set_text ("$text "); 1513 $self->{layout}->set_text ("$text ");
1261 1514
1262 $self->emit (changed => $self->{text}); 1515 $self->emit (changed => $self->{text});
1263}
1264
1265sub get_text {
1266 $_[0]{text}
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 my ($w, $h) = $self->SUPER::size_request;
1273
1274 ($w + 1, $h) # add 1 for cursor
1275}
1276
1277sub size_allocate {
1278 my ($self, $w, $h) = @_;
1279
1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1281} 1516}
1282 1517
1283sub set_text { 1518sub set_text {
1284 my ($self, $text) = @_; 1519 my ($self, $text) = @_;
1285 1520
1286 $self->{cursor} = length $text; 1521 $self->{cursor} = length $text;
1287 $self->_set_text ($text); 1522 $self->_set_text ($text);
1288 $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
1289} 1543}
1290 1544
1291sub key_down { 1545sub key_down {
1292 my ($self, $ev) = @_; 1546 my ($self, $ev) = @_;
1293 1547
… …
1295 my $sym = $ev->{sym}; 1549 my $sym = $ev->{sym};
1296 my $uni = $ev->{unicode}; 1550 my $uni = $ev->{unicode};
1297 1551
1298 my $text = $self->get_text; 1552 my $text = $self->get_text;
1299 1553
1300 if ($sym == 8) { 1554 if ($uni == 8) {
1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1555 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1302 } elsif ($sym == 127) { 1556 } elsif ($uni == 127) {
1303 substr $text, $self->{cursor}, 1, ""; 1557 substr $text, $self->{cursor}, 1, "";
1304 } elsif ($sym == CFClient::SDLK_LEFT) { 1558 } elsif ($sym == CFClient::SDLK_LEFT) {
1305 --$self->{cursor} if $self->{cursor}; 1559 --$self->{cursor} if $self->{cursor};
1306 } elsif ($sym == CFClient::SDLK_RIGHT) { 1560 } elsif ($sym == CFClient::SDLK_RIGHT) {
1307 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1561 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1308 } elsif ($sym == CFClient::SDLK_HOME) { 1562 } elsif ($sym == CFClient::SDLK_HOME) {
1309 $self->{cursor} = 0; 1563 $self->{cursor} = 0;
1310 } elsif ($sym == CFClient::SDLK_END) { 1564 } elsif ($sym == CFClient::SDLK_END) {
1311 $self->{cursor} = length $text; 1565 $self->{cursor} = length $text;
1312 } elsif ($sym == 27) { 1566 } elsif ($uni == 27) {
1313 $self->emit ('escape'); 1567 $self->emit ('escape');
1314 } elsif ($uni) { 1568 } elsif ($uni) {
1315 substr $text, $self->{cursor}++, 0, chr $uni; 1569 substr $text, $self->{cursor}++, 0, chr $uni;
1316 } 1570 }
1317 1571
1318 $self->_set_text ($text); 1572 $self->_set_text ($text);
1319 $self->update; 1573 $self->update;
1574 $self->check_size;
1320} 1575}
1321 1576
1322sub focus_in { 1577sub focus_in {
1323 my ($self) = @_; 1578 my ($self) = @_;
1324 1579
… …
1400 my ($self, $ev) = @_; 1655 my ($self, $ev) = @_;
1401 1656
1402 my $sym = $ev->{sym}; 1657 my $sym = $ev->{sym};
1403 1658
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1664 $self->emit (activate => $txt);
1406 $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 }
1407 1688
1408 } else { 1689 } else {
1409 $self->SUPER::key_down ($ev); 1690 $self->SUPER::key_down ($ev);
1410 } 1691 }
1411 1692
… …
1425 1706
1426sub new { 1707sub new {
1427 my $class = shift; 1708 my $class = shift;
1428 1709
1429 $class->SUPER::new ( 1710 $class->SUPER::new (
1430 padding => 4, 1711 padding => 4,
1431 fg => [1, 1, 1], 1712 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1713 active_fg => [0, 0, 1],
1434 can_hover => 1, 1714 can_hover => 1,
1435 align => 0, 1715 align => 0,
1436 valign => 0, 1716 valign => 0,
1437 can_events => 1, 1717 can_events => 1,
1438 @_ 1718 @_
1439 ) 1719 )
1440} 1720}
1441 1721
… …
1455 1735
1456 if ($GRAB == $self) { 1736 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1737 $self->{fg} = $self->{active_fg};
1458 } 1738 }
1459 1739
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1740 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1742 glColor 0, 0, 0, 1;
1465 1743
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1744 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1745
1468 glDisable GL_TEXTURE_2D; 1746 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1747
1471 $self->SUPER::_draw; 1748 $self->SUPER::_draw;
1472} 1749}
1473 1750
1474############################################################################# 1751#############################################################################
… …
1488 1765
1489 $class->SUPER::new ( 1766 $class->SUPER::new (
1490 padding => 2, 1767 padding => 2,
1491 fg => [1, 1, 1], 1768 fg => [1, 1, 1],
1492 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],
1493 state => 0, 1772 state => 0,
1494 can_hover => 1, 1773 can_hover => 1,
1495 @_ 1774 @_
1496 ) 1775 )
1497} 1776}
… …
1521 1800
1522 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;
1523 1802
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1803 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1804
1526 glEnable GL_BLEND; 1805 my $tex = $self->{state} ? $tex[1] : $tex[0];
1806
1527 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1808 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1809 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1810}
1537 1811
1538############################################################################# 1812#############################################################################
1539 1813
1540package CFClient::UI::Image; 1814package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1857 glTranslate 0, -$self->{w}, 0;
1584 1858
1585 ($w, $h) = ($h, $w); 1859 ($w, $h) = ($h, $w);
1586 } 1860 }
1587 1861
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1862 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1864
1593 $tex->draw_quad (0, 0, $w, $h); 1865 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1866
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1867 glDisable GL_TEXTURE_2D;
1597} 1868}
1598 1869
1599############################################################################# 1870#############################################################################
1600 1871
1601package CFClient::UI::VGauge; 1872package CFClient::UI::VGauge;
1602 1873
1603our @ISA = CFClient::UI::Base::; 1874our @ISA = CFClient::UI::Base::;
1875
1876use List::Util qw(min max);
1604 1877
1605use CFClient::OpenGL; 1878use CFClient::OpenGL;
1606 1879
1607my %tex = ( 1880my %tex = (
1608 food => [ 1881 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1882 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1883 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1884 ],
1612 grace => [ 1885 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1886 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 1888 ],
1616 hp => [ 1889 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1890 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1891 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 1892 ],
1620 mana => [ 1893 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1894 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 1896 ],
1624); 1897);
1625 1898
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 1899# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 1900sub new {
… …
1646} 1919}
1647 1920
1648sub set_max { 1921sub set_max {
1649 my ($self, $max) = @_; 1922 my ($self, $max) = @_;
1650 1923
1924 return if $self->{max_val} == $max;
1925
1651 $self->{max_val} = $max; 1926 $self->{max_val} = $max;
1927 $self->update;
1652} 1928}
1653 1929
1654sub set_value { 1930sub set_value {
1655 my ($self, $val, $max) = @_; 1931 my ($self, $val, $max) = @_;
1656 1932
1657 $self->set_max ($max) 1933 $self->set_max ($max)
1658 if defined $max; 1934 if defined $max;
1659 1935
1660 $max = $self->{max_val}; 1936 return if $self->{val} == $val;
1937
1661 $self->{val} = $val; 1938 $self->{val} = $val;
1662
1663 $self->update; 1939 $self->update;
1664} 1940}
1665 1941
1666sub _draw { 1942sub _draw {
1667 my ($self) = @_; 1943 my ($self) = @_;
1668 1944
1669 my $tex = $tex{$self->{type}}; 1945 my $tex = $tex{$self->{type}};
1946 my ($t1, $t2, $t3) = @$tex;
1670 1947
1671 my ($w, $h) = ($self->{w}, $self->{h}); 1948 my ($w, $h) = ($self->{w}, $self->{h});
1672 1949
1673 if ($self->{vertical}) { 1950 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 1951 glRotate 90, 0, 0, 1;
… …
1676 1953
1677 ($w, $h) = ($h, $w); 1954 ($w, $h) = ($h, $w);
1678 } 1955 }
1679 1956
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 1957 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 1958
1683 my $t1 = $tex->[0]; 1959 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 1964
1686 glEnable GL_BLEND; 1965 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1966 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 1967 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1968 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 1969
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1970 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 1971 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 1972 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 1973 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 1974 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 1975 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 1976 glEnd;
1701 1977
1978 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1979 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 1980 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 1981 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 1982 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 1983 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 1984 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 1996
1710 glDisable GL_BLEND; 1997 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 1998 glDisable GL_TEXTURE_2D;
1712} 1999}
1713 2000
… …
1719 2006
1720sub new { 2007sub new {
1721 my ($class, %arg) = @_; 2008 my ($class, %arg) = @_;
1722 2009
1723 my $self = $class->SUPER::new ( 2010 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 2011 tooltip => $arg{type},
2012 can_hover => 1,
2013 can_events => 1,
1725 %arg, 2014 %arg,
1726 ); 2015 );
1727 2016
1728 $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");
1729 $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);
1730 $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");
1731 2020
1732 $self 2021 $self
1733} 2022}
1734 2023
… …
1737 2026
1738 $self->{value}->set_fontsize ($fsize); 2027 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 2028 $self->{max} ->set_fontsize ($fsize);
1740} 2029}
1741 2030
2031sub set_max {
2032 my ($self, $max) = @_;
2033
2034 $self->{gauge}->set_max ($max);
2035 $self->{max}->set_text ($max);
2036}
2037
1742sub set_value { 2038sub set_value {
1743 my ($self, $val, $max) = @_; 2039 my ($self, $val, $max) = @_;
1744 2040
1745 $self->set_max ($max) 2041 $self->set_max ($max)
1746 if defined $max; 2042 if defined $max;
1747 2043
1748 $self->{gauge}->set_value ($val, $max); 2044 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2045 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2046}
1758 2047
1759############################################################################# 2048#############################################################################
1760 2049
1761package CFClient::UI::Slider; 2050package CFClient::UI::Slider;
… …
1771 qw(s1_slider.png s1_slider_bg.png); 2060 qw(s1_slider.png s1_slider_bg.png);
1772 2061
1773sub new { 2062sub new {
1774 my $class = shift; 2063 my $class = shift;
1775 2064
1776 # range [value, low, high, page] 2065 # range [value, low, high, page, unit]
1777 2066
1778 # TODO: 0-width page 2067 # TODO: 0-width page
1779 # TODO: req_w/h are wrong with vertical 2068 # TODO: req_w/h are wrong with vertical
1780 # TODO: calculations are off 2069 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2070 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2071 fg => [1, 1, 1],
1783 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],
1784 range => [0, 0, 100, 10], 2075 range => [0, 0, 100, 10, 0],
1785 req_w => 20, 2076 req_w => $::WIDTH / 80,
1786 req_h => 20, 2077 req_h => $::WIDTH / 80,
1787 vertical => 0, 2078 vertical => 0,
1788 can_hover => 1, 2079 can_hover => 1,
1789 inner_pad => 5, 2080 inner_pad => 0.02,
1790 @_ 2081 @_
1791 ); 2082 );
1792 2083
2084 $self->set_value ($self->{range}[0]);
2085 $self->update;
2086
1793 $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 }
1794} 2119}
1795 2120
1796sub size_request { 2121sub size_request {
1797 my ($self) = @_; 2122 my ($self) = @_;
1798 2123
… …
1804 2129
1805sub button_down { 2130sub button_down {
1806 my ($self, $ev, $x, $y) = @_; 2131 my ($self, $ev, $x, $y) = @_;
1807 2132
1808 $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
1809 $self->mouse_motion ($ev, $x, $y); 2137 $self->mouse_motion ($ev, $x, $y);
1810} 2138}
1811 2139
1812sub mouse_motion { 2140sub mouse_motion {
1813 my ($self, $ev, $x, $y) = @_; 2141 my ($self, $ev, $x, $y) = @_;
1814 2142
1815 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
1816 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2160 my ($value, $lo, $hi, $page) = @{$self->{range}};
2161 my $range = ($hi - $page - $lo) || 1e-100;
1817 2162
1818 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2163 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1819 2164
1820 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2165 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1821 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2166 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1822 2167
1823 $x -= $inner_pad_px; # substract the padding 2168 $value = ($value - $lo) / $range;
1824 $x = $x * ($hi - $lo) / $inner_w + $lo; 2169 $value = $value * $self->{scale} + $self->{offset};
1825 $x = $lo if $x < $lo;
1826 $x = $hi - $page if $x > $hi - $page;
1827 $self->{range}[0] = $x;
1828 2170
1829 $self->emit (changed => $x); 2171 $self->{knob_x} = $value - $knob_w * 0.5;
1830 $self->update; 2172 $self->{knob_w} = $knob_w;
1831 } 2173 });
1832}
1833 2174
1834# the inner_* stuff is for generating a padding for the slider handle, 2175 $self->SUPER::update;
1835# so that the handle doesn't leave the texture. This calculation isn't 100%
1836# correct propably, but it does the job for now
1837sub _calc_inner_pad_px {
1838 my ($self, $w) = @_;
1839 ($w / 100) * $self->{inner_pad} # % to pixels
1840} 2176}
1841 2177
1842sub _draw { 2178sub _draw {
1843 my ($self) = @_; 2179 my ($self) = @_;
1844 2180
1845 $self->SUPER::_draw (); 2181 $self->SUPER::_draw ();
1846 2182
1847 my ($w, $h) = @$self{qw(w h)}; 2183 glScale $self->{w}, $self->{h};
1848 2184
1849 if ($self->{vertical}) { 2185 if ($self->{vertical}) {
1850 # draw a vertical slider like a rotated horizontal slider 2186 # draw a vertical slider like a rotated horizontal slider
1851 2187
2188 glTranslate 1, 0, 0;
1852 glRotate 90, 0, 0, 1; 2189 glRotate 90, 0, 0, 1;
1853 glTranslate 0, -$self->{w}, 0;
1854
1855 ($w, $h) = ($h, $w);
1856 } 2190 }
1857 2191
1858 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2192 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1859 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2193 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1860 2194
1861 my ($value, $lo, $hi, $page) = @{$self->{range}};
1862
1863 $hi = $value + 1 if $lo == $hi;
1864
1865 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1866 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1867
1868 $page = int $page * $inner_w / ($hi - $lo);
1869 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1870
1871 $w -= $page;
1872 $page &= ~1;
1873 glTranslate $page * 0.5, 0, 0;
1874 $page ||= 2;
1875
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2195 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2196 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2197
1884 # draw background 2198 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2199 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1886 2200
1887 # draw handle 2201 # draw handle
1888 $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);
1889 2203
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2204 glDisable GL_TEXTURE_2D;
1892} 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 (@_) }
1893 2247
1894############################################################################# 2248#############################################################################
1895 2249
1896package CFClient::UI::TextView; 2250package CFClient::UI::TextView;
1897 2251
… …
1901 2255
1902sub new { 2256sub new {
1903 my $class = shift; 2257 my $class = shift;
1904 2258
1905 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
1906 fontsize => 1, 2260 fontsize => 1,
2261 can_events => 0,
2262 #font => default_font
1907 @_, 2263 @_,
1908 2264
1909 layout => (new CFClient::Layout), 2265 layout => (new CFClient::Layout 1),
1910 par => [], 2266 par => [],
1911 height => 0, 2267 height => 0,
1912 children => [ 2268 children => [
1913 (new CFClient::UI::Empty expand => 1), 2269 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2270 (new CFClient::UI::Slider vertical => 1),
1915 ], 2271 ],
1916 ); 2272 );
1917 2273
1918 $self->{children}[1]->connect (changed => sub { 2274 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2275
1922 $self 2276 $self
1923} 2277}
1924 2278
1925sub set_fontsize { 2279sub set_fontsize {
… …
1927 2281
1928 $self->{fontsize} = $fontsize; 2282 $self->{fontsize} = $fontsize;
1929 $self->reflow; 2283 $self->reflow;
1930} 2284}
1931 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
1932sub text_height { 2298sub text_size {
1933 my ($self, $text) = @_; 2299 my ($self, $text, $indent) = @_;
1934 2300
1935 my $layout = $self->{layout}; 2301 my $layout = $self->{layout};
1936 2302
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2303 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2304 $layout->set_width ($self->{children}[0]{w} - $indent);
1939 $layout->set_text ($text); 2305 $layout->set_markup ($text);
1940 2306
1941 ($layout->size)[1] 2307 $layout->size
1942} 2308}
1943 2309
1944sub reflow { 2310sub reflow {
1945 my ($self) = @_; 2311 my ($self) = @_;
1946 2312
1947 $self->{need_reflow}++; 2313 $self->{need_reflow}++;
1948 $self->update; 2314 $self->update;
1949} 2315}
1950 2316
1951sub 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 {
1952 my ($self, $w, $h) = @_; 2325 my ($self) = @_;
1953 2326
1954 $self->SUPER::size_allocate ($w, $h); 2327 $self->{par} = [];
1955 2328 $self->{height} = 0;
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2329 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1957 $self->{layout}->set_width ($self->{children}[0]{w});
1958
1959 $self->reflow;
1960} 2330}
1961 2331
1962sub add_paragraph { 2332sub add_paragraph {
1963 my ($self, $color, $text) = @_; 2333 my ($self, $color, $text, $indent) = @_;
1964 2334
1965 #TODO: intelligently "reformat" paragraph 2335 for my $line (split /\n/, $text) {
1966 2336 my ($w, $h) = $self->text_size ($line);
1967 my $height = $self->text_height ($text);
1968
1969 $self->{height} += $height; 2337 $self->{height} += $h;
2338 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2339 }
1970 2340
1971 push @{$self->{par}}, [$height, $color, $text];
1972
1973 $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]);
1974 $self->{children}[1]->update;
1975} 2342}
1976 2343
1977sub update { 2344sub update {
1978 my ($self) = @_; 2345 my ($self) = @_;
1979 2346
… …
1981 2348
1982 return unless $self->{h} > 0; 2349 return unless $self->{h} > 0;
1983 2350
1984 delete $self->{texture}; 2351 delete $self->{texture};
1985 2352
1986 $ROOT->on_refresh ($self, sub { 2353 $ROOT->on_post_alloc ($self, sub {
2354 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2355
1987 if (delete $self->{need_reflow}) { 2356 if (delete $self->{need_reflow}) {
1988 my $height = 0; 2357 my $height = 0;
1989 2358
1990 $height += $_->[0] = $self->text_height ($_->[2]) 2359 my $layout = $self->{layout};
2360
2361 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2362
1991 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 }
1992 2374
1993 $self->{height} = $height; 2375 $self->{height} = $height;
1994 2376
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2377 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1996 2378
1997 delete $self->{texture}; 2379 delete $self->{texture};
1998 } 2380 }
1999 2381
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2382 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2001 glClearColor 0, 0, 0, 1; 2383 glClearColor 0.5, 0.5, 0.5, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2384 glClear GL_COLOR_BUFFER_BIT;
2003 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
2004 glEnable GL_BLEND; 2397 glEnable GL_BLEND;
2398 #TODO# not correct in windows where rgba is forced off
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2399 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008
2009 my $top = int $self->{children}[1]{range}[0];
2010
2011 my $y0 = $top;
2012 my $y1 = $top + $self->{h};
2013
2014 my $y = 0;
2015
2016 my $layout = $self->{layout};
2017 2400
2018 for my $par (@{$self->{par}}) { 2401 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2402 my $h = $par->[1];
2020 2403
2021 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]);
2022 $layout->set_text ($par->[2]); 2407 $layout->set_markup ($par->[4]);
2023 2408
2024 glColor @{ $par->[1] }; 2409 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2025 my ($W, $H) = $layout->size; 2410
2026 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;
2027 } 2413 }
2028 2414
2029 $y += $h; 2415 $y += $h;
2030 } 2416 }
2031 2417
2032 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND; 2418 glDisable GL_BLEND;
2034 }; 2419 };
2035 }); 2420 });
2036} 2421}
2037 2422
2038sub _draw { 2423sub _draw {
2039 my ($self) = @_; 2424 my ($self) = @_;
2040 2425
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2426 glEnable GL_TEXTURE_2D;
2043 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;
2044 $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});
2045 glDisable GL_TEXTURE_2D; 2430 glDisable GL_TEXTURE_2D;
2046 }
2047 2431
2048 $self->{children}[1]->draw; 2432 $self->{children}[1]->draw;
2049 2433
2050} 2434}
2051 2435
… …
2099 2483
2100sub new { 2484sub new {
2101 my $class = shift; 2485 my $class = shift;
2102 2486
2103 my $self = $class->SUPER::new ( 2487 my $self = $class->SUPER::new (
2104 state => 0, 2488 state => 0,
2105 connect_activate => \&toggle_flopper, 2489 connect_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2490 @_
2108 ); 2491 );
2109 2492
2110 if ($self->{state}) { 2493 if ($self->{state}) {
2111 $self->{state} = 0; 2494 $self->{state} = 0;
… …
2131 $self->emit (changed => $self->{state}); 2514 $self->emit (changed => $self->{state});
2132} 2515}
2133 2516
2134############################################################################# 2517#############################################################################
2135 2518
2519package CFClient::UI::Tooltip;
2520
2521our @ISA = CFClient::UI::Bin::;
2522
2523use CFClient::OpenGL;
2524
2525sub new {
2526 my $class = shift;
2527
2528 $class->SUPER::new (
2529 @_,
2530 can_events => 0,
2531 )
2532}
2533
2534sub set_tooltip_from {
2535 my ($self, $widget) = @_;
2536
2537 $self->add (new CFClient::UI::Label
2538 markup => $widget->{tooltip},
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 );
2545}
2546
2547sub size_request {
2548 my ($self) = @_;
2549
2550 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2551
2552 ($w + 4, $h + 4)
2553}
2554
2555sub size_allocate {
2556 my ($self, $w, $h) = @_;
2557
2558 $self->SUPER::size_allocate ($w - 4, $h - 4);
2559}
2560
2561sub _draw {
2562 my ($self) = @_;
2563
2564 glTranslate 0.375, 0.375;
2565
2566 my ($w, $h) = @$self{qw(w h)};
2567
2568 glColor 1, 0.8, 0.4;
2569 glBegin GL_QUADS;
2570 glVertex 0 , 0;
2571 glVertex 0 , $h;
2572 glVertex $w, $h;
2573 glVertex $w, 0;
2574 glEnd;
2575
2576 glColor 0, 0, 0;
2577 glBegin GL_LINE_LOOP;
2578 glVertex 0 , 0;
2579 glVertex 0 , $h;
2580 glVertex $w, $h;
2581 glVertex $w, 0;
2582 glEnd;
2583
2584 glTranslate 2 - 0.375, 2 - 0.375;
2585 $self->SUPER::_draw;
2586}
2587
2588#############################################################################
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
2136package CFClient::UI::Root; 3012package CFClient::UI::Root;
2137 3013
2138our @ISA = CFClient::UI::Container::; 3014our @ISA = CFClient::UI::Container::;
2139 3015
2140use CFClient::OpenGL; 3016use CFClient::OpenGL;
2141 3017
2142sub check_size { 3018sub new {
2143 my ($self) = @_; 3019 my $class = shift;
2144 3020
2145 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3021 $class->SUPER::new (
2146} 3022 @_,
2147 3023 )
2148sub size_request {
2149 ($::WIDTH, $::HEIGHT)
2150} 3024}
2151 3025
2152sub configure { 3026sub configure {
2153 my ($self, $x, $y, $w, $h) = @_; 3027 my ($self, $x, $y, $w, $h) = @_;
2154 3028
2155 $self->SUPER::configure ($x, $y, $w, $h); 3029 $self->{w} = $w;
3030 $self->{h} = $h;
3031}
2156 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
2157 for my $child (@{$self->{children}}) { 3055 for my $child ($self->children) {
2158 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)};
2159 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
2160 $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;
2161 $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
2162 $child->configure ($X, $Y, $W,$H); 3067 $child->configure ($X, $Y, $W, $H);
2163 } 3068 }
2164} 3069}
2165 3070
2166sub _topleft { 3071sub coord2local {
2167 my ($self, $x, $y) = @_; 3072 my ($self, $x, $y) = @_;
2168 3073
2169 ($x, $y) 3074 ($x, $y)
2170} 3075}
2171 3076
3077sub coord2global {
3078 my ($self, $x, $y) = @_;
3079
3080 ($x, $y)
3081}
3082
2172sub update { 3083sub update {
2173 my ($self) = @_; 3084 my ($self) = @_;
2174 3085
2175 $self->check_size; 3086 $self->check_size;
2176 ::refresh (); 3087 $::WANT_REFRESH++;
2177} 3088}
2178 3089
2179sub add { 3090sub add {
2180 my ($self, $child) = @_; 3091 my ($self, @children) = @_;
2181 3092
3093 for my $child (@children) {
3094 $child->{toplevel} = 1;
3095
2182 # integerize window positions 3096 # integerise window positions
2183 $child->{x} = int $child->{x}; 3097 $child->{x} = int $child->{x};
2184 $child->{y} = int $child->{y}; 3098 $child->{y} = int $child->{y};
3099 }
2185 3100
2186 $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 }
2187} 3120}
2188 3121
2189sub on_refresh { 3122sub on_refresh {
2190 my ($self, $id, $cb) = @_; 3123 my ($self, $id, $cb) = @_;
2191 3124
2192 $self->{refresh_hook}{$id} = $cb; 3125 $self->{refresh_hook}{$id} = $cb;
2193} 3126}
2194 3127
3128sub on_post_alloc {
3129 my ($self, $id, $cb) = @_;
3130
3131 $self->{post_alloc_hook}{$id} = $cb;
3132}
3133
2195sub draw { 3134sub draw {
2196 my ($self) = @_; 3135 my ($self) = @_;
2197 3136
2198 while (my $rcb = delete $self->{refresh_hook}) { 3137 while ($self->{refresh_hook}) {
2199 $_->() 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}};
2200 } 3190 }
2201 3191
2202 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3192 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2203 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2204 glClear GL_COLOR_BUFFER_BIT; 3194 glClear GL_COLOR_BUFFER_BIT;
2205 3195
2206 glMatrixMode GL_PROJECTION; 3196 glMatrixMode GL_PROJECTION;
2207 glLoadIdentity; 3197 glLoadIdentity;
2208 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2209 glMatrixMode GL_MODELVIEW; 3199 glMatrixMode GL_MODELVIEW;
2210 glLoadIdentity; 3200 glLoadIdentity;
2211 3201
2212 $self->_draw; 3202 $self->_draw;
2213} 3203}
… …
2215############################################################################# 3205#############################################################################
2216 3206
2217package CFClient::UI; 3207package CFClient::UI;
2218 3208
2219$ROOT = new CFClient::UI::Root; 3209$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3210$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2221 3211
22221 32121
2223 3213

Diff Legend

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