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

Diff Legend

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