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

Diff Legend

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