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.157 by root, Sun Apr 23 21:47:32 2006 UTC vs.
Revision 1.223 by elmex, Tue May 23 18:10:51 2006 UTC

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

Diff Legend

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