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

Diff Legend

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