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

Diff Legend

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