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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC

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

Diff Legend

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