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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.152 by root, Sun Apr 23 01:05:03 2006 UTC vs.
Revision 1.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;
46
47 my $tip = $widget->{tooltip};
48
49 $tip = $tip->($widget) if CODE:: eq ref $tip;
50
23 $TOOLTIP->set_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
24 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
25 $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;
26 } 62 }
27 63
28 return; 64 return;
29 } 65 }
30 } 66 }
… …
34 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
35} 71}
36 72
37# class methods for events 73# class methods for events
38sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
39 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
40} 77}
41 78
42sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
43 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
44} 82}
45 83
46sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
47 my ($ev) = @_; 85 my ($ev) = @_;
48 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
56 check_tooltip; 94 check_tooltip;
57 } 95 }
58 96
59 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
60 98
61 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
62} 101}
63 102
64sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
65 my ($ev) = @_; 104 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
67 106
68 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
69 108
70 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
71 110
72 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
73 113
74 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
75 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
76 $grab->update if $grab; 116 $grab->update if $grab;
77 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
93 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
94 134
95 check_tooltip; 135 check_tooltip;
96 } 136 }
97 137
98 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
99} 140}
100 141
101# convert position array to integers 142# convert position array to integers
102sub harmonize { 143sub harmonize {
103 my ($vals) = @_; 144 my ($vals) = @_;
… …
109 $rem += $_ - $i; 150 $rem += $_ - $i;
110 $_ = $i; 151 $_ = $i;
111 } 152 }
112} 153}
113 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
114############################################################################# 191#############################################################################
115 192
116package CFClient::UI::Base; 193package CFClient::UI::Base;
117 194
118use strict; 195use strict;
… …
121 198
122sub new { 199sub new {
123 my $class = shift; 200 my $class = shift;
124 201
125 my $self = bless { 202 my $self = bless {
126 x => 0, 203 x => 0,
127 y => 0, 204 y => 0,
128 z => 0, 205 z => 0,
129 can_events => 1, 206 can_events => 1,
130 @_ 207 @_
131 }, $class; 208 }, $class;
132 209
133 for (keys %$self) { 210 for (keys %$self) {
134 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
135 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
136 } 213 }
137 } 214 }
138 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
139 $self 225 $self
140} 226}
141 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
142sub show { 245sub show {
143 my ($self) = @_; 246 my ($self) = @_;
144
145 return if $self->{parent}; 247 return if $self->{parent};
146 248
147 $CFClient::UI::ROOT->add ($self); 249 $CFClient::UI::ROOT->add ($self);
148} 250}
149 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
150sub hide { 286sub hide {
151 my ($self) = @_; 287 my ($self) = @_;
152 288
153 return unless $self->{parent}; 289 $self->set_invisible;
154 290
155 $self->{parent}->remove ($self); 291 $self->{parent}->remove ($self)
292 if $self->{parent};
156} 293}
157 294
158sub move { 295sub move {
159 my ($self, $x, $y, $z) = @_; 296 my ($self, $x, $y, $z) = @_;
160 297
… …
163 $self->{z} = $z if defined $z; 300 $self->{z} = $z if defined $z;
164 301
165 $self->update; 302 $self->update;
166} 303}
167 304
168sub needs_redraw { 305sub set_size {
169 0 306 my ($self, $w, $h) = @_;
307
308 $self->{user_w} = $w;
309 $self->{user_h} = $h;
310
311 $self->check_size;
170} 312}
171 313
172sub size_request { 314sub size_request {
173 require Carp; 315 require Carp;
174 Carp::confess "size_request is abstract"; 316 Carp::confess "size_request is abstract";
… …
194 $self->{y} = $y; 336 $self->{y} = $y;
195 $self->update; 337 $self->update;
196 } 338 }
197 339
198 if ($self->{w} != $w || $self->{h} != $h) { 340 if ($self->{w} != $w || $self->{h} != $h) {
199 $self->{w} = $w; 341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
200 $self->{h} = $h;
201
202 $self->size_allocate ($w, $h);
203 $self->update;
204 } 342 }
205} 343}
206 344
207sub size_allocate { 345sub size_allocate {
208 # nothing to be done 346 # nothing to be done
209} 347}
210 348
211# return top left coordinates 349sub reconfigure {
212sub _topleft { 350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
356sub children {
357}
358
359sub set_max_size {
213 my ($self, $x, $y) = @_; 360 my ($self, $w, $h) = @_;
214 361
215 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 362 delete $self->{max_w}; $self->{max_w} = $w if $w;
363 delete $self->{max_h}; $self->{max_h} = $h if $h;
364}
365
366sub set_tooltip {
367 my ($self, $tooltip) = @_;
368
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 }
216} 380}
217 381
218# translate global coordinates to local coordinate system 382# translate global coordinates to local coordinate system
219sub coord2local { 383sub coord2local {
220 my ($self, $x, $y) = @_; 384 my ($self, $x, $y) = @_;
221 385
222 my ($X, $Y) = $self->_topleft; 386 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
223 ($x - $X, $y - $Y)
224} 387}
225 388
226# translate local coordinates to global coordinate system 389# translate local coordinates to global coordinate system
227sub coord2global { 390sub coord2global {
228 my ($self, $x, $y) = @_; 391 my ($self, $x, $y) = @_;
229 392
230 my ($X, $Y) = $self->_topleft; 393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
231 ($x + $X, $y + $Y)
232} 394}
233 395
234sub focus_in { 396sub focus_in {
235 my ($self) = @_; 397 my ($self) = @_;
236 398
237 return if $FOCUS == $self; 399 return if $FOCUS == $self;
238 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
239 401
240 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
241 403
242 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
243 405
244 $focus->update if $focus; 406 $focus->update if $focus;
245 $FOCUS->update; 407 $FOCUS->update;
246} 408}
247 409
… …
250 412
251 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
252 414
253 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
254 416
255 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
256 418
257 $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;
258} 423}
259 424
260sub mouse_motion { } 425sub mouse_motion { }
261sub button_up { } 426sub button_up { }
262sub key_down { } 427sub key_down { }
263sub key_up { } 428sub key_up { }
264 429
265sub button_down { 430sub button_down {
266 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
267 432
268 $self->focus_in; 433 $self->focus_in;
… …
296 glVertex $x + $self->{w}, $y + $self->{h}; 461 glVertex $x + $self->{w}, $y + $self->{h};
297 glVertex $x , $y + $self->{h}; 462 glVertex $x , $y + $self->{h};
298 glEnd; 463 glEnd;
299 glDisable GL_BLEND; 464 glDisable GL_BLEND;
300 } 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 }
301} 480}
302 481
303sub _draw { 482sub _draw {
304 my ($self) = @_; 483 my ($self) = @_;
305 484
… …
320 499
321sub set_parent { 500sub set_parent {
322 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
323 502
324 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;
325} 518}
326 519
327sub check_size { 520sub check_size {
328 my ($self) = @_; 521 my ($self, $forced) = @_;
329 522
330 return unless $self->{parent}; 523 $self->{force_alloc} = 1 if $forced;
331 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
332 my ($w, $h) = $self->size_request;
333
334 if ($w != $self->{req_w} || $h != $self->{req_h}) {
335 $self->{req_w} = $w;
336 $self->{req_h} = $h;
337
338 $self->{parent}->check_size;
339 }
340} 525}
341 526
342sub update { 527sub update {
343 my ($self) = @_; 528 my ($self) = @_;
344 529
… …
350 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
351 536
352 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
353} 538}
354 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
355sub emit { 546sub emit {
356 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
357 548
358 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 549 $self->_emit ($signal, @args)
359 $cb->($self, @args); 550 || $self->$signal (@args);
360 } 551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
361} 555}
362 556
363sub DESTROY { 557sub DESTROY {
364 my ($self) = @_; 558 my ($self) = @_;
365 559
560 delete $WIDGET{$self+0};
366 #$self->deactivate; 561 #$self->deactivate;
367} 562}
368 563
369############################################################################# 564#############################################################################
370 565
… …
379 my $class = shift; 574 my $class = shift;
380 575
381 # range [value, low, high, page] 576 # range [value, low, high, page]
382 577
383 $class->SUPER::new ( 578 $class->SUPER::new (
384 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
385 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
386 @_ 581 @_
387 ) 582 )
388} 583}
389 584
390sub _draw { 585sub _draw {
391 my ($self) = @_; 586 my ($self) = @_;
392 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
393 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
394 594
395 glEnable GL_BLEND; 595 glEnable GL_BLEND;
396 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
397 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
398 598
399 glBegin GL_QUADS; 599 glBegin GL_QUADS;
400 glVertex 0 , 0; 600 glVertex 0 , 0;
401 glVertex 0 , $h; 601 glVertex 0 , $h;
402 glVertex $w, $h; 602 glVertex $w, $h;
403 glVertex $w, 0; 603 glVertex $w, 0;
404 glEnd; 604 glEnd;
405 605
406 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
407} 608}
408 609
409############################################################################# 610#############################################################################
410 611
411package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
432sub new { 633sub new {
433 my ($class, %arg) = @_; 634 my ($class, %arg) = @_;
434 635
435 my $children = delete $arg{children} || []; 636 my $children = delete $arg{children} || [];
436 637
437 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 );
438 $self->add ($_) for @$children; 643 $self->add ($_) for @$children;
439 644
440 $self 645 $self
441} 646}
442 647
443sub add { 648sub add {
444 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
445 650
446 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
447 653
448 use sort 'stable'; 654 use sort 'stable';
449 655
450 $self->{children} = [ 656 $self->{children} = [
451 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
452 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
453 ]; 659 ];
454 660
455 $child->check_size; 661 $self->check_size (1);
662 $self->update;
663}
664
665sub children {
666 @{ $_[0]{children} }
456} 667}
457 668
458sub remove { 669sub remove {
459 my ($self, $child) = @_; 670 my ($self, $child) = @_;
460 671
461 delete $child->{parent}; 672 delete $child->{parent};
673 $child->hide;
462 674
463 $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 }
464 691
465 $self->check_size; 692 $self->check_size;
466 $self->update; 693 $self->update;
467} 694}
468 695
… …
546} 773}
547 774
548sub update { 775sub update {
549 my ($self) = @_; 776 my ($self) = @_;
550 777
551 # we want to do this delayed... 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
552 $self->render_chld;
553 $self->SUPER::update; 779 $self->SUPER::update;
554}
555
556sub render_chld {
557 my ($self) = @_;
558
559 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
560 glClearColor 0, 0, 0, 1;
561 glClear GL_COLOR_BUFFER_BIT;
562 $self->child->draw;
563 };
564} 780}
565 781
566sub size_allocate { 782sub size_allocate {
567 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
568 784
569 $self->child->configure (0, 0, $w, $h); 785 $self->SUPER::size_allocate ($w, $h);
786 $self->update;
787}
570 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
571 $self->render_chld; 800 $self->_render;
801 };
572} 802}
573 803
574sub _draw { 804sub _draw {
575 my ($self) = @_; 805 my ($self) = @_;
576 806
577 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
578 808
579 my $tex = $self->{texture} 809 my $tex = $self->{texture}
580 or return; 810 or return;
581 811
582 glEnable GL_BLEND;
583 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
584 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
585 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;
586 815
587 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
588 817
589 glDisable GL_BLEND;
590 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
591} 819}
592 820
593############################################################################# 821#############################################################################
594 822
595package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
596 824
597our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
598
599sub new { die }
600
601sub size_request {
602 my ($self) = @_;
603
604 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
605 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
606
607 @$self{qw(child_w child_h)}
608}
609
610sub _draw {
611 my ($self) = @_;
612
613 $self->{children}[1]->draw;
614}
615
616
617#############################################################################
618
619package CFClient::UI::Frame;
620
621our @ISA = CFClient::UI::Bin::;
622
623use CFClient::OpenGL;
624 826
625sub new { 827sub new {
626 my $class = shift; 828 my $class = shift;
627 829
628 my $self = $class->SUPER::new ( 830 $class->SUPER::new (
629 bg => [1, 1, 1, 1], 831 scroll_x => 0,
630 border_bg => [1, 1, 1, 1], 832 scroll_y => 1,
631 border => 0.8,
632 @_ 833 @_,
633 ); 834 )
634
635 $self
636}
637
638sub set_size {
639 my ($self, $w, $h) = @_;
640 $self->{req_w} = $w;
641 $self->{req_h} = $h;
642 $self->check_size;
643} 835}
644 836
645sub size_request { 837sub size_request {
646 my ($self) = @_; 838 my ($self) = @_;
647 ($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)}
648} 843}
649 844
650sub size_allocate { 845sub size_allocate {
651 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
652 $self->{w} = $w; 847
653 $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
654 $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 )
655} 969}
656 970
657sub _draw { 971sub _draw {
658 my ($self) = @_; 972 my ($self) = @_;
659 973
660 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
661 976
662 glEnable GL_BLEND; 977 glEnable GL_BLEND;
663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
664 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
666 980
667# glBegin GL_QUADS; 981 glBegin GL_QUADS;
668# glColor 0, 0, 0, 0;
669# glVertex 0 , 0; 982 glVertex 0 , 0;
670# glVertex 0 , $h; 983 glVertex 0 , $h;
671# glVertex $w, $h; 984 glVertex $w, $h;
672# glVertex $w, 0; 985 glVertex $w, 0;
673# glEnd; 986 glEnd;
674 987
675
676 $self->child->draw;
677 glDisable GL_BLEND; 988 glDisable GL_BLEND;
678 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
679} 992}
680 993
681############################################################################# 994#############################################################################
682 995
683package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
694 my $class = shift; 1007 my $class = shift;
695 1008
696 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
697 1010
698 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
699 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
700 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
701 border => 0.8, 1014 border => 0.6,
1015 is_toplevel => 1,
702 can_events => 1, 1016 can_events => 1,
703 @_ 1017 @_
704 ); 1018 );
705 1019
706 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
707 align => 0, 1021 align => 0,
708 valign => 1, 1022 valign => 1,
709 text => $self->{title}, 1023 text => $self->{title},
710 fontsize => 1; 1024 fontsize => $self->{border};
711 1025
712 $self 1026 $self
713} 1027}
714 1028
715sub border { 1029sub border {
716 int $_[0]{border} * $::FONTSIZE 1030 int $_[0]{border} * $::FONTSIZE
717} 1031}
718 1032
719sub size_request { 1033sub size_request {
720 my ($self) = @_; 1034 my ($self) = @_;
721
722 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
723 1035
724 my ($w, $h) = $self->SUPER::size_request; 1036 my ($w, $h) = $self->SUPER::size_request;
725 1037
726 ( 1038 (
727 $w + $self->border * 2, 1039 $w + $self->border * 2,
… …
733 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
734 1046
735 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
736 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
737 1049
738 $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)
739 if $self->{title}; 1051 if $self->{title};
740 1052
741 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
742} 1054}
743 1055
744sub button_down { 1056sub button_down {
745 my ($self, $ev, $x, $y) = @_; 1057 my ($self, $ev, $x, $y) = @_;
746 1058
1059 my ($w, $h) = @$self{qw(w h)};
747 my $border = $self->border; 1060 my $border = $self->border;
748 1061
749 if ($x < $self->{w} && $x >= $self->{w} - $border 1062 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
750 && $y < $self->{h} && $y >= $self->{h} - $border) { 1063 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
751 1064
1065 if ($lr & $td) {
1066 my ($wx, $wy) = ($self->{x}, $self->{y});
752 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1067 my ($ox, $oy) = ($ev->{x}, $ev->{y});
753 my ($bw, $bh) = ($self->{w}, $self->{h}); 1068 my ($bw, $bh) = ($self->{w}, $self->{h});
754 1069
1070 my $mx = $x < $border;
1071 my $my = $y < $border;
1072
755 $self->{motion} = sub { 1073 $self->{motion} = sub {
756 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
757 1075
758 ($x, $y) = ($ev->{x}, $ev->{y}); 1076 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy;
759 1078
760 $self->{user_w} = $bw + $x - $ox; 1079 $self->{user_x} = $wx + $dx * $mx;
761 $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});
762 $self->check_size; 1084 $self->check_size;
763 }; 1085 };
764 1086
765 } elsif ($x >= 0 && $x < $self->{w} 1087 } elsif ($lr ^ $td) {
766 && $y >= 0 && $y < $border) {
767
768 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
769 my ($bx, $by) = ($self->{x}, $self->{y}); 1089 my ($bx, $by) = ($self->{x}, $self->{y});
770 1090
771 $self->{motion} = sub { 1091 $self->{motion} = sub {
772 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
773 1093
774 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
775 1095
776 $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});
777 $self->update; 1099 $self->update;
778 }; 1100 };
779 } 1101 }
780} 1102}
781 1103
… …
795 my ($self) = @_; 1117 my ($self) = @_;
796 1118
797 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
798 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
799 1121
800 glEnable GL_BLEND;
801 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
802 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
804 1124
805 my $border = $self->border; 1125 my $border = $self->border;
806 1126
807 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
808 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
809 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
810 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
811 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
812 1132
1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
813 my $bg = $tex[0]; 1134 my $bg = $tex[0];
814 1135
815 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
816 my $rep_x = $cw / $bg->{w}; 1137 my $rep_x = $cw / $bg->{w};
817 my $rep_y = $ch / $bg->{h}; 1138 my $rep_y = $ch / $bg->{h};
818 1139
819 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
820 1141
821 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
822 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
823 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
824 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
825 1147
826 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND;
828 1149
829 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
1151
830 $self->child->draw; 1152 $self->child->draw;
831} 1153}
832 1154
833############################################################################# 1155#############################################################################
834 1156
… …
843sub new { 1165sub new {
844 my $class = shift; 1166 my $class = shift;
845 1167
846 $class->SUPER::new ( 1168 $class->SUPER::new (
847 col_expand => [], 1169 col_expand => [],
848 @_ 1170 @_,
849 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
850} 1176}
851 1177
852sub add { 1178sub add {
853 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
854 1180
855 $child->set_parent ($self); 1181 $child->set_parent ($self);
856 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
857 1183
858 $child->check_size; 1184 $self->check_size (1);
859} 1185}
860 1186
861# 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?
862sub clear { 1188sub clear {
863 my ($self) = @_; 1189 my ($self) = @_;
864 1190
1191 my @children = $self->children;
865 delete $self->{children}; 1192 delete $self->{children};
1193
1194 for (@children) {
1195 delete $_->{parent};
1196 $_->hide;
1197 }
1198
1199 $self->check_size (1);
866 $self->update; 1200 $self->update;
867} 1201}
868 1202
869sub get_wh { 1203sub get_wh {
870 my ($self) = @_; 1204 my ($self) = @_;
… …
902sub size_allocate { 1236sub size_allocate {
903 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
904 1238
905 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
906 1240
907 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
908 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
909 1243
910 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
911 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
912 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
913 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1047} 1381}
1048 1382
1049sub size_allocate { 1383sub size_allocate {
1050 my ($self, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1051 1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1052 my $children = $self->{children}; 1388 my $children = $self->{children};
1053 1389
1054 my @h = map $_->{req_h}, @$children; 1390 my @h = map $_->{req_h}, @$children;
1055 1391
1056 my $req_h = List::Util::sum @h; 1392 my $req_h = List::Util::sum @h;
… …
1085 1421
1086############################################################################# 1422#############################################################################
1087 1423
1088package CFClient::UI::Label; 1424package CFClient::UI::Label;
1089 1425
1090our @ISA = CFClient::UI::Base::; 1426our @ISA = CFClient::UI::DrawBG::;
1091 1427
1092use CFClient::OpenGL; 1428use CFClient::OpenGL;
1093 1429
1094sub new { 1430sub new {
1095 my ($class, %arg) = @_; 1431 my ($class, %arg) = @_;
1096 1432
1097 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
1098 fg => [1, 1, 1], 1434 fg => [1, 1, 1],
1435 #bg => none
1436 #active_bg => none
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),
1099 fontsize => 1, 1443 fontsize => 1,
1100 text => "",
1101 align => -1, 1444 align => -1,
1102 valign => -1, 1445 valign => -1,
1103 padding => 2, 1446 padding => 2,
1104 layout => new CFClient::Layout,
1105 can_events => 0, 1447 can_events => 0,
1106 %arg 1448 %arg
1107 ); 1449 );
1108 1450
1109 if (exists $self->{template}) { 1451 if (exists $self->{template}) {
1110 my $layout = new CFClient::Layout; 1452 my $layout = new CFClient::Layout;
1111 $layout->set_text (delete $self->{template}); 1453 $layout->set_text (delete $self->{template});
1112 $self->{template} = $layout; 1454 $self->{template} = $layout;
1113 } 1455 }
1114 1456
1115 $self->set_text (delete $self->{text}) if exists $self->{text}; 1457 if (exists $self->{markup}) {
1116 $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 }
1117 1462
1118 $self 1463 $self
1119} 1464}
1120 1465
1121sub escape_text { 1466sub escape($) {
1122 local $_ = $_[1]; 1467 local $_ = $_[0];
1123 1468
1124 s/&/&amp;/g; 1469 s/&/&amp;/g;
1125 s/>/&gt;/g; 1470 s/>/&gt;/g;
1126 s/</&lt;/g; 1471 s/</&lt;/g;
1127 1472
1128 $_[1] 1473 $_
1474}
1475
1476sub update {
1477 my ($self) = @_;
1478
1479 delete $self->{texture};
1480 $self->SUPER::update;
1129} 1481}
1130 1482
1131sub set_text { 1483sub set_text {
1132 my ($self, $text) = @_; 1484 my ($self, $text) = @_;
1133 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;
1134 $self->{layout}->set_text ($text); 1490 $self->{layout}->set_text ($text);
1135 1491
1136 delete $self->{texture}; 1492 $self->update;
1137 $self->check_size; 1493 $self->check_size;
1138 $self->update;
1139} 1494}
1140 1495
1141sub set_markup { 1496sub set_markup {
1142 my ($self, $markup) = @_; 1497 my ($self, $markup) = @_;
1143 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;
1144 $self->{layout}->set_markup ($markup); 1505 $self->{layout}->set_markup ($markup);
1145 1506
1146 delete $self->{texture}; 1507 $self->update;
1147 $self->check_size; 1508 $self->check_size;
1148 $self->update;
1149} 1509}
1150 1510
1151sub size_request { 1511sub size_request {
1152 my ($self) = @_; 1512 my ($self) = @_;
1153 1513
1154 $self->{layout}->set_width; 1514 $self->{layout}->set_font ($self->{font}) if $self->{font};
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});
1155 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1156 1519
1157 my ($w, $h) = $self->{layout}->size; 1520 my ($w, $h) = $self->{layout}->size;
1158 1521
1159 if (exists $self->{template}) { 1522 if (exists $self->{template}) {
1523 $self->{template}->set_font ($self->{font}) if $self->{font};
1160 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1524 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1161 1525
1162 my ($w2, $h2) = $self->{template}->size; 1526 my ($w2, $h2) = $self->{template}->size;
1163 1527
1164 $w = List::Util::max $w, $w2; 1528 $w = List::Util::max $w, $w2;
… …
1180sub set_fontsize { 1544sub set_fontsize {
1181 my ($self, $fontsize) = @_; 1545 my ($self, $fontsize) = @_;
1182 1546
1183 $self->{fontsize} = $fontsize; 1547 $self->{fontsize} = $fontsize;
1184 delete $self->{texture}; 1548 delete $self->{texture};
1549
1550 $self->update;
1185 $self->check_size; 1551 $self->check_size;
1186 $self->update;
1187} 1552}
1188 1553
1189sub _draw { 1554sub _draw {
1190 my ($self) = @_; 1555 my ($self) = @_;
1191 1556
1557 $self->SUPER::_draw; # draw background, if applicable
1558
1192 my $tex = $self->{texture} ||= do { 1559 my $tex = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}});
1561 $self->{layout}->set_font ($self->{font}) if $self->{font};
1193 $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});
1194 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566
1195 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
1196 }; 1578 };
1197 1579
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1200 glEnable GL_TEXTURE_2D; 1580 glEnable GL_TEXTURE_2D;
1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1202 1582
1583 if ($tex->{format} == GL_ALPHA) {
1203 glColor @{$self->{fg}}; 1584 glColor @{$self->{fg}};
1204
1205 $self->{ox} = int (
1206 $self->{align} < 0 ? $self->{padding}
1207 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1208 : ($self->{w} - $tex->{w}) * 0.5
1209 );
1210
1211 $self->{oy} = int (
1212 $self->{valign} < 0 ? $self->{padding}
1213 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1214 : ($self->{h} - $tex->{h}) * 0.5
1215 );
1216
1217 $tex->draw_quad ($self->{ox}, $self->{oy}); 1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1218 1589
1219 glDisable GL_TEXTURE_2D; 1590 glDisable GL_TEXTURE_2D;
1220 glDisable GL_BLEND;
1221} 1591}
1222 1592
1223############################################################################# 1593#############################################################################
1224 1594
1225package CFClient::UI::EntryBase; 1595package CFClient::UI::EntryBase;
… …
1230 1600
1231sub new { 1601sub new {
1232 my $class = shift; 1602 my $class = shift;
1233 1603
1234 $class->SUPER::new ( 1604 $class->SUPER::new (
1235 fg => [1, 1, 1], 1605 fg => [1, 1, 1],
1236 bg => [0, 0, 0, 0.2], 1606 bg => [0, 0, 0, 0.2],
1237 active_bg => [1, 1, 1, 0.5], 1607 active_bg => [1, 1, 1, 0.5],
1238 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1239 can_hover => 1, 1609 can_hover => 1,
1240 can_focus => 1, 1610 can_focus => 1,
1241 valign => 0, 1611 valign => 0,
1242 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1243 @_ 1614 @_
1244 ) 1615 )
1245} 1616}
1246 1617
1247sub _set_text { 1618sub _set_text {
… …
1257 $self->{text} = $text; 1628 $self->{text} = $text;
1258 1629
1259 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1260 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1261 1632
1262 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1263}
1264
1265sub get_text {
1266 $_[0]{text}
1267}
1268
1269sub size_request {
1270 my ($self) = @_;
1271
1272 my ($w, $h) = $self->SUPER::size_request;
1273
1274 ($w + 1, $h) # add 1 for cursor
1275}
1276
1277sub size_allocate {
1278 my ($self, $w, $h) = @_;
1279
1280 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1281} 1634}
1282 1635
1283sub set_text { 1636sub set_text {
1284 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1285 1638
1286 $self->{cursor} = length $text; 1639 $self->{cursor} = length $text;
1287 $self->_set_text ($text); 1640 $self->_set_text ($text);
1288 $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
1289} 1655}
1290 1656
1291sub key_down { 1657sub key_down {
1292 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1293 1659
… …
1295 my $sym = $ev->{sym}; 1661 my $sym = $ev->{sym};
1296 my $uni = $ev->{unicode}; 1662 my $uni = $ev->{unicode};
1297 1663
1298 my $text = $self->get_text; 1664 my $text = $self->get_text;
1299 1665
1300 if ($sym == 8) { 1666 if ($uni == 8) {
1301 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1667 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1302 } elsif ($sym == 127) { 1668 } elsif ($uni == 127) {
1303 substr $text, $self->{cursor}, 1, ""; 1669 substr $text, $self->{cursor}, 1, "";
1304 } elsif ($sym == CFClient::SDLK_LEFT) { 1670 } elsif ($sym == CFClient::SDLK_LEFT) {
1305 --$self->{cursor} if $self->{cursor}; 1671 --$self->{cursor} if $self->{cursor};
1306 } elsif ($sym == CFClient::SDLK_RIGHT) { 1672 } elsif ($sym == CFClient::SDLK_RIGHT) {
1307 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1673 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1308 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1309 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1310 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1311 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1312 } elsif ($sym == 27) { 1678 } elsif ($uni == 27) {
1313 $self->emit ('escape'); 1679 $self->_emit ('escape');
1314 } elsif ($uni) { 1680 } elsif ($uni) {
1315 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1316 } 1682 }
1317 1683
1318 $self->_set_text ($text); 1684 $self->_set_text ($text);
1319 $self->update; 1685 $self->update;
1686 $self->check_size;
1320} 1687}
1321 1688
1322sub focus_in { 1689sub focus_in {
1323 my ($self) = @_; 1690 my ($self) = @_;
1324 1691
… …
1400 my ($self, $ev) = @_; 1767 my ($self, $ev) = @_;
1401 1768
1402 my $sym = $ev->{sym}; 1769 my $sym = $ev->{sym};
1403 1770
1404 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} = '';
1405 $self->emit (activate => $self->get_text); 1776 $self->_emit (activate => $txt);
1406 $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 }
1407 1800
1408 } else { 1801 } else {
1409 $self->SUPER::key_down ($ev); 1802 $self->SUPER::key_down ($ev);
1410 } 1803 }
1411 1804
… …
1425 1818
1426sub new { 1819sub new {
1427 my $class = shift; 1820 my $class = shift;
1428 1821
1429 $class->SUPER::new ( 1822 $class->SUPER::new (
1430 padding => 4, 1823 padding => 4,
1431 fg => [1, 1, 1], 1824 fg => [1, 1, 1],
1432 bg => [1, 1, 1, 0.2],
1433 active_fg => [0, 0, 1], 1825 active_fg => [0, 0, 1],
1434 can_hover => 1, 1826 can_hover => 1,
1435 align => 0, 1827 align => 0,
1436 valign => 0, 1828 valign => 0,
1437 can_events => 1, 1829 can_events => 1,
1438 @_ 1830 @_
1439 ) 1831 )
1440} 1832}
1441 1833
1834sub activate { }
1835
1442sub button_up { 1836sub button_up {
1443 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1444 1838
1839 $self->emit ("activate")
1445 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1446 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1447 $self->emit ("activate");
1448 }
1449} 1842}
1450 1843
1451sub _draw { 1844sub _draw {
1452 my ($self) = @_; 1845 my ($self) = @_;
1453 1846
… …
1455 1848
1456 if ($GRAB == $self) { 1849 if ($GRAB == $self) {
1457 $self->{fg} = $self->{active_fg}; 1850 $self->{fg} = $self->{active_fg};
1458 } 1851 }
1459 1852
1460 glEnable GL_BLEND;
1461 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1462 glEnable GL_TEXTURE_2D; 1853 glEnable GL_TEXTURE_2D;
1463 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1464 glColor 0, 0, 0, 1; 1855 glColor 0, 0, 0, 1;
1465 1856
1466 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1857 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1467 1858
1468 glDisable GL_TEXTURE_2D; 1859 glDisable GL_TEXTURE_2D;
1469 glDisable GL_BLEND;
1470 1860
1471 $self->SUPER::_draw; 1861 $self->SUPER::_draw;
1472} 1862}
1473 1863
1474############################################################################# 1864#############################################################################
… …
1488 1878
1489 $class->SUPER::new ( 1879 $class->SUPER::new (
1490 padding => 2, 1880 padding => 2,
1491 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1492 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],
1493 state => 0, 1885 state => 0,
1494 can_hover => 1, 1886 can_hover => 1,
1495 @_ 1887 @_
1496 ) 1888 )
1497} 1889}
… …
1506 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1507 1899
1508 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1509 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1510 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1511 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1512 } 1904 }
1513} 1905}
1514 1906
1515sub _draw { 1907sub _draw {
1516 my ($self) = @_; 1908 my ($self) = @_;
… …
1521 1913
1522 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;
1523 1915
1524 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1525 1917
1526 glEnable GL_BLEND; 1918 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919
1527 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1529
1530 my $tex = $self->{state} ? $tex[1] : $tex[0];
1531
1532 $tex->draw_quad (0, 0, $s, $s); 1921 $tex->draw_quad_alpha (0, 0, $s, $s);
1533
1534 glDisable GL_TEXTURE_2D; 1922 glDisable GL_TEXTURE_2D;
1535 glDisable GL_BLEND;
1536} 1923}
1537 1924
1538############################################################################# 1925#############################################################################
1539 1926
1540package CFClient::UI::Image; 1927package CFClient::UI::Image;
… …
1583 glTranslate 0, -$self->{w}, 0; 1970 glTranslate 0, -$self->{w}, 0;
1584 1971
1585 ($w, $h) = ($h, $w); 1972 ($w, $h) = ($h, $w);
1586 } 1973 }
1587 1974
1588 glEnable GL_BLEND;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1591 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1592 1977
1593 $tex->draw_quad (0, 0, $w, $h); 1978 $tex->draw_quad_alpha (0, 0, $w, $h);
1594 1979
1595 glDisable GL_BLEND;
1596 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1597} 1981}
1598 1982
1599############################################################################# 1983#############################################################################
1600 1984
1601package CFClient::UI::VGauge; 1985package CFClient::UI::VGauge;
1602 1986
1603our @ISA = CFClient::UI::Base::; 1987our @ISA = CFClient::UI::Base::;
1988
1989use List::Util qw(min max);
1604 1990
1605use CFClient::OpenGL; 1991use CFClient::OpenGL;
1606 1992
1607my %tex = ( 1993my %tex = (
1608 food => [ 1994 food => [
1609 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1995 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1610 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1996 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1611 ], 1997 ],
1612 grace => [ 1998 grace => [
1613 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1999 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1614 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/
1615 ], 2001 ],
1616 hp => [ 2002 hp => [
1617 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2003 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1618 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2004 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1619 ], 2005 ],
1620 mana => [ 2006 mana => [
1621 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2007 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1622 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/
1623 ], 2009 ],
1624); 2010);
1625 2011
1626# eg. VGauge->new (gauge => 'food'), default gauge: food 2012# eg. VGauge->new (gauge => 'food'), default gauge: food
1627sub new { 2013sub new {
… …
1646} 2032}
1647 2033
1648sub set_max { 2034sub set_max {
1649 my ($self, $max) = @_; 2035 my ($self, $max) = @_;
1650 2036
2037 return if $self->{max_val} == $max;
2038
1651 $self->{max_val} = $max; 2039 $self->{max_val} = $max;
2040 $self->update;
1652} 2041}
1653 2042
1654sub set_value { 2043sub set_value {
1655 my ($self, $val, $max) = @_; 2044 my ($self, $val, $max) = @_;
1656 2045
1657 $self->set_max ($max) 2046 $self->set_max ($max)
1658 if defined $max; 2047 if defined $max;
1659 2048
1660 $max = $self->{max_val}; 2049 return if $self->{val} == $val;
2050
1661 $self->{val} = $val; 2051 $self->{val} = $val;
1662
1663 $self->update; 2052 $self->update;
1664} 2053}
1665 2054
1666sub _draw { 2055sub _draw {
1667 my ($self) = @_; 2056 my ($self) = @_;
1668 2057
1669 my $tex = $tex{$self->{type}}; 2058 my $tex = $tex{$self->{type}};
2059 my ($t1, $t2, $t3) = @$tex;
1670 2060
1671 my ($w, $h) = ($self->{w}, $self->{h}); 2061 my ($w, $h) = ($self->{w}, $self->{h});
1672 2062
1673 if ($self->{vertical}) { 2063 if ($self->{vertical}) {
1674 glRotate 90, 0, 0, 1; 2064 glRotate 90, 0, 0, 1;
… …
1676 2066
1677 ($w, $h) = ($h, $w); 2067 ($w, $h) = ($h, $w);
1678 } 2068 }
1679 2069
1680 my $ycut = $self->{val} / ($self->{max_val} || 1); 2070 my $ycut = $self->{val} / ($self->{max_val} || 1);
1681 $ycut = 1 if $self->{val} > $self->{max_val};
1682 2071
1683 my $t1 = $tex->[0]; 2072 my $ycut1 = max 0, min 1, $ycut;
1684 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);
1685 2077
1686 glEnable GL_BLEND; 2078 glEnable GL_BLEND;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2079 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688 glEnable GL_TEXTURE_2D; 2080 glEnable GL_TEXTURE_2D;
1689 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2081 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1690 2082
1691 my $h1 = $self->{h} - $ycut * $self->{h};
1692 my $h2 = $ycut * $self->{h};
1693
1694 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2083 glBindTexture GL_TEXTURE_2D, $t1->{name};
1695 glBegin GL_QUADS; 2084 glBegin GL_QUADS;
1696 glTexCoord 0 , 0; glVertex 0 , 0; 2085 glTexCoord 0 , 0; glVertex 0 , 0;
1697 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2086 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1698 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2087 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1699 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2088 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1700 glEnd; 2089 glEnd;
1701 2090
2091 my $ycut1 = List::Util::min 1, $ycut;
1702 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2092 glBindTexture GL_TEXTURE_2D, $t2->{name};
1703 glBegin GL_QUADS; 2093 glBegin GL_QUADS;
1704 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2094 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1705 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2095 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1706 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2096 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1707 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2097 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1708 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 }
1709 2109
1710 glDisable GL_BLEND; 2110 glDisable GL_BLEND;
1711 glDisable GL_TEXTURE_2D; 2111 glDisable GL_TEXTURE_2D;
1712} 2112}
1713 2113
… …
1719 2119
1720sub new { 2120sub new {
1721 my ($class, %arg) = @_; 2121 my ($class, %arg) = @_;
1722 2122
1723 my $self = $class->SUPER::new ( 2123 my $self = $class->SUPER::new (
1724 tooltip => $arg{type}, 2124 tooltip => $arg{type},
2125 can_hover => 1,
2126 can_events => 1,
1725 %arg, 2127 %arg,
1726 ); 2128 );
1727 2129
1728 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2130 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1729 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1); 2131 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1730 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999"); 2132 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1731 2133
1732 $self 2134 $self
1733} 2135}
1734 2136
… …
1737 2139
1738 $self->{value}->set_fontsize ($fsize); 2140 $self->{value}->set_fontsize ($fsize);
1739 $self->{max} ->set_fontsize ($fsize); 2141 $self->{max} ->set_fontsize ($fsize);
1740} 2142}
1741 2143
2144sub set_max {
2145 my ($self, $max) = @_;
2146
2147 $self->{gauge}->set_max ($max);
2148 $self->{max}->set_text ($max);
2149}
2150
1742sub set_value { 2151sub set_value {
1743 my ($self, $val, $max) = @_; 2152 my ($self, $val, $max) = @_;
1744 2153
1745 $self->set_max ($max) 2154 $self->set_max ($max)
1746 if defined $max; 2155 if defined $max;
1747 2156
1748 $self->{gauge}->set_value ($val, $max); 2157 $self->{gauge}->set_value ($val, $max);
1749 $self->{value}->set_text ($val); 2158 $self->{value}->set_text ($val);
1750}
1751
1752sub set_max {
1753 my ($self, $max) = @_;
1754
1755 $self->{gauge}->set_max ($max);
1756 $self->{max}->set_text ($max);
1757} 2159}
1758 2160
1759############################################################################# 2161#############################################################################
1760 2162
1761package CFClient::UI::Slider; 2163package CFClient::UI::Slider;
… …
1771 qw(s1_slider.png s1_slider_bg.png); 2173 qw(s1_slider.png s1_slider_bg.png);
1772 2174
1773sub new { 2175sub new {
1774 my $class = shift; 2176 my $class = shift;
1775 2177
1776 # range [value, low, high, page] 2178 # range [value, low, high, page, unit]
1777 2179
1778 # TODO: 0-width page 2180 # TODO: 0-width page
1779 # TODO: req_w/h are wrong with vertical 2181 # TODO: req_w/h are wrong with vertical
1780 # TODO: calculations are off 2182 # TODO: calculations are off
1781 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
1782 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
1783 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],
1784 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
1785 req_w => 20, 2189 req_w => $::WIDTH / 80,
1786 req_h => 20, 2190 req_h => $::WIDTH / 80,
1787 vertical => 0, 2191 vertical => 0,
1788 can_hover => 1, 2192 can_hover => 1,
1789 inner_pad => 5, 2193 inner_pad => 0.02,
1790 @_ 2194 @_
1791 ); 2195 );
1792 2196
2197 $self->set_value ($self->{range}[0]);
2198 $self->update;
2199
1793 $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 }
1794} 2233}
1795 2234
1796sub size_request { 2235sub size_request {
1797 my ($self) = @_; 2236 my ($self) = @_;
1798 2237
… …
1804 2243
1805sub button_down { 2244sub button_down {
1806 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1807 2246
1808 $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
1809 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
1810} 2252}
1811 2253
1812sub mouse_motion { 2254sub mouse_motion {
1813 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
1814 2256
1815 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
1816 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
1817 2276
1818 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1819 2278
1820 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1821 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1822 2281
1823 $x -= $inner_pad_px; # substract the padding 2282 $value = ($value - $lo) / $range;
1824 $x = $x * ($hi - $lo) / $inner_w + $lo; 2283 $value = $value * $self->{scale} + $self->{offset};
1825 $x = $lo if $x < $lo;
1826 $x = $hi - $page if $x > $hi - $page;
1827 $self->{range}[0] = $x;
1828 2284
1829 $self->emit (changed => $x); 2285 $self->{knob_x} = $value - $knob_w * 0.5;
1830 $self->update; 2286 $self->{knob_w} = $knob_w;
1831 } 2287 });
1832}
1833 2288
1834# the inner_* stuff is for generating a padding for the slider handle, 2289 $self->SUPER::update;
1835# so that the handle doesn't leave the texture. This calculation isn't 100%
1836# correct propably, but it does the job for now
1837sub _calc_inner_pad_px {
1838 my ($self, $w) = @_;
1839 ($w / 100) * $self->{inner_pad} # % to pixels
1840} 2290}
1841 2291
1842sub _draw { 2292sub _draw {
1843 my ($self) = @_; 2293 my ($self) = @_;
1844 2294
1845 $self->SUPER::_draw (); 2295 $self->SUPER::_draw ();
1846 2296
1847 my ($w, $h) = @$self{qw(w h)}; 2297 glScale $self->{w}, $self->{h};
1848 2298
1849 if ($self->{vertical}) { 2299 if ($self->{vertical}) {
1850 # draw a vertical slider like a rotated horizontal slider 2300 # draw a vertical slider like a rotated horizontal slider
1851 2301
2302 glTranslate 1, 0, 0;
1852 glRotate 90, 0, 0, 1; 2303 glRotate 90, 0, 0, 1;
1853 glTranslate 0, -$self->{w}, 0;
1854
1855 ($w, $h) = ($h, $w);
1856 } 2304 }
1857 2305
1858 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2306 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1859 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2307 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1860 2308
1861 my ($value, $lo, $hi, $page) = @{$self->{range}};
1862
1863 $hi = $value + 1 if $lo == $hi;
1864
1865 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1866 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1867
1868 $page = int $page * $inner_w / ($hi - $lo);
1869 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1870
1871 $w -= $page;
1872 $page &= ~1;
1873 glTranslate $page * 0.5, 0, 0;
1874 $page ||= 2;
1875
1876 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1877 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1878
1879 glEnable GL_BLEND;
1880 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1881 glEnable GL_TEXTURE_2D; 2309 glEnable GL_TEXTURE_2D;
1882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1883 2311
1884 # draw background 2312 # draw background
1885 $tex[1]->draw_quad (0, 0, $w, $h); 2313 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1886 2314
1887 # draw handle 2315 # draw handle
1888 $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);
1889 2317
1890 glDisable GL_BLEND;
1891 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
1892} 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 (@_) }
1893 2361
1894############################################################################# 2362#############################################################################
1895 2363
1896package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
1897 2365
… …
1901 2369
1902sub new { 2370sub new {
1903 my $class = shift; 2371 my $class = shift;
1904 2372
1905 my $self = $class->SUPER::new ( 2373 my $self = $class->SUPER::new (
1906 fontsize => 1, 2374 fontsize => 1,
2375 can_events => 0,
2376 #font => default_font
1907 @_, 2377 @_,
1908 2378
1909 layout => (new CFClient::Layout), 2379 layout => (new CFClient::Layout 1),
1910 par => [], 2380 par => [],
1911 height => 0, 2381 height => 0,
1912 children => [ 2382 children => [
1913 (new CFClient::UI::Empty expand => 1), 2383 (new CFClient::UI::Empty expand => 1),
1914 (new CFClient::UI::Slider vertical => 1), 2384 (new CFClient::UI::Slider vertical => 1),
1915 ], 2385 ],
1916 ); 2386 );
1917 2387
1918 $self->{children}[1]->connect (changed => sub { 2388 $self->{children}[1]->connect (changed => sub { $self->update });
1919 $self->update;
1920 });
1921 2389
1922 $self 2390 $self
1923} 2391}
1924 2392
1925sub set_fontsize { 2393sub set_fontsize {
… …
1927 2395
1928 $self->{fontsize} = $fontsize; 2396 $self->{fontsize} = $fontsize;
1929 $self->reflow; 2397 $self->reflow;
1930} 2398}
1931 2399
2400sub size_allocate {
2401 my ($self, $w, $h) = @_;
2402
2403 $self->SUPER::size_allocate ($w, $h);
2404
2405 $self->{layout}->set_font ($self->{font}) if $self->{font};
2406 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2407 $self->{layout}->set_width ($self->{children}[0]{w});
2408
2409 $self->reflow;
2410}
2411
1932sub text_height { 2412sub text_size {
1933 my ($self, $text) = @_; 2413 my ($self, $text, $indent) = @_;
1934 2414
1935 my $layout = $self->{layout}; 2415 my $layout = $self->{layout};
1936 2416
1937 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1938 $layout->set_width ($self->{w}); 2418 $layout->set_width ($self->{children}[0]{w} - $indent);
1939 $layout->set_text ($text); 2419 $layout->set_markup ($text);
1940 2420
1941 ($layout->size)[1] 2421 $layout->size
1942} 2422}
1943 2423
1944sub reflow { 2424sub reflow {
1945 my ($self) = @_; 2425 my ($self) = @_;
1946 2426
1947 $self->{need_reflow}++; 2427 $self->{need_reflow}++;
1948 $self->update; 2428 $self->update;
1949} 2429}
1950 2430
1951sub size_allocate { 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 {
1952 my ($self, $w, $h) = @_; 2439 my ($self) = @_;
1953 2440
1954 $self->SUPER::size_allocate ($w, $h); 2441 $self->{par} = [];
1955 2442 $self->{height} = 0;
1956 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1957 $self->{layout}->set_width ($self->{children}[0]{w});
1958
1959 $self->reflow;
1960} 2444}
1961 2445
1962sub add_paragraph { 2446sub add_paragraph {
1963 my ($self, $color, $text) = @_; 2447 my ($self, $color, $text, $indent) = @_;
1964 2448
1965 #TODO: intelligently "reformat" paragraph 2449 for my $line (split /\n/, $text) {
1966 2450 my ($w, $h) = $self->text_size ($line);
1967 my $height = $self->text_height ($text);
1968
1969 $self->{height} += $height; 2451 $self->{height} += $h;
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2453 }
1970 2454
1971 push @{$self->{par}}, [$height, $color, $text];
1972
1973 $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]);
1974 $self->{children}[1]->update;
1975} 2456}
1976 2457
1977sub update { 2458sub update {
1978 my ($self) = @_; 2459 my ($self) = @_;
1979 2460
… …
1981 2462
1982 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
1983 2464
1984 delete $self->{texture}; 2465 delete $self->{texture};
1985 2466
1986 $ROOT->on_refresh ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
1987 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
1988 my $height = 0; 2471 my $height = 0;
1989 2472
1990 $height += $_->[0] = $self->text_height ($_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
1991 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 }
1992 2488
1993 $self->{height} = $height; 2489 $self->{height} = $height;
1994 2490
1995 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1996 2492
1997 delete $self->{texture}; 2493 delete $self->{texture};
1998 } 2494 }
1999 2495
2000 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2001 glClearColor 0, 0, 0, 1; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2002 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2003 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
2004 glEnable GL_BLEND; 2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2005 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2006 glEnable GL_TEXTURE_2D;
2007 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2008
2009 my $top = int $self->{children}[1]{range}[0];
2010
2011 my $y0 = $top;
2012 my $y1 = $top + $self->{h};
2013
2014 my $y = 0;
2015
2016 my $layout = $self->{layout};
2017 2514
2018 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2019 my $h = $par->[0]; 2516 my $h = $par->[1];
2020 2517
2021 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]);
2022 $layout->set_text ($par->[2]); 2521 $layout->set_markup ($par->[4]);
2023 2522
2024 glColor @{ $par->[1] }; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2025 my ($W, $H) = $layout->size; 2524
2026 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;
2027 } 2527 }
2028 2528
2029 $y += $h; 2529 $y += $h;
2030 } 2530 }
2031 2531
2032 glDisable GL_TEXTURE_2D;
2033 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2034 }; 2533 };
2035 }); 2534 });
2036} 2535}
2037 2536
2038sub _draw { 2537sub _draw {
2039 my ($self) = @_; 2538 my ($self) = @_;
2040 2539
2041 if ($self->{texture}) {
2042 glEnable GL_TEXTURE_2D; 2540 glEnable GL_TEXTURE_2D;
2043 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;
2044 $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});
2045 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
2046 }
2047 2545
2048 $self->{children}[1]->draw; 2546 $self->{children}[1]->draw;
2049 2547
2050} 2548}
2051 2549
… …
2099 2597
2100sub new { 2598sub new {
2101 my $class = shift; 2599 my $class = shift;
2102 2600
2103 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2104 state => 0, 2602 state => 0,
2105 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2106 can_events => 1,
2107 @_ 2604 @_
2108 ); 2605 );
2109 2606
2110 if ($self->{state}) {
2111 $self->{state} = 0;
2112 $self->toggle_flopper;
2113 }
2114
2115 $self 2607 $self
2116} 2608}
2117 2609
2118sub toggle_flopper { 2610sub toggle_flopper {
2119 my ($self) = @_; 2611 my ($self) = @_;
2120 2612
2121 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2122 if ($self->{state} = !$self->{state}) { 2614}
2123 $CFClient::UI::ROOT->add ($self->{other}); 2615
2124 $self->{other}->move ($self->coord2global (0, $self->{h})); 2616#############################################################################
2617
2618package CFClient::UI::Tooltip;
2619
2620our @ISA = CFClient::UI::Bin::;
2621
2622use CFClient::OpenGL;
2623
2624sub new {
2625 my $class = shift;
2626
2627 $class->SUPER::new (
2628 @_,
2629 can_events => 0,
2630 )
2631}
2632
2633sub set_tooltip_from {
2634 my ($self, $widget) = @_;
2635
2636 $self->add (new CFClient::UI::Label
2637 markup => $widget->{tooltip},
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 );
2644}
2645
2646sub size_request {
2647 my ($self) = @_;
2648
2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2650
2651 ($w + 4, $h + 4)
2652}
2653
2654sub size_allocate {
2655 my ($self, $w, $h) = @_;
2656
2657 $self->SUPER::size_allocate ($w - 4, $h - 4);
2658}
2659
2660sub _draw {
2661 my ($self) = @_;
2662
2663 glTranslate 0.375, 0.375;
2664
2665 my ($w, $h) = @$self{qw(w h)};
2666
2667 glColor 1, 0.8, 0.4;
2668 glBegin GL_QUADS;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674
2675 glColor 0, 0, 0;
2676 glBegin GL_LINE_LOOP;
2677 glVertex 0 , 0;
2678 glVertex 0 , $h;
2679 glVertex $w, $h;
2680 glVertex $w, 0;
2681 glEnd;
2682
2683 glTranslate 2 - 0.375, 2 - 0.375;
2684 $self->SUPER::_draw;
2685}
2686
2687#############################################################################
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
2125 $self->emit ("open"); 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};
2126 } else { 2970 } else {
2127 $CFClient::UI::ROOT->remove ($self->{other}); 2971 $self->{item}{$group} = {
2128 $self->emit ("close"); 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 };
2129 } 2981 }
2130 2982
2131 $self->emit (changed => $self->{state}); 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;
2132} 2994}
2133 2995
2134############################################################################# 2996#############################################################################
2135 2997
2136package CFClient::UI::Root; 2998package CFClient::UI::Root;
2137 2999
2138our @ISA = CFClient::UI::Container::; 3000our @ISA = CFClient::UI::Container::;
2139 3001
2140use CFClient::OpenGL; 3002use CFClient::OpenGL;
2141 3003
2142sub check_size { 3004sub new {
2143 my ($self) = @_; 3005 my $class = shift;
2144 3006
2145 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3007 $class->SUPER::new (
2146} 3008 visible => 1,
2147 3009 @_,
2148sub size_request { 3010 )
2149 ($::WIDTH, $::HEIGHT)
2150} 3011}
2151 3012
2152sub configure { 3013sub configure {
2153 my ($self, $x, $y, $w, $h) = @_; 3014 my ($self, $x, $y, $w, $h) = @_;
2154 3015
2155 $self->SUPER::configure ($x, $y, $w, $h); 3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
2156 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
2157 for my $child (@{$self->{children}}) { 3036 for my $child ($self->children) {
2158 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)};
2159 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
2160 $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;
2161 $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
2162 $child->configure ($X, $Y, $W,$H); 3051 $child->configure ($X, $Y, $W, $H);
2163 } 3052 }
2164} 3053}
2165 3054
2166sub _topleft { 3055sub coord2local {
2167 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2168 3057
2169 ($x, $y) 3058 ($x, $y)
2170} 3059}
2171 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2172sub update { 3067sub update {
2173 my ($self) = @_; 3068 my ($self) = @_;
2174 3069
2175 $self->check_size; 3070 $self->check_size;
2176 ::refresh (); 3071 $::WANT_REFRESH++;
2177} 3072}
2178 3073
2179sub add { 3074sub add {
2180 my ($self, $child) = @_; 3075 my ($self, @children) = @_;
2181 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
2182 # integerize window positions 3086 # integerise window positions
2183 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2184 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3089 }
2185 3090
2186 $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 }
2187} 3104}
2188 3105
2189sub on_refresh { 3106sub on_refresh {
2190 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2191 3108
2192 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2193} 3110}
2194 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2195sub draw { 3118sub draw {
2196 my ($self) = @_; 3119 my ($self) = @_;
2197 3120
2198 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2199 $_->() 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}};
2200 } 3176 }
2201 3177
2202 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3178 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2203 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2204 glClear GL_COLOR_BUFFER_BIT; 3180 glClear GL_COLOR_BUFFER_BIT;
2205 3181
2206 glMatrixMode GL_PROJECTION; 3182 glMatrixMode GL_PROJECTION;
2207 glLoadIdentity; 3183 glLoadIdentity;
2208 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2209 glMatrixMode GL_MODELVIEW; 3185 glMatrixMode GL_MODELVIEW;
2210 glLoadIdentity; 3186 glLoadIdentity;
2211 3187
2212 $self->_draw; 3188 $self->_draw;
2213} 3189}
… …
2215############################################################################# 3191#############################################################################
2216 3192
2217package CFClient::UI; 3193package CFClient::UI;
2218 3194
2219$ROOT = new CFClient::UI::Root; 3195$ROOT = new CFClient::UI::Root;
2220$TOOLTIP = new CFClient::UI::Label fontsize => 0.8, can_events => 0; 3196$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2221 3197
22221 31981
2223 3199

Diff Legend

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