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

Diff Legend

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