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.151 by root, Sun Apr 23 00:57:39 2006 UTC vs.
Revision 1.238 by root, Thu May 25 21:48:22 2006 UTC

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

Diff Legend

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