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.137 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.207 by elmex, Mon May 15 18:23:33 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
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;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
73
74 check_tooltip;
33 } 75 }
34 76
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $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 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $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 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
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 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 for my $widget (values %WIDGET) {
146 if ($widget->{toplevel}) {
147 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
148 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
149 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
155 }
156
157 $widget->reconfigure;
158 }
159}
160
86############################################################################# 161#############################################################################
87 162
88package CFClient::UI::Base; 163package CFClient::UI::Base;
89 164
90use strict; 165use strict;
91 166
92use SDL::OpenGL; 167use CFClient::OpenGL;
93 168
94sub new { 169sub new {
95 my $class = shift; 170 my $class = shift;
96 171
97 my $self = bless { 172 my $self = bless {
98 x => 0, 173 x => 0,
99 y => 0, 174 y => 0,
100 z => 0, 175 z => 0,
176 can_events => 1,
101 @_ 177 @_
102 }, $class; 178 }, $class;
103 179
104 for (keys %$self) { 180 for (keys %$self) {
105 if (/^connect_(.*)$/) { 181 if (/^connect_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 182 $self->connect ($1 => delete $self->{$_});
107 } 183 }
108 } 184 }
109 185
186 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
187
110 $self 188 $self
111} 189}
112 190
191sub destroy {
192 my ($self) = @_;
193
194 $self->hide;
195 %$self = ();
196}
197
113sub show { 198sub show {
114 my ($self) = @_; 199 my ($self) = @_;
115 200
116 return if $self->{parent}; 201 return if $self->{parent};
117 202
… …
119} 204}
120 205
121sub hide { 206sub hide {
122 my ($self) = @_; 207 my ($self) = @_;
123 208
124 return unless $self->{parent}; 209 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self;
125 211
126 $self->{parent}->remove ($self); 212 $self->{parent}->remove ($self)
213 if $self->{parent};
127} 214}
128 215
129sub move { 216sub move {
130 my ($self, $x, $y, $z) = @_; 217 my ($self, $x, $y, $z) = @_;
131 218
… …
134 $self->{z} = $z if defined $z; 221 $self->{z} = $z if defined $z;
135 222
136 $self->update; 223 $self->update;
137} 224}
138 225
139sub needs_redraw { 226sub set_size {
140 0 227 my ($self, $w, $h) = @_;
228
229 $self->{user_w} = $w;
230 $self->{user_h} = $h;
231
232 $self->check_size;
141} 233}
142 234
143sub size_request { 235sub size_request {
144 require Carp; 236 require Carp;
145 Carp::confess "size_request is abtract"; 237 Carp::confess "size_request is abstract";
146} 238}
147 239
148sub configure { 240sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 241 my ($self, $x, $y, $w, $h) = @_;
150 242
243 if ($self->{aspect}) {
244 my $w2 = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect};
246
247 # use alignment to adjust x, y
248
249 $x += int +($w - $w2) * 0.5;
250 $y += int +($h - $h2) * 0.5;
251
252 ($w, $h) = ($w2, $h2);
253 }
254
255 if ($self->{x} != $x || $self->{y} != $y) {
151 $self->{x} = $x; 256 $self->{x} = $x;
152 $self->{y} = $y; 257 $self->{y} = $y;
153
154 return unless $self->{w} != $w || $self->{h} != $h;
155
156 $self->{w} = $w;
157 $self->{h} = $h;
158
159 $self->size_allocate ($w, $h);
160 $self->update; 258 $self->update;
259 }
260
261 if ($self->{w} != $w || $self->{h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
263 }
161} 264}
162 265
163sub size_allocate { 266sub size_allocate {
164 # nothing to be done 267 # nothing to be done
165} 268}
166 269
167# return top left coordinates 270sub reconfigure {
168sub _topleft { 271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children {
278}
279
280sub set_max_size {
169 my ($self, $x, $y) = @_; 281 my ($self, $w, $h) = @_;
170 282
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 283 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h;
172} 285}
173 286
174# translate global coordinates to local coordinate system 287# translate global coordinates to local coordinate system
175sub coord2local { 288sub coord2local {
176 my ($self, $x, $y) = @_; 289 my ($self, $x, $y) = @_;
177 290
178 my ($X, $Y) = $self->_topleft; 291 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
179 ($x - $X, $y - $Y)
180} 292}
181 293
182# translate local coordinates to global coordinate system 294# translate local coordinates to global coordinate system
183sub coord2global { 295sub coord2global {
184 my ($self, $x, $y) = @_; 296 my ($self, $x, $y) = @_;
185 297
186 my ($X, $Y) = $self->_topleft; 298 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
187 ($x + $X, $y + $Y)
188} 299}
189 300
190sub focus_in { 301sub focus_in {
191 my ($self) = @_; 302 my ($self) = @_;
192 303
… …
252 glVertex $x + $self->{w}, $y + $self->{h}; 363 glVertex $x + $self->{w}, $y + $self->{h};
253 glVertex $x , $y + $self->{h}; 364 glVertex $x , $y + $self->{h};
254 glEnd; 365 glEnd;
255 glDisable GL_BLEND; 366 glDisable GL_BLEND;
256 } 367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0;
375 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h};
378 glEnd;
379 glPopMatrix;
380 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
381 }
257} 382}
258 383
259sub _draw { 384sub _draw {
260 my ($self) = @_; 385 my ($self) = @_;
261 386
262 warn "no draw defined for $self\n"; 387 warn "no draw defined for $self\n";
263} 388}
264 389
265sub find_widget { 390sub find_widget {
266 my ($self, $x, $y) = @_; 391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
267 394
268 return $self 395 return $self
269 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
271 398
… …
274 401
275sub set_parent { 402sub set_parent {
276 my ($self, $parent) = @_; 403 my ($self, $parent) = @_;
277 404
278 Scalar::Util::weaken ($self->{parent} = $parent); 405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
279} 410}
280 411
281sub check_size { 412sub check_size {
282 my ($self) = @_; 413 my ($self, $forced) = @_;
283 414
284 my ($w, $h) = $self->size_request; 415 $self->{force_alloc} = 1 if $forced;
285 416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
286 if ($w != $self->{req_w} || $h != $self->{req_h}) {
287 $self->{req_w} = $w;
288 $self->{req_h} = $h;
289
290 $self->{parent}->check_size
291 if $self->{parent};
292 }
293} 417}
294 418
295sub update { 419sub update {
296 my ($self) = @_; 420 my ($self) = @_;
297 421
… …
306} 430}
307 431
308sub emit { 432sub emit {
309 my ($self, $signal, @args) = @_; 433 my ($self, $signal, @args) = @_;
310 434
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
312 $cb->($self, @args);
313 }
314} 436}
315 437
316sub DESTROY { 438sub DESTROY {
317 my ($self) = @_; 439 my ($self) = @_;
318 440
441 delete $WIDGET{$self+0};
319 #$self->deactivate; 442 #$self->deactivate;
320} 443}
321 444
322############################################################################# 445#############################################################################
323 446
324package CFClient::UI::DrawBG; 447package CFClient::UI::DrawBG;
325 448
326our @ISA = CFClient::UI::Base::; 449our @ISA = CFClient::UI::Base::;
327 450
328use strict; 451use strict;
329use SDL::OpenGL; 452use CFClient::OpenGL;
330 453
331sub new { 454sub new {
332 my $class = shift; 455 my $class = shift;
333 456
334 # range [value, low, high, page] 457 # range [value, low, high, page]
… …
363 486
364package CFClient::UI::Empty; 487package CFClient::UI::Empty;
365 488
366our @ISA = CFClient::UI::Base::; 489our @ISA = CFClient::UI::Base::;
367 490
491sub new {
492 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg);
494}
495
368sub size_request { 496sub size_request {
369 (0, 0) 497 (0, 0)
370} 498}
371 499
372sub draw { } 500sub draw { }
… …
380sub new { 508sub new {
381 my ($class, %arg) = @_; 509 my ($class, %arg) = @_;
382 510
383 my $children = delete $arg{children} || []; 511 my $children = delete $arg{children} || [];
384 512
385 my $self = $class->SUPER::new (children => [], %arg); 513 my $self = $class->SUPER::new (
514 children => [],
515 can_events => 0,
516 %arg,
517 );
386 $self->add ($_) for @$children; 518 $self->add ($_) for @$children;
387 519
388 $self 520 $self
389} 521}
390 522
391sub add { 523sub add {
392 my ($self, $child) = @_; 524 my ($self, @widgets) = @_;
393 525
394 $child->set_parent ($self); 526 $_->set_parent ($self)
527 for @widgets;
395 528
396 use sort 'stable'; 529 use sort 'stable';
397 530
398 $self->{children} = [ 531 $self->{children} = [
399 sort { $a->{z} <=> $b->{z} } 532 sort { $a->{z} <=> $b->{z} }
400 @{$self->{children}}, $child 533 @{$self->{children}}, @widgets
401 ]; 534 ];
402 535
403 $child->check_size; 536 $self->check_size (1);
537 $self->update;
538}
539
540sub children {
541 @{ $_[0]{children} }
404} 542}
405 543
406sub remove { 544sub remove {
407 my ($self, $child) = @_; 545 my ($self, $child) = @_;
408 546
409 delete $child->{parent}; 547 delete $child->{parent};
548 $child->hide;
410 549
411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412 551
413 $self->check_size; 552 $self->check_size;
553 $self->update;
554}
555
556sub clear {
557 my ($self) = @_;
558
559 my $children = delete $self->{children};
560 $self->{children} = [];
561
562 for (@$children) {
563 delete $_->{parent};
564 $_->hide;
565 }
566
567 $self->check_size;
568 $self->update;
414} 569}
415 570
416sub find_widget { 571sub find_widget {
417 my ($self, $x, $y) = @_; 572 my ($self, $x, $y) = @_;
418 573
… …
482 637
483package CFClient::UI::Window; 638package CFClient::UI::Window;
484 639
485our @ISA = CFClient::UI::Bin::; 640our @ISA = CFClient::UI::Bin::;
486 641
487use SDL::OpenGL; 642use CFClient::OpenGL;
488 643
489sub new { 644sub new {
490 my ($class, %arg) = @_; 645 my ($class, %arg) = @_;
491 646
492 my $self = $class->SUPER::new (%arg); 647 my $self = $class->SUPER::new (%arg);
493} 648}
494 649
495sub update { 650sub update {
496 my ($self) = @_; 651 my ($self) = @_;
497 652
498 # we want to do this delayed... 653 $ROOT->on_post_alloc ($self => sub { $self->render_child });
499 $self->render_chld;
500 $self->SUPER::update; 654 $self->SUPER::update;
501}
502
503sub render_chld {
504 my ($self) = @_;
505
506 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
507 glClearColor 0, 0, 0, 1;
508 glClear GL_COLOR_BUFFER_BIT;
509 $self->child->draw;
510 };
511} 655}
512 656
513sub size_allocate { 657sub size_allocate {
514 my ($self, $w, $h) = @_; 658 my ($self, $w, $h) = @_;
515 659
516 $self->child->configure (0, 0, $w, $h); 660 $self->SUPER::size_allocate ($w, $h);
661 $self->update;
662}
517 663
664sub _render {
665 $_[0]{children}[0]->draw;
666}
667
668sub render_child {
669 my ($self) = @_;
670
671 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
672 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT;
674
518 $self->render_chld; 675 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 };
519} 684}
520 685
521sub _draw { 686sub _draw {
522 my ($self) = @_; 687 my ($self) = @_;
523 688
524 my ($w, $h) = ($self->w, $self->h); 689 my ($w, $h) = ($self->w, $self->h);
525 690
526 my $tex = $self->{texture} 691 my $tex = $self->{texture}
527 or return; 692 or return;
528 693
529 glEnable GL_BLEND;
530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
531 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1;
533 697
534 $tex->draw_quad (0, 0, $w, $h); 698 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
535 699
536 glDisable GL_BLEND;
537 glDisable GL_TEXTURE_2D; 700 glDisable GL_TEXTURE_2D;
538} 701}
539 702
540############################################################################# 703#############################################################################
541 704
542package CFClient::UI::ViewPort; 705package CFClient::UI::ViewPort;
543 706
544our @ISA = CFClient::UI::Window::; 707our @ISA = CFClient::UI::Window::;
545 708
546sub new { die }
547
548sub size_request { 709sub size_request {
549 my ($self) = @_; 710 my ($self) = @_;
550 711
551 @$self{qw(child_w child_h)} = $self->child->size_request; 712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
553 714
554 @$self{qw(child_w child_h)} 715 @$self{qw(child_w child_h)}
555} 716}
556 717
557sub _draw {
558 my ($self) = @_;
559
560 $self->{children}[1]->draw;
561}
562
563
564#############################################################################
565
566package CFClient::UI::Frame;
567
568our @ISA = CFClient::UI::Bin::;
569
570use SDL::OpenGL;
571
572sub size_request {
573 my ($self) = @_;
574 my $chld = $self->child
575 or return (0, 0);
576
577 $chld->move (2, 2);
578
579 map { $_ + 4 } $chld->size_request;
580}
581
582sub size_allocate { 718sub size_allocate {
583 my ($self, $x, $y, $w, $h) = @_; 719 my ($self, $w, $h) = @_;
720
721 $self->update;
722}
723
724sub set_offset {
725 my ($self, $x, $y) = @_;
726
727 $self->{view_x} = int $x;
728 $self->{view_y} = int $y;
729
730 $self->update;
731}
732
733# hmm, this does not work for topleft of $self... but we should not ask for that
734sub coord2local {
735 my ($self, $x, $y) = @_;
736
737 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
738}
739
740sub coord2global {
741 my ($self, $x, $y) = @_;
742
743 $x = List::Util::min $self->{w}, $x - $self->{view_x};
744 $y = List::Util::min $self->{h}, $y - $self->{view_y};
745
746 $self->SUPER::coord2global ($x, $y)
747}
748
749sub find_widget {
750 my ($self, $x, $y) = @_;
751
752 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
753 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
754 ) {
755 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
756 } else {
757 $self->CFClient::UI::Base::find_widget ($x, $y)
584 758 }
585 $self->child->configure (2, 2, $w - 4, $h - 4);
586} 759}
587 760
588sub _draw { 761sub _render {
589 my ($self) = @_; 762 my ($self) = @_;
590 763
591 my $chld = $self->child; 764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
592 765
593 my ($w, $h) = $chld->size_request; 766 $self->SUPER::_render;
594
595 glBegin GL_QUADS;
596 glColor 0, 0, 0;
597 glVertex 0 , 0;
598 glVertex 0 , $h + 4;
599 glVertex $w + 4 , $h + 4;
600 glVertex $w + 4 , 0;
601 glEnd;
602
603 $chld->draw;
604} 767}
605 768
606############################################################################# 769#############################################################################
607 770
608package CFClient::UI::FancyFrame; 771package CFClient::UI::ScrolledWindow;
609 772
610our @ISA = CFClient::UI::Bin::; 773our @ISA = CFClient::UI::HBox::;
611
612use SDL::OpenGL;
613
614my @tex =
615 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
616 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
617 774
618sub new { 775sub new {
619 my $class = shift; 776 my $class = shift;
620 777
778 my $self;
779
780 my $slider = new CFClient::UI::Slider
781 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
785 },
786 ;
787
788 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort),
790 slider => $slider,
791 @_,
792 );
793
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider});
797
798 $self
799}
800
801#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll
803
804#############################################################################
805
806package CFClient::UI::Frame;
807
808our @ISA = CFClient::UI::Bin::;
809
810use CFClient::OpenGL;
811
812sub new {
813 my $class = shift;
814
815 $class->SUPER::new (
816 bg => undef,
817 @_,
818 )
819}
820
821sub _draw {
822 my ($self) = @_;
823
824 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)};
826
827 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} };
830
831 glBegin GL_QUADS;
832 glVertex 0 , 0;
833 glVertex 0 , $h;
834 glVertex $w, $h;
835 glVertex $w, 0;
836 glEnd;
837
838 glDisable GL_BLEND;
839 }
840
841 $self->SUPER::_draw;
842}
843
844#############################################################################
845
846package CFClient::UI::FancyFrame;
847
848our @ISA = CFClient::UI::Bin::;
849
850use CFClient::OpenGL;
851
852my @tex =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
855
856sub new {
857 my $class = shift;
858
621 # TODO: user_x, user_y, overwrite moveto? 859 # TODO: user_x, user_y, overwrite moveto?
622 860
623 $class->SUPER::new ( 861 my $self = $class->SUPER::new (
624 bg => [1, 1, 1, 1], 862 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1], 863 border_bg => [1, 1, 1, 1],
626 border => 0.8, 864 border => 0.6,
865 toplevel => 1,
866 can_events => 1,
627 @_ 867 @_
628 ) 868 );
869
870 $self->{title} &&= new CFClient::UI::Label
871 align => 0,
872 valign => 1,
873 text => $self->{title},
874 fontsize => $self->{border};
875
876 $self
629} 877}
630 878
631sub border { 879sub border {
632 int $_[0]{border} * $::FONTSIZE 880 int $_[0]{border} * $::FONTSIZE
633} 881}
634 882
635sub size_request { 883sub size_request {
636 my ($self) = @_; 884 my ($self) = @_;
637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639 885
640 my ($w, $h) = $self->SUPER::size_request; 886 my ($w, $h) = $self->SUPER::size_request;
641 887
642 ( 888 (
643 $w + $self->border * 2, 889 $w + $self->border * 2,
… …
649 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
650 896
651 $h -= List::Util::max 0, $self->border * 2; 897 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2; 898 $w -= List::Util::max 0, $self->border * 2;
653 899
900 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
901 if $self->{title};
902
654 $self->child->configure ($self->border, $self->border, $w, $h); 903 $self->child->configure ($self->border, $self->border, $w, $h);
655} 904}
656 905
657sub button_down { 906sub button_down {
658 my ($self, $ev, $x, $y) = @_; 907 my ($self, $ev, $x, $y) = @_;
659 908
909 my ($w, $h) = @$self{qw(w h)};
660 my $border = $self->border; 910 my $border = $self->border;
661 911
662 if ($x < $self->{w} && $x >= $self->{w} - $border 912 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
663 && $y < $self->{h} && $y >= $self->{h} - $border) { 913 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
664 914
915 if ($lr & $td) {
916 my ($wx, $wy) = ($self->{x}, $self->{y});
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 917 my ($ox, $oy) = ($ev->{x}, $ev->{y});
666 my ($bw, $bh) = ($self->{w}, $self->{h}); 918 my ($bw, $bh) = ($self->{w}, $self->{h});
919
920 my $mx = $x < $border;
921 my $my = $y < $border;
667 922
668 $self->{motion} = sub { 923 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_; 924 my ($ev, $x, $y) = @_;
670 925
671 ($x, $y) = ($ev->motion_x, $ev->motion_y); 926 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy;
672 928
673 $self->{user_w} = $bw + $x - $ox; 929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
674 $self->{user_h} = $bh + $y - $oy; 930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
675 $self->check_size; 932 $self->check_size;
676 }; 933 };
677 934
678 } elsif ($x >= 0 && $x < $self->{w} 935 } elsif ($lr ^ $td) {
679 && $y >= 0 && $y < $border) {
680
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 936 my ($ox, $oy) = ($ev->{x}, $ev->{y});
682 my ($bx, $by) = ($self->{x}, $self->{y}); 937 my ($bx, $by) = ($self->{x}, $self->{y});
683 938
684 $self->{motion} = sub { 939 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_; 940 my ($ev, $x, $y) = @_;
686 941
687 ($x, $y) = ($ev->motion_x, $ev->motion_y); 942 ($x, $y) = ($ev->{x}, $ev->{y});
688 943
689 $self->move ($bx + $x - $ox, $by + $y - $oy); 944 $self->move ($bx + $x - $ox, $by + $y - $oy);
690 $self->update; 945 $self->update;
691 }; 946 };
692 } 947 }
… …
708 my ($self) = @_; 963 my ($self) = @_;
709 964
710 my ($w, $h ) = ($self->{w}, $self->{h}); 965 my ($w, $h ) = ($self->{w}, $self->{h});
711 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
712 967
713 glEnable GL_BLEND;
714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
715 glEnable GL_TEXTURE_2D; 968 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
717 970
718 my $border = $self->border; 971 my $border = $self->border;
719 972
720 glColor @{ $self->{border_bg} }; 973 glColor @{ $self->{border_bg} };
721 $tex[1]->draw_quad (0, 0, $w, $border); 974 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
722 $tex[3]->draw_quad (0, $border, $border, $ch); 975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
724 $tex[4]->draw_quad (0, $h - $border, $w, $border); 977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
725 978
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
726 my $bg = $tex[0]; 980 my $bg = $tex[0];
727 981
728 # TODO: repeat texture not scale 982 # TODO: repeat texture not scale
729 my $rep_x = $cw / $bg->{w}; 983 my $rep_x = $cw / $bg->{w};
730 my $rep_y = $ch / $bg->{h}; 984 my $rep_y = $ch / $bg->{h};
731 985
732 glColor @{ $self->{bg} }; 986 glColor @{ $self->{bg} };
733 987
734 $bg->{s} = $rep_x; 988 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y; 989 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1; 990 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch); 991 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 }
738 993
739 glDisable GL_TEXTURE_2D; 994 glDisable GL_TEXTURE_2D;
740 glDisable GL_BLEND; 995
996 $self->{title}->draw if $self->{title};
741 997
742 $self->child->draw; 998 $self->child->draw;
743} 999}
744 1000
745############################################################################# 1001#############################################################################
… …
748 1004
749our @ISA = CFClient::UI::Base::; 1005our @ISA = CFClient::UI::Base::;
750 1006
751use List::Util qw(max sum); 1007use List::Util qw(max sum);
752 1008
753use SDL::OpenGL; 1009use CFClient::OpenGL;
754 1010
755sub new { 1011sub new {
756 my $class = shift; 1012 my $class = shift;
757 1013
758 $class->SUPER::new ( 1014 $class->SUPER::new (
… …
768 $self->{children}[$y][$x] = $child; 1024 $self->{children}[$y][$x] = $child;
769 1025
770 $child->check_size; 1026 $child->check_size;
771} 1027}
772 1028
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
773# TODO: move to container class maybe? send childs a signal on removal? 1033# TODO: move to container class maybe? send childs a signal on removal?
774sub clear { 1034sub clear {
775 my ($self) = @_; 1035 my ($self) = @_;
776 1036
1037 my @children = $self->children;
777 delete $self->{children}; 1038 delete $self->{children};
1039
1040 for (@children) {
1041 delete $_->{parent};
1042 $_->hide;
1043 }
1044
778 $self->update; 1045 $self->update;
779} 1046}
780 1047
781sub get_wh { 1048sub get_wh {
782 my ($self) = @_; 1049 my ($self) = @_;
… …
788 or next; 1055 or next;
789 1056
790 for my $x (0 .. $#$row) { 1057 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x] 1058 my $widget = $row->[$x]
792 or next; 1059 or next;
793 my ($w, $h) = $widget->size_request; 1060 my ($w, $h) = @$widget{qw(req_w req_h)};
794 1061
795 $w[$x] = max $w[$x], $w; 1062 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h; 1063 $h[$y] = max $h[$y], $h;
797 } 1064 }
798 } 1065 }
… …
903 1170
904 ($h, $w) = ($w, $h); 1171 ($h, $w) = ($w, $h);
905 1172
906 my $children = $self->{children}; 1173 my $children = $self->{children};
907 1174
908 my @h = map +($_->size_request)[0], @$children; 1175 my @h = map $_->{req_w}, @$children;
909 1176
910 my $req_h = List::Util::sum @h; 1177 my $req_h = List::Util::sum @h;
911 1178
912 if ($req_h > $h) { 1179 if ($req_h > $h) {
913 # ah well, not enough space 1180 # ah well, not enough space
… …
959} 1226}
960 1227
961sub size_allocate { 1228sub size_allocate {
962 my ($self, $w, $h) = @_; 1229 my ($self, $w, $h) = @_;
963 1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
964 my $children = $self->{children}; 1233 my $children = $self->{children};
965 1234
966 my @h = map +($_->size_request)[1], @$children; 1235 my @h = map $_->{req_h}, @$children;
967 1236
968 my $req_h = List::Util::sum @h; 1237 my $req_h = List::Util::sum @h;
969 1238
970 if ($req_h > $h) { 1239 if ($req_h > $h) {
971 # ah well, not enough space 1240 # ah well, not enough space
… …
999 1268
1000package CFClient::UI::Label; 1269package CFClient::UI::Label;
1001 1270
1002our @ISA = CFClient::UI::Base::; 1271our @ISA = CFClient::UI::Base::;
1003 1272
1004use SDL::OpenGL; 1273use CFClient::OpenGL;
1005 1274
1006sub new { 1275sub new {
1007 my ($class, %arg) = @_; 1276 my ($class, %arg) = @_;
1008 1277
1009 my $self = $class->SUPER::new ( 1278 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1], 1279 fg => [1, 1, 1],
1280 #font => default_font
1281 #text => initial text
1282 #markup => initial narkup
1283 layout => (new CFClient::Layout),
1011 fontsize => 1, 1284 fontsize => 1,
1012 text => "",
1013 align => -1, 1285 align => -1,
1014 valign => -1, 1286 valign => -1,
1015 padding => 2, 1287 padding => 2,
1016 layout => new CFClient::Layout, 1288 can_events => 0,
1017 %arg 1289 %arg
1018 ); 1290 );
1019 1291
1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1292 if (exists $self->{template}) {
1293 my $layout = new CFClient::Layout;
1294 $layout->set_text (delete $self->{template});
1295 $self->{template} = $layout;
1296 }
1021 1297
1022 $self->set_text (delete $self->{text}) if exists $self->{text}; 1298 if (exists $self->{markup}) {
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1299 $self->set_markup (delete $self->{markup});
1300 } else {
1301 $self->set_text (delete $self->{text});
1302 }
1024 1303
1025 $self 1304 $self
1026} 1305}
1027 1306
1028sub escape_text { 1307sub escape {
1029 local $_ = $_[1]; 1308 local $_ = $_[1];
1030 1309
1031 s/&/&amp;/g; 1310 s/&/&amp;/g;
1032 s/>/&gt;/g; 1311 s/>/&gt;/g;
1033 s/</&lt;/g; 1312 s/</&lt;/g;
1034 1313
1035 $_[1] 1314 $_[1]
1036} 1315}
1037 1316
1317sub update {
1318 my ($self) = @_;
1319
1320 delete $self->{texture};
1321 $self->SUPER::update;
1322}
1323
1038sub set_text { 1324sub set_text {
1039 my ($self, $text) = @_; 1325 my ($self, $text) = @_;
1040 1326
1327 return if $self->{text} eq "T$text";
1328 $self->{text} = "T$text";
1329
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1041 $self->{layout}->set_text ($text); 1331 $self->{layout}->set_text ($text);
1042 1332
1043 delete $self->{texture};
1044 $self->update; 1333 $self->update;
1334 $self->check_size;
1045} 1335}
1046 1336
1047sub set_markup { 1337sub set_markup {
1048 my ($self, $markup) = @_; 1338 my ($self, $markup) = @_;
1049 1339
1340 return if $self->{text} eq "M$markup";
1341 $self->{text} = "M$markup";
1342
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344
1345 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1050 $self->{layout}->set_markup ($markup); 1346 $self->{layout}->set_markup ($markup);
1051 1347
1052 delete $self->{texture};
1053 $self->update; 1348 $self->update;
1349 $self->check_size;
1054} 1350}
1055 1351
1056sub size_request { 1352sub size_request {
1057 my ($self) = @_; 1353 my ($self) = @_;
1058 1354
1059 $self->{layout}->set_width; 1355 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $self->{layout}->set_width ($self->{max_w} || -1);
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061 1358
1062 my ($w, $h) = $self->{layout}->size; 1359 my ($w, $h) = $self->{layout}->size;
1360
1361 if (exists $self->{template}) {
1362 $self->{template}->set_font ($self->{font}) if $self->{font};
1363 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1364
1365 my ($w2, $h2) = $self->{template}->size;
1366
1367 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2;
1369 }
1063 1370
1064 ( 1371 (
1065 $w + $self->{padding} * 2, 1372 $w + $self->{padding} * 2,
1066 $h + $self->{padding} * 2, 1373 $h + $self->{padding} * 2,
1067 ) 1374 )
… …
1071 my ($self, $w, $h) = @_; 1378 my ($self, $w, $h) = @_;
1072 1379
1073 delete $self->{texture}; 1380 delete $self->{texture};
1074} 1381}
1075 1382
1383sub set_fontsize {
1384 my ($self, $fontsize) = @_;
1385
1386 $self->{fontsize} = $fontsize;
1387 delete $self->{texture};
1388
1389 $self->update;
1390 $self->check_size;
1391}
1392
1076sub _draw { 1393sub _draw {
1077 my ($self) = @_; 1394 my ($self) = @_;
1078 1395
1079 my $tex = $self->{texture} ||= do { 1396 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font};
1080 $self->{layout}->set_width ($self->{w}); 1399 $self->{layout}->set_width ($self->{w});
1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1401
1082 new_from_layout CFClient::Texture $self->{layout} 1402 my $tex = new_from_layout CFClient::Texture $self->{layout};
1403
1404 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1406 : ($self->{w} - $tex->{w}) * 0.5;
1407
1408 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1410 : ($self->{h} - $tex->{h}) * 0.5;
1411
1412 $tex
1083 }; 1413 };
1084 1414
1085 glEnable GL_BLEND;
1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1087 glEnable GL_TEXTURE_2D; 1415 glEnable GL_TEXTURE_2D;
1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1089 1417
1418 if ($tex->{format} == GL_ALPHA) {
1090 glColor @{$self->{fg}}; 1419 glColor @{$self->{fg}};
1091
1092 $self->{ox} = int (
1093 $self->{align} < 0 ? $self->{padding}
1094 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1095 : ($self->{w} - $tex->{w}) * 0.5
1096 );
1097
1098 $self->{oy} = int (
1099 $self->{valign} < 0 ? $self->{padding}
1100 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1101 : ($self->{h} - $tex->{h}) * 0.5
1102 );
1103
1104 $tex->draw_quad ($self->{ox}, $self->{oy}); 1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1105 1424
1106 glDisable GL_TEXTURE_2D; 1425 glDisable GL_TEXTURE_2D;
1107 glDisable GL_BLEND;
1108} 1426}
1109 1427
1110############################################################################# 1428#############################################################################
1111 1429
1112package CFClient::UI::EntryBase; 1430package CFClient::UI::EntryBase;
1113 1431
1114our @ISA = CFClient::UI::Label::; 1432our @ISA = CFClient::UI::Label::;
1115 1433
1116use SDL::OpenGL; 1434use CFClient::OpenGL;
1117 1435
1118sub new { 1436sub new {
1119 my $class = shift; 1437 my $class = shift;
1120 1438
1121 $class->SUPER::new ( 1439 $class->SUPER::new (
1122 fg => [1, 1, 1], 1440 fg => [1, 1, 1],
1123 bg => [0, 0, 0, 0.2], 1441 bg => [0, 0, 0, 0.2],
1124 active_bg => [1, 1, 1, 0.5], 1442 active_bg => [1, 1, 1, 0.5],
1125 active_fg => [0, 0, 0], 1443 active_fg => [0, 0, 0],
1126 can_hover => 1, 1444 can_hover => 1,
1127 can_focus => 1, 1445 can_focus => 1,
1128 valign => 0, 1446 valign => 0,
1447 can_events => 1,
1129 @_ 1448 @_
1130 ) 1449 )
1131} 1450}
1132 1451
1133sub _set_text { 1452sub _set_text {
… …
1146 $self->{layout}->set_text ("$text "); 1465 $self->{layout}->set_text ("$text ");
1147 1466
1148 $self->emit (changed => $self->{text}); 1467 $self->emit (changed => $self->{text});
1149} 1468}
1150 1469
1470sub set_text {
1471 my ($self, $text) = @_;
1472
1473 $self->{cursor} = length $text;
1474 $self->_set_text ($text);
1475 $self->check_size;
1476 $self->update;
1477}
1478
1151sub get_text { 1479sub get_text {
1152 $_[0]{text} 1480 $_[0]{text}
1153} 1481}
1154 1482
1155sub size_request { 1483sub size_request {
… …
1161} 1489}
1162 1490
1163sub size_allocate { 1491sub size_allocate {
1164 my ($self, $w, $h) = @_; 1492 my ($self, $w, $h) = @_;
1165 1493
1166 $self->_set_text ($self->{text}); 1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1167}
1168
1169sub set_text {
1170 my ($self, $text) = @_;
1171
1172 $self->{cursor} = length $text;
1173 $self->_set_text ($text);
1174 $self->update;
1175} 1495}
1176 1496
1177sub key_down { 1497sub key_down {
1178 my ($self, $ev) = @_; 1498 my ($self, $ev) = @_;
1179 1499
… …
1181 my $sym = $ev->{sym}; 1501 my $sym = $ev->{sym};
1182 my $uni = $ev->{unicode}; 1502 my $uni = $ev->{unicode};
1183 1503
1184 my $text = $self->get_text; 1504 my $text = $self->get_text;
1185 1505
1186 if ($sym == 8) { 1506 if ($uni == 8) {
1187 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1507 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1188 } elsif ($sym == 127) { 1508 } elsif ($uni == 127) {
1189 substr $text, $self->{cursor}, 1, ""; 1509 substr $text, $self->{cursor}, 1, "";
1190 } elsif ($sym == CFClient::SDLK_LEFT) { 1510 } elsif ($sym == CFClient::SDLK_LEFT) {
1191 --$self->{cursor} if $self->{cursor}; 1511 --$self->{cursor} if $self->{cursor};
1192 } elsif ($sym == CFClient::SDLK_RIGHT) { 1512 } elsif ($sym == CFClient::SDLK_RIGHT) {
1193 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1513 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1194 } elsif ($sym == CFClient::SDLK_HOME) { 1514 } elsif ($sym == CFClient::SDLK_HOME) {
1195 $self->{cursor} = 0; 1515 $self->{cursor} = 0;
1196 } elsif ($sym == CFClient::SDLK_END) { 1516 } elsif ($sym == CFClient::SDLK_END) {
1197 $self->{cursor} = length $text; 1517 $self->{cursor} = length $text;
1198 } elsif ($sym == 27) { 1518 } elsif ($uni == 27) {
1199 $self->emit ('escape'); 1519 $self->emit ('escape');
1200 } elsif ($uni) { 1520 } elsif ($uni) {
1201 substr $text, $self->{cursor}++, 0, chr $uni; 1521 substr $text, $self->{cursor}++, 0, chr $uni;
1202 } 1522 }
1203 1523
… …
1278 1598
1279package CFClient::UI::Entry; 1599package CFClient::UI::Entry;
1280 1600
1281our @ISA = CFClient::UI::EntryBase::; 1601our @ISA = CFClient::UI::EntryBase::;
1282 1602
1283use SDL::OpenGL; 1603use CFClient::OpenGL;
1284 1604
1285sub key_down { 1605sub key_down {
1286 my ($self, $ev) = @_; 1606 my ($self, $ev) = @_;
1287 1607
1288 my $sym = $ev->{sym}; 1608 my $sym = $ev->{sym};
1289 1609
1290 if ($sym == 13) { 1610 if ($sym == 13) {
1611 unshift @{$self->{history}},
1612 my $txt = $self->get_text;
1613 $self->{history_pointer} = -1;
1614 $self->{history_saveback} = '';
1291 $self->emit (activate => $self->get_text); 1615 $self->emit (activate => $txt);
1292 $self->update; 1616 $self->update;
1617
1618 } elsif ($sym == CFClient::SDLK_UP) {
1619 if ($self->{history_pointer} < 0) {
1620 $self->{history_saveback} = $self->get_text;
1621 }
1622 if (@{$self->{history} || []} > 0) {
1623 $self->{history_pointer}++;
1624 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1625 $self->{history_pointer} = @{$self->{history} || []} - 1;
1626 }
1627 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1628 }
1629
1630 } elsif ($sym == CFClient::SDLK_DOWN) {
1631 $self->{history_pointer}--;
1632 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1633
1634 if ($self->{history_pointer} >= 0) {
1635 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1636 } else {
1637 $self->set_text ($self->{history_saveback});
1638 }
1293 1639
1294 } else { 1640 } else {
1295 $self->SUPER::key_down ($ev); 1641 $self->SUPER::key_down ($ev);
1296 } 1642 }
1297 1643
… …
1301 1647
1302package CFClient::UI::Button; 1648package CFClient::UI::Button;
1303 1649
1304our @ISA = CFClient::UI::Label::; 1650our @ISA = CFClient::UI::Label::;
1305 1651
1306use SDL::OpenGL; 1652use CFClient::OpenGL;
1307 1653
1308my @tex = 1654my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1655 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310 qw(b1_button_active.png); 1656 qw(b1_button_active.png);
1311 1657
1312sub new { 1658sub new {
1313 my $class = shift; 1659 my $class = shift;
1314 1660
1315 $class->SUPER::new ( 1661 $class->SUPER::new (
1316 padding => 4, 1662 padding => 4,
1317 fg => [1, 1, 1], 1663 fg => [1, 1, 1],
1318 bg => [1, 1, 1, 0.2], 1664 bg => [1, 1, 1, 0.2],
1319 active_fg => [0, 0, 1], 1665 active_fg => [0, 0, 1],
1320 can_hover => 1, 1666 can_hover => 1,
1321 align => 0, 1667 align => 0,
1322 valign => 0, 1668 valign => 0,
1669 can_events => 1,
1323 @_ 1670 @_
1324 ) 1671 )
1325} 1672}
1326 1673
1327sub button_up { 1674sub button_up {
… …
1340 1687
1341 if ($GRAB == $self) { 1688 if ($GRAB == $self) {
1342 $self->{fg} = $self->{active_fg}; 1689 $self->{fg} = $self->{active_fg};
1343 } 1690 }
1344 1691
1345 glEnable GL_BLEND;
1346 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1347 glEnable GL_TEXTURE_2D; 1692 glEnable GL_TEXTURE_2D;
1348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1693 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1349 glColor 0, 0, 0, 1; 1694 glColor 0, 0, 0, 1;
1350 1695
1351 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1696 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1352 1697
1353 glDisable GL_TEXTURE_2D; 1698 glDisable GL_TEXTURE_2D;
1354 glDisable GL_BLEND;
1355 1699
1356 $self->SUPER::_draw; 1700 $self->SUPER::_draw;
1357} 1701}
1358 1702
1359############################################################################# 1703#############################################################################
… …
1361package CFClient::UI::CheckBox; 1705package CFClient::UI::CheckBox;
1362 1706
1363our @ISA = CFClient::UI::DrawBG::; 1707our @ISA = CFClient::UI::DrawBG::;
1364 1708
1365my @tex = 1709my @tex =
1366 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1710 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1367 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1711 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1368 1712
1369use SDL::OpenGL; 1713use CFClient::OpenGL;
1370 1714
1371sub new { 1715sub new {
1372 my $class = shift; 1716 my $class = shift;
1373 1717
1374 $class->SUPER::new ( 1718 $class->SUPER::new (
… …
1406 1750
1407 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1751 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1408 1752
1409 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1753 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1410 1754
1411 glEnable GL_BLEND; 1755 my $tex = $self->{state} ? $tex[1] : $tex[0];
1756
1412 glEnable GL_TEXTURE_2D; 1757 glEnable GL_TEXTURE_2D;
1413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1414
1415 my $tex = $self->{state} ? $tex[1] : $tex[0];
1416
1417 $tex->draw_quad (0, 0, $s, $s); 1758 $tex->draw_quad_alpha (0, 0, $s, $s);
1418
1419 glDisable GL_TEXTURE_2D; 1759 glDisable GL_TEXTURE_2D;
1760}
1761
1762#############################################################################
1763
1764package CFClient::UI::Image;
1765
1766our @ISA = CFClient::UI::Base::;
1767
1768use CFClient::OpenGL;
1769use Carp qw/confess/;
1770
1771our %loaded_images;
1772
1773sub new {
1774 my $class = shift;
1775
1776 my $self = $class->SUPER::new (can_events => 0, @_);
1777
1778 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1779
1780 $loaded_images{$self->{image}} ||=
1781 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1782
1783 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1784
1785 Scalar::Util::weaken $loaded_images{$self->{image}};
1786
1787 $self->{aspect} = $tex->{w} / $tex->{h};
1788
1789 $self
1790}
1791
1792sub size_request {
1793 my ($self) = @_;
1794
1795 ($self->{tex}->{w}, $self->{tex}->{h})
1796}
1797
1798sub _draw {
1799 my ($self) = @_;
1800
1801 my $tex = $self->{tex};
1802
1803 my ($w, $h) = ($self->{w}, $self->{h});
1804
1805 if ($self->{rot90}) {
1806 glRotate 90, 0, 0, 1;
1807 glTranslate 0, -$self->{w}, 0;
1808
1809 ($w, $h) = ($h, $w);
1810 }
1811
1812 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1814
1815 $tex->draw_quad_alpha (0, 0, $w, $h);
1816
1420 glDisable GL_BLEND; 1817 glDisable GL_TEXTURE_2D;
1421} 1818}
1422 1819
1423############################################################################# 1820#############################################################################
1424 1821
1425package CFClient::UI::VGauge; 1822package CFClient::UI::VGauge;
1426 1823
1427our @ISA = CFClient::UI::Base::; 1824our @ISA = CFClient::UI::Base::;
1428 1825
1429use SDL::OpenGL; 1826use List::Util qw(min max);
1827
1828use CFClient::OpenGL;
1430 1829
1431my %tex = ( 1830my %tex = (
1432 food => [ 1831 food => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1434 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1833 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1435 ], 1834 ],
1436 grace => [ 1835 grace => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1438 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1837 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1439 ], 1838 ],
1440 hp => [ 1839 hp => [
1441 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1442 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1841 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1443 ], 1842 ],
1444 mana => [ 1843 mana => [
1445 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1844 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1446 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1845 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1447 ], 1846 ],
1448); 1847);
1449 1848
1450# eg. VGauge->new (gauge => 'food'), default gauge: food 1849# eg. VGauge->new (gauge => 'food'), default gauge: food
1451sub new { 1850sub new {
1452 my $class = shift; 1851 my $class = shift;
1453 1852
1454 my $self = $class->SUPER::new (gauge => 'food', @_); 1853 my $self = $class->SUPER::new (
1854 type => 'food',
1855 @_
1856 );
1857
1858 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1455 1859
1456 $self 1860 $self
1457} 1861}
1458 1862
1459sub size_request { 1863sub size_request {
1460 my ($self) = @_; 1864 my ($self) = @_;
1461 1865
1462 my $tex = $tex{$self->{gauge}}[0]; 1866 #my $tex = $tex{$self->{type}}[0];
1463
1464 @$tex{qw(w h)} 1867 #@$tex{qw(w h)}
1868 (0, 0)
1465} 1869}
1466 1870
1467sub set_max { 1871sub set_max {
1468 my ($self, $max) = @_; 1872 my ($self, $max) = @_;
1469 1873
1874 return if $self->{max_val} == $max;
1875
1470 $self->{max_val} = $max; 1876 $self->{max_val} = $max;
1877 $self->update;
1471} 1878}
1472 1879
1473sub set_value { 1880sub set_value {
1474 my ($self, $val, $max) = @_; 1881 my ($self, $val, $max) = @_;
1475 1882
1476 $self->set_max ($max) 1883 $self->set_max ($max)
1477 if defined $max; 1884 if defined $max;
1478 1885
1479 $max = $self->{max_val}; 1886 return if $self->{val} == $val;
1887
1480 $self->{val} = $val; 1888 $self->{val} = $val;
1481
1482 $self->update; 1889 $self->update;
1483} 1890}
1484 1891
1485sub _draw { 1892sub _draw {
1486 my ($self) = @_; 1893 my ($self) = @_;
1487 1894
1488 my $tex = $tex{$self->{gauge}}; 1895 my $tex = $tex{$self->{type}};
1896 my ($t1, $t2, $t3) = @$tex;
1489 1897
1490 my ($w, $h) = ($self->{w}, $self->{h}); 1898 my ($w, $h) = ($self->{w}, $self->{h});
1491 1899
1900 if ($self->{vertical}) {
1901 glRotate 90, 0, 0, 1;
1902 glTranslate 0, -$self->{w}, 0;
1903
1904 ($w, $h) = ($h, $w);
1905 }
1906
1492 my $ycut = $self->{val} / ($self->{max_val} || 1); 1907 my $ycut = $self->{val} / ($self->{max_val} || 1);
1493 $ycut = 1 if $self->{val} > $self->{max_val};
1494 1908
1495 my $t1 = $tex->[0]; 1909 my $ycut1 = max 0, min 1, $ycut;
1496 my $t2 = $tex->[1]; 1910 my $ycut2 = max 0, min 1, $ycut - 1;
1911
1912 my $h1 = $self->{h} * (1 - $ycut1);
1913 my $h2 = $self->{h} * (1 - $ycut2);
1497 1914
1498 glEnable GL_BLEND; 1915 glEnable GL_BLEND;
1499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1916 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1500 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1501 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1502 1919
1503 my $h1 = $self->{h} - $ycut * $self->{h};
1504 my $h2 = $ycut * $self->{h};
1505
1506 my $yp = 0;
1507
1508 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1920 glBindTexture GL_TEXTURE_2D, $t1->{name};
1509 glBegin GL_QUADS; 1921 glBegin GL_QUADS;
1510 glTexCoord 0 , 0; glVertex 0 , $yp; 1922 glTexCoord 0 , 0; glVertex 0 , 0;
1511 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1923 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1512 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1924 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1513 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1925 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1514 glEnd; 1926 glEnd;
1515 1927
1516 $yp += $h1; 1928 my $ycut1 = List::Util::min 1, $ycut;
1517
1518 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1929 glBindTexture GL_TEXTURE_2D, $t2->{name};
1519 glBegin GL_QUADS; 1930 glBegin GL_QUADS;
1520 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1931 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1521 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1932 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1522 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1523 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1933 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1934 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1524 glEnd; 1935 glEnd;
1936
1937 if ($t3) {
1938 glBindTexture GL_TEXTURE_2D, $t3->{name};
1939 glBegin GL_QUADS;
1940 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1941 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1942 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1943 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1944 glEnd;
1945 }
1525 1946
1526 glDisable GL_BLEND; 1947 glDisable GL_BLEND;
1527 glDisable GL_TEXTURE_2D; 1948 glDisable GL_TEXTURE_2D;
1528} 1949}
1529 1950
1530############################################################################# 1951#############################################################################
1531 1952
1953package CFClient::UI::Gauge;
1954
1955our @ISA = CFClient::UI::VBox::;
1956
1957sub new {
1958 my ($class, %arg) = @_;
1959
1960 my $self = $class->SUPER::new (
1961 tooltip => $arg{type},
1962 can_hover => 1,
1963 can_events => 1,
1964 %arg,
1965 );
1966
1967 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1968 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1969 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1970
1971 $self
1972}
1973
1974sub set_fontsize {
1975 my ($self, $fsize) = @_;
1976
1977 $self->{value}->set_fontsize ($fsize);
1978 $self->{max} ->set_fontsize ($fsize);
1979}
1980
1981sub set_max {
1982 my ($self, $max) = @_;
1983
1984 $self->{gauge}->set_max ($max);
1985 $self->{max}->set_text ($max);
1986}
1987
1988sub set_value {
1989 my ($self, $val, $max) = @_;
1990
1991 $self->set_max ($max)
1992 if defined $max;
1993
1994 $self->{gauge}->set_value ($val, $max);
1995 $self->{value}->set_text ($val);
1996}
1997
1998#############################################################################
1999
1532package CFClient::UI::Slider; 2000package CFClient::UI::Slider;
1533 2001
1534use strict; 2002use strict;
1535 2003
1536use SDL::OpenGL; 2004use CFClient::OpenGL;
1537 2005
1538our @ISA = CFClient::UI::DrawBG::; 2006our @ISA = CFClient::UI::DrawBG::;
1539 2007
1540my @tex = 2008my @tex =
1541 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2009 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1542 qw(s1_slider.png s1_slider_bg.png); 2010 qw(s1_slider.png s1_slider_bg.png);
1543 2011
1544sub new { 2012sub new {
1545 my $class = shift; 2013 my $class = shift;
1546 2014
1547 # range [value, low, high, page] 2015 # range [value, low, high, page, unit]
1548 2016
1549 # TODO: 0-width page 2017 # TODO: 0-width page
1550 # TODO: req_w/h are wrong with vertical 2018 # TODO: req_w/h are wrong with vertical
1551 # TODO: calculations are off 2019 # TODO: calculations are off
1552 my $self = $class->SUPER::new ( 2020 my $self = $class->SUPER::new (
1553 fg => [1, 1, 1], 2021 fg => [1, 1, 1],
1554 active_fg => [0, 0, 0], 2022 active_fg => [0, 0, 0],
1555 range => [0, 0, 100, 10], 2023 range => [0, 0, 100, 10],
1556 req_w => 20, 2024 req_w => $::WIDTH / 80,
1557 req_h => 20, 2025 req_h => $::WIDTH / 80,
1558 vertical => 0, 2026 vertical => 0,
1559 can_hover => 1, 2027 can_hover => 1,
1560 inner_pad => 5, 2028 inner_pad => .05,
1561 @_ 2029 @_
1562 ); 2030 );
1563 2031
2032 $self->set_value ($self->{range}[0]);
2033 $self->update;
2034
1564 $self 2035 $self
2036}
2037
2038sub set_value {
2039 my ($self, $value) = @_;
2040
2041 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2042
2043 $hi = $lo + 1 if $hi <= $lo;
2044
2045 $value = $lo if $value < $lo;
2046 $value = $hi if $value > $hi;
2047
2048 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2049 if $unit;
2050
2051 $page = $hi - $lo if $page > $hi - $lo;
2052
2053 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2054
2055 if ($value != $old_value) {
2056 $self->emit (changed => $value);
2057 $self->update;
2058 }
1565} 2059}
1566 2060
1567sub size_request { 2061sub size_request {
1568 my ($self) = @_; 2062 my ($self) = @_;
1569 2063
… …
1582 2076
1583sub mouse_motion { 2077sub mouse_motion {
1584 my ($self, $ev, $x, $y) = @_; 2078 my ($self, $ev, $x, $y) = @_;
1585 2079
1586 if ($GRAB == $self) { 2080 if ($GRAB == $self) {
2081 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2082
2083 my (undef, $lo, $hi, $page) = @{$self->{range}};
2084
2085 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2086
2087 $self->set_value ($x * ($hi - $lo) + $lo);
2088 }
2089}
2090
2091sub update {
2092 my ($self) = @_;
2093
2094 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2095 $self->set_value ($self->{range}[0]);
2096
1587 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2097 my ($value, $lo, $hi, $page) = @{$self->{range}};
1588 2098
1589 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2099 my $inner_w = 1 - 2 * $self->{inner_pad};
1590 2100
1591 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2101 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1592 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1593 2102
1594 $x -= $inner_pad_px; # substract the padding 2103 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1595 $x = $x * ($hi - $lo) / $inner_w + $lo; 2104 $value = $self->{scale} * ($value - $lo);
1596 $x = $lo if $x < $lo;
1597 $x = $hi - $page if $x > $hi - $page;
1598 $self->{range}[0] = $x;
1599 2105
1600 $self->emit (changed => $x); 2106 $value = $self->{inner_pad} + ($value - $page * 0.5);
1601 $self->update; 2107
2108 $value = 0 if $value < 0;
2109 $page = 1 - $value if $value + $page > 1;
2110
2111 $self->{knob_x} = $value;
2112 $self->{knob_w} = $page;
1602 } 2113 });
1603}
1604 2114
1605# the inner_* stuff is for generating a padding for the slider handle, 2115 $self->SUPER::update;
1606# so that the handle doesn't leave the texture. This calculation isn't 100%
1607# correct propably, but it does the job for now
1608sub _calc_inner_pad_px {
1609 my ($self, $w) = @_;
1610 ($w / 100) * $self->{inner_pad} # % to pixels
1611} 2116}
1612 2117
1613sub _draw { 2118sub _draw {
1614 my ($self) = @_; 2119 my ($self) = @_;
1615 2120
1616 $self->SUPER::_draw (); 2121 $self->SUPER::_draw ();
1617 2122
1618 my ($w, $h) = @$self{qw(w h)}; 2123 glScale $self->{w}, $self->{h};
1619 2124
1620 if ($self->{vertical}) { 2125 if ($self->{vertical}) {
1621 # draw a vertical slider like a rotated horizontal slider 2126 # draw a vertical slider like a rotated horizontal slider
1622 2127
1623 glRotate 90, 0, 0, 1; 2128 glRotate 90, 0, 0, 1;
1624 glTranslate 0, -$self->{w}, 0; 2129 glTranslate 0, 1, 0;
1625
1626 ($w, $h) = ($h, $w);
1627 } 2130 }
1628 2131
1629 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2132 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1630 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2133 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1631 2134
1632 my ($value, $lo, $hi, $page) = @{$self->{range}};
1633
1634 $hi = $value + 1 if $lo == $hi;
1635
1636 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1637 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1638
1639 $page = int $page * $inner_w / ($hi - $lo);
1640 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1641
1642 $w -= $page;
1643 $page &= ~1;
1644 glTranslate $page * 0.5, 0, 0;
1645 $page ||= 2;
1646
1647 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1648 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1649
1650 glEnable GL_BLEND;
1651 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1652 glEnable GL_TEXTURE_2D; 2135 glEnable GL_TEXTURE_2D;
1653 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1654 2137
1655 # draw background 2138 # draw background
1656 $tex[1]->draw_quad (0, 0, $w, $h); 2139 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1657 2140
1658 # draw handle 2141 # draw handle
1659 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2142 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1660 2143
1661 glDisable GL_BLEND;
1662 glDisable GL_TEXTURE_2D; 2144 glDisable GL_TEXTURE_2D;
1663} 2145}
1664 2146
1665############################################################################# 2147#############################################################################
1666 2148
1667package CFClient::UI::TextView; 2149package CFClient::UI::TextView;
1668 2150
1669our @ISA = CFClient::UI::HBox::; 2151our @ISA = CFClient::UI::HBox::;
1670 2152
1671use SDL::OpenGL; 2153use CFClient::OpenGL;
1672 2154
1673sub new { 2155sub new {
1674 my $class = shift; 2156 my $class = shift;
1675 2157
1676 my $self = $class->SUPER::new ( 2158 my $self = $class->SUPER::new (
1677 fontsize => 1, 2159 fontsize => 1,
2160 can_events => 0,
2161 #font => default_font
1678 @_, 2162 @_,
1679 2163
1680 layout => (new CFClient::Layout), 2164 layout => (new CFClient::Layout 1),
1681 par => [], 2165 par => [],
1682 height => 0, 2166 height => 0,
1683 children => [ 2167 children => [
1684 (new CFClient::UI::Empty expand => 1), 2168 (new CFClient::UI::Empty expand => 1),
1685 (new CFClient::UI::Slider vertical => 1), 2169 (new CFClient::UI::Slider vertical => 1),
1686 ], 2170 ],
1687 ); 2171 );
1688 2172
1689 $self->{children}[1]->connect (changed => sub { 2173 $self->{children}[1]->connect (changed => sub { $self->update });
1690 $self->update;
1691 });
1692 2174
1693 $self 2175 $self
1694} 2176}
1695 2177
1696sub set_fontsize { 2178sub set_fontsize {
… …
1704 my ($self, $text) = @_; 2186 my ($self, $text) = @_;
1705 2187
1706 my $layout = $self->{layout}; 2188 my $layout = $self->{layout};
1707 2189
1708 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2190 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1709 $layout->set_width ($self->{w}); 2191 $layout->set_width ($self->{children}[0]{w});
1710 $layout->set_text ($text); 2192 $layout->set_markup ($text);
1711 2193
1712 ($layout->size)[1] 2194 ($layout->size)[1]
1713} 2195}
1714 2196
1715sub reflow { 2197sub reflow {
… …
1722sub size_allocate { 2204sub size_allocate {
1723 my ($self, $w, $h) = @_; 2205 my ($self, $w, $h) = @_;
1724 2206
1725 $self->SUPER::size_allocate ($w, $h); 2207 $self->SUPER::size_allocate ($w, $h);
1726 2208
2209 $self->{layout}->set_font ($self->{font}) if $self->{font};
1727 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2210 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1728 $self->{layout}->set_width ($self->{children}[0]{w}); 2211 $self->{layout}->set_width ($self->{children}[0]{w});
1729 2212
1730 $self->reflow; 2213 $self->reflow;
1731} 2214}
… …
1752 2235
1753 return unless $self->{h} > 0; 2236 return unless $self->{h} > 0;
1754 2237
1755 delete $self->{texture}; 2238 delete $self->{texture};
1756 2239
1757 $ROOT->on_refresh ($self, sub { 2240 $ROOT->on_post_alloc ($self, sub {
1758 if (delete $self->{need_reflow}) { 2241 if (delete $self->{need_reflow}) {
1759 my $height = 0; 2242 my $height = 0;
1760 2243
1761 $height += $_->[0] = $self->text_height ($_->[2]) 2244 $height += $_->[0] = $self->text_height ($_->[2])
1762 for @{$self->{par}}; 2245 for @{$self->{par}};
… …
1766 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2249 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1767 2250
1768 delete $self->{texture}; 2251 delete $self->{texture};
1769 } 2252 }
1770 2253
1771 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2254 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1772 glClearColor 0, 0, 0, 1; 2255 glClearColor 0, 0, 0, 0;
1773 glClear GL_COLOR_BUFFER_BIT; 2256 glClear GL_COLOR_BUFFER_BIT;
1774 2257
1775 glEnable GL_BLEND;
1776 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1777 glEnable GL_TEXTURE_2D; 2258 glEnable GL_TEXTURE_2D;
1778 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2259 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1779 2260
1780 my $top = int $self->{children}[1]{range}[0]; 2261 my $top = int $self->{children}[1]{range}[0];
1781 2262
… …
1784 2265
1785 my $y = 0; 2266 my $y = 0;
1786 2267
1787 my $layout = $self->{layout}; 2268 my $layout = $self->{layout};
1788 2269
2270 $layout->set_font ($self->{font}) if $self->{font};
2271
1789 for my $par (@{$self->{par}}) { 2272 for my $par (@{$self->{par}}) {
1790 my $h = $par->[0]; 2273 my $h = $par->[0];
1791 2274
1792 if ($y0 < $y + $h && $y < $y1) { 2275 if ($y0 < $y + $h && $y < $y1) {
2276 $layout->set_foreground (@{ $par->[1] });
1793 $layout->set_text ($par->[2]); 2277 $layout->set_markup ($par->[2]);
1794 2278
1795 glColor @{ $par->[1] };
1796 my ($W, $H) = $layout->size; 2279 my ($W, $H) = $layout->size;
1797 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2280 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1798 } 2281 }
1799 2282
1800 $y += $h; 2283 $y += $h;
1801 } 2284 }
1802 2285
1803 glDisable GL_TEXTURE_2D; 2286 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }; 2287 };
1806 }); 2288 });
1807} 2289}
1808 2290
1809sub _draw { 2291sub _draw {
1810 my ($self) = @_; 2292 my ($self) = @_;
1811 2293
1812 if ($self->{texture}) {
1813 glEnable GL_TEXTURE_2D; 2294 glEnable GL_TEXTURE_2D;
1814 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1815 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2296 glColor 1, 1, 1, 1;
2297 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1816 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
1817 }
1818 2299
1819 $self->{children}[1]->draw; 2300 $self->{children}[1]->draw;
1820 2301
1821} 2302}
1822 2303
1823############################################################################# 2304#############################################################################
1824 2305
1825package CFClient::UI::Animator; 2306package CFClient::UI::Animator;
1826 2307
1827use SDL::OpenGL; 2308use CFClient::OpenGL;
1828 2309
1829our @ISA = CFClient::UI::Bin::; 2310our @ISA = CFClient::UI::Bin::;
1830 2311
1831sub moveto { 2312sub moveto {
1832 my ($self, $x, $y) = @_; 2313 my ($self, $x, $y) = @_;
… …
1870 2351
1871sub new { 2352sub new {
1872 my $class = shift; 2353 my $class = shift;
1873 2354
1874 my $self = $class->SUPER::new ( 2355 my $self = $class->SUPER::new (
1875 state => 0, 2356 state => 0,
1876 connect_activate => \&toggle_flopper, 2357 connect_activate => \&toggle_flopper,
1877 @_ 2358 @_
1878 ); 2359 );
1879 2360
1880 if ($self->{state}) { 2361 if ($self->{state}) {
… …
1901 $self->emit (changed => $self->{state}); 2382 $self->emit (changed => $self->{state});
1902} 2383}
1903 2384
1904############################################################################# 2385#############################################################################
1905 2386
2387package CFClient::UI::Tooltip;
2388
2389our @ISA = CFClient::UI::Bin::;
2390
2391use CFClient::OpenGL;
2392
2393sub new {
2394 my $class = shift;
2395
2396 $class->SUPER::new (
2397 @_,
2398 can_events => 0,
2399 )
2400}
2401
2402sub set_tooltip_from {
2403 my ($self, $widget) = @_;
2404
2405 $self->add (new CFClient::UI::Label
2406 markup => $widget->{tooltip},
2407 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2408 fontsize => 0.8,
2409 fg => [0, 0, 0, 1],
2410 font => ($widget->{tooltip_font} || $::FONT_PROP),
2411 );
2412}
2413
2414sub size_request {
2415 my ($self) = @_;
2416
2417 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2418
2419 ($w + 4, $h + 4)
2420}
2421
2422sub size_allocate {
2423 my ($self, $w, $h) = @_;
2424
2425 $self->SUPER::size_allocate ($w - 4, $h - 4);
2426}
2427
2428sub _draw {
2429 my ($self) = @_;
2430
2431 glTranslate 0.375, 0.375;
2432
2433 my ($w, $h) = @$self{qw(w h)};
2434
2435 glColor 1, 0.8, 0.4;
2436 glBegin GL_QUADS;
2437 glVertex 0 , 0;
2438 glVertex 0 , $h;
2439 glVertex $w, $h;
2440 glVertex $w, 0;
2441 glEnd;
2442
2443 glColor 0, 0, 0;
2444 glBegin GL_LINE_LOOP;
2445 glVertex 0 , 0;
2446 glVertex 0 , $h;
2447 glVertex $w, $h;
2448 glVertex $w, 0;
2449 glEnd;
2450
2451 glTranslate 2 - 0.375, 2 - 0.375;
2452 $self->SUPER::_draw;
2453}
2454
2455#############################################################################
2456
2457package CFClient::UI::Face;
2458
2459our @ISA = CFClient::UI::Base::;
2460
2461use CFClient::OpenGL;
2462
2463sub new {
2464 my $class = shift;
2465
2466 $class->SUPER::new (
2467 aspect => 1,
2468 @_,
2469 )
2470}
2471
2472sub size_request {
2473 (32, 8)
2474}
2475
2476sub _draw {
2477 my ($self) = @_;
2478
2479 return unless $::CONN;#d# manage and cache textures differently
2480 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2481
2482 # TODO animation
2483 if ($tex) {
2484 glEnable GL_TEXTURE_2D;
2485 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2486 glColor 1, 1, 1, 1;
2487 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2488 glDisable GL_TEXTURE_2D;
2489 }
2490}
2491
2492#############################################################################
2493
2494package CFClient::UI::InventoryItem;
2495
2496our @ISA = CFClient::UI::HBox::;
2497
2498sub new {
2499 my $class = shift;
2500
2501 my %args = @_;
2502
2503 my $item = delete $args{item};
2504
2505 my $desc = $item->{nrof} < 2
2506 ? $item->{name}
2507 : "$item->{nrof} $item->{name_pl}";
2508
2509 $item->{flags} & Crossfire::Protocol::F_OPEN
2510 and $desc .= " (open)";
2511 $item->{flags} & Crossfire::Protocol::F_APPLIED
2512 and $desc .= " (applied)";
2513 $item->{flags} & Crossfire::Protocol::F_UNPAID
2514 and $desc .= " (unpaid)";
2515 $item->{flags} & Crossfire::Protocol::F_MAGIC
2516 and $desc .= " (magic)";
2517 $item->{flags} & Crossfire::Protocol::F_CURSED
2518 and $desc .= " (cursed)";
2519 $item->{flags} & Crossfire::Protocol::F_DAMNED
2520 and $desc .= " (damned)";
2521 $item->{flags} & Crossfire::Protocol::F_LOCKED
2522 and $desc .= " *";
2523
2524 my $self = $class->SUPER::new (
2525 can_hover => 1,
2526 can_events => 1,
2527 tooltip => (CFClient::UI::Label->escape ($desc)
2528 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2529 connect_button_down => sub {
2530 my ($self, $ev, $x, $y) = @_;
2531
2532 # todo: maybe put examine on 1? but should just be a tooltip :(
2533 if ($ev->{button} == 1) {
2534 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2535 } elsif ($ev->{button} == 2) {
2536 $::CONN->send ("apply $item->{tag}");
2537 } elsif ($ev->{button} == 3) {
2538 my @menu_items = (
2539 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2543 [
2544 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2545 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2546 ],
2547 );
2548
2549 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2550 }
2551
2552 1
2553 },
2554 %args
2555 );
2556
2557 $self->add (new CFClient::UI::Face
2558 can_events => 0,
2559 face => $item->{face},
2560 anim => $item->{anim},
2561 animspeed => $item->{animspeed},
2562 );
2563
2564 $self->add (new CFClient::UI::Label
2565 can_events => 0,
2566 text => $desc,
2567 );
2568
2569 $self
2570}
2571
2572#############################################################################
2573
2574package CFClient::UI::Inventory;
2575
2576our @ISA = CFClient::UI::ScrolledWindow::;
2577
2578sub new {
2579 my $class = shift;
2580
2581 my $self = $class->SUPER::new (
2582 scrolled => (new CFClient::UI::VBox),
2583 @_,
2584 );
2585
2586 $self
2587}
2588
2589sub set_items {
2590 my ($self, $items) = @_;
2591
2592 $self->{scrolled}->clear;
2593 return unless $items;
2594
2595 my @items = sort {
2596 ($a->{type} <=> $b->{type})
2597 or ($a->{name} cmp $b->{name})
2598 } @$items;
2599
2600 $self->{real_items} = \@items;
2601
2602 for my $item (@items) {
2603 my $desc = $item->{nrof} < 2
2604 ? $item->{name}
2605 : "$item->{nrof} $item->{name_pl}";
2606
2607 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2608 }
2609
2610 $self->{scrolled}->add (@items);
2611
2612# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2613}
2614
2615sub size_request {
2616 my ($self) = @_;
2617 ($self->{req_w}, $self->{req_h});
2618}
2619
2620#############################################################################
2621
2622package CFClient::UI::Menu;
2623
2624our @ISA = CFClient::UI::FancyFrame::;
2625
2626use CFClient::OpenGL;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 items => [],
2633 z => 100,
2634 @_,
2635 );
2636
2637 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2638
2639 for my $item (@{ $self->{items} }) {
2640 my ($widget, $cb) = @$item;
2641
2642 # handle various types of items, only text for now
2643 if (!ref $widget) {
2644 $widget = new CFClient::UI::Label
2645 can_hover => 1,
2646 can_events => 1,
2647 text => $widget;
2648 }
2649
2650 $self->{item}{$widget} = $item;
2651
2652 $self->{vbox}->add ($widget);
2653 }
2654
2655 $self
2656}
2657
2658# popup given the event (must be a mouse button down event currently)
2659sub popup {
2660 my ($self, $ev) = @_;
2661
2662 $self->emit ("popdown");
2663
2664 # maybe save $GRAB? must be careful about events...
2665 $GRAB = $self;
2666 $self->{button} = $ev->{button};
2667
2668 $self->show;
2669 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2670}
2671
2672sub mouse_motion {
2673 my ($self, $ev, $x, $y) = @_;
2674
2675 # TODO: should use vbox->find_widget or so
2676 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2677 $self->{hover} = $self->{item}{$HOVER};
2678}
2679
2680sub button_up {
2681 my ($self, $ev, $x, $y) = @_;
2682
2683 if ($ev->{button} == $self->{button}) {
2684 undef $GRAB;
2685 $self->hide;
2686
2687 $self->emit ("popdown");
2688 $self->{hover}[1]->() if $self->{hover};
2689 }
2690}
2691
2692#############################################################################
2693
2694package CFClient::UI::Statusbox;
2695
2696our @ISA = CFClient::UI::VBox::;
2697
2698sub reorder {
2699 my ($self) = @_;
2700 my $NOW = time;
2701
2702 while (my ($k, $v) = each %{ $self->{item} }) {
2703 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2704 }
2705
2706 my @widgets;
2707
2708 my @items = sort {
2709 $a->{pri} <=> $b->{pri}
2710 or $b->{id} <=> $a->{id}
2711 } values %{ $self->{item} };
2712
2713 my $count = 10 + 1;
2714 for my $item (@items) {
2715 last unless --$count;
2716
2717 push @widgets, $item->{label} ||= do {
2718 # TODO: doesn't handle markup well (read as: at all)
2719 my $short = $item->{count} > 1
2720 ? "<b>$item->{count} ×</b> $item->{text}"
2721 : $item->{text};
2722
2723 for ($short) {
2724 s/^\s+//;
2725 s/\s+/ /g;
2726 my $len = int 40 / $item->{fontsize};
2727 substr $_, $len, length, "…" if $len < length;
2728 }
2729
2730 new CFClient::UI::Label
2731 markup => $short,
2732 tooltip => $item->{tooltip},
2733 tooltip_font => $::FONT_PROP,
2734 tooltip_width => 0.67,
2735 fontsize => $item->{fontsize},
2736 fg => $item->{fg},
2737 can_events => 1,
2738 can_hover => 1
2739 };
2740 }
2741
2742 $self->clear;
2743 $self->SUPER::add (reverse @widgets);
2744}
2745
2746sub add {
2747 my ($self, $text, %arg) = @_;
2748
2749 $text =~ s/^\s+//;
2750 $text =~ s/\s+$//;
2751
2752 my $timeout = time + ((delete $arg{timeout}) || 60);
2753
2754 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2755
2756 if (my $item = $self->{item}{$group}) {
2757 if ($item->{text} eq $text) {
2758 $item->{count}++;
2759 } else {
2760 $item->{count} = 1;
2761 $item->{text} = $item->{tooltip} = $text;
2762 }
2763 $item->{id} = ++$self->{id};
2764 $item->{timeout} = $timeout;
2765 delete $item->{label};
2766 } else {
2767 $self->{item}{$group} = {
2768 id => ++$self->{id},
2769 text => $text,
2770 timeout => $timeout,
2771 tooltip => $text,
2772 fontsize => 0.8,
2773 fg => [0.8, 0.8, 0.8, 0.8],
2774 pri => 0,
2775 count => 1,
2776 %arg,
2777 };
2778 }
2779
2780 $self->reorder;
2781}
2782
2783#############################################################################
2784
1906package CFClient::UI::Root; 2785package CFClient::UI::Root;
1907 2786
1908our @ISA = CFClient::UI::Container::; 2787our @ISA = CFClient::UI::Container::;
1909 2788
1910use SDL::OpenGL; 2789use CFClient::OpenGL;
1911 2790
1912sub check_size { 2791sub new {
1913 my ($self) = @_; 2792 my $class = shift;
1914 2793
1915 $self->configure (0, 0, $::WITH, $::HEIGHT); 2794 $class->SUPER::new (
1916} 2795 @_,
1917 2796 )
1918sub size_request {
1919 ($::WIDTH, $::HEIGHT)
1920} 2797}
1921 2798
1922sub configure { 2799sub configure {
1923 my ($self, $x, $y, $w, $h) = @_; 2800 my ($self, $x, $y, $w, $h) = @_;
1924 2801
1925 $self->SUPER::configure ($x, $y, $w, $h); 2802 $self->{w} = $w;
1926 2803 $self->{h} = $h;
1927 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1928 for @{$self->{children}};
1929} 2804}
1930 2805
1931sub _topleft { 2806sub check_size {
2807 my ($self) = @_;
2808
2809 $self->size_allocate ($self->{w}, $self->{h})
2810 if $self->{w};
2811}
2812
2813sub size_request {
2814 my ($self) = @_;
2815
2816 ($self->{w}, $self->{h})
2817}
2818
2819sub size_allocate {
2820 my ($self, $w, $h) = @_;
2821
2822 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2823 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2824
2825 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2826 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2827
2828 for my $child ($self->children) {
2829 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2830
2831 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2832 if exists $child->{req_x};
2833
2834 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2835 if exists $child->{req_y};
2836
2837 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2838 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2839
2840 $child->configure ($X, $Y, $W, $H);
2841 }
2842}
2843
2844sub coord2local {
1932 my ($self, $x, $y) = @_; 2845 my ($self, $x, $y) = @_;
1933 2846
1934 ($x, $y) 2847 ($x, $y)
1935} 2848}
1936 2849
2850sub coord2global {
2851 my ($self, $x, $y) = @_;
2852
2853 ($x, $y)
2854}
2855
1937sub update { 2856sub update {
1938 my ($self) = @_; 2857 my ($self) = @_;
1939 2858
1940 $self->check_size; 2859 $self->check_size;
1941 ::refresh (); 2860 $::WANT_REFRESH++;
1942} 2861}
1943 2862
1944sub add { 2863sub add {
1945 my ($self, $child) = @_; 2864 my ($self, @children) = @_;
1946 2865
2866 for my $child (@children) {
2867 $child->{toplevel} = 1;
2868
2869 # integerise window positions
2870 $child->{x} = int $child->{x};
2871 $child->{y} = int $child->{y};
2872 }
2873
1947 $self->SUPER::add ($child); 2874 $self->SUPER::add (@children);
1948} 2875}
1949 2876
1950sub on_refresh { 2877sub on_refresh {
1951 my ($self, $id, $cb) = @_; 2878 my ($self, $id, $cb) = @_;
1952 2879
1953 $self->{refresh_hook}{$id} = $cb; 2880 $self->{refresh_hook}{$id} = $cb;
1954} 2881}
1955 2882
2883sub on_post_alloc {
2884 my ($self, $id, $cb) = @_;
2885
2886 $self->{post_alloc_hook}{$id} = $cb;
2887}
2888
1956sub draw { 2889sub draw {
1957 my ($self) = @_; 2890 my ($self) = @_;
1958 2891
1959 while (my $rcb = delete $self->{refresh_hook}) { 2892 while ($self->{refresh_hook}) {
1960 $_->() for values %$rcb; 2893 $_->()
2894 for values %{delete $self->{refresh_hook}};
2895 }
2896
2897 if ($self->{check_size}) {
2898 my @queue = ([], []);
2899
2900 for (;;) {
2901 if ($self->{check_size}) {
2902 # heuristic: check containers last
2903 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2904 for values %{delete $self->{check_size}}
2905 }
2906
2907 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2908
2909 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2910 ? @$widget{qw(user_w user_h)}
2911 : $widget->size_request;
2912
2913 if (delete $widget->{force_alloc}
2914 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2915 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2916
2917 $widget->{req_w} = $w;
2918 $widget->{req_h} = $h;
2919
2920 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2921
2922 $widget->{parent}->check_size
2923 if $widget->{parent};
2924 }
2925 }
2926 }
2927
2928 while ($self->{size_alloc}) {
2929 for (values %{delete $self->{size_alloc}}) {
2930 my ($widget, $w, $h) = @$_;
2931
2932 $w = 0 if $w < 0;
2933 $h = 0 if $h < 0;
2934
2935 $widget->{w} = $w;
2936 $widget->{h} = $h;
2937 $widget->size_allocate ($w, $h);
2938 $widget->emit (size_allocate => $w, $h);
2939 }
2940 }
2941
2942 while ($self->{post_alloc_hook}) {
2943 $_->()
2944 for values %{delete $self->{post_alloc_hook}};
1961 } 2945 }
1962 2946
1963 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1964 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1965 glClear GL_COLOR_BUFFER_BIT; 2949 glClear GL_COLOR_BUFFER_BIT;
… …
1976############################################################################# 2960#############################################################################
1977 2961
1978package CFClient::UI; 2962package CFClient::UI;
1979 2963
1980$ROOT = new CFClient::UI::Root; 2964$ROOT = new CFClient::UI::Root;
2965$TOOLTIP = new CFClient::UI::Tooltip;
1981 2966
19821 29671
1983 2968

Diff Legend

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