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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.250 by root, Sun May 28 02:31:03 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 52 $TOOLTIP->show;
31 53
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 55
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
37 58
38 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
39 } 62 }
40 63
41 return; 64 return;
42 } 65 }
43 } 66 }
… …
47 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
71 check_tooltip; 94 check_tooltip;
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 check_tooltip;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
131 for (@$vals) { 148 for (@$vals) {
132 my $i = int $_ + $rem; 149 my $i = int $_ + $rem;
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
153}
154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
180 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
181 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
182 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
183 }
184 }
185
186 reconfigure_widgets;
136} 187}
137 188
138############################################################################# 189#############################################################################
139 190
140package CFClient::UI::Base; 191package CFClient::UI::Base;
… …
153 can_events => 1, 204 can_events => 1,
154 @_ 205 @_
155 }, $class; 206 }, $class;
156 207
157 for (keys %$self) { 208 for (keys %$self) {
158 if (/^connect_(.*)$/) { 209 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 210 $self->connect ($1 => delete $self->{$_});
160 } 211 }
161 } 212 }
162 213
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH;
218 $self->{req_y} = $layout->{y} * $::HEIGHT;
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
221 }
222
163 $self 223 $self
164} 224}
165 225
166sub destroy { 226sub destroy {
167 my ($self) = @_; 227 my ($self) = @_;
… …
176 return if $self->{parent}; 236 return if $self->{parent};
177 237
178 $CFClient::UI::ROOT->add ($self); 238 $CFClient::UI::ROOT->add ($self);
179} 239}
180 240
181sub hide { 241sub center {
182 my ($self) = @_; 242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262}
263
264sub set_invisible {
265 my ($self) = @_;
266
267 return unless $self->{visible};
268
269 # broken show/hide model
270
271 delete $self->{root};
272 delete $self->{visible};
183 273
184 undef $GRAB if $GRAB == $self; 274 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 275 undef $HOVER if $HOVER == $self;
276
277 CFClient::UI::check_tooltip
278 if $CFClient::UI::TOOLTIP->{owner} == $self;
279
280 $self->focus_out;
281
282 $self->emit (visibility_change => 0);
283}
284
285sub set_visibility {
286 my ($self, $visible) = @_;
287
288 return if $self->{visible} == $visible;
289
290 $visible ? $self->hide
291 : $self->show;
292}
293
294sub toggle_visibility {
295 my ($self) = @_;
296
297 $self->{visible}
298 ? $self->hide
299 : $self->show;
300}
301
302sub hide {
303 my ($self) = @_;
304
305 $self->set_invisible;
186 306
187 $self->{parent}->remove ($self) 307 $self->{parent}->remove ($self)
188 if $self->{parent}; 308 if $self->{parent};
189} 309}
190 310
… …
199} 319}
200 320
201sub set_size { 321sub set_size {
202 my ($self, $w, $h) = @_; 322 my ($self, $w, $h) = @_;
203 323
204 $self->{user_w} = $w; 324 $self->{def_w} = $w;
205 $self->{user_h} = $h; 325 $self->{def_h} = $h;
206 326
207 $self->check_size; 327 $self->check_size;
208} 328}
209 329
210sub size_request { 330sub size_request {
… …
232 $self->{y} = $y; 352 $self->{y} = $y;
233 $self->update; 353 $self->update;
234 } 354 }
235 355
236 if ($self->{w} != $w || $self->{h} != $h) { 356 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 } 358 }
243} 359}
244 360
245sub size_allocate { 361sub size_allocate {
246 # nothing to be done 362 # nothing to be done
247} 363}
248 364
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
249sub children { 372sub children {
250}
251
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260} 373}
261 374
262sub set_max_size { 375sub set_max_size {
263 my ($self, $w, $h) = @_; 376 my ($self, $w, $h) = @_;
264 377
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 378 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 379 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 380}
268 381
269# return top left coordinates 382sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 383 my ($self, $tooltip) = @_;
272 384
273 $self->{parent} 385 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 386 $tooltip =~ s/\s+$//;
275 387
276 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 388 return if $self->{tooltip} eq $tooltip;
389
390 $self->{tooltip} = $tooltip;
391
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip;
395 }
277} 396}
278 397
279# translate global coordinates to local coordinate system 398# translate global coordinates to local coordinate system
280sub coord2local { 399sub coord2local {
281 my ($self, $x, $y) = @_; 400 my ($self, $x, $y) = @_;
282 401
283 my ($X, $Y) = $self->_topleft; 402 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 403}
286 404
287# translate local coordinates to global coordinate system 405# translate local coordinates to global coordinate system
288sub coord2global { 406sub coord2global {
289 my ($self, $x, $y) = @_; 407 my ($self, $x, $y) = @_;
290 408
291 my ($X, $Y) = $self->_topleft; 409 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 410}
294 411
295sub focus_in { 412sub focus_in {
296 my ($self) = @_; 413 my ($self) = @_;
297 414
298 return if $FOCUS == $self; 415 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 416 return unless $self->{can_focus};
300 417
301 my $focus = $FOCUS; $FOCUS = $self; 418 my $focus = $FOCUS; $FOCUS = $self;
302 419
303 $self->emit (focus_in => $focus); 420 $self->_emit (focus_in => $focus);
304 421
305 $focus->update if $focus; 422 $focus->update if $focus;
306 $FOCUS->update; 423 $FOCUS->update;
307} 424}
308 425
… …
311 428
312 return unless $FOCUS == $self; 429 return unless $FOCUS == $self;
313 430
314 my $focus = $FOCUS; undef $FOCUS; 431 my $focus = $FOCUS; undef $FOCUS;
315 432
316 $self->emit (focus_out => $focus); 433 $self->_emit (focus_out => $focus);
317 434
318 $focus->update if $focus; #? 435 $focus->update if $focus; #?
436
437 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
438 unless $FOCUS;
319} 439}
320 440
321sub mouse_motion { } 441sub mouse_motion { }
322sub button_up { } 442sub button_up { }
323sub key_down { } 443sub key_down { }
324sub key_up { } 444sub key_up { }
325 445
326sub button_down { 446sub button_down {
327 my ($self, $ev, $x, $y) = @_; 447 my ($self, $ev, $x, $y) = @_;
328 448
329 $self->focus_in; 449 $self->focus_in;
… …
363 if ($ENV{PCLIENT_DEBUG}) { 483 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 484 glPushMatrix;
365 glColor 1, 1, 0, 1; 485 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 487 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 488 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 489 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 490 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 491 glVertex 0 , $self->{h} - 1;
372 glEnd; 492 glEnd;
373 glPopMatrix; 493 glPopMatrix;
374 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 494 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
375 } 495 }
376} 496}
377 497
378sub _draw { 498sub _draw {
379 my ($self) = @_; 499 my ($self) = @_;
… …
395 515
396sub set_parent { 516sub set_parent {
397 my ($self, $parent) = @_; 517 my ($self, $parent) = @_;
398 518
399 Scalar::Util::weaken ($self->{parent} = $parent); 519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
400} 524}
401 525
402sub check_size { 526sub check_size {
403 my ($self) = @_; 527 my ($self, $forced) = @_;
404 528
405 $self->{parent} 529 $self->{force_alloc} = 1 if $forced;
406 or return 1; 530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426} 531}
427 532
428sub update { 533sub update {
429 my ($self) = @_; 534 my ($self) = @_;
430 535
… …
436 my ($self, $signal, $cb) = @_; 541 my ($self, $signal, $cb) = @_;
437 542
438 push @{ $self->{signal_cb}{$signal} }, $cb; 543 push @{ $self->{signal_cb}{$signal} }, $cb;
439} 544}
440 545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
441sub emit { 552sub emit {
442 my ($self, $signal, @args) = @_; 553 my ($self, $signal, @args) = @_;
443 554
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
445} 561}
446 562
447sub DESTROY { 563sub DESTROY {
448 my ($self) = @_; 564 my ($self) = @_;
449 565
566 delete $WIDGET{$self+0};
450 #$self->deactivate; 567 #$self->deactivate;
451} 568}
452 569
453############################################################################# 570#############################################################################
454 571
… …
463 my $class = shift; 580 my $class = shift;
464 581
465 # range [value, low, high, page] 582 # range [value, low, high, page]
466 583
467 $class->SUPER::new ( 584 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 585 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 586 #active_bg => [1, 1, 1, 0.5],
470 @_ 587 @_
471 ) 588 )
472} 589}
473 590
474sub _draw { 591sub _draw {
475 my ($self) = @_; 592 my ($self) = @_;
476 593
594 my $color = $FOCUS == $self && $self->{active_bg}
595 ? $self->{active_bg}
596 : $self->{bg};
597
598 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 599 my ($w, $h) = @$self{qw(w h)};
478 600
479 glEnable GL_BLEND; 601 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 603 glColor @$color;
482 604
483 glBegin GL_QUADS; 605 glBegin GL_QUADS;
484 glVertex 0 , 0; 606 glVertex 0 , 0;
485 glVertex 0 , $h; 607 glVertex 0 , $h;
486 glVertex $w, $h; 608 glVertex $w, $h;
487 glVertex $w, 0; 609 glVertex $w, 0;
488 glEnd; 610 glEnd;
489 611
490 glDisable GL_BLEND; 612 glDisable GL_BLEND;
613 }
491} 614}
492 615
493############################################################################# 616#############################################################################
494 617
495package CFClient::UI::Empty; 618package CFClient::UI::Empty;
… …
527 650
528 $self 651 $self
529} 652}
530 653
531sub add { 654sub add {
532 my ($self, $child) = @_; 655 my ($self, @widgets) = @_;
533 656
534 $child->set_parent ($self); 657 $_->set_parent ($self)
658 for @widgets;
535 659
536 use sort 'stable'; 660 use sort 'stable';
537 661
538 $self->{children} = [ 662 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 663 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 664 @{$self->{children}}, @widgets
541 ]; 665 ];
542 666
543 $child->check_size; 667 $self->check_size (1);
668 $self->update;
544} 669}
545 670
546sub children { 671sub children {
547 @{ $_[0]{children} } 672 @{ $_[0]{children} }
548} 673}
… …
553 delete $child->{parent}; 678 delete $child->{parent};
554 $child->hide; 679 $child->hide;
555 680
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 682
558 $self->check_size; 683 $self->check_size (1);
559 $self->update; 684 $self->update;
560} 685}
561 686
562sub clear { 687sub clear {
563 my ($self) = @_; 688 my ($self) = @_;
… …
567 692
568 for (@$children) { 693 for (@$children) {
569 delete $_->{parent}; 694 delete $_->{parent};
570 $_->hide; 695 $_->hide;
571 } 696 }
697
698 $self->check_size;
699 $self->update;
572} 700}
573 701
574sub find_widget { 702sub find_widget {
575 my ($self, $x, $y) = @_; 703 my ($self, $x, $y) = @_;
576 704
… …
651} 779}
652 780
653sub update { 781sub update {
654 my ($self) = @_; 782 my ($self) = @_;
655 783
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 784 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 785 $self->SUPER::update;
658} 786}
659 787
660sub size_allocate { 788sub size_allocate {
661 my ($self, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
662 790
663 $self->SUPER::size_allocate ($w, $h); 791 $self->SUPER::size_allocate ($w, $h);
664 $self->update; 792 $self->update;
793}
794
795sub _render {
796 $_[0]{children}[0]->draw;
665} 797}
666 798
667sub render_child { 799sub render_child {
668 my ($self) = @_; 800 my ($self) = @_;
669 801
670 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
671 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 805
674# glColorMask 1, 1, 1, 0; 806 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 807 };
682} 808}
683 809
684sub _draw { 810sub _draw {
685 my ($self) = @_; 811 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
688 814
689 my $tex = $self->{texture} 815 my $tex = $self->{texture}
690 or return; 816 or return;
691 817
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
697 821
698 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 823
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
702} 825}
703 826
704############################################################################# 827#############################################################################
705 828
706package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
707 830
708our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 832
736sub new { 833sub new {
737 my $class = shift; 834 my $class = shift;
738 835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
843sub size_request {
844 my ($self) = @_;
845
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
847
848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
852}
853
854sub size_allocate {
855 my ($self, $w, $h) = @_;
856
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
859
860 $self->child->configure (0, 0, $w, $h);
861 $self->update;
862}
863
864sub set_offset {
865 my ($self, $x, $y) = @_;
866
867 $self->{view_x} = int $x;
868 $self->{view_y} = int $y;
869
870 $self->update;
871}
872
873# hmm, this does not work for topleft of $self... but we should not ask for that
874sub coord2local {
875 my ($self, $x, $y) = @_;
876
877 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
878}
879
880sub coord2global {
881 my ($self, $x, $y) = @_;
882
883 $x = List::Util::min $self->{w}, $x - $self->{view_x};
884 $y = List::Util::min $self->{h}, $y - $self->{view_y};
885
886 $self->SUPER::coord2global ($x, $y)
887}
888
889sub find_widget {
890 my ($self, $x, $y) = @_;
891
892 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
893 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
894 ) {
895 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
896 } else {
897 $self->CFClient::UI::Base::find_widget ($x, $y)
898 }
899}
900
901sub _render {
902 my ($self) = @_;
903
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905
906 $self->SUPER::_render;
907}
908
909#############################################################################
910
911package CFClient::UI::ScrolledWindow;
912
913our @ISA = CFClient::UI::HBox::;
914
915sub new {
916 my $class = shift;
917
918 my $self;
919
920 my $slider = new CFClient::UI::Slider
921 vertical => 1,
922 range => [0, 0, 1, 0.01], # HACK fix
923 on_changed => sub {
924 $self->{vp}->set_offset (0, $_[1]);
925 },
926 ;
927
739 my $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 929 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 930 slider => $slider,
742 border => 0.8,
743 @_ 931 @_,
744 ); 932 );
745 933
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider});
937
746 $self 938 $self
747} 939}
748 940
941sub update {
942 my ($self) = @_;
943
944 $self->SUPER::update;
945
946 # todo: overwrite size_allocate of child
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
951sub size_allocate {
952 my ($self, $w, $h) = @_;
953
954 $self->SUPER::size_allocate ($w, $h);
955
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958}
959
960#TODO# update range on size_allocate depending on child
961# update viewport offset on scroll
962
963#############################################################################
964
965package CFClient::UI::Frame;
966
967our @ISA = CFClient::UI::Bin::;
968
969use CFClient::OpenGL;
970
971sub new {
972 my $class = shift;
973
974 $class->SUPER::new (
975 bg => undef,
976 @_,
977 )
978}
979
749sub _draw { 980sub _draw {
750 my ($self) = @_; 981 my ($self) = @_;
751 982
752 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
753 985
754 glEnable GL_BLEND; 986 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 989
759# glBegin GL_QUADS; 990 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 991 glVertex 0 , 0;
762# glVertex 0 , $h; 992 glVertex 0 , $h;
763# glVertex $w, $h; 993 glVertex $w, $h;
764# glVertex $w, 0; 994 glVertex $w, 0;
765# glEnd; 995 glEnd;
766 996
767
768 $self->child->draw;
769 glDisable GL_BLEND; 997 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
771} 1001}
772 1002
773############################################################################# 1003#############################################################################
774 1004
775package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
783 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
784 1014
785sub new { 1015sub new {
786 my $class = shift; 1016 my $class = shift;
787 1017
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1021 border => 0.6,
1022 is_toplevel => 1,
794 can_events => 1, 1023 can_events => 1,
795 @_ 1024 @_
796 ); 1025 );
797 1026
798 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 1028 align => 0,
… …
823 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
824 1053
825 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
827 1056
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
829 if $self->{title}; 1058 if $self->{title};
830 1059
831 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1061}
833 1062
… …
852 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
853 1082
854 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
856 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
860 $self->check_size; 1091 $self->check_size;
861 }; 1092 };
862 1093
863 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
867 $self->{motion} = sub { 1098 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
869 1100
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
871 1102
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
873 $self->update; 1107 $self->update;
874 }; 1108 };
875 } 1109 }
876} 1110}
877 1111
… …
891 my ($self) = @_; 1125 my ($self) = @_;
892 1126
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1129
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1132
901 my $border = $self->border; 1133 my $border = $self->border;
902 1134
903 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1140
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1142 my $bg = $tex[0];
911 1143
912 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1148 glColor @{ $self->{bg} };
917 1149
918 $bg->{s} = $rep_x; 1150 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1151 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1152 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 }
922 1155
923 glDisable GL_TEXTURE_2D; 1156 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1157
927 $self->{title}->draw if $self->{title}; 1158 $self->{title}->draw if $self->{title};
928 1159
929 $self->child->draw; 1160 $self->child->draw;
930} 1161}
… …
942sub new { 1173sub new {
943 my $class = shift; 1174 my $class = shift;
944 1175
945 $class->SUPER::new ( 1176 $class->SUPER::new (
946 col_expand => [], 1177 col_expand => [],
947 @_ 1178 @_,
948 ) 1179 )
1180}
1181
1182sub children {
1183 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1184}
950 1185
951sub add { 1186sub add {
952 my ($self, $x, $y, $child) = @_; 1187 my ($self, $x, $y, $child) = @_;
953 1188
954 $child->set_parent ($self); 1189 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1190 $self->{children}[$y][$x] = $child;
956 1191
957 $child->check_size; 1192 $self->check_size (1);
958} 1193}
959 1194
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# TODO: move to container class maybe? send childs a signal on removal? 1195# TODO: move to container class maybe? send children a signal on removal?
965sub clear { 1196sub clear {
966 my ($self) = @_; 1197 my ($self) = @_;
967 1198
968 my @children = $self->children; 1199 my @children = $self->children;
969 delete $self->{children}; 1200 delete $self->{children};
… …
971 for (@children) { 1202 for (@children) {
972 delete $_->{parent}; 1203 delete $_->{parent};
973 $_->hide; 1204 $_->hide;
974 } 1205 }
975 1206
1207 $self->check_size (1);
976 $self->update; 1208 $self->update;
977} 1209}
978 1210
979sub get_wh { 1211sub get_wh {
980 my ($self) = @_; 1212 my ($self) = @_;
… …
1012sub size_allocate { 1244sub size_allocate {
1013 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h) = @_;
1014 1246
1015 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1016 1248
1017 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1019 1251
1020 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1309 }
1078} 1310}
1079 1311
1080############################################################################# 1312#############################################################################
1081 1313
1082package CFClient::UI::HBox; 1314package CFClient::UI::Box;
1083
1084# TODO: wrap into common Box base class
1085 1315
1086our @ISA = CFClient::UI::Container::; 1316our @ISA = CFClient::UI::Container::;
1087 1317
1088sub size_request { 1318sub size_request {
1089 my ($self) = @_; 1319 my ($self) = @_;
1090 1320
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1321 $self->{vertical}
1092 1322 ? (
1093 ( 1323 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1094 (List::Util::sum map $_->[0], @alloc), 1324 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1095 (List::Util::max map $_->[1], @alloc), 1325 )
1096 ) 1326 : (
1327 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1328 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1329 )
1097} 1330}
1098 1331
1099sub size_allocate { 1332sub size_allocate {
1100 my ($self, $w, $h) = @_; 1333 my ($self, $w, $h) = @_;
1101 1334
1102 ($h, $w) = ($w, $h); 1335 my $space = $self->{vertical} ? $h : $w;
1103
1104 my $children = $self->{children}; 1336 my $children = $self->{children};
1105 1337
1106 my @h = map $_->{req_w}, @$children; 1338 my @req;
1107 1339
1108 my $req_h = List::Util::sum @h; 1340 if ($self->{homogeneous}) {
1109 1341 @req = ($space / (@$children || 1)) x @$children;
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } else { 1342 } else {
1343 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1344 my $req = List::Util::sum @req;
1345
1346 if ($req > $space) {
1347 # ah well, not enough space
1348 $_ *= $space / $req for @req;
1349 } else {
1114 my $exp = List::Util::sum map $_->{expand}, @$children; 1350 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1115 $exp ||= 1;
1116 1351
1352 $space = ($space - $req) / $expand; # remaining space to give away
1353
1354 $req[$_] += $space * $children->[$_]{expand}
1117 for (0 .. $#$children) { 1355 for 0 .. $#$children;
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 } 1356 }
1124 } 1357 }
1125 1358
1126 CFClient::UI::harmonize \@h; 1359 CFClient::UI::harmonize \@req;
1127 1360
1128 my $y = 0; 1361 my $pos = 0;
1129 for (0 .. $#$children) { 1362 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_]; 1363 my $alloc = $req[$_];
1132 $child->configure ($y, 0, $h, $w); 1364 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1133 1365
1134 $y += $h; 1366 $pos += $alloc;
1135 } 1367 }
1136 1368
1137 1 1369 1
1138} 1370}
1139 1371
1140############################################################################# 1372#############################################################################
1141 1373
1374package CFClient::UI::HBox;
1375
1376our @ISA = CFClient::UI::Box::;
1377
1378sub new {
1379 my $class = shift;
1380
1381 $class->SUPER::new (
1382 vertical => 0,
1383 @_,
1384 )
1385}
1386
1387#############################################################################
1388
1142package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1143 1390
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1147 1392
1148sub size_request { 1393sub new {
1149 my ($self) = @_; 1394 my $class = shift;
1150 1395
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1152 1397 vertical => 1,
1153 ( 1398 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1399 )
1157} 1400}
1158 1401
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1402#############################################################################
1197 1403
1198package CFClient::UI::Label; 1404package CFClient::UI::Label;
1199 1405
1200our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1201 1407
1202use CFClient::OpenGL; 1408use CFClient::OpenGL;
1203 1409
1204sub new { 1410sub new {
1205 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1206 1412
1207 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1209 #font => default_font 1417 #font => default_font
1418 #text => initial text
1419 #markup => initial narkup
1420 #max_w => maximum pixel width
1421 ellipsise => 3, # end
1422 layout => (new CFClient::Layout),
1210 fontsize => 1, 1423 fontsize => 1,
1211 text => "",
1212 align => -1, 1424 align => -1,
1213 valign => -1, 1425 valign => -1,
1214 padding => 2, 1426 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1427 can_events => 0,
1217 %arg 1428 %arg
1218 ); 1429 );
1219 1430
1220 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1434 $self->{template} = $layout;
1224 } 1435 }
1225 1436
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1438 $self->set_markup (delete $self->{markup});
1439 } else {
1440 $self->set_text (delete $self->{text});
1441 }
1228 1442
1229 $self 1443 $self
1230} 1444}
1231 1445
1232sub escape { 1446sub escape($) {
1233 local $_ = $_[1]; 1447 local $_ = $_[0];
1234 1448
1235 s/&/&amp;/g; 1449 s/&/&amp;/g;
1236 s/>/&gt;/g; 1450 s/>/&gt;/g;
1237 s/</&lt;/g; 1451 s/</&lt;/g;
1238 1452
1239 $_[1] 1453 $_
1240} 1454}
1241 1455
1242sub update { 1456sub update {
1243 my ($self) = @_; 1457 my ($self) = @_;
1244 1458
1245 delete $self->{texture}; 1459 delete $self->{texture};
1246 $self->SUPER::update; 1460 $self->SUPER::update;
1247} 1461}
1248 1462
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1463sub set_text {
1256 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1257 1465
1258 return if $self->{text} eq "T$text"; 1466 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1260 1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1262 1471
1263 delete $self->{texture};
1264 $self->update; 1472 $self->update;
1265 $self->check_size; 1473 $self->check_size;
1266} 1474}
1267 1475
1268sub set_markup { 1476sub set_markup {
1269 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1270 1478
1271 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1273 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1275 1486
1276 delete $self->{texture};
1277 $self->update; 1487 $self->update;
1278 $self->check_size; 1488 $self->check_size;
1279} 1489}
1280 1490
1281sub size_request { 1491sub size_request {
1282 my ($self) = @_; 1492 my ($self) = @_;
1283 1493
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1495 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1499
1288 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1289 1501
1290 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1312sub set_fontsize { 1524sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1314 1526
1315 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1528 delete $self->{texture};
1529
1530 $self->update;
1317 $self->check_size; 1531 $self->check_size;
1318 $self->update;
1319} 1532}
1320 1533
1321sub _draw { 1534sub _draw {
1322 my ($self) = @_; 1535 my ($self) = @_;
1323 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1324 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1542 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1328 new_from_layout CFClient::Texture $self->{layout} 1547 my $tex = new_from_layout CFClient::Texture $self->{layout};
1548
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1551 : ($self->{w} - $tex->{w}) * 0.5);
1552
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1555 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1329 }; 1558 };
1330 1559
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1562
1563 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1566 } else {
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1568 }
1351 1569
1352 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1571}
1355 1572
1356############################################################################# 1573#############################################################################
1357 1574
1358package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1372 can_hover => 1, 1589 can_hover => 1,
1373 can_focus => 1, 1590 can_focus => 1,
1374 valign => 0, 1591 valign => 0,
1375 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1376 @_ 1594 @_
1377 ) 1595 )
1378} 1596}
1379 1597
1380sub _set_text { 1598sub _set_text {
… …
1390 $self->{text} = $text; 1608 $self->{text} = $text;
1391 1609
1392 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1394 1612
1395 $self->emit (changed => $self->{text}); 1613 $self->_emit (changed => $self->{text});
1396}
1397
1398sub get_text {
1399 $_[0]{text}
1400}
1401
1402sub size_request {
1403 my ($self) = @_;
1404
1405 my ($w, $h) = $self->SUPER::size_request;
1406
1407 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414} 1614}
1415 1615
1416sub set_text { 1616sub set_text {
1417 my ($self, $text) = @_; 1617 my ($self, $text) = @_;
1418 1618
1419 $self->{cursor} = length $text; 1619 $self->{cursor} = length $text;
1420 $self->_set_text ($text); 1620 $self->_set_text ($text);
1421 $self->update; 1621 $self->update;
1622 $self->check_size;
1623}
1624
1625sub get_text {
1626 $_[0]{text}
1627}
1628
1629sub size_request {
1630 my ($self) = @_;
1631
1632 my ($w, $h) = $self->SUPER::size_request;
1633
1634 ($w + 1, $h) # add 1 for cursor
1422} 1635}
1423 1636
1424sub key_down { 1637sub key_down {
1425 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1426 1639
… …
1428 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1430 1643
1431 my $text = $self->get_text; 1644 my $text = $self->get_text;
1432 1645
1433 if ($sym == 8) { 1646 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1659 $self->_emit ('escape');
1447 } elsif ($uni) { 1660 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1662 }
1450 1663
1451 $self->_set_text ($text); 1664 $self->_set_text ($text);
1452 $self->update; 1665 $self->update;
1666 $self->check_size;
1453} 1667}
1454 1668
1455sub focus_in { 1669sub focus_in {
1456 my ($self) = @_; 1670 my ($self) = @_;
1457 1671
… …
1537 if ($sym == 13) { 1751 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1543 $self->update; 1757 $self->update;
1544 1758
1545 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1800 my $class = shift;
1587 1801
1588 $class->SUPER::new ( 1802 $class->SUPER::new (
1589 padding => 4, 1803 padding => 4,
1590 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1593 can_hover => 1, 1806 can_hover => 1,
1594 align => 0, 1807 align => 0,
1595 valign => 0, 1808 valign => 0,
1596 can_events => 1, 1809 can_events => 1,
1597 @_ 1810 @_
1598 ) 1811 )
1599} 1812}
1600 1813
1814sub activate { }
1815
1601sub button_up { 1816sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1603 1818
1819 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1822}
1609 1823
1610sub _draw { 1824sub _draw {
1611 my ($self) = @_; 1825 my ($self) = @_;
1612 1826
… …
1614 1828
1615 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1617 } 1831 }
1618 1832
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1624 1836
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1838
1627 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1840
1630 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1631} 1842}
1632 1843
1633############################################################################# 1844#############################################################################
… …
1647 1858
1648 $class->SUPER::new ( 1859 $class->SUPER::new (
1649 padding => 2, 1860 padding => 2,
1650 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 1862 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 1865 state => 0,
1653 can_hover => 1, 1866 can_hover => 1,
1654 @_ 1867 @_
1655 ) 1868 )
1656} 1869}
… …
1665 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1666 1879
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1671 } 1884 }
1672} 1885}
1673 1886
1674sub _draw { 1887sub _draw {
1675 my ($self) = @_; 1888 my ($self) = @_;
… …
1680 1893
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1682 1895
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1897
1685 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1686 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1903}
1696 1904
1697############################################################################# 1905#############################################################################
1698 1906
1699package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1743 1951
1744 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1745 } 1953 }
1746 1954
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1957
1752 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1959
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1756} 1961}
1757 1962
1758############################################################################# 1963#############################################################################
1759 1964
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
1949 2154
1950sub new { 2155sub new {
1951 my $class = shift; 2156 my $class = shift;
1952 2157
1953 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
1954 2159
1955 # TODO: 0-width page 2160 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2162 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2165 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2169 req_w => $::WIDTH / 80,
1963 req_h => 20, 2170 req_h => $::WIDTH / 80,
1964 vertical => 0, 2171 vertical => 0,
1965 can_hover => 1, 2172 can_hover => 1,
1966 inner_pad => 5, 2173 inner_pad => 0.02,
1967 @_ 2174 @_
1968 ); 2175 );
1969 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
1970 $self 2180 $self
2181}
2182
2183sub set_range {
2184 my ($self, $range) = @_;
2185
2186 ($range, $self->{range}) = ($self->{range}, $range);
2187
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}";
2190}
2191
2192sub set_value {
2193 my ($self, $value) = @_;
2194
2195 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2196
2197 $hi = $lo + 1 if $hi <= $lo;
2198
2199 $page = $hi - $lo if $page > $hi - $lo;
2200
2201 $value = $lo if $value < $lo;
2202 $value = $hi - $page if $value > $hi - $page;
2203
2204 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2205 if $unit;
2206
2207 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2208
2209 if ($value != $old_value) {
2210 $self->_emit (changed => $value);
2211 $self->update;
2212 }
1971} 2213}
1972 2214
1973sub size_request { 2215sub size_request {
1974 my ($self) = @_; 2216 my ($self) = @_;
1975 2217
… …
1981 2223
1982sub button_down { 2224sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2225 my ($self, $ev, $x, $y) = @_;
1984 2226
1985 $self->SUPER::button_down ($ev, $x, $y); 2227 $self->SUPER::button_down ($ev, $x, $y);
2228
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230
1986 $self->mouse_motion ($ev, $x, $y); 2231 $self->mouse_motion ($ev, $x, $y);
1987} 2232}
1988 2233
1989sub mouse_motion { 2234sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
1991 2236
1992 if ($GRAB == $self) { 2237 if ($GRAB == $self) {
2238 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2239
2240 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2245 }
2246}
2247
2248sub update {
2249 my ($self) = @_;
2250
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2252 $self->set_value ($self->{range}[0]);
2253
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2254 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100;
1994 2256
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2257 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2258
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2259 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2260 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2261
2000 $x -= $inner_pad_px; # substract the padding 2262 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2263 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2264
2006 $self->emit (changed => $x); 2265 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2266 $self->{knob_w} = $knob_w;
2008 } 2267 });
2009}
2010 2268
2011# the inner_* stuff is for generating a padding for the slider handle, 2269 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2270}
2018 2271
2019sub _draw { 2272sub _draw {
2020 my ($self) = @_; 2273 my ($self) = @_;
2021 2274
2022 $self->SUPER::_draw (); 2275 $self->SUPER::_draw ();
2023 2276
2024 my ($w, $h) = @$self{qw(w h)}; 2277 glScale $self->{w}, $self->{h};
2025 2278
2026 if ($self->{vertical}) { 2279 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2280 # draw a vertical slider like a rotated horizontal slider
2028 2281
2282 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2283 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2284 }
2034 2285
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2286 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2287 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2288
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2289 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2290 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2291
2061 # draw background 2292 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2293 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2294
2064 # draw handle 2295 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2296 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2297
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2298 glDisable GL_TEXTURE_2D;
2069} 2299}
2300
2301#############################################################################
2302
2303package CFClient::UI::ValSlider;
2304
2305our @ISA = CFClient::UI::HBox::;
2306
2307sub new {
2308 my ($class, %arg) = @_;
2309
2310 my $range = delete $arg{range};
2311
2312 my $self = $class->SUPER::new (
2313 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2314 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2315 to_value => sub { shift },
2316 from_value => sub { shift },
2317 %arg,
2318 );
2319
2320 $self->{slider}->connect (changed => sub {
2321 my ($self, $value) = @_;
2322 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2323 $self->{parent}->emit (changed => $value);
2324 });
2325
2326# $self->{entry}->connect (changed => sub {
2327# my ($self, $value) = @_;
2328# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2329# $self->{parent}->emit (changed => $value);
2330# });
2331
2332 $self->add ($self->{slider}, $self->{entry});
2333
2334 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2335
2336 $self
2337}
2338
2339sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) }
2070 2341
2071############################################################################# 2342#############################################################################
2072 2343
2073package CFClient::UI::TextView; 2344package CFClient::UI::TextView;
2074 2345
… …
2083 fontsize => 1, 2354 fontsize => 1,
2084 can_events => 0, 2355 can_events => 0,
2085 #font => default_font 2356 #font => default_font
2086 @_, 2357 @_,
2087 2358
2088 layout => (new CFClient::Layout), 2359 layout => (new CFClient::Layout 1),
2089 par => [], 2360 par => [],
2090 height => 0, 2361 height => 0,
2091 children => [ 2362 children => [
2092 (new CFClient::UI::Empty expand => 1), 2363 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2364 (new CFClient::UI::Slider vertical => 1),
… …
2104 2375
2105 $self->{fontsize} = $fontsize; 2376 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2377 $self->reflow;
2107} 2378}
2108 2379
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2380sub size_allocate {
2129 my ($self, $w, $h) = @_; 2381 my ($self, $w, $h) = @_;
2130 2382
2131 $self->SUPER::size_allocate ($w, $h); 2383 $self->SUPER::size_allocate ($w, $h);
2132 2384
… …
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2387 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2388
2137 $self->reflow; 2389 $self->reflow;
2138} 2390}
2139 2391
2392sub text_size {
2393 my ($self, $text, $indent) = @_;
2394
2395 my $layout = $self->{layout};
2396
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent);
2399 $layout->set_markup ($text);
2400
2401 $layout->size
2402}
2403
2404sub reflow {
2405 my ($self) = @_;
2406
2407 $self->{need_reflow}++;
2408 $self->update;
2409}
2410
2411sub set_offset {
2412 my ($self, $offset) = @_;
2413
2414 # todo: base offset on lines or so, not on pixels
2415 $self->{children}[1]->set_value ($offset);
2416}
2417
2418sub clear {
2419 my ($self) = @_;
2420
2421 $self->{par} = [];
2422 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424}
2425
2140sub add_paragraph { 2426sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2427 my ($self, $color, $text, $indent) = @_;
2142 2428
2143 #TODO: intelligently "reformat" paragraph 2429 for my $line (split /\n/, $text) {
2144 2430 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2431 $self->{height} += $h;
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2433 }
2148 2434
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2152 $self->{children}[1]->update;
2153} 2436}
2154 2437
2155sub update { 2438sub update {
2156 my ($self) = @_; 2439 my ($self) = @_;
2157 2440
… …
2159 2442
2160 return unless $self->{h} > 0; 2443 return unless $self->{h} > 0;
2161 2444
2162 delete $self->{texture}; 2445 delete $self->{texture};
2163 2446
2164 $ROOT->on_refresh ($self, sub { 2447 $ROOT->on_post_alloc ($self, sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449
2165 if (delete $self->{need_reflow}) { 2450 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2451 my $height = 0;
2167 2452
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2169 for @{$self->{par}}; 2457 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h;
2464 }
2465
2466 $height += $_->[1];
2467 }
2170 2468
2171 $self->{height} = $height; 2469 $self->{height} = $height;
2172 2470
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2472
2175 delete $self->{texture}; 2473 delete $self->{texture};
2176 } 2474 }
2177 2475
2178 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2179 glClearColor 0, 0, 0, 0; 2477 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2478 glClear GL_COLOR_BUFFER_BIT;
2181 2479
2480 my $top = int $self->{children}[1]{range}[0];
2481
2482 my $y0 = $top;
2483 my $y1 = $top + $H;
2484
2485 my $y = 0;
2486
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490
2182 glEnable GL_BLEND; 2491 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2494
2198 for my $par (@{$self->{par}}) { 2495 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2496 my $h = $par->[1];
2200 2497
2201 if ($y0 < $y + $h && $y < $y1) { 2498 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]);
2202 $layout->set_text ($par->[2]); 2501 $layout->set_markup ($par->[4]);
2203 2502
2204 glColor @{ $par->[1] }; 2503 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2504
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2505 glRasterPos $par->[3], $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2207 } 2507 }
2208 2508
2209 $y += $h; 2509 $y += $h;
2210 } 2510 }
2211 2511
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2512 glDisable GL_BLEND;
2214 }; 2513 };
2215 }); 2514 });
2216} 2515}
2217 2516
2218sub _draw { 2517sub _draw {
2219 my ($self) = @_; 2518 my ($self) = @_;
2220 2519
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2520 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2522 glColor 1, 1, 1, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2524 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2525
2230 $self->{children}[1]->draw; 2526 $self->{children}[1]->draw;
2231 2527
2232} 2528}
2233 2529
… …
2281 2577
2282sub new { 2578sub new {
2283 my $class = shift; 2579 my $class = shift;
2284 2580
2285 my $self = $class->SUPER::new ( 2581 my $self = $class->SUPER::new (
2286 state => 0, 2582 state => 0,
2287 connect_activate => \&toggle_flopper, 2583 on_activate => \&toggle_flopper,
2288 @_ 2584 @_
2289 ); 2585 );
2290 2586
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2587 $self
2297} 2588}
2298 2589
2299sub toggle_flopper { 2590sub toggle_flopper {
2300 my ($self) = @_; 2591 my ($self) = @_;
2301 2592
2302 # TODO: use animation 2593 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2594}
2314 2595
2315############################################################################# 2596#############################################################################
2316 2597
2317package CFClient::UI::Tooltip; 2598package CFClient::UI::Tooltip;
… …
2327 @_, 2608 @_,
2328 can_events => 0, 2609 can_events => 0,
2329 ) 2610 )
2330} 2611}
2331 2612
2332sub set_markup { 2613sub set_tooltip_from {
2333 my ($self, $text) = @_; 2614 my ($self, $widget) = @_;
2334 2615
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2616 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2617 markup => $widget->{tooltip},
2337 $self->add ($self->{label}); 2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8,
2620 fg => [0, 0, 0, 1],
2621 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP),
2623 );
2338} 2624}
2339 2625
2340sub size_request { 2626sub size_request {
2341 my ($self) = @_; 2627 my ($self) = @_;
2342
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344 2628
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2630
2347 ($w + 4, $h + 4) 2631 ($w + 4, $h + 4)
2348} 2632}
… …
2354} 2638}
2355 2639
2356sub _draw { 2640sub _draw {
2357 my ($self) = @_; 2641 my ($self) = @_;
2358 2642
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2643 glTranslate 0.375, 0.375;
2361 2644
2362 my ($w, $h) = @$self{qw(w h)}; 2645 my ($w, $h) = @$self{qw(w h)};
2363 2646
2364 glColor 1, 0.8, 0.4; 2647 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2658 glVertex 0 , $h;
2376 glVertex $w, $h; 2659 glVertex $w, $h;
2377 glVertex $w, 0; 2660 glVertex $w, 0;
2378 glEnd; 2661 glEnd;
2379 2662
2380 glPopMatrix; 2663 glTranslate 2 - 0.375, 2 - 0.375;
2381
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2664 $self->SUPER::_draw;
2384} 2665}
2385 2666
2386############################################################################# 2667#############################################################################
2387 2668
… …
2392use CFClient::OpenGL; 2673use CFClient::OpenGL;
2393 2674
2394sub new { 2675sub new {
2395 my $class = shift; 2676 my $class = shift;
2396 2677
2397 $class->SUPER::new ( 2678 my $self = $class->SUPER::new (
2398 aspect => 1, 2679 aspect => 1,
2680 can_events => 0,
2399 @_, 2681 @_,
2400 ) 2682 );
2683
2684 if ($self->{anim} && $self->{animspeed}) {
2685 Scalar::Util::weaken (my $widget = $self);
2686
2687 $self->{timer} = Event->timer (
2688 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2689 hard => 1,
2690 interval => $self->{animspeed},
2691 cb => sub {
2692 ++$widget->{frame};
2693 $widget->update;
2694 },
2695 );
2696 }
2697
2698 $self
2401} 2699}
2402 2700
2403sub size_request { 2701sub size_request {
2404 (32, 8) 2702 (32, 8)
2405} 2703}
2406 2704
2705sub update {
2706 my ($self) = @_;
2707
2708 return unless $self->{visible};
2709
2710 $self->SUPER::update;
2711}
2712
2407sub _draw { 2713sub _draw {
2408 my ($self) = @_; 2714 my ($self) = @_;
2409 2715
2716 return unless $::CONN;
2717
2718 my $face;
2719
2720 if ($self->{frame}) {
2721 my $anim = $::CONN->{anim}[$self->{anim}];
2722
2723 $face = $anim->[ $self->{frame} % @$anim ]
2724 if $anim && @$anim;
2725 }
2726
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2728
2412 # TODO animation
2413 if ($tex) { 2729 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2730 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2732 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2734 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND; 2735 }
2736}
2737
2738sub DESTROY {
2739 my ($self) = @_;
2740
2741 $self->{timer}->cancel
2742 if $self->{timer};
2743
2744 $self->SUPER::DESTROY;
2745}
2746
2747#############################################################################
2748
2749package CFClient::UI::Inventory;
2750
2751our @ISA = CFClient::UI::ScrolledWindow::;
2752
2753sub new {
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2422 } 2786 }
2423} 2787}
2424 2788
2425############################################################################# 2789#############################################################################
2426 2790
… …
2462 2826
2463# popup given the event (must be a mouse button down event currently) 2827# popup given the event (must be a mouse button down event currently)
2464sub popup { 2828sub popup {
2465 my ($self, $ev) = @_; 2829 my ($self, $ev) = @_;
2466 2830
2467 $self->emit ("popdown"); 2831 $self->_emit ("popdown");
2468 2832
2469 # maybe save $GRAB? must be careful about events... 2833 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2834 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2835 $self->{button} = $ev->{button};
2472 2836
… …
2475} 2839}
2476 2840
2477sub mouse_motion { 2841sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2842 my ($self, $ev, $x, $y) = @_;
2479 2843
2480 # TODO: should use vbox->fdind_widget or so 2844 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2846 $self->{hover} = $self->{item}{$HOVER};
2483} 2847}
2484 2848
2485sub button_up { 2849sub button_up {
… …
2487 2851
2488 if ($ev->{button} == $self->{button}) { 2852 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2853 undef $GRAB;
2490 $self->hide; 2854 $self->hide;
2491 2855
2492 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2857 $self->{hover}[1]->() if $self->{hover};
2494 } 2858 }
2495} 2859}
2496 2860
2497############################################################################# 2861#############################################################################
2498 2862
2863package CFClient::UI::Statusbox;
2864
2865our @ISA = CFClient::UI::VBox::;
2866
2867sub new {
2868 my $class = shift;
2869
2870 $class->SUPER::new (
2871 fontsize => 0.8,
2872 @_,
2873 )
2874}
2875
2876sub reorder {
2877 my ($self) = @_;
2878 my $NOW = time;
2879
2880 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 }
2883
2884 my @widgets;
2885
2886 my @items = sort {
2887 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} };
2890
2891 my $count = 10 + 1;
2892 for my $item (@items) {
2893 last unless --$count;
2894
2895 push @widgets, $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text};
2900
2901 for ($short) {
2902 s/^\s+//;
2903 s/\s+/ /g;
2904 }
2905
2906 new CFClient::UI::Label
2907 markup => $short,
2908 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg},
2914 can_events => 1,
2915 can_hover => 1
2916 };
2917 }
2918
2919 $self->clear;
2920 $self->SUPER::add (reverse @widgets);
2921}
2922
2923sub add {
2924 my ($self, $text, %arg) = @_;
2925
2926 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//;
2928
2929 return unless $text;
2930
2931 my $timeout = time + ((delete $arg{timeout}) || 60);
2932
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934
2935 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) {
2937 $item->{count}++;
2938 } else {
2939 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text;
2941 }
2942 $item->{id} = ++$self->{id};
2943 $item->{timeout} = $timeout;
2944 delete $item->{label};
2945 } else {
2946 $self->{item}{$group} = {
2947 id => ++$self->{id},
2948 text => $text,
2949 timeout => $timeout,
2950 tooltip => $text,
2951 fg => [0.8, 0.8, 0.8, 0.8],
2952 pri => 0,
2953 count => 1,
2954 %arg,
2955 };
2956 }
2957
2958 $self->reorder;
2959}
2960
2961sub reconfigure {
2962 my ($self) = @_;
2963
2964 delete $_->{label}
2965 for values %{ $self->{item} || {} };
2966
2967 $self->reorder;
2968 $self->SUPER::reconfigure;
2969}
2970
2971#############################################################################
2972
2499package CFClient::UI::Root; 2973package CFClient::UI::Root;
2500 2974
2501our @ISA = CFClient::UI::Container::; 2975our @ISA = CFClient::UI::Container::;
2502 2976
2503use CFClient::OpenGL; 2977use CFClient::OpenGL;
2504 2978
2505sub check_size { 2979sub new {
2506 my ($self) = @_; 2980 my $class = shift;
2507 2981
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2982 $class->SUPER::new (
2509} 2983 visible => 1,
2510 2984 @_,
2511sub size_request { 2985 )
2512 ($::WIDTH, $::HEIGHT)
2513} 2986}
2514 2987
2515sub configure { 2988sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 2989 my ($self, $x, $y, $w, $h) = @_;
2517 2990
2518 $self->SUPER::configure ($x, $y, $w, $h); 2991 $self->{w} = $w;
2992 $self->{h} = $h;
2993}
2519 2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000}
3001
3002sub size_request {
3003 my ($self) = @_;
3004
3005 ($self->{w}, $self->{h})
3006}
3007
3008sub size_allocate {
3009 my ($self, $w, $h) = @_;
3010
2520 for my $child (@{$self->{children}}) { 3011 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3013
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3015 if exists $child->{req_x};
3016
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3018 if exists $child->{req_y};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024
2525 $child->configure ($X, $Y, $W,$H); 3025 $child->configure ($X, $Y, $W, $H);
2526 } 3026 }
2527} 3027}
2528 3028
2529sub _topleft { 3029sub coord2local {
2530 my ($self, $x, $y) = @_; 3030 my ($self, $x, $y) = @_;
2531 3031
2532 ($x, $y) 3032 ($x, $y)
2533} 3033}
2534 3034
3035sub coord2global {
3036 my ($self, $x, $y) = @_;
3037
3038 ($x, $y)
3039}
3040
2535sub update { 3041sub update {
2536 my ($self) = @_; 3042 my ($self) = @_;
2537 3043
2538 $self->check_size; 3044 $self->check_size;
2539 ::refresh (); 3045 $::WANT_REFRESH++;
2540} 3046}
2541 3047
2542sub add { 3048sub add {
2543 my ($self, $child) = @_; 3049 my ($self, @children) = @_;
2544 3050
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1;
3053
2545 # integerize window positions 3054 # integerise window positions
2546 $child->{x} = int $child->{x}; 3055 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 3056 $child->{y} = int $child->{y};
3057 }
2548 3058
2549 $self->SUPER::add ($child); 3059 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066}
3067
3068sub remove {
3069 my ($self, @children) = @_;
3070
3071 $self->SUPER::remove (@children);
3072
3073 while (@children) {
3074 my $w = pop @children;
3075 push @children, $w->children;
3076 $w->set_invisible;
3077 }
2550} 3078}
2551 3079
2552sub on_refresh { 3080sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3081 my ($self, $id, $cb) = @_;
2554 3082
2555 $self->{refresh_hook}{$id} = $cb; 3083 $self->{refresh_hook}{$id} = $cb;
2556} 3084}
2557 3085
3086sub on_post_alloc {
3087 my ($self, $id, $cb) = @_;
3088
3089 $self->{post_alloc_hook}{$id} = $cb;
3090}
3091
2558sub draw { 3092sub draw {
2559 my ($self) = @_; 3093 my ($self) = @_;
2560 3094
2561 while (my $rcb = delete $self->{refresh_hook}) { 3095 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3096 $_->()
3097 for values %{delete $self->{refresh_hook}};
3098 }
3099
3100 if ($self->{check_size}) {
3101 my @queue;
3102
3103 while () {
3104 if ($self->{check_size}) {
3105 #TODO use array-of-depth approach
3106
3107 @queue = sort { $a->{visible} <=> $b->{visible} }
3108 @queue, values %{delete $self->{check_size}};
3109 }
3110
3111 my $widget = pop @queue || last;
3112
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122
3123 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h;
3125
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3127
3128 $widget->{parent}->check_size
3129 if $widget->{parent};
3130 }
3131 }
3132 }
3133
3134 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3136 values %$size_alloc;
3137
3138 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last };
3140
3141 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0;
3143
3144 $widget->{w} = $w;
3145 $widget->{h} = $h;
3146 $widget->emit (size_allocate => $w, $h);
3147 }
3148 }
3149
3150 while ($self->{post_alloc_hook}) {
3151 $_->()
3152 for values %{delete $self->{post_alloc_hook}};
2563 } 3153 }
2564 3154
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3155 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3157 glClear GL_COLOR_BUFFER_BIT;
2568 3158
2569 glMatrixMode GL_PROJECTION; 3159 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3160 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3162 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3163 glLoadIdentity;
2574 3164
2575 $self->_draw; 3165 $self->_draw;
2576} 3166}
2577 3167
2578############################################################################# 3168#############################################################################
2579 3169
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3170package CFClient::UI;
2688 3171
2689$ROOT = new CFClient::UI::Root; 3172$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3173$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3174
26921 31751
2693 3176

Diff Legend

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