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.187 by root, Mon May 8 20:40:31 2006 UTC vs.
Revision 1.245 by elmex, Sat May 27 21:15:57 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
226}
227
228sub toggle_visibility {
229 my ($self) = @_;
230
231 if ($self->{visible}) {
232 $self->hide;
233 } else {
234 $self->show;
235 }
164} 236}
165 237
166sub destroy { 238sub destroy {
167 my ($self) = @_; 239 my ($self) = @_;
168 240
… …
170 %$self = (); 242 %$self = ();
171} 243}
172 244
173sub show { 245sub show {
174 my ($self) = @_; 246 my ($self) = @_;
175
176 return if $self->{parent}; 247 return if $self->{parent};
177 248
178 $CFClient::UI::ROOT->add ($self); 249 $CFClient::UI::ROOT->add ($self);
179} 250}
180 251
181sub hide { 252sub show_centered {
182 my ($self) = @_; 253 my ($self) = @_;
254 return if $self->{parent};
255
256 $self->show;
257
258 $CFClient::UI::ROOT->on_post_alloc (
259 "centered $self" => sub {
260 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
261 },
262 );
263}
264
265sub set_invisible {
266 my ($self) = @_;
267
268 return unless $self->{visible};
269
270 # broken show/hide model
271
272 delete $self->{root};
273 delete $self->{visible};
183 274
184 undef $GRAB if $GRAB == $self; 275 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 276 undef $HOVER if $HOVER == $self;
277
278 CFClient::UI::check_tooltip
279 if $CFClient::UI::TOOLTIP->{owner} == $self;
280
281 $self->focus_out;
282
283 $self->emit (visibility_change => 0);
284}
285
286sub hide {
287 my ($self) = @_;
288
289 $self->set_invisible;
186 290
187 $self->{parent}->remove ($self) 291 $self->{parent}->remove ($self)
188 if $self->{parent}; 292 if $self->{parent};
189} 293}
190 294
… …
232 $self->{y} = $y; 336 $self->{y} = $y;
233 $self->update; 337 $self->update;
234 } 338 }
235 339
236 if ($self->{w} != $w || $self->{h} != $h) { 340 if ($self->{w} != $w || $self->{h} != $h) {
237 $self->{w} = $w; 341 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
238 $self->{h} = $h;
239
240 $self->size_allocate ($w, $h);
241 $self->update;
242 $self->emit (size_allocate => $w, $h);
243 } 342 }
244} 343}
245 344
246sub size_allocate { 345sub size_allocate {
247 # nothing to be done 346 # nothing to be done
248} 347}
249 348
349sub reconfigure {
350 my ($self) = @_;
351
352 $self->check_size (1);
353 $self->update;
354}
355
250sub children { 356sub children {
251}
252
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263} 357}
264 358
265sub set_max_size { 359sub set_max_size {
266 my ($self, $w, $h) = @_; 360 my ($self, $w, $h) = @_;
267 361
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 362 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 363 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 364}
271 365
272# return top left coordinates 366sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 367 my ($self, $tooltip) = @_;
275 368
276 $self->{parent} 369 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 370 $tooltip =~ s/\s+$//;
278 371
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 372 return if $self->{tooltip} eq $tooltip;
373
374 $self->{tooltip} = $tooltip;
375
376 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
377 delete $CFClient::UI::TOOLTIP->{owner};
378 CFClient::UI::check_tooltip;
379 }
280} 380}
281 381
282# translate global coordinates to local coordinate system 382# translate global coordinates to local coordinate system
283sub coord2local { 383sub coord2local {
284 my ($self, $x, $y) = @_; 384 my ($self, $x, $y) = @_;
285 385
286 my ($X, $Y) = $self->_topleft; 386 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 387}
289 388
290# translate local coordinates to global coordinate system 389# translate local coordinates to global coordinate system
291sub coord2global { 390sub coord2global {
292 my ($self, $x, $y) = @_; 391 my ($self, $x, $y) = @_;
293 392
294 my ($X, $Y) = $self->_topleft; 393 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 394}
297 395
298sub focus_in { 396sub focus_in {
299 my ($self) = @_; 397 my ($self) = @_;
300 398
301 return if $FOCUS == $self; 399 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 400 return unless $self->{can_focus};
303 401
304 my $focus = $FOCUS; $FOCUS = $self; 402 my $focus = $FOCUS; $FOCUS = $self;
305 403
306 $self->emit (focus_in => $focus); 404 $self->_emit (focus_in => $focus);
307 405
308 $focus->update if $focus; 406 $focus->update if $focus;
309 $FOCUS->update; 407 $FOCUS->update;
310} 408}
311 409
… …
314 412
315 return unless $FOCUS == $self; 413 return unless $FOCUS == $self;
316 414
317 my $focus = $FOCUS; undef $FOCUS; 415 my $focus = $FOCUS; undef $FOCUS;
318 416
319 $self->emit (focus_out => $focus); 417 $self->_emit (focus_out => $focus);
320 418
321 $focus->update if $focus; #? 419 $focus->update if $focus; #?
420
421 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
422 unless $FOCUS;
322} 423}
323 424
324sub mouse_motion { } 425sub mouse_motion { }
325sub button_up { } 426sub button_up { }
326sub key_down { } 427sub key_down { }
327sub key_up { } 428sub key_up { }
328 429
329sub button_down { 430sub button_down {
330 my ($self, $ev, $x, $y) = @_; 431 my ($self, $ev, $x, $y) = @_;
331 432
332 $self->focus_in; 433 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 467 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 468 glPushMatrix;
368 glColor 1, 1, 0, 1; 469 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 470 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 471 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 472 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 473 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 474 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 475 glVertex 0 , $self->{h} - 1;
375 glEnd; 476 glEnd;
376 glPopMatrix; 477 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 478 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 479 }
379} 480}
380 481
381sub _draw { 482sub _draw {
382 my ($self) = @_; 483 my ($self) = @_;
… …
398 499
399sub set_parent { 500sub set_parent {
400 my ($self, $parent) = @_; 501 my ($self, $parent) = @_;
401 502
402 Scalar::Util::weaken ($self->{parent} = $parent); 503 Scalar::Util::weaken ($self->{parent} = $parent);
504
505 if ($parent->{visible} || 1) {
506 $self->{root} = $parent->{root};
507 $self->{visible} = $parent->{visible} + 1;
508
509 $self->emit (visibility_change => 1)
510 unless $self->{parent}{visible};
511 }
512
513 # TODO: req_w _does_change after ->reconfigure
514 $self->check_size
515 unless exists $self->{req_w};
516
517 $self->show;
403} 518}
404 519
405sub check_size { 520sub check_size {
406 my ($self) = @_; 521 my ($self, $forced) = @_;
407 522
408 $self->{parent} 523 $self->{force_alloc} = 1 if $forced;
409 or return 1; 524 $CFClient::UI::ROOT->{check_size}{$self} = $self;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429} 525}
430 526
431sub update { 527sub update {
432 my ($self) = @_; 528 my ($self) = @_;
433 529
… …
439 my ($self, $signal, $cb) = @_; 535 my ($self, $signal, $cb) = @_;
440 536
441 push @{ $self->{signal_cb}{$signal} }, $cb; 537 push @{ $self->{signal_cb}{$signal} }, $cb;
442} 538}
443 539
540sub _emit {
541 my ($self, $signal, @args) = @_;
542
543 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
544}
545
444sub emit { 546sub emit {
445 my ($self, $signal, @args) = @_; 547 my ($self, $signal, @args) = @_;
446 548
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 549 $self->_emit ($signal, @args)
550 || $self->$signal (@args);
551}
552
553sub visibility_change {
554 #my ($self, $visible) = @_;
448} 555}
449 556
450sub DESTROY { 557sub DESTROY {
451 my ($self) = @_; 558 my ($self) = @_;
452 559
560 delete $WIDGET{$self+0};
453 #$self->deactivate; 561 #$self->deactivate;
454} 562}
455 563
456############################################################################# 564#############################################################################
457 565
… …
466 my $class = shift; 574 my $class = shift;
467 575
468 # range [value, low, high, page] 576 # range [value, low, high, page]
469 577
470 $class->SUPER::new ( 578 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 579 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 580 #active_bg => [1, 1, 1, 0.5],
473 @_ 581 @_
474 ) 582 )
475} 583}
476 584
477sub _draw { 585sub _draw {
478 my ($self) = @_; 586 my ($self) = @_;
479 587
588 my $color = $FOCUS == $self && $self->{active_bg}
589 ? $self->{active_bg}
590 : $self->{bg};
591
592 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 593 my ($w, $h) = @$self{qw(w h)};
481 594
482 glEnable GL_BLEND; 595 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 597 glColor @$color;
485 598
486 glBegin GL_QUADS; 599 glBegin GL_QUADS;
487 glVertex 0 , 0; 600 glVertex 0 , 0;
488 glVertex 0 , $h; 601 glVertex 0 , $h;
489 glVertex $w, $h; 602 glVertex $w, $h;
490 glVertex $w, 0; 603 glVertex $w, 0;
491 glEnd; 604 glEnd;
492 605
493 glDisable GL_BLEND; 606 glDisable GL_BLEND;
607 }
494} 608}
495 609
496############################################################################# 610#############################################################################
497 611
498package CFClient::UI::Empty; 612package CFClient::UI::Empty;
… …
530 644
531 $self 645 $self
532} 646}
533 647
534sub add { 648sub add {
535 my ($self, $child) = @_; 649 my ($self, @widgets) = @_;
536 650
537 $child->set_parent ($self); 651 $_->set_parent ($self)
652 for @widgets;
538 653
539 use sort 'stable'; 654 use sort 'stable';
540 655
541 $self->{children} = [ 656 $self->{children} = [
542 sort { $a->{z} <=> $b->{z} } 657 sort { $a->{z} <=> $b->{z} }
543 @{$self->{children}}, $child 658 @{$self->{children}}, @widgets
544 ]; 659 ];
545 660
546 $child->check_size; 661 $self->check_size (1);
547 $self->update; 662 $self->update;
548} 663}
549 664
550sub children { 665sub children {
551 @{ $_[0]{children} } 666 @{ $_[0]{children} }
… …
557 delete $child->{parent}; 672 delete $child->{parent};
558 $child->hide; 673 $child->hide;
559 674
560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 675 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
561 676
562 $self->check_size; 677 $self->check_size (1);
563 $self->update; 678 $self->update;
564} 679}
565 680
566sub clear { 681sub clear {
567 my ($self) = @_; 682 my ($self) = @_;
… …
658} 773}
659 774
660sub update { 775sub update {
661 my ($self) = @_; 776 my ($self) = @_;
662 777
663 $ROOT->on_refresh ($self => sub { $self->render_child }); 778 $ROOT->on_post_alloc ($self => sub { $self->render_child });
664 $self->SUPER::update; 779 $self->SUPER::update;
665} 780}
666 781
667sub size_allocate { 782sub size_allocate {
668 my ($self, $w, $h) = @_; 783 my ($self, $w, $h) = @_;
… …
681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
682 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
683 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
684 799
685 $self->_render; 800 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
693 }; 801 };
694} 802}
695 803
696sub _draw { 804sub _draw {
697 my ($self) = @_; 805 my ($self) = @_;
… …
699 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
700 808
701 my $tex = $self->{texture} 809 my $tex = $self->{texture}
702 or return; 810 or return;
703 811
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
709 815
710 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
711 817
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
714} 819}
715 820
716############################################################################# 821#############################################################################
717 822
718package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
719 824
720our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
721 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
722sub size_request { 837sub size_request {
723 my ($self) = @_; 838 my ($self) = @_;
724 839
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727 841
728 @$self{qw(child_w child_h)} 842 @$self{qw(child_w child_h)}
729} 843}
730 844
731sub size_allocate { 845sub size_allocate {
732 my ($self, $w, $h) = @_; 846 my ($self, $w, $h) = @_;
733 847
848 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w};
849 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h};
850
851 $self->child->configure (0, 0, $w, $h);
734 $self->update; 852 $self->update;
735} 853}
736 854
737sub set_offset { 855sub set_offset {
738 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
… …
741 $self->{view_y} = int $y; 859 $self->{view_y} = int $y;
742 860
743 $self->update; 861 $self->update;
744} 862}
745 863
746# hmm, this does not work for topleft of $self... but we should not aks for that 864# hmm, this does not work for topleft of $self... but we should not ask for that
747sub _topleft { 865sub coord2local {
748 my ($self, $x, $y) = @_; 866 my ($self, $x, $y) = @_;
749 867
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 868 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
869}
870
871sub coord2global {
872 my ($self, $x, $y) = @_;
873
874 $x = List::Util::min $self->{w}, $x - $self->{view_x};
875 $y = List::Util::min $self->{h}, $y - $self->{view_y};
876
877 $self->SUPER::coord2global ($x, $y)
751} 878}
752 879
753sub find_widget { 880sub find_widget {
754 my ($self, $x, $y) = @_; 881 my ($self, $x, $y) = @_;
755 882
… …
780 my $class = shift; 907 my $class = shift;
781 908
782 my $self; 909 my $self;
783 910
784 my $slider = new CFClient::UI::Slider 911 my $slider = new CFClient::UI::Slider
785 vertical => 1, 912 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix 913 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub { 914 on_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 915 $self->{vp}->set_offset (0, $_[1]);
789 }, 916 },
790 ; 917 ;
791 918
792 $self = $class->SUPER::new ( 919 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort), 920 vp => (new CFClient::UI::ViewPort expand => 1),
794 slider => $slider, 921 slider => $slider,
795 @_, 922 @_,
796 ); 923 );
797 924
798 $self->{vp}->add ($self->{scrolled}); 925 $self->{vp}->add ($self->{scrolled});
… …
800 $self->add ($self->{slider}); 927 $self->add ($self->{slider});
801 928
802 $self 929 $self
803} 930}
804 931
932sub update {
933 my ($self) = @_;
934
935 $self->SUPER::update;
936
937 # todo: overwrite size_allocate of child
938 my $child = $self->{vp}->child;
939 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
940}
941
942sub size_allocate {
943 my ($self, $w, $h) = @_;
944
945 $self->SUPER::size_allocate ($w, $h);
946
947 my $child = $self->{vp}->child;
948 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
949}
950
805#TODO# update range on size_allocate depeneing on child 951#TODO# update range on size_allocate depending on child
806# update viewport offset on scroll 952# update viewport offset on scroll
807 953
808############################################################################# 954#############################################################################
809 955
810package CFClient::UI::Frame; 956package CFClient::UI::Frame;
… …
814use CFClient::OpenGL; 960use CFClient::OpenGL;
815 961
816sub new { 962sub new {
817 my $class = shift; 963 my $class = shift;
818 964
819 my $self = $class->SUPER::new ( 965 $class->SUPER::new (
820 bg => [1, 1, 1, 1], 966 bg => undef,
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_ 967 @_,
824 ); 968 )
825
826 $self
827} 969}
828 970
829sub _draw { 971sub _draw {
830 my ($self) = @_; 972 my ($self) = @_;
831 973
832 my ($w, $h) = ($self->{w}, $self->{h}); 974 if ($self->{bg}) {
975 my ($w, $h) = @$self{qw(w h)};
833 976
834 glEnable GL_BLEND; 977 glEnable GL_BLEND;
835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 978 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
836 glEnable GL_TEXTURE_2D; 979 glColor @{ $self->{bg} };
837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
838 980
839# glBegin GL_QUADS; 981 glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0; 982 glVertex 0 , 0;
842# glVertex 0 , $h; 983 glVertex 0 , $h;
843# glVertex $w, $h; 984 glVertex $w, $h;
844# glVertex $w, 0; 985 glVertex $w, 0;
845# glEnd; 986 glEnd;
846 987
847
848 $self->child->draw;
849 glDisable GL_BLEND; 988 glDisable GL_BLEND;
850 glDisable GL_TEXTURE_2D; 989 }
990
991 $self->SUPER::_draw;
851} 992}
852 993
853############################################################################# 994#############################################################################
854 995
855package CFClient::UI::FancyFrame; 996package CFClient::UI::FancyFrame;
… …
866 my $class = shift; 1007 my $class = shift;
867 1008
868 # TODO: user_x, user_y, overwrite moveto? 1009 # TODO: user_x, user_y, overwrite moveto?
869 1010
870 my $self = $class->SUPER::new ( 1011 my $self = $class->SUPER::new (
871 bg => [1, 1, 1, 1], 1012 bg => [1, 1, 1, 1],
872 border_bg => [1, 1, 1, 1], 1013 border_bg => [1, 1, 1, 1],
873 border => 0.6, 1014 border => 0.6,
1015 is_toplevel => 1,
874 can_events => 1, 1016 can_events => 1,
875 @_ 1017 @_
876 ); 1018 );
877 1019
878 $self->{title} &&= new CFClient::UI::Label 1020 $self->{title} &&= new CFClient::UI::Label
879 align => 0, 1021 align => 0,
… …
903 my ($self, $w, $h) = @_; 1045 my ($self, $w, $h) = @_;
904 1046
905 $h -= List::Util::max 0, $self->border * 2; 1047 $h -= List::Util::max 0, $self->border * 2;
906 $w -= List::Util::max 0, $self->border * 2; 1048 $w -= List::Util::max 0, $self->border * 2;
907 1049
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
909 if $self->{title}; 1051 if $self->{title};
910 1052
911 $self->child->configure ($self->border, $self->border, $w, $h); 1053 $self->child->configure ($self->border, $self->border, $w, $h);
912} 1054}
913 1055
… …
932 my ($ev, $x, $y) = @_; 1074 my ($ev, $x, $y) = @_;
933 1075
934 my $dx = $ev->{x} - $ox; 1076 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy; 1077 my $dy = $ev->{y} - $oy;
936 1078
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1081 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1082 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
939 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1083 $self->move ($self->{user_x}, $self->{user_y});
940 $self->check_size; 1084 $self->check_size;
941 }; 1085 };
942 1086
943 } elsif ($lr ^ $td) { 1087 } elsif ($lr ^ $td) {
944 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1088 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
947 $self->{motion} = sub { 1091 $self->{motion} = sub {
948 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
949 1093
950 ($x, $y) = ($ev->{x}, $ev->{y}); 1094 ($x, $y) = ($ev->{x}, $ev->{y});
951 1095
952 $self->move ($bx + $x - $ox, $by + $y - $oy); 1096 $self->{user_x} = $bx + $x - $ox;
1097 $self->{user_y} = $by + $y - $oy;
1098 $self->move ($self->{user_x}, $self->{user_y});
953 $self->update; 1099 $self->update;
954 }; 1100 };
955 } 1101 }
956} 1102}
957 1103
… …
971 my ($self) = @_; 1117 my ($self) = @_;
972 1118
973 my ($w, $h ) = ($self->{w}, $self->{h}); 1119 my ($w, $h ) = ($self->{w}, $self->{h});
974 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1120 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
975 1121
976 glEnable GL_BLEND;
977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
978 glEnable GL_TEXTURE_2D; 1122 glEnable GL_TEXTURE_2D;
979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
980 1124
981 my $border = $self->border; 1125 my $border = $self->border;
982 1126
983 glColor @{ $self->{border_bg} }; 1127 glColor @{ $self->{border_bg} };
984 $tex[1]->draw_quad (0, 0, $w, $border); 1128 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
985 $tex[3]->draw_quad (0, $border, $border, $ch); 1129 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1130 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
987 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1131 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
988 1132
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1133 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
990 my $bg = $tex[0]; 1134 my $bg = $tex[0];
991 1135
992 # TODO: repeat texture not scale 1136 # TODO: repeat texture not scale
… …
996 glColor @{ $self->{bg} }; 1140 glColor @{ $self->{bg} };
997 1141
998 $bg->{s} = $rep_x; 1142 $bg->{s} = $rep_x;
999 $bg->{t} = $rep_y; 1143 $bg->{t} = $rep_y;
1000 $bg->{wrap_mode} = 1; 1144 $bg->{wrap_mode} = 1;
1001 $bg->draw_quad ($border, $border, $cw, $ch); 1145 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1146 }
1002 1147
1003 glDisable GL_TEXTURE_2D; 1148 glDisable GL_TEXTURE_2D;
1004 glDisable GL_BLEND;
1005 }
1006 1149
1007 $self->{title}->draw if $self->{title}; 1150 $self->{title}->draw if $self->{title};
1008 1151
1009 $self->child->draw; 1152 $self->child->draw;
1010} 1153}
… …
1022sub new { 1165sub new {
1023 my $class = shift; 1166 my $class = shift;
1024 1167
1025 $class->SUPER::new ( 1168 $class->SUPER::new (
1026 col_expand => [], 1169 col_expand => [],
1027 @_ 1170 @_,
1028 ) 1171 )
1172}
1173
1174sub children {
1175 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1029} 1176}
1030 1177
1031sub add { 1178sub add {
1032 my ($self, $x, $y, $child) = @_; 1179 my ($self, $x, $y, $child) = @_;
1033 1180
1034 $child->set_parent ($self); 1181 $child->set_parent ($self);
1035 $self->{children}[$y][$x] = $child; 1182 $self->{children}[$y][$x] = $child;
1036 1183
1037 $child->check_size; 1184 $self->check_size (1);
1038} 1185}
1039 1186
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1042}
1043
1044# 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?
1045sub clear { 1188sub clear {
1046 my ($self) = @_; 1189 my ($self) = @_;
1047 1190
1048 my @children = $self->children; 1191 my @children = $self->children;
1049 delete $self->{children}; 1192 delete $self->{children};
… …
1051 for (@children) { 1194 for (@children) {
1052 delete $_->{parent}; 1195 delete $_->{parent};
1053 $_->hide; 1196 $_->hide;
1054 } 1197 }
1055 1198
1199 $self->check_size (1);
1056 $self->update; 1200 $self->update;
1057} 1201}
1058 1202
1059sub get_wh { 1203sub get_wh {
1060 my ($self) = @_; 1204 my ($self) = @_;
… …
1092sub size_allocate { 1236sub size_allocate {
1093 my ($self, $w, $h) = @_; 1237 my ($self, $w, $h) = @_;
1094 1238
1095 my ($ws, $hs) = $self->get_wh; 1239 my ($ws, $hs) = $self->get_wh;
1096 1240
1097 my $req_w = sum @$ws; 1241 my $req_w = (sum @$ws) || 1;
1098 my $req_h = sum @$hs; 1242 my $req_h = (sum @$hs) || 1;
1099 1243
1100 # TODO: nicer code && do row_expand 1244 # TODO: nicer code && do row_expand
1101 my @col_expand = @{$self->{col_expand}}; 1245 my @col_expand = @{$self->{col_expand}};
1102 @col_expand = (1) x @$ws unless @col_expand; 1246 @col_expand = (1) x @$ws unless @col_expand;
1103 my $col_expand = (sum @col_expand) || 1; 1247 my $col_expand = (sum @col_expand) || 1;
… …
1237} 1381}
1238 1382
1239sub size_allocate { 1383sub size_allocate {
1240 my ($self, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1241 1385
1386 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1387
1242 my $children = $self->{children}; 1388 my $children = $self->{children};
1243 1389
1244 my @h = map $_->{req_h}, @$children; 1390 my @h = map $_->{req_h}, @$children;
1245 1391
1246 my $req_h = List::Util::sum @h; 1392 my $req_h = List::Util::sum @h;
… …
1275 1421
1276############################################################################# 1422#############################################################################
1277 1423
1278package CFClient::UI::Label; 1424package CFClient::UI::Label;
1279 1425
1280our @ISA = CFClient::UI::Base::; 1426our @ISA = CFClient::UI::DrawBG::;
1281 1427
1282use CFClient::OpenGL; 1428use CFClient::OpenGL;
1283 1429
1284sub new { 1430sub new {
1285 my ($class, %arg) = @_; 1431 my ($class, %arg) = @_;
1286 1432
1287 my $self = $class->SUPER::new ( 1433 my $self = $class->SUPER::new (
1288 fg => [1, 1, 1], 1434 fg => [1, 1, 1],
1435 #bg => none
1436 #active_bg => none
1289 #font => default_font 1437 #font => default_font
1438 #text => initial text
1439 #markup => initial narkup
1440 #max_w => maximum pixel width
1441 ellipsise => 3, # end
1442 layout => (new CFClient::Layout),
1290 fontsize => 1, 1443 fontsize => 1,
1291 text => "",
1292 align => -1, 1444 align => -1,
1293 valign => -1, 1445 valign => -1,
1294 padding => 2, 1446 padding => 2,
1295 layout => new CFClient::Layout,
1296 can_events => 0, 1447 can_events => 0,
1297 %arg 1448 %arg
1298 ); 1449 );
1299 1450
1300 if (exists $self->{template}) { 1451 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout; 1452 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template}); 1453 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout; 1454 $self->{template} = $layout;
1304 } 1455 }
1305 1456
1306 $self->set_text (delete $self->{text}) if exists $self->{text}; 1457 if (exists $self->{markup}) {
1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1458 $self->set_markup (delete $self->{markup});
1459 } else {
1460 $self->set_text (delete $self->{text});
1461 }
1308 1462
1309 $self 1463 $self
1310} 1464}
1311 1465
1312sub escape { 1466sub escape($) {
1313 local $_ = $_[1]; 1467 local $_ = $_[0];
1314 1468
1315 s/&/&amp;/g; 1469 s/&/&amp;/g;
1316 s/>/&gt;/g; 1470 s/>/&gt;/g;
1317 s/</&lt;/g; 1471 s/</&lt;/g;
1318 1472
1319 $_[1] 1473 $_
1320} 1474}
1321 1475
1322sub update { 1476sub update {
1323 my ($self) = @_; 1477 my ($self) = @_;
1324 1478
… …
1330 my ($self, $text) = @_; 1484 my ($self, $text) = @_;
1331 1485
1332 return if $self->{text} eq "T$text"; 1486 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text"; 1487 $self->{text} = "T$text";
1334 1488
1489 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1335 $self->{layout}->set_text ($text); 1490 $self->{layout}->set_text ($text);
1336 1491
1337 delete $self->{texture};
1338 $self->update; 1492 $self->update;
1339 $self->check_size; 1493 $self->check_size;
1340} 1494}
1341 1495
1342sub set_markup { 1496sub set_markup {
1343 my ($self, $markup) = @_; 1497 my ($self, $markup) = @_;
1344 1498
1345 return if $self->{text} eq "M$markup"; 1499 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup"; 1500 $self->{text} = "M$markup";
1347 1501
1502 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1503
1504 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1348 $self->{layout}->set_markup ($markup); 1505 $self->{layout}->set_markup ($markup);
1349 1506
1350 delete $self->{texture};
1351 $self->update; 1507 $self->update;
1352 $self->check_size; 1508 $self->check_size;
1353} 1509}
1354 1510
1355sub size_request { 1511sub size_request {
1356 my ($self) = @_; 1512 my ($self) = @_;
1357 1513
1358 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1514 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1); 1515 $self->{layout}->set_width ($self->{max_w} || -1);
1516 $self->{layout}->set_ellipsise ($self->{ellipsise});
1517 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1518 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1361 1519
1362 my ($w, $h) = $self->{layout}->size; 1520 my ($w, $h) = $self->{layout}->size;
1363 1521
1364 if (exists $self->{template}) { 1522 if (exists $self->{template}) {
… …
1394} 1552}
1395 1553
1396sub _draw { 1554sub _draw {
1397 my ($self) = @_; 1555 my ($self) = @_;
1398 1556
1557 $self->SUPER::_draw; # draw background, if applicable
1558
1399 my $tex = $self->{texture} ||= do { 1559 my $tex = $self->{texture} ||= do {
1560 $self->{layout}->set_foreground (@{$self->{fg}});
1400 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1561 $self->{layout}->set_font ($self->{font}) if $self->{font};
1401 $self->{layout}->set_width ($self->{w}); 1562 $self->{layout}->set_width ($self->{w});
1563 $self->{layout}->set_ellipsise ($self->{ellipsise});
1564 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1565 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1566
1403 new_from_layout CFClient::Texture $self->{layout} 1567 my $tex = new_from_layout CFClient::Texture $self->{layout};
1568
1569 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1570 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1571 : ($self->{w} - $tex->{w}) * 0.5);
1572
1573 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1574 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1575 : ($self->{h} - $tex->{h}) * 0.5);
1576
1577 $tex
1404 }; 1578 };
1405 1579
1406 glEnable GL_BLEND;
1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1408 glEnable GL_TEXTURE_2D; 1580 glEnable GL_TEXTURE_2D;
1409 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1410 1582
1583 if ($tex->{format} == GL_ALPHA) {
1411 glColor @{$self->{fg}}; 1584 glColor @{$self->{fg}};
1412
1413 $self->{ox} = int (
1414 $self->{align} < 0 ? $self->{padding}
1415 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1416 : ($self->{w} - $tex->{w}) * 0.5
1417 );
1418
1419 $self->{oy} = int (
1420 $self->{valign} < 0 ? $self->{padding}
1421 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1422 : ($self->{h} - $tex->{h}) * 0.5
1423 );
1424
1425 $tex->draw_quad ($self->{ox}, $self->{oy}); 1585 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1586 } else {
1587 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1588 }
1426 1589
1427 glDisable GL_TEXTURE_2D; 1590 glDisable GL_TEXTURE_2D;
1428 glDisable GL_BLEND;
1429} 1591}
1430 1592
1431############################################################################# 1593#############################################################################
1432 1594
1433package CFClient::UI::EntryBase; 1595package CFClient::UI::EntryBase;
… …
1446 active_fg => [0, 0, 0], 1608 active_fg => [0, 0, 0],
1447 can_hover => 1, 1609 can_hover => 1,
1448 can_focus => 1, 1610 can_focus => 1,
1449 valign => 0, 1611 valign => 0,
1450 can_events => 1, 1612 can_events => 1,
1613 #text => ...
1451 @_ 1614 @_
1452 ) 1615 )
1453} 1616}
1454 1617
1455sub _set_text { 1618sub _set_text {
… …
1465 $self->{text} = $text; 1628 $self->{text} = $text;
1466 1629
1467 $text =~ s/./*/g if $self->{hidden}; 1630 $text =~ s/./*/g if $self->{hidden};
1468 $self->{layout}->set_text ("$text "); 1631 $self->{layout}->set_text ("$text ");
1469 1632
1470 $self->emit (changed => $self->{text}); 1633 $self->_emit (changed => $self->{text});
1471}
1472
1473sub get_text {
1474 $_[0]{text}
1475}
1476
1477sub size_request {
1478 my ($self) = @_;
1479
1480 my ($w, $h) = $self->SUPER::size_request;
1481
1482 ($w + 1, $h) # add 1 for cursor
1483}
1484
1485sub size_allocate {
1486 my ($self, $w, $h) = @_;
1487
1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1489} 1634}
1490 1635
1491sub set_text { 1636sub set_text {
1492 my ($self, $text) = @_; 1637 my ($self, $text) = @_;
1493 1638
1494 $self->{cursor} = length $text; 1639 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1640 $self->_set_text ($text);
1496 $self->update; 1641 $self->update;
1642 $self->check_size;
1643}
1644
1645sub get_text {
1646 $_[0]{text}
1647}
1648
1649sub size_request {
1650 my ($self) = @_;
1651
1652 my ($w, $h) = $self->SUPER::size_request;
1653
1654 ($w + 1, $h) # add 1 for cursor
1497} 1655}
1498 1656
1499sub key_down { 1657sub key_down {
1500 my ($self, $ev) = @_; 1658 my ($self, $ev) = @_;
1501 1659
… …
1503 my $sym = $ev->{sym}; 1661 my $sym = $ev->{sym};
1504 my $uni = $ev->{unicode}; 1662 my $uni = $ev->{unicode};
1505 1663
1506 my $text = $self->get_text; 1664 my $text = $self->get_text;
1507 1665
1508 if ($sym == 8) { 1666 if ($uni == 8) {
1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1667 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1510 } elsif ($sym == 127) { 1668 } elsif ($uni == 127) {
1511 substr $text, $self->{cursor}, 1, ""; 1669 substr $text, $self->{cursor}, 1, "";
1512 } elsif ($sym == CFClient::SDLK_LEFT) { 1670 } elsif ($sym == CFClient::SDLK_LEFT) {
1513 --$self->{cursor} if $self->{cursor}; 1671 --$self->{cursor} if $self->{cursor};
1514 } elsif ($sym == CFClient::SDLK_RIGHT) { 1672 } elsif ($sym == CFClient::SDLK_RIGHT) {
1515 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1673 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1516 } elsif ($sym == CFClient::SDLK_HOME) { 1674 } elsif ($sym == CFClient::SDLK_HOME) {
1517 $self->{cursor} = 0; 1675 $self->{cursor} = 0;
1518 } elsif ($sym == CFClient::SDLK_END) { 1676 } elsif ($sym == CFClient::SDLK_END) {
1519 $self->{cursor} = length $text; 1677 $self->{cursor} = length $text;
1520 } elsif ($sym == 27) { 1678 } elsif ($uni == 27) {
1521 $self->emit ('escape'); 1679 $self->_emit ('escape');
1522 } elsif ($uni) { 1680 } elsif ($uni) {
1523 substr $text, $self->{cursor}++, 0, chr $uni; 1681 substr $text, $self->{cursor}++, 0, chr $uni;
1524 } 1682 }
1525 1683
1526 $self->_set_text ($text); 1684 $self->_set_text ($text);
1527 $self->update; 1685 $self->update;
1686 $self->check_size;
1528} 1687}
1529 1688
1530sub focus_in { 1689sub focus_in {
1531 my ($self) = @_; 1690 my ($self) = @_;
1532 1691
… …
1612 if ($sym == 13) { 1771 if ($sym == 13) {
1613 unshift @{$self->{history}}, 1772 unshift @{$self->{history}},
1614 my $txt = $self->get_text; 1773 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1; 1774 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = ''; 1775 $self->{history_saveback} = '';
1617 $self->emit (activate => $txt); 1776 $self->_emit (activate => $txt);
1618 $self->update; 1777 $self->update;
1619 1778
1620 } elsif ($sym == CFClient::SDLK_UP) { 1779 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) { 1780 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text; 1781 $self->{history_saveback} = $self->get_text;
… …
1661 my $class = shift; 1820 my $class = shift;
1662 1821
1663 $class->SUPER::new ( 1822 $class->SUPER::new (
1664 padding => 4, 1823 padding => 4,
1665 fg => [1, 1, 1], 1824 fg => [1, 1, 1],
1666 bg => [1, 1, 1, 0.2],
1667 active_fg => [0, 0, 1], 1825 active_fg => [0, 0, 1],
1668 can_hover => 1, 1826 can_hover => 1,
1669 align => 0, 1827 align => 0,
1670 valign => 0, 1828 valign => 0,
1671 can_events => 1, 1829 can_events => 1,
1672 @_ 1830 @_
1673 ) 1831 )
1674} 1832}
1675 1833
1834sub activate { }
1835
1676sub button_up { 1836sub button_up {
1677 my ($self, $ev, $x, $y) = @_; 1837 my ($self, $ev, $x, $y) = @_;
1678 1838
1839 $self->emit ("activate")
1679 if ($x >= 0 && $x < $self->{w} 1840 if $x >= 0 && $x < $self->{w}
1680 && $y >= 0 && $y < $self->{h}) { 1841 && $y >= 0 && $y < $self->{h};
1681 $self->emit ("activate");
1682 }
1683} 1842}
1684 1843
1685sub _draw { 1844sub _draw {
1686 my ($self) = @_; 1845 my ($self) = @_;
1687 1846
… …
1689 1848
1690 if ($GRAB == $self) { 1849 if ($GRAB == $self) {
1691 $self->{fg} = $self->{active_fg}; 1850 $self->{fg} = $self->{active_fg};
1692 } 1851 }
1693 1852
1694 glEnable GL_BLEND;
1695 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1696 glEnable GL_TEXTURE_2D; 1853 glEnable GL_TEXTURE_2D;
1697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1698 glColor 0, 0, 0, 1; 1855 glColor 0, 0, 0, 1;
1699 1856
1700 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1857 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1701 1858
1702 glDisable GL_TEXTURE_2D; 1859 glDisable GL_TEXTURE_2D;
1703 glDisable GL_BLEND;
1704 1860
1705 $self->SUPER::_draw; 1861 $self->SUPER::_draw;
1706} 1862}
1707 1863
1708############################################################################# 1864#############################################################################
… …
1722 1878
1723 $class->SUPER::new ( 1879 $class->SUPER::new (
1724 padding => 2, 1880 padding => 2,
1725 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1726 active_fg => [1, 1, 0], 1882 active_fg => [1, 1, 0],
1883 bg => [0, 0, 0, 0.2],
1884 active_bg => [1, 1, 1, 0.5],
1727 state => 0, 1885 state => 0,
1728 can_hover => 1, 1886 can_hover => 1,
1729 @_ 1887 @_
1730 ) 1888 )
1731} 1889}
… …
1740 my ($self, $ev, $x, $y) = @_; 1898 my ($self, $ev, $x, $y) = @_;
1741 1899
1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1900 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1901 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1744 $self->{state} = !$self->{state}; 1902 $self->{state} = !$self->{state};
1745 $self->emit (changed => $self->{state}); 1903 $self->_emit (changed => $self->{state});
1746 } 1904 }
1747} 1905}
1748 1906
1749sub _draw { 1907sub _draw {
1750 my ($self) = @_; 1908 my ($self) = @_;
… …
1755 1913
1756 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1914 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1757 1915
1758 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1916 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1759 1917
1760 glEnable GL_BLEND; 1918 my $tex = $self->{state} ? $tex[1] : $tex[0];
1919
1761 glEnable GL_TEXTURE_2D; 1920 glEnable GL_TEXTURE_2D;
1762 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1763
1764 my $tex = $self->{state} ? $tex[1] : $tex[0];
1765
1766 $tex->draw_quad (0, 0, $s, $s); 1921 $tex->draw_quad_alpha (0, 0, $s, $s);
1767
1768 glDisable GL_TEXTURE_2D; 1922 glDisable GL_TEXTURE_2D;
1769 glDisable GL_BLEND;
1770} 1923}
1771 1924
1772############################################################################# 1925#############################################################################
1773 1926
1774package CFClient::UI::Image; 1927package CFClient::UI::Image;
… …
1817 glTranslate 0, -$self->{w}, 0; 1970 glTranslate 0, -$self->{w}, 0;
1818 1971
1819 ($w, $h) = ($h, $w); 1972 ($w, $h) = ($h, $w);
1820 } 1973 }
1821 1974
1822 glEnable GL_BLEND;
1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1824 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1826 1977
1827 $tex->draw_quad (0, 0, $w, $h); 1978 $tex->draw_quad_alpha (0, 0, $w, $h);
1828 1979
1829 glDisable GL_BLEND;
1830 glDisable GL_TEXTURE_2D; 1980 glDisable GL_TEXTURE_2D;
1831} 1981}
1832 1982
1833############################################################################# 1983#############################################################################
1834 1984
… …
2023 qw(s1_slider.png s1_slider_bg.png); 2173 qw(s1_slider.png s1_slider_bg.png);
2024 2174
2025sub new { 2175sub new {
2026 my $class = shift; 2176 my $class = shift;
2027 2177
2028 # range [value, low, high, page] 2178 # range [value, low, high, page, unit]
2029 2179
2030 # TODO: 0-width page 2180 # TODO: 0-width page
2031 # TODO: req_w/h are wrong with vertical 2181 # TODO: req_w/h are wrong with vertical
2032 # TODO: calculations are off 2182 # TODO: calculations are off
2033 my $self = $class->SUPER::new ( 2183 my $self = $class->SUPER::new (
2034 fg => [1, 1, 1], 2184 fg => [1, 1, 1],
2035 active_fg => [0, 0, 0], 2185 active_fg => [0, 0, 0],
2186 bg => [0, 0, 0, 0.2],
2187 active_bg => [1, 1, 1, 0.5],
2036 range => [0, 0, 100, 10], 2188 range => [0, 0, 100, 10, 0],
2037 req_w => $::WIDTH / 80, 2189 req_w => $::WIDTH / 80,
2038 req_h => $::WIDTH / 80, 2190 req_h => $::WIDTH / 80,
2039 vertical => 0, 2191 vertical => 0,
2040 can_hover => 1, 2192 can_hover => 1,
2041 inner_pad => 5, 2193 inner_pad => 0.02,
2042 @_ 2194 @_
2043 ); 2195 );
2044 2196
2197 $self->set_value ($self->{range}[0]);
2198 $self->update;
2199
2045 $self 2200 $self
2201}
2202
2203sub set_range {
2204 my ($self, $range) = @_;
2205
2206 ($range, $self->{range}) = ($self->{range}, $range);
2207
2208 $self->update
2209 if "@$range" ne "@{$self->{range}}";
2210}
2211
2212sub set_value {
2213 my ($self, $value) = @_;
2214
2215 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2216
2217 $hi = $lo + 1 if $hi <= $lo;
2218
2219 $page = $hi - $lo if $page > $hi - $lo;
2220
2221 $value = $lo if $value < $lo;
2222 $value = $hi - $page if $value > $hi - $page;
2223
2224 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2225 if $unit;
2226
2227 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2228
2229 if ($value != $old_value) {
2230 $self->_emit (changed => $value);
2231 $self->update;
2232 }
2046} 2233}
2047 2234
2048sub size_request { 2235sub size_request {
2049 my ($self) = @_; 2236 my ($self) = @_;
2050 2237
… …
2056 2243
2057sub button_down { 2244sub button_down {
2058 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2059 2246
2060 $self->SUPER::button_down ($ev, $x, $y); 2247 $self->SUPER::button_down ($ev, $x, $y);
2248
2249 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2250
2061 $self->mouse_motion ($ev, $x, $y); 2251 $self->mouse_motion ($ev, $x, $y);
2062} 2252}
2063 2253
2064sub mouse_motion { 2254sub mouse_motion {
2065 my ($self, $ev, $x, $y) = @_; 2255 my ($self, $ev, $x, $y) = @_;
2066 2256
2067 if ($GRAB == $self) { 2257 if ($GRAB == $self) {
2258 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2259
2260 my (undef, $lo, $hi, $page) = @{$self->{range}};
2261
2262 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2263
2264 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2265 }
2266}
2267
2268sub update {
2269 my ($self) = @_;
2270
2271 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2272 $self->set_value ($self->{range}[0]);
2273
2068 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2274 my ($value, $lo, $hi, $page) = @{$self->{range}};
2275 my $range = ($hi - $page - $lo) || 1e-100;
2069 2276
2070 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2277 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2071 2278
2072 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2279 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2073 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2280 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2074 2281
2075 $x -= $inner_pad_px; # substract the padding 2282 $value = ($value - $lo) / $range;
2076 $x = $x * ($hi - $lo) / $inner_w + $lo; 2283 $value = $value * $self->{scale} + $self->{offset};
2077 $x = $lo if $x < $lo;
2078 $x = $hi - $page if $x > $hi - $page;
2079 $self->{range}[0] = $x;
2080 2284
2081 $self->emit (changed => $x); 2285 $self->{knob_x} = $value - $knob_w * 0.5;
2082 $self->update; 2286 $self->{knob_w} = $knob_w;
2083 } 2287 });
2084}
2085 2288
2086# the inner_* stuff is for generating a padding for the slider handle, 2289 $self->SUPER::update;
2087# so that the handle doesn't leave the texture. This calculation isn't 100%
2088# correct propably, but it does the job for now
2089sub _calc_inner_pad_px {
2090 my ($self, $w) = @_;
2091 ($w / 100) * $self->{inner_pad} # % to pixels
2092} 2290}
2093 2291
2094sub _draw { 2292sub _draw {
2095 my ($self) = @_; 2293 my ($self) = @_;
2096 2294
2097 $self->SUPER::_draw (); 2295 $self->SUPER::_draw ();
2098 2296
2099 my ($w, $h) = @$self{qw(w h)}; 2297 glScale $self->{w}, $self->{h};
2100 2298
2101 if ($self->{vertical}) { 2299 if ($self->{vertical}) {
2102 # draw a vertical slider like a rotated horizontal slider 2300 # draw a vertical slider like a rotated horizontal slider
2103 2301
2302 glTranslate 1, 0, 0;
2104 glRotate 90, 0, 0, 1; 2303 glRotate 90, 0, 0, 1;
2105 glTranslate 0, -$self->{w}, 0;
2106
2107 ($w, $h) = ($h, $w);
2108 } 2304 }
2109 2305
2110 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2306 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2111 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2307 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2112 2308
2113 my ($value, $lo, $hi, $page) = @{$self->{range}};
2114
2115 $hi = $value + 1 if $lo == $hi;
2116
2117 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2118 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2119
2120 $page = int $page * $inner_w / ($hi - $lo);
2121 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2122
2123 $w -= $page;
2124 $page &= ~1;
2125 glTranslate $page * 0.5, 0, 0;
2126 $page ||= 2;
2127
2128 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2129 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2130
2131 glEnable GL_BLEND;
2132 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2133 glEnable GL_TEXTURE_2D; 2309 glEnable GL_TEXTURE_2D;
2134 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2310 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2135 2311
2136 # draw background 2312 # draw background
2137 $tex[1]->draw_quad (0, 0, $w, $h); 2313 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2138 2314
2139 # draw handle 2315 # draw handle
2140 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2316 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2141 2317
2142 glDisable GL_BLEND;
2143 glDisable GL_TEXTURE_2D; 2318 glDisable GL_TEXTURE_2D;
2144} 2319}
2320
2321#############################################################################
2322
2323package CFClient::UI::ValSlider;
2324
2325our @ISA = CFClient::UI::HBox::;
2326
2327sub new {
2328 my ($class, %arg) = @_;
2329
2330 my $range = delete $arg{range};
2331
2332 my $self = $class->SUPER::new (
2333 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2334 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2335 to_value => sub { shift },
2336 from_value => sub { shift },
2337 %arg,
2338 );
2339
2340 $self->{slider}->connect (changed => sub {
2341 my ($self, $value) = @_;
2342 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2343 $self->{parent}->emit (changed => $value);
2344 });
2345
2346# $self->{entry}->connect (changed => sub {
2347# my ($self, $value) = @_;
2348# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2349# $self->{parent}->emit (changed => $value);
2350# });
2351
2352 $self->add ($self->{slider}, $self->{entry});
2353
2354 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2355
2356 $self
2357}
2358
2359sub set_range { shift->{slider}->set_range (@_) }
2360sub set_value { shift->{slider}->set_value (@_) }
2145 2361
2146############################################################################# 2362#############################################################################
2147 2363
2148package CFClient::UI::TextView; 2364package CFClient::UI::TextView;
2149 2365
… …
2158 fontsize => 1, 2374 fontsize => 1,
2159 can_events => 0, 2375 can_events => 0,
2160 #font => default_font 2376 #font => default_font
2161 @_, 2377 @_,
2162 2378
2163 layout => (new CFClient::Layout), 2379 layout => (new CFClient::Layout 1),
2164 par => [], 2380 par => [],
2165 height => 0, 2381 height => 0,
2166 children => [ 2382 children => [
2167 (new CFClient::UI::Empty expand => 1), 2383 (new CFClient::UI::Empty expand => 1),
2168 (new CFClient::UI::Slider vertical => 1), 2384 (new CFClient::UI::Slider vertical => 1),
… …
2179 2395
2180 $self->{fontsize} = $fontsize; 2396 $self->{fontsize} = $fontsize;
2181 $self->reflow; 2397 $self->reflow;
2182} 2398}
2183 2399
2184sub text_height {
2185 my ($self, $text) = @_;
2186
2187 my $layout = $self->{layout};
2188
2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2190 $layout->set_width ($self->{children}[0]{w});
2191 $layout->set_text ($text);
2192
2193 ($layout->size)[1]
2194}
2195
2196sub reflow {
2197 my ($self) = @_;
2198
2199 $self->{need_reflow}++;
2200 $self->update;
2201}
2202
2203sub size_allocate { 2400sub size_allocate {
2204 my ($self, $w, $h) = @_; 2401 my ($self, $w, $h) = @_;
2205 2402
2206 $self->SUPER::size_allocate ($w, $h); 2403 $self->SUPER::size_allocate ($w, $h);
2207 2404
… …
2210 $self->{layout}->set_width ($self->{children}[0]{w}); 2407 $self->{layout}->set_width ($self->{children}[0]{w});
2211 2408
2212 $self->reflow; 2409 $self->reflow;
2213} 2410}
2214 2411
2412sub text_size {
2413 my ($self, $text, $indent) = @_;
2414
2415 my $layout = $self->{layout};
2416
2417 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2418 $layout->set_width ($self->{children}[0]{w} - $indent);
2419 $layout->set_markup ($text);
2420
2421 $layout->size
2422}
2423
2424sub reflow {
2425 my ($self) = @_;
2426
2427 $self->{need_reflow}++;
2428 $self->update;
2429}
2430
2431sub set_offset {
2432 my ($self, $offset) = @_;
2433
2434 # todo: base offset on lines or so, not on pixels
2435 $self->{children}[1]->set_value ($offset);
2436}
2437
2438sub clear {
2439 my ($self) = @_;
2440
2441 $self->{par} = [];
2442 $self->{height} = 0;
2443 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2444}
2445
2215sub add_paragraph { 2446sub add_paragraph {
2216 my ($self, $color, $text) = @_; 2447 my ($self, $color, $text, $indent) = @_;
2217 2448
2218 #TODO: intelligently "reformat" paragraph 2449 for my $line (split /\n/, $text) {
2219 2450 my ($w, $h) = $self->text_size ($line);
2220 my $height = $self->text_height ($text);
2221
2222 $self->{height} += $height; 2451 $self->{height} += $h;
2452 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2453 }
2223 2454
2224 push @{$self->{par}}, [$height, $color, $text];
2225
2226 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2455 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2227 $self->{children}[1]->update;
2228} 2456}
2229 2457
2230sub update { 2458sub update {
2231 my ($self) = @_; 2459 my ($self) = @_;
2232 2460
… …
2234 2462
2235 return unless $self->{h} > 0; 2463 return unless $self->{h} > 0;
2236 2464
2237 delete $self->{texture}; 2465 delete $self->{texture};
2238 2466
2239 $ROOT->on_refresh ($self, sub { 2467 $ROOT->on_post_alloc ($self, sub {
2468 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2469
2240 if (delete $self->{need_reflow}) { 2470 if (delete $self->{need_reflow}) {
2241 my $height = 0; 2471 my $height = 0;
2242 2472
2243 $height += $_->[0] = $self->text_height ($_->[2]) 2473 my $layout = $self->{layout};
2474
2475 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2476
2244 for @{$self->{par}}; 2477 for (@{$self->{par}}) {
2478 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2479 $layout->set_width ($W - $_->[3]);
2480 $layout->set_markup ($_->[4]);
2481 my ($w, $h) = $layout->size;
2482 $_->[0] = $w + $_->[3];
2483 $_->[1] = $h;
2484 }
2485
2486 $height += $_->[1];
2487 }
2245 2488
2246 $self->{height} = $height; 2489 $self->{height} = $height;
2247 2490
2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2491 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2249 2492
2250 delete $self->{texture}; 2493 delete $self->{texture};
2251 } 2494 }
2252 2495
2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2496 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2254 glClearColor 0, 0, 0, 0; 2497 glClearColor 0.5, 0.5, 0.5, 0;
2255 glClear GL_COLOR_BUFFER_BIT; 2498 glClear GL_COLOR_BUFFER_BIT;
2256 2499
2500 my $top = int $self->{children}[1]{range}[0];
2501
2502 my $y0 = $top;
2503 my $y1 = $top + $H;
2504
2505 my $y = 0;
2506
2507 my $layout = $self->{layout};
2508
2509 $layout->set_font ($self->{font}) if $self->{font};
2510
2257 glEnable GL_BLEND; 2511 glEnable GL_BLEND;
2512 #TODO# not correct in windows where rgba is forced off
2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2513 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0];
2263
2264 my $y0 = $top;
2265 my $y1 = $top + $self->{h};
2266
2267 my $y = 0;
2268
2269 my $layout = $self->{layout};
2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272 2514
2273 for my $par (@{$self->{par}}) { 2515 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2516 my $h = $par->[1];
2275 2517
2276 if ($y0 < $y + $h && $y < $y1) { 2518 if ($y0 < $y + $h && $y < $y1) {
2519 $layout->set_foreground (@{ $par->[2] });
2520 $layout->set_width ($W - $par->[3]);
2277 $layout->set_text ($par->[2]); 2521 $layout->set_markup ($par->[4]);
2278 2522
2279 glColor @{ $par->[1] }; 2523 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2280 my ($W, $H) = $layout->size; 2524
2281 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2525 glRasterPos $par->[3], $y - $y0;
2526 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2282 } 2527 }
2283 2528
2284 $y += $h; 2529 $y += $h;
2285 } 2530 }
2286 2531
2287 glDisable GL_TEXTURE_2D;
2288 glDisable GL_BLEND; 2532 glDisable GL_BLEND;
2289 }; 2533 };
2290 }); 2534 });
2291} 2535}
2292 2536
2293sub _draw { 2537sub _draw {
2294 my ($self) = @_; 2538 my ($self) = @_;
2295 2539
2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2298 glEnable GL_TEXTURE_2D; 2540 glEnable GL_TEXTURE_2D;
2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2541 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1; 2542 glColor 1, 1, 1, 1;
2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2543 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2302 glDisable GL_TEXTURE_2D; 2544 glDisable GL_TEXTURE_2D;
2303 glDisable GL_BLEND;
2304 2545
2305 $self->{children}[1]->draw; 2546 $self->{children}[1]->draw;
2306 2547
2307} 2548}
2308 2549
… …
2356 2597
2357sub new { 2598sub new {
2358 my $class = shift; 2599 my $class = shift;
2359 2600
2360 my $self = $class->SUPER::new ( 2601 my $self = $class->SUPER::new (
2361 state => 0, 2602 state => 0,
2362 connect_activate => \&toggle_flopper, 2603 on_activate => \&toggle_flopper,
2363 @_ 2604 @_
2364 ); 2605 );
2365 2606
2366 if ($self->{state}) {
2367 $self->{state} = 0;
2368 $self->toggle_flopper;
2369 }
2370
2371 $self 2607 $self
2372} 2608}
2373 2609
2374sub toggle_flopper { 2610sub toggle_flopper {
2375 my ($self) = @_; 2611 my ($self) = @_;
2376 2612
2377 # TODO: use animation 2613 $self->{other}->toggle_visibility;
2378 if ($self->{state} = !$self->{state}) {
2379 $CFClient::UI::ROOT->add ($self->{other});
2380 $self->{other}->move ($self->coord2global (0, $self->{h}));
2381 $self->emit ("open");
2382 } else {
2383 $CFClient::UI::ROOT->remove ($self->{other});
2384 $self->emit ("close");
2385 }
2386
2387 $self->emit (changed => $self->{state});
2388} 2614}
2389 2615
2390############################################################################# 2616#############################################################################
2391 2617
2392package CFClient::UI::Tooltip; 2618package CFClient::UI::Tooltip;
… …
2402 @_, 2628 @_,
2403 can_events => 0, 2629 can_events => 0,
2404 ) 2630 )
2405} 2631}
2406 2632
2407sub set_markup { 2633sub set_tooltip_from {
2408 my ($self, $text) = @_; 2634 my ($self, $widget) = @_;
2409 2635
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2636 $self->add (new CFClient::UI::Label
2411 $self->{label}->set_markup ($text); 2637 markup => $widget->{tooltip},
2412 $self->add ($self->{label}); 2638 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2639 fontsize => 0.8,
2640 fg => [0, 0, 0, 1],
2641 ellipsise => 0,
2642 font => ($widget->{tooltip_font} || $::FONT_PROP),
2643 );
2413} 2644}
2414 2645
2415sub size_request { 2646sub size_request {
2416 my ($self) = @_; 2647 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419 2648
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2649 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421 2650
2422 ($w + 4, $h + 4) 2651 ($w + 4, $h + 4)
2423} 2652}
… …
2429} 2658}
2430 2659
2431sub _draw { 2660sub _draw {
2432 my ($self) = @_; 2661 my ($self) = @_;
2433 2662
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375; 2663 glTranslate 0.375, 0.375;
2436 2664
2437 my ($w, $h) = @$self{qw(w h)}; 2665 my ($w, $h) = @$self{qw(w h)};
2438 2666
2439 glColor 1, 0.8, 0.4; 2667 glColor 1, 0.8, 0.4;
… …
2450 glVertex 0 , $h; 2678 glVertex 0 , $h;
2451 glVertex $w, $h; 2679 glVertex $w, $h;
2452 glVertex $w, 0; 2680 glVertex $w, 0;
2453 glEnd; 2681 glEnd;
2454 2682
2455 glPopMatrix; 2683 glTranslate 2 - 0.375, 2 - 0.375;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2459} 2685}
2460 2686
2461############################################################################# 2687#############################################################################
2462 2688
… …
2467use CFClient::OpenGL; 2693use CFClient::OpenGL;
2468 2694
2469sub new { 2695sub new {
2470 my $class = shift; 2696 my $class = shift;
2471 2697
2472 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2473 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2474 @_, 2701 @_,
2475 ) 2702 );
2703
2704 if ($self->{anim} && $self->{animspeed}) {
2705 Scalar::Util::weaken (my $widget = $self);
2706
2707 $self->{timer} = Event->timer (
2708 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2709 hard => 1,
2710 interval => $self->{animspeed},
2711 cb => sub {
2712 ++$widget->{frame};
2713 $widget->update;
2714 },
2715 );
2716 }
2717
2718 $self
2476} 2719}
2477 2720
2478sub size_request { 2721sub size_request {
2479 (32, 8) 2722 (32, 8)
2480} 2723}
2481 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2482sub _draw { 2733sub _draw {
2483 my ($self) = @_; 2734 my ($self) = @_;
2484 2735
2485 return unless $::CONN;#d# manage and cache textures differently 2736 return unless $::CONN;
2737
2738 my $face;
2739
2740 if ($self->{frame}) {
2741 my $anim = $::CONN->{anim}[$self->{anim}];
2742
2743 $face = $anim->[ $self->{frame} % @$anim ]
2744 if $anim && @$anim;
2745 }
2746
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2487 2748
2488 # TODO animation
2489 if ($tex) { 2749 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 } 2755 }
2756}
2757
2758sub DESTROY {
2759 my ($self) = @_;
2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2499} 2765}
2500 2766
2501############################################################################# 2767#############################################################################
2502 2768
2503package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2504 2770
2505our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2506 2772
2507sub new { 2773sub new {
2508 my $class = shift; 2774 my $class = shift;
2509 2775
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2520 can_hover => 1, 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_, 2778 @_,
2575 ); 2779 );
2576 2780
2577 $self 2781 $self
2578} 2782}
… …
2581 my ($self, $items) = @_; 2785 my ($self, $items) = @_;
2582 2786
2583 $self->{scrolled}->clear; 2787 $self->{scrolled}->clear;
2584 return unless $items; 2788 return unless $items;
2585 2789
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2587 2794
2588 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2589 2796
2797 my $row = 0;
2590 for my $item (@items) { 2798 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2 2799 CFClient::Item::update_widgets $item;
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594 2800
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2596 } 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2597 2804
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2806 }
2599} 2807}
2600 2808
2601sub size_request { 2809sub size_request {
2602 my ($self) = @_; 2810 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h}); 2811 ($self->{req_w}, $self->{req_h});
… …
2643 2851
2644# popup given the event (must be a mouse button down event currently) 2852# popup given the event (must be a mouse button down event currently)
2645sub popup { 2853sub popup {
2646 my ($self, $ev) = @_; 2854 my ($self, $ev) = @_;
2647 2855
2648 $self->emit ("popdown"); 2856 $self->_emit ("popdown");
2649 2857
2650 # maybe save $GRAB? must be careful about events... 2858 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self; 2859 $GRAB = $self;
2652 $self->{button} = $ev->{button}; 2860 $self->{button} = $ev->{button};
2653 2861
… …
2668 2876
2669 if ($ev->{button} == $self->{button}) { 2877 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB; 2878 undef $GRAB;
2671 $self->hide; 2879 $self->hide;
2672 2880
2673 $self->emit ("popdown"); 2881 $self->_emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover}; 2882 $self->{hover}[1]->() if $self->{hover};
2675 } 2883 }
2676} 2884}
2677 2885
2678############################################################################# 2886#############################################################################
2679 2887
2888package CFClient::UI::Statusbox;
2889
2890our @ISA = CFClient::UI::VBox::;
2891
2892sub new {
2893 my $class = shift;
2894
2895 $class->SUPER::new (
2896 fontsize => 0.8,
2897 @_,
2898 )
2899}
2900
2901sub reorder {
2902 my ($self) = @_;
2903 my $NOW = time;
2904
2905 while (my ($k, $v) = each %{ $self->{item} }) {
2906 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2907 }
2908
2909 my @widgets;
2910
2911 my @items = sort {
2912 $a->{pri} <=> $b->{pri}
2913 or $b->{id} <=> $a->{id}
2914 } values %{ $self->{item} };
2915
2916 my $count = 10 + 1;
2917 for my $item (@items) {
2918 last unless --$count;
2919
2920 push @widgets, $item->{label} ||= do {
2921 # TODO: doesn't handle markup well (read as: at all)
2922 my $short = $item->{count} > 1
2923 ? "<b>$item->{count} ×</b> $item->{text}"
2924 : $item->{text};
2925
2926 for ($short) {
2927 s/^\s+//;
2928 s/\s+/ /g;
2929 }
2930
2931 new CFClient::UI::Label
2932 markup => $short,
2933 tooltip => $item->{tooltip},
2934 tooltip_font => $::FONT_PROP,
2935 tooltip_width => 0.67,
2936 fontsize => $item->{fontsize} || $self->{fontsize},
2937 max_w => $::WIDTH * 0.44,
2938 fg => $item->{fg},
2939 can_events => 1,
2940 can_hover => 1
2941 };
2942 }
2943
2944 $self->clear;
2945 $self->SUPER::add (reverse @widgets);
2946}
2947
2948sub add {
2949 my ($self, $text, %arg) = @_;
2950
2951 $text =~ s/^\s+//;
2952 $text =~ s/\s+$//;
2953
2954 return unless $text;
2955
2956 my $timeout = time + ((delete $arg{timeout}) || 60);
2957
2958 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2959
2960 if (my $item = $self->{item}{$group}) {
2961 if ($item->{text} eq $text) {
2962 $item->{count}++;
2963 } else {
2964 $item->{count} = 1;
2965 $item->{text} = $item->{tooltip} = $text;
2966 }
2967 $item->{id} = ++$self->{id};
2968 $item->{timeout} = $timeout;
2969 delete $item->{label};
2970 } else {
2971 $self->{item}{$group} = {
2972 id => ++$self->{id},
2973 text => $text,
2974 timeout => $timeout,
2975 tooltip => $text,
2976 fg => [0.8, 0.8, 0.8, 0.8],
2977 pri => 0,
2978 count => 1,
2979 %arg,
2980 };
2981 }
2982
2983 $self->reorder;
2984}
2985
2986sub reconfigure {
2987 my ($self) = @_;
2988
2989 delete $_->{label}
2990 for values %{ $self->{item} || {} };
2991
2992 $self->reorder;
2993 $self->SUPER::reconfigure;
2994}
2995
2996#############################################################################
2997
2680package CFClient::UI::Root; 2998package CFClient::UI::Root;
2681 2999
2682our @ISA = CFClient::UI::Container::; 3000our @ISA = CFClient::UI::Container::;
2683 3001
2684use CFClient::OpenGL; 3002use CFClient::OpenGL;
2685 3003
3004sub new {
3005 my $class = shift;
3006
3007 $class->SUPER::new (
3008 visible => 1,
3009 @_,
3010 )
3011}
3012
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
2686sub check_size { 3020sub check_size {
2687 my ($self) = @_; 3021 my ($self) = @_;
2688 3022
2689 $self->configure (0, 0, $self->{w}, $self->{h}); 3023 $self->size_allocate ($self->{w}, $self->{h})
3024 if $self->{w};
2690} 3025}
2691 3026
2692sub size_request { 3027sub size_request {
2693 my ($self) = @_; 3028 my ($self) = @_;
2694 3029
… …
2696} 3031}
2697 3032
2698sub size_allocate { 3033sub size_allocate {
2699 my ($self, $w, $h) = @_; 3034 my ($self, $w, $h) = @_;
2700 3035
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2722 my ($self, $x, $y, $w, $h) = @_;
2723
2724 $self->SUPER::configure ($x, $y, $w, $h);
2725
2726 for my $child ($self->children) { 3036 for my $child ($self->children) {
2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728 3038
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3040 if exists $child->{req_x};
3041
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3043 if exists $child->{req_y};
3044
3045 $X = $self->{user_x} if exists $self->{user_x};
3046 $Y = $self->{user_y} if exists $self->{user_y};
3047
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050
2731 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2732 } 3052 }
2733} 3053}
2734 3054
2735sub _topleft { 3055sub coord2local {
2736 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2737 3057
2738 ($x, $y) 3058 ($x, $y)
2739} 3059}
2740 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2741sub update { 3067sub update {
2742 my ($self) = @_; 3068 my ($self) = @_;
2743 3069
2744 $self->check_size; 3070 $self->check_size;
2745 ::refresh (); 3071 $::WANT_REFRESH++;
2746} 3072}
2747 3073
2748sub add { 3074sub add {
2749 my ($self, $child) = @_; 3075 my ($self, @children) = @_;
2750 3076
3077 for (my @widgets = @children; my $w = pop @widgets; ) {
3078 push @widgets, $w->children;
3079 $w->{root} = $self;
3080 $w->{visible} = $self->{visible} + 1;
3081 }
3082
3083 for my $child (@children) {
3084 $child->{is_toplevel} = 1;
3085
2751 # integerize window positions 3086 # integerise window positions
2752 $child->{x} = int $child->{x}; 3087 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y}; 3088 $child->{y} = int $child->{y};
3089 }
2754 3090
2755 $self->SUPER::add ($child); 3091 $self->SUPER::add (@children);
3092}
3093
3094sub remove {
3095 my ($self, @children) = @_;
3096
3097 $self->SUPER::remove (@children);
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2756} 3104}
2757 3105
2758sub on_refresh { 3106sub on_refresh {
2759 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2760 3108
2761 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2762} 3110}
2763 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2764sub draw { 3118sub draw {
2765 my ($self) = @_; 3119 my ($self) = @_;
2766 3120
2767 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2768 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
3124 }
3125
3126 if ($self->{check_size}) {
3127 my @queue;
3128
3129 for (;;) {
3130 if ($self->{check_size}) {
3131 #TODO use array-of-depth approach
3132
3133 @queue = sort { $a->{visible} <=> $b->{visible} }
3134 @queue, values %{delete $self->{check_size}};
3135 }
3136
3137 my $widget = pop @queue || last;
3138
3139 defined $widget->{visible} or last; # do not resize invisible widgets
3140
3141 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3142 ? @$widget{qw(user_w user_h)}
3143 : $widget->size_request;
3144
3145 if (delete $widget->{force_alloc}
3146 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3147 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3148
3149 $widget->{req_w} = $w;
3150 $widget->{req_h} = $h;
3151
3152 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3153
3154 $widget->{parent}->check_size
3155 if $widget->{parent};
3156 }
3157 }
3158 }
3159
3160 while ($self->{size_alloc}) {
3161 for (values %{delete $self->{size_alloc}}) {
3162 my ($widget, $w, $h) = @$_;
3163
3164 $w = 0 if $w < 0;
3165 $h = 0 if $h < 0;
3166
3167 $widget->{w} = $w;
3168 $widget->{h} = $h;
3169 $widget->emit (size_allocate => $w, $h);
3170 }
3171 }
3172
3173 while ($self->{post_alloc_hook}) {
3174 $_->()
3175 for values %{delete $self->{post_alloc_hook}};
2769 } 3176 }
2770 3177
2771 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3178 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2772 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3179 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2773 glClear GL_COLOR_BUFFER_BIT; 3180 glClear GL_COLOR_BUFFER_BIT;
2774 3181
2775 glMatrixMode GL_PROJECTION; 3182 glMatrixMode GL_PROJECTION;
2776 glLoadIdentity; 3183 glLoadIdentity;
2777 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3184 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2778 glMatrixMode GL_MODELVIEW; 3185 glMatrixMode GL_MODELVIEW;
2779 glLoadIdentity; 3186 glLoadIdentity;
2780 3187
2781 $self->_draw; 3188 $self->_draw;
2782} 3189}
… …
2784############################################################################# 3191#############################################################################
2785 3192
2786package CFClient::UI; 3193package CFClient::UI;
2787 3194
2788$ROOT = new CFClient::UI::Root; 3195$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip; 3196$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2790 3197
27911 31981
2792 3199

Diff Legend

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