ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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