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.190 by root, Mon May 8 22:17:38 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 $self->emit (size_allocate => $w, $h);
243 } 332 }
244} 333}
245 334
246sub size_allocate { 335sub size_allocate {
247 # nothing to be done 336 # nothing to be done
248} 337}
249 338
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
250sub children { 346sub 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} 347}
264 348
265sub set_max_size { 349sub set_max_size {
266 my ($self, $w, $h) = @_; 350 my ($self, $w, $h) = @_;
267 351
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 352 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 353 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 354}
271 355
272# return top left coordinates 356sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 357 my ($self, $tooltip) = @_;
275 358
276 $self->{parent} 359 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 360 $tooltip =~ s/\s+$//;
278 361
279 $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 }
280} 370}
281 371
282# translate global coordinates to local coordinate system 372# translate global coordinates to local coordinate system
283sub coord2local { 373sub coord2local {
284 my ($self, $x, $y) = @_; 374 my ($self, $x, $y) = @_;
285 375
286 my ($X, $Y) = $self->_topleft; 376 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 377}
289 378
290# translate local coordinates to global coordinate system 379# translate local coordinates to global coordinate system
291sub coord2global { 380sub coord2global {
292 my ($self, $x, $y) = @_; 381 my ($self, $x, $y) = @_;
293 382
294 my ($X, $Y) = $self->_topleft; 383 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 384}
297 385
298sub focus_in { 386sub focus_in {
299 my ($self) = @_; 387 my ($self) = @_;
300 388
301 return if $FOCUS == $self; 389 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 390 return unless $self->{can_focus};
303 391
304 my $focus = $FOCUS; $FOCUS = $self; 392 my $focus = $FOCUS; $FOCUS = $self;
305 393
306 $self->emit (focus_in => $focus); 394 $self->_emit (focus_in => $focus);
307 395
308 $focus->update if $focus; 396 $focus->update if $focus;
309 $FOCUS->update; 397 $FOCUS->update;
310} 398}
311 399
… …
314 402
315 return unless $FOCUS == $self; 403 return unless $FOCUS == $self;
316 404
317 my $focus = $FOCUS; undef $FOCUS; 405 my $focus = $FOCUS; undef $FOCUS;
318 406
319 $self->emit (focus_out => $focus); 407 $self->_emit (focus_out => $focus);
320 408
321 $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;
322} 413}
323 414
324sub mouse_motion { } 415sub mouse_motion { }
325sub button_up { } 416sub button_up { }
326sub key_down { } 417sub key_down { }
327sub key_up { } 418sub key_up { }
328 419
329sub button_down { 420sub button_down {
330 my ($self, $ev, $x, $y) = @_; 421 my ($self, $ev, $x, $y) = @_;
331 422
332 $self->focus_in; 423 $self->focus_in;
… …
366 if ($ENV{PCLIENT_DEBUG}) { 457 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 458 glPushMatrix;
368 glColor 1, 1, 0, 1; 459 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 461 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 462 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 463 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 464 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 465 glVertex 0 , $self->{h} - 1;
375 glEnd; 466 glEnd;
376 glPopMatrix; 467 glPopMatrix;
377 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;
378 } 469 }
379} 470}
380 471
381sub _draw { 472sub _draw {
382 my ($self) = @_; 473 my ($self) = @_;
… …
398 489
399sub set_parent { 490sub set_parent {
400 my ($self, $parent) = @_; 491 my ($self, $parent) = @_;
401 492
402 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;
403} 508}
404 509
405sub check_size { 510sub check_size {
406 my ($self) = @_; 511 my ($self, $forced) = @_;
407 512
408 $self->_check_size; 513 $self->{force_alloc} = 1 if $forced;
409 return;
410 #TODO: but needs a vastly more difficult algorithm
411 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
412
413 $check_size->{$self} = $self;
414
415 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
416 while (%$check_size) {
417 my @widgets = values %$check_size;
418 $_->_check_size
419 for @widgets;
420 }
421 });
422}
423
424sub _check_size {
425 my ($self) = @_;
426
427 delete $CFClient::UI::ROOT->{_check_size}{$self}; 514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428
429 $self->{parent}
430 or return 1;
431
432 my ($w, $h) = $self->{user_w} && $self->{user_h}
433 ? @$self{qw(user_w user_h)}
434 : $self->size_request;
435
436 if ($w != $self->{req_w} || $h != $self->{req_h}) {
437 $self->{req_w} = $w;
438 $self->{req_h} = $h;
439
440 $self->{parent}->_check_size
441 or $self->size_allocate (
442 (List::Util::max $self->{w}, $w),
443 (List::Util::max $self->{h}, $h),
444 );
445
446 1
447 } else {
448 0
449 }
450} 515}
451 516
452sub update { 517sub update {
453 my ($self) = @_; 518 my ($self) = @_;
454 519
455 my $update = $CFClient::UI::ROOT->{_update} ||= {}; 520 $self->{parent}->update
456 521 if $self->{parent};
457 $update->{$self} = $self;
458
459 $CFClient::UI::ROOT->on_refresh (_update => sub {
460 while (%$update) {
461 my @widgets = values %$update;
462 %$update = ();
463
464 $_->{parent} && $_->{parent}->update
465 for @widgets;
466 }
467 });
468} 522}
469 523
470sub connect { 524sub connect {
471 my ($self, $signal, $cb) = @_; 525 my ($self, $signal, $cb) = @_;
472 526
473 push @{ $self->{signal_cb}{$signal} }, $cb; 527 push @{ $self->{signal_cb}{$signal} }, $cb;
474} 528}
475 529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
476sub emit { 536sub emit {
477 my ($self, $signal, @args) = @_; 537 my ($self, $signal, @args) = @_;
478 538
479 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) = @_;
480} 545}
481 546
482sub DESTROY { 547sub DESTROY {
483 my ($self) = @_; 548 my ($self) = @_;
484 549
550 delete $WIDGET{$self+0};
485 #$self->deactivate; 551 #$self->deactivate;
486} 552}
487 553
488############################################################################# 554#############################################################################
489 555
… …
498 my $class = shift; 564 my $class = shift;
499 565
500 # range [value, low, high, page] 566 # range [value, low, high, page]
501 567
502 $class->SUPER::new ( 568 $class->SUPER::new (
503 bg => [0, 0, 0, 0.2], 569 #bg => [0, 0, 0, 0.2],
504 active_bg => [1, 1, 1, 0.5], 570 #active_bg => [1, 1, 1, 0.5],
505 @_ 571 @_
506 ) 572 )
507} 573}
508 574
509sub _draw { 575sub _draw {
510 my ($self) = @_; 576 my ($self) = @_;
511 577
578 my $color = $FOCUS == $self && $self->{active_bg}
579 ? $self->{active_bg}
580 : $self->{bg};
581
582 if ($color && (@$color < 4 || $color->[3])) {
512 my ($w, $h) = @$self{qw(w h)}; 583 my ($w, $h) = @$self{qw(w h)};
513 584
514 glEnable GL_BLEND; 585 glEnable GL_BLEND;
515 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
516 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 587 glColor @$color;
517 588
518 glBegin GL_QUADS; 589 glBegin GL_QUADS;
519 glVertex 0 , 0; 590 glVertex 0 , 0;
520 glVertex 0 , $h; 591 glVertex 0 , $h;
521 glVertex $w, $h; 592 glVertex $w, $h;
522 glVertex $w, 0; 593 glVertex $w, 0;
523 glEnd; 594 glEnd;
524 595
525 glDisable GL_BLEND; 596 glDisable GL_BLEND;
597 }
526} 598}
527 599
528############################################################################# 600#############################################################################
529 601
530package CFClient::UI::Empty; 602package CFClient::UI::Empty;
… …
574 $self->{children} = [ 646 $self->{children} = [
575 sort { $a->{z} <=> $b->{z} } 647 sort { $a->{z} <=> $b->{z} }
576 @{$self->{children}}, @widgets 648 @{$self->{children}}, @widgets
577 ]; 649 ];
578 650
579 $_->check_size 651 $self->check_size (1);
580 for @widgets;
581
582 $self->update; 652 $self->update;
583} 653}
584 654
585sub children { 655sub children {
586 @{ $_[0]{children} } 656 @{ $_[0]{children} }
… …
592 delete $child->{parent}; 662 delete $child->{parent};
593 $child->hide; 663 $child->hide;
594 664
595 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
596 666
597 $self->check_size; 667 $self->check_size (1);
598 $self->update; 668 $self->update;
599} 669}
600 670
601sub clear { 671sub clear {
602 my ($self) = @_; 672 my ($self) = @_;
… …
693} 763}
694 764
695sub update { 765sub update {
696 my ($self) = @_; 766 my ($self) = @_;
697 767
698 $ROOT->on_refresh ($self => sub { $self->render_child }); 768 $ROOT->on_post_alloc ($self => sub { $self->render_child });
699 $self->SUPER::update; 769 $self->SUPER::update;
700} 770}
701 771
702sub size_allocate { 772sub size_allocate {
703 my ($self, $w, $h) = @_; 773 my ($self, $w, $h) = @_;
… …
716 $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 {
717 glClearColor 0, 0, 0, 0; 787 glClearColor 0, 0, 0, 0;
718 glClear GL_COLOR_BUFFER_BIT; 788 glClear GL_COLOR_BUFFER_BIT;
719 789
720 $self->_render; 790 $self->_render;
721# glColorMask 1, 1, 1, 0;
722# glEnable GL_BLEND;
723# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
724# glRasterPos 0, 0;
725# glCopyPixels 0, 0, $self->{w}, $self->{h};
726# glDisable GL_BLEND;
727# glColorMask 1, 1, 1, 1;
728 }; 791 };
729} 792}
730 793
731sub _draw { 794sub _draw {
732 my ($self) = @_; 795 my ($self) = @_;
… …
734 my ($w, $h) = ($self->w, $self->h); 797 my ($w, $h) = ($self->w, $self->h);
735 798
736 my $tex = $self->{texture} 799 my $tex = $self->{texture}
737 or return; 800 or return;
738 801
739 glEnable GL_BLEND;
740 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
741 glEnable GL_TEXTURE_2D; 802 glEnable GL_TEXTURE_2D;
742 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
743 glColor 0, 0, 0, 1; 804 glColor 1, 1, 1, 1;
744 805
745 $tex->draw_quad (0, 0, $w, $h); 806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
746 807
747 glDisable GL_BLEND;
748 glDisable GL_TEXTURE_2D; 808 glDisable GL_TEXTURE_2D;
749} 809}
750 810
751############################################################################# 811#############################################################################
752 812
753package CFClient::UI::ViewPort; 813package CFClient::UI::ViewPort;
754 814
755our @ISA = CFClient::UI::Window::; 815our @ISA = CFClient::UI::Window::;
756 816
817sub new {
818 my $class = shift;
819
820 $class->SUPER::new (
821 scroll_x => 0,
822 scroll_y => 1,
823 @_,
824 )
825}
826
757sub size_request { 827sub size_request {
758 my ($self) = @_; 828 my ($self) = @_;
759 829
760 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
761 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
762 831
763 @$self{qw(child_w child_h)} 832 @$self{qw(child_w child_h)}
764} 833}
765 834
766sub size_allocate { 835sub size_allocate {
767 my ($self, $w, $h) = @_; 836 my ($self, $w, $h) = @_;
768 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);
769 $self->update; 842 $self->update;
770} 843}
771 844
772sub set_offset { 845sub set_offset {
773 my ($self, $x, $y) = @_; 846 my ($self, $x, $y) = @_;
… …
776 $self->{view_y} = int $y; 849 $self->{view_y} = int $y;
777 850
778 $self->update; 851 $self->update;
779} 852}
780 853
781# hmm, this does not work for topleft of $self... but we should not aks for that 854# hmm, this does not work for topleft of $self... but we should not ask for that
782sub _topleft { 855sub coord2local {
783 my ($self, $x, $y) = @_; 856 my ($self, $x, $y) = @_;
784 857
785 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 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)
786} 868}
787 869
788sub find_widget { 870sub find_widget {
789 my ($self, $x, $y) = @_; 871 my ($self, $x, $y) = @_;
790 872
… …
815 my $class = shift; 897 my $class = shift;
816 898
817 my $self; 899 my $self;
818 900
819 my $slider = new CFClient::UI::Slider 901 my $slider = new CFClient::UI::Slider
820 vertical => 1, 902 vertical => 1,
821 range => [0, 0, 1, 0.01], # HACK fix 903 range => [0, 0, 1, 0.01], # HACK fix
822 connect_changed => sub { 904 on_changed => sub {
823 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 905 $self->{vp}->set_offset (0, $_[1]);
824 }, 906 },
825 ; 907 ;
826 908
827 $self = $class->SUPER::new ( 909 $self = $class->SUPER::new (
828 vp => (new CFClient::UI::ViewPort), 910 vp => (new CFClient::UI::ViewPort expand => 1),
829 slider => $slider, 911 slider => $slider,
830 @_, 912 @_,
831 ); 913 );
832 914
833 $self->{vp}->add ($self->{scrolled}); 915 $self->{vp}->add ($self->{scrolled});
… …
835 $self->add ($self->{slider}); 917 $self->add ($self->{slider});
836 918
837 $self 919 $self
838} 920}
839 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
840#TODO# update range on size_allocate depeneing on child 941#TODO# update range on size_allocate depending on child
841# update viewport offset on scroll 942# update viewport offset on scroll
842 943
843############################################################################# 944#############################################################################
844 945
845package CFClient::UI::Frame; 946package CFClient::UI::Frame;
… …
849use CFClient::OpenGL; 950use CFClient::OpenGL;
850 951
851sub new { 952sub new {
852 my $class = shift; 953 my $class = shift;
853 954
854 my $self = $class->SUPER::new ( 955 $class->SUPER::new (
855 bg => [1, 1, 1, 1], 956 bg => undef,
856 border_bg => [1, 1, 1, 1],
857 border => 0.8,
858 @_ 957 @_,
859 ); 958 )
860
861 $self
862} 959}
863 960
864sub _draw { 961sub _draw {
865 my ($self) = @_; 962 my ($self) = @_;
866 963
867 my ($w, $h) = ($self->{w}, $self->{h}); 964 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)};
868 966
869 glEnable GL_BLEND; 967 glEnable GL_BLEND;
870 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
871 glEnable GL_TEXTURE_2D; 969 glColor @{ $self->{bg} };
872 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
873 970
874# glBegin GL_QUADS; 971 glBegin GL_QUADS;
875# glColor 0, 0, 0, 0;
876# glVertex 0 , 0; 972 glVertex 0 , 0;
877# glVertex 0 , $h; 973 glVertex 0 , $h;
878# glVertex $w, $h; 974 glVertex $w, $h;
879# glVertex $w, 0; 975 glVertex $w, 0;
880# glEnd; 976 glEnd;
881 977
882
883 $self->child->draw;
884 glDisable GL_BLEND; 978 glDisable GL_BLEND;
885 glDisable GL_TEXTURE_2D; 979 }
980
981 $self->SUPER::_draw;
886} 982}
887 983
888############################################################################# 984#############################################################################
889 985
890package CFClient::UI::FancyFrame; 986package CFClient::UI::FancyFrame;
… …
901 my $class = shift; 997 my $class = shift;
902 998
903 # TODO: user_x, user_y, overwrite moveto? 999 # TODO: user_x, user_y, overwrite moveto?
904 1000
905 my $self = $class->SUPER::new ( 1001 my $self = $class->SUPER::new (
906 bg => [1, 1, 1, 1], 1002 bg => [1, 1, 1, 1],
907 border_bg => [1, 1, 1, 1], 1003 border_bg => [1, 1, 1, 1],
908 border => 0.6, 1004 border => 0.6,
1005 is_toplevel => 1,
909 can_events => 1, 1006 can_events => 1,
910 @_ 1007 @_
911 ); 1008 );
912 1009
913 $self->{title} &&= new CFClient::UI::Label 1010 $self->{title} &&= new CFClient::UI::Label
914 align => 0, 1011 align => 0,
… …
938 my ($self, $w, $h) = @_; 1035 my ($self, $w, $h) = @_;
939 1036
940 $h -= List::Util::max 0, $self->border * 2; 1037 $h -= List::Util::max 0, $self->border * 2;
941 $w -= List::Util::max 0, $self->border * 2; 1038 $w -= List::Util::max 0, $self->border * 2;
942 1039
943 $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)
944 if $self->{title}; 1041 if $self->{title};
945 1042
946 $self->child->configure ($self->border, $self->border, $w, $h); 1043 $self->child->configure ($self->border, $self->border, $w, $h);
947} 1044}
948 1045
… …
967 my ($ev, $x, $y) = @_; 1064 my ($ev, $x, $y) = @_;
968 1065
969 my $dx = $ev->{x} - $ox; 1066 my $dx = $ev->{x} - $ox;
970 my $dy = $ev->{y} - $oy; 1067 my $dy = $ev->{y} - $oy;
971 1068
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
972 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
973 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
974 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1073 $self->move ($self->{user_x}, $self->{user_y});
975 $self->check_size; 1074 $self->check_size;
976 }; 1075 };
977 1076
978 } elsif ($lr ^ $td) { 1077 } elsif ($lr ^ $td) {
979 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1078 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
982 $self->{motion} = sub { 1081 $self->{motion} = sub {
983 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
984 1083
985 ($x, $y) = ($ev->{x}, $ev->{y}); 1084 ($x, $y) = ($ev->{x}, $ev->{y});
986 1085
987 $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});
988 $self->update; 1089 $self->update;
989 }; 1090 };
990 } 1091 }
991} 1092}
992 1093
… …
1006 my ($self) = @_; 1107 my ($self) = @_;
1007 1108
1008 my ($w, $h ) = ($self->{w}, $self->{h}); 1109 my ($w, $h ) = ($self->{w}, $self->{h});
1009 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1010 1111
1011 glEnable GL_BLEND;
1012 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1013 glEnable GL_TEXTURE_2D; 1112 glEnable GL_TEXTURE_2D;
1014 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1015 1114
1016 my $border = $self->border; 1115 my $border = $self->border;
1017 1116
1018 glColor @{ $self->{border_bg} }; 1117 glColor @{ $self->{border_bg} };
1019 $tex[1]->draw_quad (0, 0, $w, $border); 1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1020 $tex[3]->draw_quad (0, $border, $border, $ch); 1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1021 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1022 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1023 1122
1024 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1025 my $bg = $tex[0]; 1124 my $bg = $tex[0];
1026 1125
1027 # TODO: repeat texture not scale 1126 # TODO: repeat texture not scale
… …
1031 glColor @{ $self->{bg} }; 1130 glColor @{ $self->{bg} };
1032 1131
1033 $bg->{s} = $rep_x; 1132 $bg->{s} = $rep_x;
1034 $bg->{t} = $rep_y; 1133 $bg->{t} = $rep_y;
1035 $bg->{wrap_mode} = 1; 1134 $bg->{wrap_mode} = 1;
1036 $bg->draw_quad ($border, $border, $cw, $ch); 1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 }
1037 1137
1038 glDisable GL_TEXTURE_2D; 1138 glDisable GL_TEXTURE_2D;
1039 glDisable GL_BLEND;
1040 }
1041 1139
1042 $self->{title}->draw if $self->{title}; 1140 $self->{title}->draw if $self->{title};
1043 1141
1044 $self->child->draw; 1142 $self->child->draw;
1045} 1143}
… …
1057sub new { 1155sub new {
1058 my $class = shift; 1156 my $class = shift;
1059 1157
1060 $class->SUPER::new ( 1158 $class->SUPER::new (
1061 col_expand => [], 1159 col_expand => [],
1062 @_ 1160 @_,
1063 ) 1161 )
1162}
1163
1164sub children {
1165 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1064} 1166}
1065 1167
1066sub add { 1168sub add {
1067 my ($self, $x, $y, $child) = @_; 1169 my ($self, $x, $y, $child) = @_;
1068 1170
1069 $child->set_parent ($self); 1171 $child->set_parent ($self);
1070 $self->{children}[$y][$x] = $child; 1172 $self->{children}[$y][$x] = $child;
1071 1173
1072 $child->check_size; 1174 $self->check_size (1);
1073} 1175}
1074 1176
1075sub children {
1076 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1077}
1078
1079# 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?
1080sub clear { 1178sub clear {
1081 my ($self) = @_; 1179 my ($self) = @_;
1082 1180
1083 my @children = $self->children; 1181 my @children = $self->children;
1084 delete $self->{children}; 1182 delete $self->{children};
… …
1086 for (@children) { 1184 for (@children) {
1087 delete $_->{parent}; 1185 delete $_->{parent};
1088 $_->hide; 1186 $_->hide;
1089 } 1187 }
1090 1188
1189 $self->check_size (1);
1091 $self->update; 1190 $self->update;
1092} 1191}
1093 1192
1094sub get_wh { 1193sub get_wh {
1095 my ($self) = @_; 1194 my ($self) = @_;
… …
1127sub size_allocate { 1226sub size_allocate {
1128 my ($self, $w, $h) = @_; 1227 my ($self, $w, $h) = @_;
1129 1228
1130 my ($ws, $hs) = $self->get_wh; 1229 my ($ws, $hs) = $self->get_wh;
1131 1230
1132 my $req_w = sum @$ws; 1231 my $req_w = (sum @$ws) || 1;
1133 my $req_h = sum @$hs; 1232 my $req_h = (sum @$hs) || 1;
1134 1233
1135 # TODO: nicer code && do row_expand 1234 # TODO: nicer code && do row_expand
1136 my @col_expand = @{$self->{col_expand}}; 1235 my @col_expand = @{$self->{col_expand}};
1137 @col_expand = (1) x @$ws unless @col_expand; 1236 @col_expand = (1) x @$ws unless @col_expand;
1138 my $col_expand = (sum @col_expand) || 1; 1237 my $col_expand = (sum @col_expand) || 1;
… …
1272} 1371}
1273 1372
1274sub size_allocate { 1373sub size_allocate {
1275 my ($self, $w, $h) = @_; 1374 my ($self, $w, $h) = @_;
1276 1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1277 my $children = $self->{children}; 1378 my $children = $self->{children};
1278 1379
1279 my @h = map $_->{req_h}, @$children; 1380 my @h = map $_->{req_h}, @$children;
1280 1381
1281 my $req_h = List::Util::sum @h; 1382 my $req_h = List::Util::sum @h;
… …
1310 1411
1311############################################################################# 1412#############################################################################
1312 1413
1313package CFClient::UI::Label; 1414package CFClient::UI::Label;
1314 1415
1315our @ISA = CFClient::UI::Base::; 1416our @ISA = CFClient::UI::DrawBG::;
1316 1417
1317use CFClient::OpenGL; 1418use CFClient::OpenGL;
1318 1419
1319sub new { 1420sub new {
1320 my ($class, %arg) = @_; 1421 my ($class, %arg) = @_;
1321 1422
1322 my $self = $class->SUPER::new ( 1423 my $self = $class->SUPER::new (
1323 fg => [1, 1, 1], 1424 fg => [1, 1, 1],
1425 #bg => none
1426 #active_bg => none
1324 #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),
1325 fontsize => 1, 1433 fontsize => 1,
1326 text => "",
1327 align => -1, 1434 align => -1,
1328 valign => -1, 1435 valign => -1,
1329 padding => 2, 1436 padding => 2,
1330 layout => new CFClient::Layout,
1331 can_events => 0, 1437 can_events => 0,
1332 %arg 1438 %arg
1333 ); 1439 );
1334 1440
1335 if (exists $self->{template}) { 1441 if (exists $self->{template}) {
1336 my $layout = new CFClient::Layout; 1442 my $layout = new CFClient::Layout;
1337 $layout->set_text (delete $self->{template}); 1443 $layout->set_text (delete $self->{template});
1338 $self->{template} = $layout; 1444 $self->{template} = $layout;
1339 } 1445 }
1340 1446
1341 $self->set_text (delete $self->{text}) if exists $self->{text}; 1447 if (exists $self->{markup}) {
1342 $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 }
1343 1452
1344 $self 1453 $self
1345} 1454}
1346 1455
1347sub escape { 1456sub escape($) {
1348 local $_ = $_[1]; 1457 local $_ = $_[0];
1349 1458
1350 s/&/&amp;/g; 1459 s/&/&amp;/g;
1351 s/>/&gt;/g; 1460 s/>/&gt;/g;
1352 s/</&lt;/g; 1461 s/</&lt;/g;
1353 1462
1354 $_[1] 1463 $_
1355} 1464}
1356 1465
1357sub update { 1466sub update {
1358 my ($self) = @_; 1467 my ($self) = @_;
1359 1468
… …
1365 my ($self, $text) = @_; 1474 my ($self, $text) = @_;
1366 1475
1367 return if $self->{text} eq "T$text"; 1476 return if $self->{text} eq "T$text";
1368 $self->{text} = "T$text"; 1477 $self->{text} = "T$text";
1369 1478
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1480 $self->{layout}->set_text ($text);
1371 1481
1372 delete $self->{texture};
1373 $self->update; 1482 $self->update;
1374 $self->check_size; 1483 $self->check_size;
1375} 1484}
1376 1485
1377sub set_markup { 1486sub set_markup {
1378 my ($self, $markup) = @_; 1487 my ($self, $markup) = @_;
1379 1488
1380 return if $self->{text} eq "M$markup"; 1489 return if $self->{text} eq "M$markup";
1381 $self->{text} = "M$markup"; 1490 $self->{text} = "M$markup";
1382 1491
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493
1494 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1383 $self->{layout}->set_markup ($markup); 1495 $self->{layout}->set_markup ($markup);
1384 1496
1385 delete $self->{texture};
1386 $self->update; 1497 $self->update;
1387 $self->check_size; 1498 $self->check_size;
1388} 1499}
1389 1500
1390sub size_request { 1501sub size_request {
1391 my ($self) = @_; 1502 my ($self) = @_;
1392 1503
1393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1504 $self->{layout}->set_font ($self->{font}) if $self->{font};
1394 $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});
1395 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1396 1509
1397 my ($w, $h) = $self->{layout}->size; 1510 my ($w, $h) = $self->{layout}->size;
1398 1511
1399 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1429} 1542}
1430 1543
1431sub _draw { 1544sub _draw {
1432 my ($self) = @_; 1545 my ($self) = @_;
1433 1546
1547 $self->SUPER::_draw; # draw background, if applicable
1548
1434 my $tex = $self->{texture} ||= do { 1549 my $tex = $self->{texture} ||= do {
1550 $self->{layout}->set_foreground (@{$self->{fg}});
1435 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1551 $self->{layout}->set_font ($self->{font}) if $self->{font};
1436 $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});
1437 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556
1438 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
1439 }; 1568 };
1440 1569
1441 glEnable GL_BLEND;
1442 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1443 glEnable GL_TEXTURE_2D; 1570 glEnable GL_TEXTURE_2D;
1444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1445 1572
1573 if ($tex->{format} == GL_ALPHA) {
1446 glColor @{$self->{fg}}; 1574 glColor @{$self->{fg}};
1447
1448 $self->{ox} = int (
1449 $self->{align} < 0 ? $self->{padding}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1451 : ($self->{w} - $tex->{w}) * 0.5
1452 );
1453
1454 $self->{oy} = int (
1455 $self->{valign} < 0 ? $self->{padding}
1456 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1457 : ($self->{h} - $tex->{h}) * 0.5
1458 );
1459
1460 $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 }
1461 1579
1462 glDisable GL_TEXTURE_2D; 1580 glDisable GL_TEXTURE_2D;
1463 glDisable GL_BLEND;
1464} 1581}
1465 1582
1466############################################################################# 1583#############################################################################
1467 1584
1468package CFClient::UI::EntryBase; 1585package CFClient::UI::EntryBase;
… …
1481 active_fg => [0, 0, 0], 1598 active_fg => [0, 0, 0],
1482 can_hover => 1, 1599 can_hover => 1,
1483 can_focus => 1, 1600 can_focus => 1,
1484 valign => 0, 1601 valign => 0,
1485 can_events => 1, 1602 can_events => 1,
1603 #text => ...
1486 @_ 1604 @_
1487 ) 1605 )
1488} 1606}
1489 1607
1490sub _set_text { 1608sub _set_text {
… …
1500 $self->{text} = $text; 1618 $self->{text} = $text;
1501 1619
1502 $text =~ s/./*/g if $self->{hidden}; 1620 $text =~ s/./*/g if $self->{hidden};
1503 $self->{layout}->set_text ("$text "); 1621 $self->{layout}->set_text ("$text ");
1504 1622
1505 $self->emit (changed => $self->{text}); 1623 $self->_emit (changed => $self->{text});
1506}
1507
1508sub get_text {
1509 $_[0]{text}
1510}
1511
1512sub size_request {
1513 my ($self) = @_;
1514
1515 my ($w, $h) = $self->SUPER::size_request;
1516
1517 ($w + 1, $h) # add 1 for cursor
1518}
1519
1520sub size_allocate {
1521 my ($self, $w, $h) = @_;
1522
1523 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1524} 1624}
1525 1625
1526sub set_text { 1626sub set_text {
1527 my ($self, $text) = @_; 1627 my ($self, $text) = @_;
1528 1628
1529 $self->{cursor} = length $text; 1629 $self->{cursor} = length $text;
1530 $self->_set_text ($text); 1630 $self->_set_text ($text);
1531 $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
1532} 1645}
1533 1646
1534sub key_down { 1647sub key_down {
1535 my ($self, $ev) = @_; 1648 my ($self, $ev) = @_;
1536 1649
… …
1538 my $sym = $ev->{sym}; 1651 my $sym = $ev->{sym};
1539 my $uni = $ev->{unicode}; 1652 my $uni = $ev->{unicode};
1540 1653
1541 my $text = $self->get_text; 1654 my $text = $self->get_text;
1542 1655
1543 if ($sym == 8) { 1656 if ($uni == 8) {
1544 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1657 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1545 } elsif ($sym == 127) { 1658 } elsif ($uni == 127) {
1546 substr $text, $self->{cursor}, 1, ""; 1659 substr $text, $self->{cursor}, 1, "";
1547 } elsif ($sym == CFClient::SDLK_LEFT) { 1660 } elsif ($sym == CFClient::SDLK_LEFT) {
1548 --$self->{cursor} if $self->{cursor}; 1661 --$self->{cursor} if $self->{cursor};
1549 } elsif ($sym == CFClient::SDLK_RIGHT) { 1662 } elsif ($sym == CFClient::SDLK_RIGHT) {
1550 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1663 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1551 } elsif ($sym == CFClient::SDLK_HOME) { 1664 } elsif ($sym == CFClient::SDLK_HOME) {
1552 $self->{cursor} = 0; 1665 $self->{cursor} = 0;
1553 } elsif ($sym == CFClient::SDLK_END) { 1666 } elsif ($sym == CFClient::SDLK_END) {
1554 $self->{cursor} = length $text; 1667 $self->{cursor} = length $text;
1555 } elsif ($sym == 27) { 1668 } elsif ($uni == 27) {
1556 $self->emit ('escape'); 1669 $self->_emit ('escape');
1557 } elsif ($uni) { 1670 } elsif ($uni) {
1558 substr $text, $self->{cursor}++, 0, chr $uni; 1671 substr $text, $self->{cursor}++, 0, chr $uni;
1559 } 1672 }
1560 1673
1561 $self->_set_text ($text); 1674 $self->_set_text ($text);
1562 $self->update; 1675 $self->update;
1676 $self->check_size;
1563} 1677}
1564 1678
1565sub focus_in { 1679sub focus_in {
1566 my ($self) = @_; 1680 my ($self) = @_;
1567 1681
… …
1647 if ($sym == 13) { 1761 if ($sym == 13) {
1648 unshift @{$self->{history}}, 1762 unshift @{$self->{history}},
1649 my $txt = $self->get_text; 1763 my $txt = $self->get_text;
1650 $self->{history_pointer} = -1; 1764 $self->{history_pointer} = -1;
1651 $self->{history_saveback} = ''; 1765 $self->{history_saveback} = '';
1652 $self->emit (activate => $txt); 1766 $self->_emit (activate => $txt);
1653 $self->update; 1767 $self->update;
1654 1768
1655 } elsif ($sym == CFClient::SDLK_UP) { 1769 } elsif ($sym == CFClient::SDLK_UP) {
1656 if ($self->{history_pointer} < 0) { 1770 if ($self->{history_pointer} < 0) {
1657 $self->{history_saveback} = $self->get_text; 1771 $self->{history_saveback} = $self->get_text;
… …
1696 my $class = shift; 1810 my $class = shift;
1697 1811
1698 $class->SUPER::new ( 1812 $class->SUPER::new (
1699 padding => 4, 1813 padding => 4,
1700 fg => [1, 1, 1], 1814 fg => [1, 1, 1],
1701 bg => [1, 1, 1, 0.2],
1702 active_fg => [0, 0, 1], 1815 active_fg => [0, 0, 1],
1703 can_hover => 1, 1816 can_hover => 1,
1704 align => 0, 1817 align => 0,
1705 valign => 0, 1818 valign => 0,
1706 can_events => 1, 1819 can_events => 1,
1707 @_ 1820 @_
1708 ) 1821 )
1709} 1822}
1710 1823
1824sub activate { }
1825
1711sub button_up { 1826sub button_up {
1712 my ($self, $ev, $x, $y) = @_; 1827 my ($self, $ev, $x, $y) = @_;
1713 1828
1829 $self->emit ("activate")
1714 if ($x >= 0 && $x < $self->{w} 1830 if $x >= 0 && $x < $self->{w}
1715 && $y >= 0 && $y < $self->{h}) { 1831 && $y >= 0 && $y < $self->{h};
1716 $self->emit ("activate");
1717 }
1718} 1832}
1719 1833
1720sub _draw { 1834sub _draw {
1721 my ($self) = @_; 1835 my ($self) = @_;
1722 1836
… …
1724 1838
1725 if ($GRAB == $self) { 1839 if ($GRAB == $self) {
1726 $self->{fg} = $self->{active_fg}; 1840 $self->{fg} = $self->{active_fg};
1727 } 1841 }
1728 1842
1729 glEnable GL_BLEND;
1730 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1731 glEnable GL_TEXTURE_2D; 1843 glEnable GL_TEXTURE_2D;
1732 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1733 glColor 0, 0, 0, 1; 1845 glColor 0, 0, 0, 1;
1734 1846
1735 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1847 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1736 1848
1737 glDisable GL_TEXTURE_2D; 1849 glDisable GL_TEXTURE_2D;
1738 glDisable GL_BLEND;
1739 1850
1740 $self->SUPER::_draw; 1851 $self->SUPER::_draw;
1741} 1852}
1742 1853
1743############################################################################# 1854#############################################################################
… …
1757 1868
1758 $class->SUPER::new ( 1869 $class->SUPER::new (
1759 padding => 2, 1870 padding => 2,
1760 fg => [1, 1, 1], 1871 fg => [1, 1, 1],
1761 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],
1762 state => 0, 1875 state => 0,
1763 can_hover => 1, 1876 can_hover => 1,
1764 @_ 1877 @_
1765 ) 1878 )
1766} 1879}
… …
1775 my ($self, $ev, $x, $y) = @_; 1888 my ($self, $ev, $x, $y) = @_;
1776 1889
1777 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1778 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1779 $self->{state} = !$self->{state}; 1892 $self->{state} = !$self->{state};
1780 $self->emit (changed => $self->{state}); 1893 $self->_emit (changed => $self->{state});
1781 } 1894 }
1782} 1895}
1783 1896
1784sub _draw { 1897sub _draw {
1785 my ($self) = @_; 1898 my ($self) = @_;
… …
1790 1903
1791 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;
1792 1905
1793 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1794 1907
1795 glEnable GL_BLEND; 1908 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909
1796 glEnable GL_TEXTURE_2D; 1910 glEnable GL_TEXTURE_2D;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798
1799 my $tex = $self->{state} ? $tex[1] : $tex[0];
1800
1801 $tex->draw_quad (0, 0, $s, $s); 1911 $tex->draw_quad_alpha (0, 0, $s, $s);
1802
1803 glDisable GL_TEXTURE_2D; 1912 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805} 1913}
1806 1914
1807############################################################################# 1915#############################################################################
1808 1916
1809package CFClient::UI::Image; 1917package CFClient::UI::Image;
… …
1852 glTranslate 0, -$self->{w}, 0; 1960 glTranslate 0, -$self->{w}, 0;
1853 1961
1854 ($w, $h) = ($h, $w); 1962 ($w, $h) = ($h, $w);
1855 } 1963 }
1856 1964
1857 glEnable GL_BLEND;
1858 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1859 glEnable GL_TEXTURE_2D; 1965 glEnable GL_TEXTURE_2D;
1860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1966 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1861 1967
1862 $tex->draw_quad (0, 0, $w, $h); 1968 $tex->draw_quad_alpha (0, 0, $w, $h);
1863 1969
1864 glDisable GL_BLEND;
1865 glDisable GL_TEXTURE_2D; 1970 glDisable GL_TEXTURE_2D;
1866} 1971}
1867 1972
1868############################################################################# 1973#############################################################################
1869 1974
… …
2058 qw(s1_slider.png s1_slider_bg.png); 2163 qw(s1_slider.png s1_slider_bg.png);
2059 2164
2060sub new { 2165sub new {
2061 my $class = shift; 2166 my $class = shift;
2062 2167
2063 # range [value, low, high, page] 2168 # range [value, low, high, page, unit]
2064 2169
2065 # TODO: 0-width page 2170 # TODO: 0-width page
2066 # TODO: req_w/h are wrong with vertical 2171 # TODO: req_w/h are wrong with vertical
2067 # TODO: calculations are off 2172 # TODO: calculations are off
2068 my $self = $class->SUPER::new ( 2173 my $self = $class->SUPER::new (
2069 fg => [1, 1, 1], 2174 fg => [1, 1, 1],
2070 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],
2071 range => [0, 0, 100, 10], 2178 range => [0, 0, 100, 10, 0],
2072 req_w => $::WIDTH / 80, 2179 req_w => $::WIDTH / 80,
2073 req_h => $::WIDTH / 80, 2180 req_h => $::WIDTH / 80,
2074 vertical => 0, 2181 vertical => 0,
2075 can_hover => 1, 2182 can_hover => 1,
2076 inner_pad => 5, 2183 inner_pad => 0.02,
2077 @_ 2184 @_
2078 ); 2185 );
2079 2186
2187 $self->set_value ($self->{range}[0]);
2188 $self->update;
2189
2080 $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 }
2081} 2223}
2082 2224
2083sub size_request { 2225sub size_request {
2084 my ($self) = @_; 2226 my ($self) = @_;
2085 2227
… …
2091 2233
2092sub button_down { 2234sub button_down {
2093 my ($self, $ev, $x, $y) = @_; 2235 my ($self, $ev, $x, $y) = @_;
2094 2236
2095 $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
2096 $self->mouse_motion ($ev, $x, $y); 2241 $self->mouse_motion ($ev, $x, $y);
2097} 2242}
2098 2243
2099sub mouse_motion { 2244sub mouse_motion {
2100 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
2101 2246
2102 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
2103 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2264 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100;
2104 2266
2105 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2267 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2106 2268
2107 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2269 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2108 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2270 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2109 2271
2110 $x -= $inner_pad_px; # substract the padding 2272 $value = ($value - $lo) / $range;
2111 $x = $x * ($hi - $lo) / $inner_w + $lo; 2273 $value = $value * $self->{scale} + $self->{offset};
2112 $x = $lo if $x < $lo;
2113 $x = $hi - $page if $x > $hi - $page;
2114 $self->{range}[0] = $x;
2115 2274
2116 $self->emit (changed => $x); 2275 $self->{knob_x} = $value - $knob_w * 0.5;
2117 $self->update; 2276 $self->{knob_w} = $knob_w;
2118 } 2277 });
2119}
2120 2278
2121# the inner_* stuff is for generating a padding for the slider handle, 2279 $self->SUPER::update;
2122# so that the handle doesn't leave the texture. This calculation isn't 100%
2123# correct propably, but it does the job for now
2124sub _calc_inner_pad_px {
2125 my ($self, $w) = @_;
2126 ($w / 100) * $self->{inner_pad} # % to pixels
2127} 2280}
2128 2281
2129sub _draw { 2282sub _draw {
2130 my ($self) = @_; 2283 my ($self) = @_;
2131 2284
2132 $self->SUPER::_draw (); 2285 $self->SUPER::_draw ();
2133 2286
2134 my ($w, $h) = @$self{qw(w h)}; 2287 glScale $self->{w}, $self->{h};
2135 2288
2136 if ($self->{vertical}) { 2289 if ($self->{vertical}) {
2137 # draw a vertical slider like a rotated horizontal slider 2290 # draw a vertical slider like a rotated horizontal slider
2138 2291
2292 glTranslate 1, 0, 0;
2139 glRotate 90, 0, 0, 1; 2293 glRotate 90, 0, 0, 1;
2140 glTranslate 0, -$self->{w}, 0;
2141
2142 ($w, $h) = ($h, $w);
2143 } 2294 }
2144 2295
2145 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2296 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2146 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2297 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2147 2298
2148 my ($value, $lo, $hi, $page) = @{$self->{range}};
2149
2150 $hi = $value + 1 if $lo == $hi;
2151
2152 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2153 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2154
2155 $page = int $page * $inner_w / ($hi - $lo);
2156 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2157
2158 $w -= $page;
2159 $page &= ~1;
2160 glTranslate $page * 0.5, 0, 0;
2161 $page ||= 2;
2162
2163 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2164 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2165
2166 glEnable GL_BLEND;
2167 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2168 glEnable GL_TEXTURE_2D; 2299 glEnable GL_TEXTURE_2D;
2169 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2300 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2170 2301
2171 # draw background 2302 # draw background
2172 $tex[1]->draw_quad (0, 0, $w, $h); 2303 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2173 2304
2174 # draw handle 2305 # draw handle
2175 $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);
2176 2307
2177 glDisable GL_BLEND;
2178 glDisable GL_TEXTURE_2D; 2308 glDisable GL_TEXTURE_2D;
2179} 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 (@_) }
2180 2351
2181############################################################################# 2352#############################################################################
2182 2353
2183package CFClient::UI::TextView; 2354package CFClient::UI::TextView;
2184 2355
… …
2193 fontsize => 1, 2364 fontsize => 1,
2194 can_events => 0, 2365 can_events => 0,
2195 #font => default_font 2366 #font => default_font
2196 @_, 2367 @_,
2197 2368
2198 layout => (new CFClient::Layout), 2369 layout => (new CFClient::Layout 1),
2199 par => [], 2370 par => [],
2200 height => 0, 2371 height => 0,
2201 children => [ 2372 children => [
2202 (new CFClient::UI::Empty expand => 1), 2373 (new CFClient::UI::Empty expand => 1),
2203 (new CFClient::UI::Slider vertical => 1), 2374 (new CFClient::UI::Slider vertical => 1),
… …
2214 2385
2215 $self->{fontsize} = $fontsize; 2386 $self->{fontsize} = $fontsize;
2216 $self->reflow; 2387 $self->reflow;
2217} 2388}
2218 2389
2219sub text_height {
2220 my ($self, $text) = @_;
2221
2222 my $layout = $self->{layout};
2223
2224 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2225 $layout->set_width ($self->{children}[0]{w});
2226 $layout->set_text ($text);
2227
2228 ($layout->size)[1]
2229}
2230
2231sub reflow {
2232 my ($self) = @_;
2233
2234 $self->{need_reflow}++;
2235 $self->update;
2236}
2237
2238sub size_allocate { 2390sub size_allocate {
2239 my ($self, $w, $h) = @_; 2391 my ($self, $w, $h) = @_;
2240 2392
2241 $self->SUPER::size_allocate ($w, $h); 2393 $self->SUPER::size_allocate ($w, $h);
2242 2394
… …
2245 $self->{layout}->set_width ($self->{children}[0]{w}); 2397 $self->{layout}->set_width ($self->{children}[0]{w});
2246 2398
2247 $self->reflow; 2399 $self->reflow;
2248} 2400}
2249 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
2250sub add_paragraph { 2436sub add_paragraph {
2251 my ($self, $color, $text) = @_; 2437 my ($self, $color, $text, $indent) = @_;
2252 2438
2253 #TODO: intelligently "reformat" paragraph 2439 for my $line (split /\n/, $text) {
2254 2440 my ($w, $h) = $self->text_size ($line);
2255 my $height = $self->text_height ($text);
2256
2257 $self->{height} += $height; 2441 $self->{height} += $h;
2442 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2443 }
2258 2444
2259 push @{$self->{par}}, [$height, $color, $text];
2260
2261 $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]);
2262 $self->{children}[1]->update;
2263} 2446}
2264 2447
2265sub update { 2448sub update {
2266 my ($self) = @_; 2449 my ($self) = @_;
2267 2450
… …
2269 2452
2270 return unless $self->{h} > 0; 2453 return unless $self->{h} > 0;
2271 2454
2272 delete $self->{texture}; 2455 delete $self->{texture};
2273 2456
2274 $ROOT->on_refresh ($self, sub { 2457 $ROOT->on_post_alloc ($self, sub {
2458 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2459
2275 if (delete $self->{need_reflow}) { 2460 if (delete $self->{need_reflow}) {
2276 my $height = 0; 2461 my $height = 0;
2277 2462
2278 $height += $_->[0] = $self->text_height ($_->[2]) 2463 my $layout = $self->{layout};
2464
2465 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2466
2279 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 }
2280 2478
2281 $self->{height} = $height; 2479 $self->{height} = $height;
2282 2480
2283 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2481 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2284 2482
2285 delete $self->{texture}; 2483 delete $self->{texture};
2286 } 2484 }
2287 2485
2288 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2289 glClearColor 0, 0, 0, 0; 2487 glClearColor 0.5, 0.5, 0.5, 0;
2290 glClear GL_COLOR_BUFFER_BIT; 2488 glClear GL_COLOR_BUFFER_BIT;
2291 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
2292 glEnable GL_BLEND; 2501 glEnable GL_BLEND;
2502 #TODO# not correct in windows where rgba is forced off
2293 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2503 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 glEnable GL_TEXTURE_2D;
2295 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2296
2297 my $top = int $self->{children}[1]{range}[0];
2298
2299 my $y0 = $top;
2300 my $y1 = $top + $self->{h};
2301
2302 my $y = 0;
2303
2304 my $layout = $self->{layout};
2305
2306 $layout->set_font ($self->{font}) if $self->{font};
2307 2504
2308 for my $par (@{$self->{par}}) { 2505 for my $par (@{$self->{par}}) {
2309 my $h = $par->[0]; 2506 my $h = $par->[1];
2310 2507
2311 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]);
2312 $layout->set_text ($par->[2]); 2511 $layout->set_markup ($par->[4]);
2313 2512
2314 glColor @{ $par->[1] }; 2513 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2315 my ($W, $H) = $layout->size; 2514
2316 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;
2317 } 2517 }
2318 2518
2319 $y += $h; 2519 $y += $h;
2320 } 2520 }
2321 2521
2322 glDisable GL_TEXTURE_2D;
2323 glDisable GL_BLEND; 2522 glDisable GL_BLEND;
2324 }; 2523 };
2325 }); 2524 });
2326} 2525}
2327 2526
2328sub _draw { 2527sub _draw {
2329 my ($self) = @_; 2528 my ($self) = @_;
2330 2529
2331 glEnable GL_BLEND;
2332 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2333 glEnable GL_TEXTURE_2D; 2530 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2532 glColor 1, 1, 1, 1;
2336 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2534 glDisable GL_TEXTURE_2D;
2338 glDisable GL_BLEND;
2339 2535
2340 $self->{children}[1]->draw; 2536 $self->{children}[1]->draw;
2341 2537
2342} 2538}
2343 2539
… …
2391 2587
2392sub new { 2588sub new {
2393 my $class = shift; 2589 my $class = shift;
2394 2590
2395 my $self = $class->SUPER::new ( 2591 my $self = $class->SUPER::new (
2396 state => 0, 2592 state => 0,
2397 connect_activate => \&toggle_flopper, 2593 on_activate => \&toggle_flopper,
2398 @_ 2594 @_
2399 ); 2595 );
2400 2596
2401 if ($self->{state}) { 2597 if ($self->{state}) {
2402 $self->{state} = 0; 2598 $self->{state} = 0;
… …
2411 2607
2412 # TODO: use animation 2608 # TODO: use animation
2413 if ($self->{state} = !$self->{state}) { 2609 if ($self->{state} = !$self->{state}) {
2414 $CFClient::UI::ROOT->add ($self->{other}); 2610 $CFClient::UI::ROOT->add ($self->{other});
2415 $self->{other}->move ($self->coord2global (0, $self->{h})); 2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2416 $self->emit ("open"); 2612 $self->_emit ("open");
2417 } else { 2613 } else {
2418 $CFClient::UI::ROOT->remove ($self->{other}); 2614 $CFClient::UI::ROOT->remove ($self->{other});
2419 $self->emit ("close"); 2615 $self->_emit ("close");
2420 } 2616 }
2421 2617
2422 $self->emit (changed => $self->{state}); 2618 $self->_emit (changed => $self->{state});
2423} 2619}
2424 2620
2425############################################################################# 2621#############################################################################
2426 2622
2427package CFClient::UI::Tooltip; 2623package CFClient::UI::Tooltip;
… …
2437 @_, 2633 @_,
2438 can_events => 0, 2634 can_events => 0,
2439 ) 2635 )
2440} 2636}
2441 2637
2442sub set_markup { 2638sub set_tooltip_from {
2443 my ($self, $text) = @_; 2639 my ($self, $widget) = @_;
2444 2640
2445 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2641 $self->add (new CFClient::UI::Label
2446 $self->{label}->set_markup ($text); 2642 markup => $widget->{tooltip},
2447 $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 );
2448} 2649}
2449 2650
2450sub size_request { 2651sub size_request {
2451 my ($self) = @_; 2652 my ($self) = @_;
2452
2453 $self->child->set_max_size ($::WIDTH * 0.3);
2454 2653
2455 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2654 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2456 2655
2457 ($w + 4, $h + 4) 2656 ($w + 4, $h + 4)
2458} 2657}
… …
2464} 2663}
2465 2664
2466sub _draw { 2665sub _draw {
2467 my ($self) = @_; 2666 my ($self) = @_;
2468 2667
2469 glPushMatrix;
2470 glTranslate 0.375, 0.375; 2668 glTranslate 0.375, 0.375;
2471 2669
2472 my ($w, $h) = @$self{qw(w h)}; 2670 my ($w, $h) = @$self{qw(w h)};
2473 2671
2474 glColor 1, 0.8, 0.4; 2672 glColor 1, 0.8, 0.4;
… …
2485 glVertex 0 , $h; 2683 glVertex 0 , $h;
2486 glVertex $w, $h; 2684 glVertex $w, $h;
2487 glVertex $w, 0; 2685 glVertex $w, 0;
2488 glEnd; 2686 glEnd;
2489 2687
2490 glPopMatrix; 2688 glTranslate 2 - 0.375, 2 - 0.375;
2491
2492 glTranslate 2, 2;
2493 $self->SUPER::_draw; 2689 $self->SUPER::_draw;
2494} 2690}
2495 2691
2496############################################################################# 2692#############################################################################
2497 2693
… …
2502use CFClient::OpenGL; 2698use CFClient::OpenGL;
2503 2699
2504sub new { 2700sub new {
2505 my $class = shift; 2701 my $class = shift;
2506 2702
2507 $class->SUPER::new ( 2703 my $self = $class->SUPER::new (
2508 aspect => 1, 2704 aspect => 1,
2705 can_events => 0,
2509 @_, 2706 @_,
2510 ) 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
2511} 2724}
2512 2725
2513sub size_request { 2726sub size_request {
2514 (32, 8) 2727 (32, 8)
2515} 2728}
2516 2729
2730sub update {
2731 my ($self) = @_;
2732
2733 return unless $self->{visible};
2734
2735 $self->SUPER::update;
2736}
2737
2517sub _draw { 2738sub _draw {
2518 my ($self) = @_; 2739 my ($self) = @_;
2519 2740
2520 return unless $::CONN;#d# manage and cache textures differently 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
2521 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2522 2753
2523 # TODO animation
2524 if ($tex) { 2754 if ($tex) {
2525 glEnable GL_BLEND;
2526 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2527 glEnable GL_TEXTURE_2D; 2755 glEnable GL_TEXTURE_2D;
2528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2529 glColor 1, 1, 1, 1; 2757 glColor 1, 1, 1, 1;
2530 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2531 glDisable GL_TEXTURE_2D; 2759 glDisable GL_TEXTURE_2D;
2532 glDisable GL_BLEND;
2533 } 2760 }
2761}
2762
2763sub DESTROY {
2764 my ($self) = @_;
2765
2766 $self->{timer}->cancel
2767 if $self->{timer};
2768
2769 $self->SUPER::DESTROY;
2534} 2770}
2535 2771
2536############################################################################# 2772#############################################################################
2537 2773
2538package CFClient::UI::InventoryItem; 2774package CFClient::UI::Inventory;
2539 2775
2540our @ISA = CFClient::UI::HBox::; 2776our @ISA = CFClient::UI::ScrolledWindow::;
2541 2777
2542sub new { 2778sub new {
2543 my $class = shift; 2779 my $class = shift;
2544 2780
2545 my %args = @_;
2546
2547 my $item = $args{item};
2548
2549 my $desc = $item->{nrof} < 2
2550 ? $item->{name}
2551 : "$item->{nrof} $item->{name_pl}";
2552
2553
2554 my $self = $class->SUPER::new ( 2781 my $self = $class->SUPER::new (
2555 can_hover => 1, 2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2556 can_events => 1,
2557 tooltip => (CFClient::UI::Label->escape ($desc)
2558 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2559 connect_button_down => sub {
2560 my ($self, $ev, $x, $y) = @_;
2561
2562 # todo: maybe put examine on 1? but should just be a tooltip :(
2563 if ($ev->{button} == 1) {
2564 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2565 } elsif ($ev->{button} == 2) {
2566 $::CONN->send ("apply $item->{tag}");
2567 } elsif ($ev->{button} == 3) {
2568 CFClient::UI::Menu->new (
2569 items => [
2570 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2571 [
2572 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2573 sub { $::CONN->send ("lock $item->{tag}") },
2574 ],
2575 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2576 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2577 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2578 ],
2579 )->popup ($ev);
2580 }
2581
2582 1
2583 },
2584 %args
2585 );
2586 $self->add(new CFClient::UI::Face
2587 can_events => 0,
2588 face => $item->{face},
2589 anim => $item->{anim},
2590 animspeed => $item->{animspeed});
2591 $self->add(new CFClient::UI::Label
2592 can_events => 0,
2593 text => $desc);
2594
2595 $self
2596}
2597
2598#############################################################################
2599
2600package CFClient::UI::Inventory;
2601
2602our @ISA = CFClient::UI::ScrolledWindow::;
2603
2604sub new {
2605 my $class = shift;
2606
2607 my $self = $class->SUPER::new (
2608 scrolled => (new CFClient::UI::VBox),
2609 @_, 2783 @_,
2610 ); 2784 );
2611 2785
2612 $self 2786 $self
2613} 2787}
… …
2616 my ($self, $items) = @_; 2790 my ($self, $items) = @_;
2617 2791
2618 $self->{scrolled}->clear; 2792 $self->{scrolled}->clear;
2619 return unless $items; 2793 return unless $items;
2620 2794
2621 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2622 2799
2623 $self->{real_items} = \@items; 2800 $self->{real_items} = \@items;
2624 2801
2802 my $row = 0;
2625 for my $item (@items) { 2803 for my $item (@items) {
2626 my $desc = $item->{nrof} < 2 2804 CFClient::Item::update_widgets $item;
2627 ? $item->{name}
2628 : "$item->{nrof} $item->{name_pl}";
2629 2805
2630 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2631 } 2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2632 2809
2633# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2810 $row++;
2811 }
2634} 2812}
2635 2813
2636sub size_request { 2814sub size_request {
2637 my ($self) = @_; 2815 my ($self) = @_;
2638 ($self->{req_w}, $self->{req_h}); 2816 ($self->{req_w}, $self->{req_h});
… …
2678 2856
2679# popup given the event (must be a mouse button down event currently) 2857# popup given the event (must be a mouse button down event currently)
2680sub popup { 2858sub popup {
2681 my ($self, $ev) = @_; 2859 my ($self, $ev) = @_;
2682 2860
2683 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2684 2862
2685 # maybe save $GRAB? must be careful about events... 2863 # maybe save $GRAB? must be careful about events...
2686 $GRAB = $self; 2864 $GRAB = $self;
2687 $self->{button} = $ev->{button}; 2865 $self->{button} = $ev->{button};
2688 2866
… …
2703 2881
2704 if ($ev->{button} == $self->{button}) { 2882 if ($ev->{button} == $self->{button}) {
2705 undef $GRAB; 2883 undef $GRAB;
2706 $self->hide; 2884 $self->hide;
2707 2885
2708 $self->emit ("popdown"); 2886 $self->_emit ("popdown");
2709 $self->{hover}[1]->() if $self->{hover}; 2887 $self->{hover}[1]->() if $self->{hover};
2710 } 2888 }
2711} 2889}
2712 2890
2713############################################################################# 2891#############################################################################
2714 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
2715package CFClient::UI::Root; 3003package CFClient::UI::Root;
2716 3004
2717our @ISA = CFClient::UI::Container::; 3005our @ISA = CFClient::UI::Container::;
2718 3006
2719use CFClient::OpenGL; 3007use CFClient::OpenGL;
2720 3008
3009sub new {
3010 my $class = shift;
3011
3012 $class->SUPER::new (
3013 visible => 1,
3014 @_,
3015 )
3016}
3017
3018sub configure {
3019 my ($self, $x, $y, $w, $h) = @_;
3020
3021 $self->{w} = $w;
3022 $self->{h} = $h;
3023}
3024
2721sub check_size { 3025sub check_size {
2722 my ($self) = @_; 3026 my ($self) = @_;
2723 3027
2724 $self->configure (0, 0, $self->{w}, $self->{h}); 3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
2725} 3030}
2726 3031
2727sub size_request { 3032sub size_request {
2728 my ($self) = @_; 3033 my ($self) = @_;
2729 3034
… …
2731} 3036}
2732 3037
2733sub size_allocate { 3038sub size_allocate {
2734 my ($self, $w, $h) = @_; 3039 my ($self, $w, $h) = @_;
2735 3040
2736 my $old_w = $self->{old_w};
2737 my $old_h = $self->{old_h};
2738
2739 if ($old_w && $old_h) {
2740 for my $child ($self->children) {
2741 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2742 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2743 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2744 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2745 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2746 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2747 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2748 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2749 }
2750 }
2751
2752 $self->{old_w} = $w;
2753 $self->{old_h} = $h;
2754}
2755
2756sub configure {
2757 my ($self, $x, $y, $w, $h) = @_;
2758
2759 $self->SUPER::configure ($x, $y, $w, $h);
2760
2761 for my $child ($self->children) { 3041 for my $child ($self->children) {
2762 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)};
2763 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
2764 $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;
2765 $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
2766 $child->configure ($X, $Y, $W, $H); 3056 $child->configure ($X, $Y, $W, $H);
2767 } 3057 }
2768} 3058}
2769 3059
2770sub _topleft { 3060sub coord2local {
2771 my ($self, $x, $y) = @_; 3061 my ($self, $x, $y) = @_;
2772 3062
2773 ($x, $y) 3063 ($x, $y)
2774} 3064}
2775 3065
3066sub coord2global {
3067 my ($self, $x, $y) = @_;
3068
3069 ($x, $y)
3070}
3071
2776sub update { 3072sub update {
2777 my ($self) = @_; 3073 my ($self) = @_;
2778 3074
2779 $self->check_size; 3075 $self->check_size;
2780 ::refresh (); 3076 $::WANT_REFRESH++;
2781} 3077}
2782 3078
2783sub add { 3079sub add {
2784 my ($self, $child) = @_; 3080 my ($self, @children) = @_;
2785 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
2786 # integerize window positions 3091 # integerise window positions
2787 $child->{x} = int $child->{x}; 3092 $child->{x} = int $child->{x};
2788 $child->{y} = int $child->{y}; 3093 $child->{y} = int $child->{y};
3094 }
2789 3095
2790 $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 }
2791} 3109}
2792 3110
2793sub on_refresh { 3111sub on_refresh {
2794 my ($self, $id, $cb) = @_; 3112 my ($self, $id, $cb) = @_;
2795 3113
2796 $self->{refresh_hook}{$id} = $cb; 3114 $self->{refresh_hook}{$id} = $cb;
2797} 3115}
2798 3116
3117sub on_post_alloc {
3118 my ($self, $id, $cb) = @_;
3119
3120 $self->{post_alloc_hook}{$id} = $cb;
3121}
3122
2799sub draw { 3123sub draw {
2800 my ($self) = @_; 3124 my ($self) = @_;
2801 3125
2802 while (my $rcb = delete $self->{refresh_hook}) { 3126 while ($self->{refresh_hook}) {
2803 $_->() 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}};
2804 } 3181 }
2805 3182
2806 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3183 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2807 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2808 glClear GL_COLOR_BUFFER_BIT; 3185 glClear GL_COLOR_BUFFER_BIT;
2809 3186
2810 glMatrixMode GL_PROJECTION; 3187 glMatrixMode GL_PROJECTION;
2811 glLoadIdentity; 3188 glLoadIdentity;
2812 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2813 glMatrixMode GL_MODELVIEW; 3190 glMatrixMode GL_MODELVIEW;
2814 glLoadIdentity; 3191 glLoadIdentity;
2815 3192
2816 $self->_draw; 3193 $self->_draw;
2817} 3194}
… …
2819############################################################################# 3196#############################################################################
2820 3197
2821package CFClient::UI; 3198package CFClient::UI;
2822 3199
2823$ROOT = new CFClient::UI::Root; 3200$ROOT = new CFClient::UI::Root;
2824$TOOLTIP = new CFClient::UI::Tooltip; 3201$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2825 3202
28261 32031
2827 3204

Diff Legend

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