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.191 by root, Tue May 9 22:27:53 2006 UTC vs.
Revision 1.251 by root, Sun May 28 22:24:24 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
13our $TOOLTIP; 16our $TOOLTIP;
14our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
15 38
16sub check_tooltip { 39sub check_tooltip {
17 if (!$GRAB) { 40 if (!$GRAB) {
18 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
19 if (length $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
… …
23 46
24 my $tip = $widget->{tooltip}; 47 my $tip = $widget->{tooltip};
25 48
26 $tip = $tip->($widget) if CODE:: eq ref $tip; 49 $tip = $tip->($widget) if CODE:: eq ref $tip;
27 50
28 $TOOLTIP->set_markup ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29
30 $TOOLTIP->show; 52 $TOOLTIP->show;
31 53
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33 55
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0); 56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
36 } 57 if $x + $TOOLTIP->{w} > $::WIDTH;
37 58
38 $TOOLTIP->move ($x, $y); 59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->realloc;
39 } 61 }
40 62
41 return; 63 return;
42 } 64 }
43 } 65 }
… …
47 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
48} 70}
49 71
50# class methods for events 72# class methods for events
51sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 75 if $FOCUS;
54} 76}
55 77
56sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 80 if $FOCUS;
59} 81}
60 82
61sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
62 my ($ev) = @_; 84 my ($ev) = @_;
… …
71 check_tooltip; 93 check_tooltip;
72 } 94 }
73 95
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 97
76 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 100}
81 101
82sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
83 my ($ev) = @_; 103 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
85 105
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 107
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 109
90 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 112
95 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 115 $grab->update if $grab;
98 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 133
116 check_tooltip; 134 check_tooltip;
117 } 135 }
118 136
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 138 if $HOVER;
123} 139}
124 140
125# convert position array to integers 141# convert position array to integers
126sub harmonize { 142sub harmonize {
127 my ($vals) = @_; 143 my ($vals) = @_;
… …
131 for (@$vals) { 147 for (@$vals) {
132 my $i = int $_ + $rem; 148 my $i = int $_ + $rem;
133 $rem += $_ - $i; 149 $rem += $_ - $i;
134 $_ = $i; 150 $_ = $i;
135 } 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;
136} 186}
137 187
138############################################################################# 188#############################################################################
139 189
140package CFClient::UI::Base; 190package CFClient::UI::Base;
… …
153 can_events => 1, 203 can_events => 1,
154 @_ 204 @_
155 }, $class; 205 }, $class;
156 206
157 for (keys %$self) { 207 for (keys %$self) {
158 if (/^connect_(.*)$/) { 208 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 209 $self->connect ($1 => delete $self->{$_});
160 } 210 }
161 } 211 }
162 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
163 $self 222 $self
164} 223}
165 224
166sub destroy { 225sub destroy {
167 my ($self) = @_; 226 my ($self) = @_;
… …
176 return if $self->{parent}; 235 return if $self->{parent};
177 236
178 $CFClient::UI::ROOT->add ($self); 237 $CFClient::UI::ROOT->add ($self);
179} 238}
180 239
181sub hide { 240sub center {
182 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};
183 276
184 undef $GRAB if $GRAB == $self; 277 undef $GRAB if $GRAB == $self;
185 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;
186 309
187 $self->{parent}->remove ($self) 310 $self->{parent}->remove ($self)
188 if $self->{parent}; 311 if $self->{parent};
189} 312}
190 313
… …
199} 322}
200 323
201sub set_size { 324sub set_size {
202 my ($self, $w, $h) = @_; 325 my ($self, $w, $h) = @_;
203 326
204 $self->{user_w} = $w; 327 $self->{def_w} = $w;
205 $self->{user_h} = $h; 328 $self->{def_h} = $h;
206 329
207 $self->check_size; 330 $self->realloc;
208} 331}
209 332
210sub size_request { 333sub size_request {
211 require Carp; 334 require Carp;
212 Carp::confess "size_request is abstract"; 335 Carp::confess "size_request is abstract";
… …
232 $self->{y} = $y; 355 $self->{y} = $y;
233 $self->update; 356 $self->update;
234 } 357 }
235 358
236 if ($self->{w} != $w || $self->{h} != $h) { 359 if ($self->{w} != $w || $self->{h} != $h) {
360 return unless $self->{visible};
361
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h];
238 } 363 }
239} 364}
240 365
241sub size_allocate { 366sub size_allocate {
242 # nothing to be done 367 # nothing to be done
243} 368}
244 369
245sub children { 370sub children {
246} 371}
247 372
248# call when resolution changes etc.
249sub reconfigure {
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $self->size_allocate ($self->{w}, $self->{h});
257 $self->update;
258}
259
260sub set_max_size { 373sub set_max_size {
261 my ($self, $w, $h) = @_; 374 my ($self, $w, $h) = @_;
262 375
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 376 delete $self->{max_w}; $self->{max_w} = $w if $w;
264 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 }
265} 394}
266 395
267# translate global coordinates to local coordinate system 396# translate global coordinates to local coordinate system
268sub coord2local { 397sub coord2local {
269 my ($self, $x, $y) = @_; 398 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 413 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 414 return unless $self->{can_focus};
286 415
287 my $focus = $FOCUS; $FOCUS = $self; 416 my $focus = $FOCUS; $FOCUS = $self;
288 417
289 $self->emit (focus_in => $focus); 418 $self->_emit (focus_in => $focus);
290 419
291 $focus->update if $focus; 420 $focus->update if $focus;
292 $FOCUS->update; 421 $FOCUS->update;
293} 422}
294 423
… …
297 426
298 return unless $FOCUS == $self; 427 return unless $FOCUS == $self;
299 428
300 my $focus = $FOCUS; undef $FOCUS; 429 my $focus = $FOCUS; undef $FOCUS;
301 430
302 $self->emit (focus_out => $focus); 431 $self->_emit (focus_out => $focus);
303 432
304 $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;
305} 437}
306 438
307sub mouse_motion { } 439sub mouse_motion { }
308sub button_up { } 440sub button_up { }
309sub key_down { } 441sub key_down { }
310sub key_up { } 442sub key_up { }
311 443
312sub button_down { 444sub button_down {
313 my ($self, $ev, $x, $y) = @_; 445 my ($self, $ev, $x, $y) = @_;
314 446
315 $self->focus_in; 447 $self->focus_in;
… …
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 450sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 451sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 452sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 453sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
322sub 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}
323 518
324sub draw { 519sub draw {
325 my ($self) = @_; 520 my ($self) = @_;
326 521
327 return unless $self->{h} && $self->{w}; 522 return unless $self->{h} && $self->{w};
… …
349 if ($ENV{PCLIENT_DEBUG}) { 544 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix; 545 glPushMatrix;
351 glColor 1, 1, 0, 1; 546 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 547 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP; 548 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 549 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 550 glVertex $self->{w} - 1, 0;
356 glVertex $self->{w}, $self->{h}; 551 glVertex $self->{w} - 1, $self->{h} - 1;
357 glVertex 0 , $self->{h}; 552 glVertex 0 , $self->{h} - 1;
358 glEnd; 553 glEnd;
359 glPopMatrix; 554 glPopMatrix;
360 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;
361 } 556 }
362} 557}
363 558
364sub _draw { 559sub _draw {
365 my ($self) = @_; 560 my ($self) = @_;
366 561
367 warn "no draw defined for $self\n"; 562 warn "no draw defined for $self\n";
368} 563}
369 564
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 $self->{_tree_depth} = $parent->{_tree_depth} + 1;
386 Scalar::Util::weaken ($self->{parent} = $parent);
387}
388
389sub check_size {
390 my ($self) = @_;
391
392 $CFClient::UI::ROOT->{check_size}{$self} = $self;
393}
394
395sub update {
396 my ($self) = @_;
397
398 $self->{parent}->update
399 if $self->{parent};
400}
401
402sub connect {
403 my ($self, $signal, $cb) = @_;
404
405 push @{ $self->{signal_cb}{$signal} }, $cb;
406}
407
408sub emit {
409 my ($self, $signal, @args) = @_;
410
411 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
412}
413
414sub DESTROY { 565sub DESTROY {
415 my ($self) = @_; 566 my ($self) = @_;
416 567
568 delete $WIDGET{$self+0};
417 #$self->deactivate; 569 #$self->deactivate;
418} 570}
419 571
420############################################################################# 572#############################################################################
421 573
… …
430 my $class = shift; 582 my $class = shift;
431 583
432 # range [value, low, high, page] 584 # range [value, low, high, page]
433 585
434 $class->SUPER::new ( 586 $class->SUPER::new (
435 bg => [0, 0, 0, 0.2], 587 #bg => [0, 0, 0, 0.2],
436 active_bg => [1, 1, 1, 0.5], 588 #active_bg => [1, 1, 1, 0.5],
437 @_ 589 @_
438 ) 590 )
439} 591}
440 592
441sub _draw { 593sub _draw {
442 my ($self) = @_; 594 my ($self) = @_;
443 595
596 my $color = $FOCUS == $self && $self->{active_bg}
597 ? $self->{active_bg}
598 : $self->{bg};
599
600 if ($color && (@$color < 4 || $color->[3])) {
444 my ($w, $h) = @$self{qw(w h)}; 601 my ($w, $h) = @$self{qw(w h)};
445 602
446 glEnable GL_BLEND; 603 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 604 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
448 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 605 glColor @$color;
449 606
450 glBegin GL_QUADS; 607 glBegin GL_QUADS;
451 glVertex 0 , 0; 608 glVertex 0 , 0;
452 glVertex 0 , $h; 609 glVertex 0 , $h;
453 glVertex $w, $h; 610 glVertex $w, $h;
454 glVertex $w, 0; 611 glVertex $w, 0;
455 glEnd; 612 glEnd;
456 613
457 glDisable GL_BLEND; 614 glDisable GL_BLEND;
615 }
458} 616}
459 617
460############################################################################# 618#############################################################################
461 619
462package CFClient::UI::Empty; 620package CFClient::UI::Empty;
… …
506 $self->{children} = [ 664 $self->{children} = [
507 sort { $a->{z} <=> $b->{z} } 665 sort { $a->{z} <=> $b->{z} }
508 @{$self->{children}}, @widgets 666 @{$self->{children}}, @widgets
509 ]; 667 ];
510 668
511 $_->check_size 669 $self->realloc;
512 for @widgets;
513
514 $self->update;
515} 670}
516 671
517sub children { 672sub children {
518 @{ $_[0]{children} } 673 @{ $_[0]{children} }
519} 674}
… …
524 delete $child->{parent}; 679 delete $child->{parent};
525 $child->hide; 680 $child->hide;
526 681
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 682 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 683
529 $self->check_size; 684 $self->realloc;
530 $self->update;
531} 685}
532 686
533sub clear { 687sub clear {
534 my ($self) = @_; 688 my ($self) = @_;
535 689
… …
539 for (@$children) { 693 for (@$children) {
540 delete $_->{parent}; 694 delete $_->{parent};
541 $_->hide; 695 $_->hide;
542 } 696 }
543 697
544 $self->check_size; 698 $self->realloc;
545 $self->update;
546} 699}
547 700
548sub find_widget { 701sub find_widget {
549 my ($self, $x, $y) = @_; 702 my ($self, $x, $y) = @_;
550 703
… …
603sub size_request { 756sub size_request {
604 $_[0]{children}[0]->size_request 757 $_[0]{children}[0]->size_request
605} 758}
606 759
607sub size_allocate { 760sub size_allocate {
608 my ($self, $w, $h) = @_; 761 my ($self, $w, $h, $changed) = @_;
609 762
610 $self->{children}[0]->configure (0, 0, $w, $h); 763 $self->{children}[0]->configure (0, 0, $w, $h);
611} 764}
612 765
613############################################################################# 766#############################################################################
… …
625} 778}
626 779
627sub update { 780sub update {
628 my ($self) = @_; 781 my ($self) = @_;
629 782
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 783 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 784 $self->SUPER::update;
632} 785}
633 786
634sub size_allocate { 787sub size_allocate {
635 my ($self, $w, $h) = @_; 788 my ($self, $w, $h, $changed) = @_;
636 789
637 $self->SUPER::size_allocate ($w, $h); 790 $self->SUPER::size_allocate ($w, $h, $changed);
638 $self->update; 791 $self->update
792 if $changed;
639} 793}
640 794
641sub _render { 795sub _render {
642 $_[0]{children}[0]->draw; 796 $_[0]{children}[0]->draw;
643} 797}
… …
648 $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 {
649 glClearColor 0, 0, 0, 0; 803 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 804 glClear GL_COLOR_BUFFER_BIT;
651 805
652 $self->_render; 806 $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 }; 807 };
661} 808}
662 809
663sub _draw { 810sub _draw {
664 my ($self) = @_; 811 my ($self) = @_;
… …
666 my ($w, $h) = ($self->w, $self->h); 813 my ($w, $h) = ($self->w, $self->h);
667 814
668 my $tex = $self->{texture} 815 my $tex = $self->{texture}
669 or return; 816 or return;
670 817
671 glEnable GL_BLEND;
672 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
673 glEnable GL_TEXTURE_2D; 818 glEnable GL_TEXTURE_2D;
674 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
675 glColor 0, 0, 0, 1; 820 glColor 1, 1, 1, 1;
676 821
677 $tex->draw_quad (0, 0, $w, $h); 822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
678 823
679 glDisable GL_BLEND;
680 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
681} 825}
682 826
683############################################################################# 827#############################################################################
684 828
685package CFClient::UI::ViewPort; 829package CFClient::UI::ViewPort;
686 830
687our @ISA = CFClient::UI::Window::; 831our @ISA = CFClient::UI::Window::;
688 832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 scroll_x => 0,
838 scroll_y => 1,
839 @_,
840 )
841}
842
689sub size_request { 843sub size_request {
690 my ($self) = @_; 844 my ($self) = @_;
691 845
692 @$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)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 847
695 @$self{qw(child_w child_h)} 848 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y};
850
851 ($w, $h)
696} 852}
697 853
698sub size_allocate { 854sub size_allocate {
699 my ($self, $w, $h) = @_; 855 my ($self, $w, $h, $changed) = @_;
700 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);
701 $self->update; 861 $self->update;
702} 862}
703 863
704sub set_offset { 864sub set_offset {
705 my ($self, $x, $y) = @_; 865 my ($self, $x, $y) = @_;
… …
756 my $class = shift; 916 my $class = shift;
757 917
758 my $self; 918 my $self;
759 919
760 my $slider = new CFClient::UI::Slider 920 my $slider = new CFClient::UI::Slider
761 vertical => 1, 921 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix 922 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub { 923 on_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 924 $self->{vp}->set_offset (0, $_[1]);
765 }, 925 },
766 ; 926 ;
767 927
768 $self = $class->SUPER::new ( 928 $self = $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 929 vp => (new CFClient::UI::ViewPort expand => 1),
770 slider => $slider, 930 slider => $slider,
771 @_, 931 @_,
772 ); 932 );
773 933
774 $self->{vp}->add ($self->{scrolled}); 934 $self->{vp}->add ($self->{scrolled});
… …
776 $self->add ($self->{slider}); 936 $self->add ($self->{slider});
777 937
778 $self 938 $self
779} 939}
780 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
781#TODO# update range on size_allocate depeneing on child 960#TODO# update range on size_allocate depending on child
782# update viewport offset on scroll 961# update viewport offset on scroll
783 962
784############################################################################# 963#############################################################################
785 964
786package CFClient::UI::Frame; 965package CFClient::UI::Frame;
… …
790use CFClient::OpenGL; 969use CFClient::OpenGL;
791 970
792sub new { 971sub new {
793 my $class = shift; 972 my $class = shift;
794 973
795 my $self = $class->SUPER::new ( 974 $class->SUPER::new (
796 bg => [1, 1, 1, 1], 975 bg => undef,
797 border_bg => [1, 1, 1, 1],
798 border => 0.8,
799 @_ 976 @_,
800 ); 977 )
801
802 $self
803} 978}
804 979
805sub _draw { 980sub _draw {
806 my ($self) = @_; 981 my ($self) = @_;
807 982
808 my ($w, $h) = ($self->{w}, $self->{h}); 983 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)};
809 985
810 glEnable GL_BLEND; 986 glEnable GL_BLEND;
811 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
812 glEnable GL_TEXTURE_2D; 988 glColor @{ $self->{bg} };
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 989
815# glBegin GL_QUADS; 990 glBegin GL_QUADS;
816# glColor 0, 0, 0, 0;
817# glVertex 0 , 0; 991 glVertex 0 , 0;
818# glVertex 0 , $h; 992 glVertex 0 , $h;
819# glVertex $w, $h; 993 glVertex $w, $h;
820# glVertex $w, 0; 994 glVertex $w, 0;
821# glEnd; 995 glEnd;
822 996
823
824 $self->child->draw;
825 glDisable GL_BLEND; 997 glDisable GL_BLEND;
826 glDisable GL_TEXTURE_2D; 998 }
999
1000 $self->SUPER::_draw;
827} 1001}
828 1002
829############################################################################# 1003#############################################################################
830 1004
831package CFClient::UI::FancyFrame; 1005package CFClient::UI::FancyFrame;
… …
839 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);
840 1014
841sub new { 1015sub new {
842 my $class = shift; 1016 my $class = shift;
843 1017
844 # TODO: user_x, user_y, overwrite moveto?
845
846 my $self = $class->SUPER::new ( 1018 my $self = $class->SUPER::new (
847 bg => [1, 1, 1, 1], 1019 bg => [1, 1, 1, 1],
848 border_bg => [1, 1, 1, 1], 1020 border_bg => [1, 1, 1, 1],
849 border => 0.6, 1021 border => 0.6,
1022 is_toplevel => 1,
850 can_events => 1, 1023 can_events => 1,
851 @_ 1024 @_
852 ); 1025 );
853 1026
854 $self->{title} &&= new CFClient::UI::Label 1027 $self->{title} &&= new CFClient::UI::Label
855 align => 0, 1028 align => 0,
… …
874 $h + $self->border * 2, 1047 $h + $self->border * 2,
875 ) 1048 )
876} 1049}
877 1050
878sub size_allocate { 1051sub size_allocate {
879 my ($self, $w, $h) = @_; 1052 my ($self, $w, $h, $changed) = @_;
1053
1054 return unless $changed;
880 1055
881 $h -= List::Util::max 0, $self->border * 2; 1056 $h -= List::Util::max 0, $self->border * 2;
882 $w -= List::Util::max 0, $self->border * 2; 1057 $w -= List::Util::max 0, $self->border * 2;
883 1058
884 $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)
885 if $self->{title}; 1060 if $self->{title};
886 1061
887 $self->child->configure ($self->border, $self->border, $w, $h); 1062 $self->child->configure ($self->border, $self->border, $w, $h);
888} 1063}
889 1064
… …
908 my ($ev, $x, $y) = @_; 1083 my ($ev, $x, $y) = @_;
909 1084
910 my $dx = $ev->{x} - $ox; 1085 my $dx = $ev->{x} - $ox;
911 my $dy = $ev->{y} - $oy; 1086 my $dy = $ev->{y} - $oy;
912 1087
1088 $self->{user_x} = $wx + $dx * $mx;
1089 $self->{user_y} = $wy + $dy * $my;
913 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1090 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
914 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1091 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
915 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1092 $self->move ($self->{user_x}, $self->{user_y});
916 $self->check_size; 1093 $self->realloc;
917 }; 1094 };
918 1095
919 } elsif ($lr ^ $td) { 1096 } elsif ($lr ^ $td) {
920 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1097 my ($ox, $oy) = ($ev->{x}, $ev->{y});
921 my ($bx, $by) = ($self->{x}, $self->{y}); 1098 my ($bx, $by) = ($self->{x}, $self->{y});
… …
923 $self->{motion} = sub { 1100 $self->{motion} = sub {
924 my ($ev, $x, $y) = @_; 1101 my ($ev, $x, $y) = @_;
925 1102
926 ($x, $y) = ($ev->{x}, $ev->{y}); 1103 ($x, $y) = ($ev->{x}, $ev->{y});
927 1104
928 $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});
929 $self->update; 1109 $self->realloc;
930 }; 1110 };
931 } 1111 }
932} 1112}
933 1113
934sub button_up { 1114sub button_up {
… …
947 my ($self) = @_; 1127 my ($self) = @_;
948 1128
949 my ($w, $h ) = ($self->{w}, $self->{h}); 1129 my ($w, $h ) = ($self->{w}, $self->{h});
950 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1130 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
951 1131
952 glEnable GL_BLEND;
953 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
954 glEnable GL_TEXTURE_2D; 1132 glEnable GL_TEXTURE_2D;
955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1133 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
956 1134
957 my $border = $self->border; 1135 my $border = $self->border;
958 1136
959 glColor @{ $self->{border_bg} }; 1137 glColor @{ $self->{border_bg} };
960 $tex[1]->draw_quad (0, 0, $w, $border); 1138 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
961 $tex[3]->draw_quad (0, $border, $border, $ch); 1139 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
962 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1140 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
963 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1141 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
964 1142
965 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1143 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
966 my $bg = $tex[0]; 1144 my $bg = $tex[0];
967 1145
968 # TODO: repeat texture not scale 1146 # TODO: repeat texture not scale
… …
972 glColor @{ $self->{bg} }; 1150 glColor @{ $self->{bg} };
973 1151
974 $bg->{s} = $rep_x; 1152 $bg->{s} = $rep_x;
975 $bg->{t} = $rep_y; 1153 $bg->{t} = $rep_y;
976 $bg->{wrap_mode} = 1; 1154 $bg->{wrap_mode} = 1;
977 $bg->draw_quad ($border, $border, $cw, $ch); 1155 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1156 }
978 1157
979 glDisable GL_TEXTURE_2D; 1158 glDisable GL_TEXTURE_2D;
980 glDisable GL_BLEND;
981 }
982 1159
983 $self->{title}->draw if $self->{title}; 1160 $self->{title}->draw if $self->{title};
984 1161
985 $self->child->draw; 1162 $self->child->draw;
986} 1163}
… …
998sub new { 1175sub new {
999 my $class = shift; 1176 my $class = shift;
1000 1177
1001 $class->SUPER::new ( 1178 $class->SUPER::new (
1002 col_expand => [], 1179 col_expand => [],
1003 @_ 1180 @_,
1004 ) 1181 )
1182}
1183
1184sub children {
1185 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1005} 1186}
1006 1187
1007sub add { 1188sub add {
1008 my ($self, $x, $y, $child) = @_; 1189 my ($self, $x, $y, $child) = @_;
1009 1190
1010 $child->set_parent ($self); 1191 $child->set_parent ($self);
1011 $self->{children}[$y][$x] = $child; 1192 $self->{children}[$y][$x] = $child;
1012 1193
1013 $child->check_size; 1194 $self->realloc;
1014} 1195}
1015 1196
1016sub children {
1017 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018}
1019
1020# 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?
1021sub clear { 1198sub clear {
1022 my ($self) = @_; 1199 my ($self) = @_;
1023 1200
1024 my @children = $self->children; 1201 my @children = $self->children;
1025 delete $self->{children}; 1202 delete $self->{children};
… …
1027 for (@children) { 1204 for (@children) {
1028 delete $_->{parent}; 1205 delete $_->{parent};
1029 $_->hide; 1206 $_->hide;
1030 } 1207 }
1031 1208
1032 $self->update; 1209 $self->realloc;
1033} 1210}
1034 1211
1035sub get_wh { 1212sub get_wh {
1036 my ($self) = @_; 1213 my ($self) = @_;
1037 1214
… …
1064 (sum @$hs), 1241 (sum @$hs),
1065 ) 1242 )
1066} 1243}
1067 1244
1068sub size_allocate { 1245sub size_allocate {
1069 my ($self, $w, $h) = @_; 1246 my ($self, $w, $h, $changed) = @_;
1070 1247
1071 my ($ws, $hs) = $self->get_wh; 1248 my ($ws, $hs) = $self->get_wh;
1072 1249
1073 my $req_w = sum @$ws; 1250 my $req_w = (sum @$ws) || 1;
1074 my $req_h = sum @$hs; 1251 my $req_h = (sum @$hs) || 1;
1075 1252
1076 # TODO: nicer code && do row_expand 1253 # TODO: nicer code && do row_expand
1077 my @col_expand = @{$self->{col_expand}}; 1254 my @col_expand = @{$self->{col_expand}};
1078 @col_expand = (1) x @$ws unless @col_expand; 1255 @col_expand = (1) x @$ws unless @col_expand;
1079 my $col_expand = (sum @col_expand) || 1; 1256 my $col_expand = (sum @col_expand) || 1;
… …
1133 } 1310 }
1134} 1311}
1135 1312
1136############################################################################# 1313#############################################################################
1137 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
1138package CFClient::UI::HBox; 1375package CFClient::UI::HBox;
1139 1376
1140# TODO: wrap into common Box base class
1141
1142our @ISA = CFClient::UI::Container::; 1377our @ISA = CFClient::UI::Box::;
1143 1378
1144sub size_request { 1379sub new {
1145 my ($self) = @_; 1380 my $class = shift;
1146 1381
1147 my @alloc = map [$_->size_request], @{$self->{children}}; 1382 $class->SUPER::new (
1148 1383 vertical => 0,
1149 ( 1384 @_,
1150 (List::Util::sum map $_->[0], @alloc),
1151 (List::Util::max map $_->[1], @alloc),
1152 ) 1385 )
1153} 1386}
1154 1387
1155sub size_allocate {
1156 my ($self, $w, $h) = @_;
1157
1158 ($h, $w) = ($w, $h);
1159
1160 my $children = $self->{children};
1161
1162 my @h = map $_->{req_w}, @$children;
1163
1164 my $req_h = List::Util::sum @h;
1165
1166 if ($req_h > $h) {
1167 # ah well, not enough space
1168 $_ *= $h / $req_h for @h;
1169 } else {
1170 my $exp = List::Util::sum map $_->{expand}, @$children;
1171 $exp ||= 1;
1172
1173 for (0 .. $#$children) {
1174 my $child = $children->[$_];
1175
1176 my $alloc_h = $h[$_];
1177 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1178 $h[$_] = $alloc_h;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure ($y, 0, $h, $w);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1388#############################################################################
1197 1389
1198package CFClient::UI::VBox; 1390package CFClient::UI::VBox;
1199 1391
1200# TODO: wrap into common Box base class
1201
1202our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Box::;
1203 1393
1204sub size_request { 1394sub new {
1205 my ($self) = @_; 1395 my $class = shift;
1206 1396
1207 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $class->SUPER::new (
1208 1398 vertical => 1,
1209 ( 1399 @_,
1210 (List::Util::max map $_->[0], @alloc),
1211 (List::Util::sum map $_->[1], @alloc),
1212 ) 1400 )
1213} 1401}
1214 1402
1215sub size_allocate {
1216 my ($self, $w, $h) = @_;
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
1419 #text => initial text
1420 #markup => initial narkup
1421 #max_w => maximum pixel width
1422 ellipsise => 3, # end
1423 layout => (new CFClient::Layout),
1266 fontsize => 1, 1424 fontsize => 1,
1267 text => "",
1268 align => -1, 1425 align => -1,
1269 valign => -1, 1426 valign => -1,
1270 padding => 2, 1427 padding => 2,
1271 layout => new CFClient::Layout,
1272 can_events => 0, 1428 can_events => 0,
1273 %arg 1429 %arg
1274 ); 1430 );
1275 1431
1276 if (exists $self->{template}) { 1432 if (exists $self->{template}) {
1277 my $layout = new CFClient::Layout; 1433 my $layout = new CFClient::Layout;
1278 $layout->set_text (delete $self->{template}); 1434 $layout->set_text (delete $self->{template});
1279 $self->{template} = $layout; 1435 $self->{template} = $layout;
1280 } 1436 }
1281 1437
1282 $self->set_text (delete $self->{text}) if exists $self->{text}; 1438 if (exists $self->{markup}) {
1283 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1439 $self->set_markup (delete $self->{markup});
1440 } else {
1441 $self->set_text (delete $self->{text});
1442 }
1284 1443
1285 $self 1444 $self
1286} 1445}
1287 1446
1288sub escape { 1447sub escape($) {
1289 local $_ = $_[1]; 1448 local $_ = $_[0];
1290 1449
1291 s/&/&amp;/g; 1450 s/&/&amp;/g;
1292 s/>/&gt;/g; 1451 s/>/&gt;/g;
1293 s/</&lt;/g; 1452 s/</&lt;/g;
1294 1453
1295 $_[1] 1454 $_
1296} 1455}
1297 1456
1298sub update { 1457sub update {
1299 my ($self) = @_; 1458 my ($self) = @_;
1300 1459
… …
1306 my ($self, $text) = @_; 1465 my ($self, $text) = @_;
1307 1466
1308 return if $self->{text} eq "T$text"; 1467 return if $self->{text} eq "T$text";
1309 $self->{text} = "T$text"; 1468 $self->{text} = "T$text";
1310 1469
1470 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1311 $self->{layout}->set_text ($text); 1471 $self->{layout}->set_text ($text);
1312 1472
1313 $self->update; 1473 $self->realloc;
1314 $self->check_size;
1315} 1474}
1316 1475
1317sub set_markup { 1476sub set_markup {
1318 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1319 1478
1320 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1321 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1322 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1323 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1324 1486
1325 $self->update; 1487 $self->realloc;
1326 $self->check_size;
1327} 1488}
1328 1489
1329sub size_request { 1490sub size_request {
1330 my ($self) = @_; 1491 my ($self) = @_;
1331 1492
1332 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1493 $self->{layout}->set_font ($self->{font}) if $self->{font};
1333 $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});
1334 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1335 1498
1336 my ($w, $h) = $self->{layout}->size; 1499 my ($w, $h) = $self->{layout}->size;
1337 1500
1338 if (exists $self->{template}) { 1501 if (exists $self->{template}) {
… …
1350 $h + $self->{padding} * 2, 1513 $h + $self->{padding} * 2,
1351 ) 1514 )
1352} 1515}
1353 1516
1354sub size_allocate { 1517sub size_allocate {
1355 my ($self, $w, $h) = @_; 1518 my ($self, $w, $h, $changed) = @_;
1356 1519
1357 delete $self->{texture}; 1520 delete $self->{texture}
1521 if $changed;
1358} 1522}
1359 1523
1360sub set_fontsize { 1524sub set_fontsize {
1361 my ($self, $fontsize) = @_; 1525 my ($self, $fontsize) = @_;
1362 1526
1363 $self->{fontsize} = $fontsize; 1527 $self->{fontsize} = $fontsize;
1364 delete $self->{texture}; 1528 delete $self->{texture};
1365 1529
1366 $self->update; 1530 $self->realloc;
1367 $self->check_size;
1368} 1531}
1369 1532
1370sub _draw { 1533sub _draw {
1371 my ($self) = @_; 1534 my ($self) = @_;
1372 1535
1536 $self->SUPER::_draw; # draw background, if applicable
1537
1373 my $tex = $self->{texture} ||= do { 1538 my $tex = $self->{texture} ||= do {
1539 $self->{layout}->set_foreground (@{$self->{fg}});
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1540 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $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});
1376 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545
1377 new_from_layout CFClient::Texture $self->{layout} 1546 my $tex = new_from_layout CFClient::Texture $self->{layout};
1547
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1550 : ($self->{w} - $tex->{w}) * 0.5);
1551
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1554 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1378 }; 1557 };
1379 1558
1380 glEnable GL_BLEND;
1381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1382 glEnable GL_TEXTURE_2D; 1559 glEnable GL_TEXTURE_2D;
1383 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1384 1561
1562 if ($tex->{format} == GL_ALPHA) {
1385 glColor @{$self->{fg}}; 1563 glColor @{$self->{fg}};
1386
1387 $self->{ox} = int (
1388 $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5
1391 );
1392
1393 $self->{oy} = int (
1394 $self->{valign} < 0 ? $self->{padding}
1395 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1396 : ($self->{h} - $tex->{h}) * 0.5
1397 );
1398
1399 $tex->draw_quad ($self->{ox}, $self->{oy}); 1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1565 } else {
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1567 }
1400 1568
1401 glDisable GL_TEXTURE_2D; 1569 glDisable GL_TEXTURE_2D;
1402 glDisable GL_BLEND;
1403} 1570}
1404 1571
1405############################################################################# 1572#############################################################################
1406 1573
1407package CFClient::UI::EntryBase; 1574package CFClient::UI::EntryBase;
… …
1420 active_fg => [0, 0, 0], 1587 active_fg => [0, 0, 0],
1421 can_hover => 1, 1588 can_hover => 1,
1422 can_focus => 1, 1589 can_focus => 1,
1423 valign => 0, 1590 valign => 0,
1424 can_events => 1, 1591 can_events => 1,
1592 #text => ...
1425 @_ 1593 @_
1426 ) 1594 )
1427} 1595}
1428 1596
1429sub _set_text { 1597sub _set_text {
… …
1439 $self->{text} = $text; 1607 $self->{text} = $text;
1440 1608
1441 $text =~ s/./*/g if $self->{hidden}; 1609 $text =~ s/./*/g if $self->{hidden};
1442 $self->{layout}->set_text ("$text "); 1610 $self->{layout}->set_text ("$text ");
1443 1611
1444 $self->emit (changed => $self->{text}); 1612 $self->_emit (changed => $self->{text});
1613}
1614
1615sub set_text {
1616 my ($self, $text) = @_;
1617
1618 $self->{cursor} = length $text;
1619 $self->_set_text ($text);
1620
1621 $self->realloc;
1445} 1622}
1446 1623
1447sub get_text { 1624sub get_text {
1448 $_[0]{text} 1625 $_[0]{text}
1449} 1626}
… …
1452 my ($self) = @_; 1629 my ($self) = @_;
1453 1630
1454 my ($w, $h) = $self->SUPER::size_request; 1631 my ($w, $h) = $self->SUPER::size_request;
1455 1632
1456 ($w + 1, $h) # add 1 for cursor 1633 ($w + 1, $h) # add 1 for cursor
1457}
1458
1459sub size_allocate {
1460 my ($self, $w, $h) = @_;
1461
1462 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1463}
1464
1465sub set_text {
1466 my ($self, $text) = @_;
1467
1468 $self->{cursor} = length $text;
1469 $self->_set_text ($text);
1470 $self->update;
1471} 1634}
1472 1635
1473sub key_down { 1636sub key_down {
1474 my ($self, $ev) = @_; 1637 my ($self, $ev) = @_;
1475 1638
… …
1477 my $sym = $ev->{sym}; 1640 my $sym = $ev->{sym};
1478 my $uni = $ev->{unicode}; 1641 my $uni = $ev->{unicode};
1479 1642
1480 my $text = $self->get_text; 1643 my $text = $self->get_text;
1481 1644
1482 if ($sym == 8) { 1645 if ($uni == 8) {
1483 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1646 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1484 } elsif ($sym == 127) { 1647 } elsif ($uni == 127) {
1485 substr $text, $self->{cursor}, 1, ""; 1648 substr $text, $self->{cursor}, 1, "";
1486 } elsif ($sym == CFClient::SDLK_LEFT) { 1649 } elsif ($sym == CFClient::SDLK_LEFT) {
1487 --$self->{cursor} if $self->{cursor}; 1650 --$self->{cursor} if $self->{cursor};
1488 } elsif ($sym == CFClient::SDLK_RIGHT) { 1651 } elsif ($sym == CFClient::SDLK_RIGHT) {
1489 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1652 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1490 } elsif ($sym == CFClient::SDLK_HOME) { 1653 } elsif ($sym == CFClient::SDLK_HOME) {
1491 $self->{cursor} = 0; 1654 $self->{cursor} = 0;
1492 } elsif ($sym == CFClient::SDLK_END) { 1655 } elsif ($sym == CFClient::SDLK_END) {
1493 $self->{cursor} = length $text; 1656 $self->{cursor} = length $text;
1494 } elsif ($sym == 27) { 1657 } elsif ($uni == 27) {
1495 $self->emit ('escape'); 1658 $self->_emit ('escape');
1496 } elsif ($uni) { 1659 } elsif ($uni) {
1497 substr $text, $self->{cursor}++, 0, chr $uni; 1660 substr $text, $self->{cursor}++, 0, chr $uni;
1498 } 1661 }
1499 1662
1500 $self->_set_text ($text); 1663 $self->_set_text ($text);
1501 $self->update; 1664
1665 $self->realloc;
1502} 1666}
1503 1667
1504sub focus_in { 1668sub focus_in {
1505 my ($self) = @_; 1669 my ($self) = @_;
1506 1670
… …
1586 if ($sym == 13) { 1750 if ($sym == 13) {
1587 unshift @{$self->{history}}, 1751 unshift @{$self->{history}},
1588 my $txt = $self->get_text; 1752 my $txt = $self->get_text;
1589 $self->{history_pointer} = -1; 1753 $self->{history_pointer} = -1;
1590 $self->{history_saveback} = ''; 1754 $self->{history_saveback} = '';
1591 $self->emit (activate => $txt); 1755 $self->_emit (activate => $txt);
1592 $self->update; 1756 $self->update;
1593 1757
1594 } elsif ($sym == CFClient::SDLK_UP) { 1758 } elsif ($sym == CFClient::SDLK_UP) {
1595 if ($self->{history_pointer} < 0) { 1759 if ($self->{history_pointer} < 0) {
1596 $self->{history_saveback} = $self->get_text; 1760 $self->{history_saveback} = $self->get_text;
… …
1635 my $class = shift; 1799 my $class = shift;
1636 1800
1637 $class->SUPER::new ( 1801 $class->SUPER::new (
1638 padding => 4, 1802 padding => 4,
1639 fg => [1, 1, 1], 1803 fg => [1, 1, 1],
1640 bg => [1, 1, 1, 0.2],
1641 active_fg => [0, 0, 1], 1804 active_fg => [0, 0, 1],
1642 can_hover => 1, 1805 can_hover => 1,
1643 align => 0, 1806 align => 0,
1644 valign => 0, 1807 valign => 0,
1645 can_events => 1, 1808 can_events => 1,
1646 @_ 1809 @_
1647 ) 1810 )
1648} 1811}
1649 1812
1813sub activate { }
1814
1650sub button_up { 1815sub button_up {
1651 my ($self, $ev, $x, $y) = @_; 1816 my ($self, $ev, $x, $y) = @_;
1652 1817
1818 $self->emit ("activate")
1653 if ($x >= 0 && $x < $self->{w} 1819 if $x >= 0 && $x < $self->{w}
1654 && $y >= 0 && $y < $self->{h}) { 1820 && $y >= 0 && $y < $self->{h};
1655 $self->emit ("activate");
1656 }
1657} 1821}
1658 1822
1659sub _draw { 1823sub _draw {
1660 my ($self) = @_; 1824 my ($self) = @_;
1661 1825
… …
1663 1827
1664 if ($GRAB == $self) { 1828 if ($GRAB == $self) {
1665 $self->{fg} = $self->{active_fg}; 1829 $self->{fg} = $self->{active_fg};
1666 } 1830 }
1667 1831
1668 glEnable GL_BLEND;
1669 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1670 glEnable GL_TEXTURE_2D; 1832 glEnable GL_TEXTURE_2D;
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1672 glColor 0, 0, 0, 1; 1834 glColor 0, 0, 0, 1;
1673 1835
1674 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1836 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1675 1837
1676 glDisable GL_TEXTURE_2D; 1838 glDisable GL_TEXTURE_2D;
1677 glDisable GL_BLEND;
1678 1839
1679 $self->SUPER::_draw; 1840 $self->SUPER::_draw;
1680} 1841}
1681 1842
1682############################################################################# 1843#############################################################################
… …
1696 1857
1697 $class->SUPER::new ( 1858 $class->SUPER::new (
1698 padding => 2, 1859 padding => 2,
1699 fg => [1, 1, 1], 1860 fg => [1, 1, 1],
1700 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],
1701 state => 0, 1864 state => 0,
1702 can_hover => 1, 1865 can_hover => 1,
1703 @_ 1866 @_
1704 ) 1867 )
1705} 1868}
… …
1714 my ($self, $ev, $x, $y) = @_; 1877 my ($self, $ev, $x, $y) = @_;
1715 1878
1716 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1717 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1718 $self->{state} = !$self->{state}; 1881 $self->{state} = !$self->{state};
1719 $self->emit (changed => $self->{state}); 1882 $self->_emit (changed => $self->{state});
1720 } 1883 }
1721} 1884}
1722 1885
1723sub _draw { 1886sub _draw {
1724 my ($self) = @_; 1887 my ($self) = @_;
… …
1729 1892
1730 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;
1731 1894
1732 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1733 1896
1734 glEnable GL_BLEND; 1897 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898
1735 glEnable GL_TEXTURE_2D; 1899 glEnable GL_TEXTURE_2D;
1736 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1737
1738 my $tex = $self->{state} ? $tex[1] : $tex[0];
1739
1740 $tex->draw_quad (0, 0, $s, $s); 1900 $tex->draw_quad_alpha (0, 0, $s, $s);
1741
1742 glDisable GL_TEXTURE_2D; 1901 glDisable GL_TEXTURE_2D;
1743 glDisable GL_BLEND;
1744} 1902}
1745 1903
1746############################################################################# 1904#############################################################################
1747 1905
1748package CFClient::UI::Image; 1906package CFClient::UI::Image;
… …
1791 glTranslate 0, -$self->{w}, 0; 1949 glTranslate 0, -$self->{w}, 0;
1792 1950
1793 ($w, $h) = ($h, $w); 1951 ($w, $h) = ($h, $w);
1794 } 1952 }
1795 1953
1796 glEnable GL_BLEND;
1797 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1798 glEnable GL_TEXTURE_2D; 1954 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1955 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 1956
1801 $tex->draw_quad (0, 0, $w, $h); 1957 $tex->draw_quad_alpha (0, 0, $w, $h);
1802 1958
1803 glDisable GL_BLEND;
1804 glDisable GL_TEXTURE_2D; 1959 glDisable GL_TEXTURE_2D;
1805} 1960}
1806 1961
1807############################################################################# 1962#############################################################################
1808 1963
… …
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_BLEND;
2106 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2107 glEnable GL_TEXTURE_2D; 2290 glEnable GL_TEXTURE_2D;
2108 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2291 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2109 2292
2110 # draw background 2293 # draw background
2111 $tex[1]->draw_quad (0, 0, $w, $h); 2294 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2112 2295
2113 # draw handle 2296 # draw handle
2114 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2297 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2115 2298
2116 glDisable GL_BLEND;
2117 glDisable GL_TEXTURE_2D; 2299 glDisable GL_TEXTURE_2D;
2118} 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 (@_) }
2119 2342
2120############################################################################# 2343#############################################################################
2121 2344
2122package CFClient::UI::TextView; 2345package CFClient::UI::TextView;
2123 2346
… …
2132 fontsize => 1, 2355 fontsize => 1,
2133 can_events => 0, 2356 can_events => 0,
2134 #font => default_font 2357 #font => default_font
2135 @_, 2358 @_,
2136 2359
2137 layout => (new CFClient::Layout), 2360 layout => (new CFClient::Layout 1),
2138 par => [], 2361 par => [],
2139 height => 0, 2362 height => 0,
2140 children => [ 2363 children => [
2141 (new CFClient::UI::Empty expand => 1), 2364 (new CFClient::UI::Empty expand => 1),
2142 (new CFClient::UI::Slider vertical => 1), 2365 (new CFClient::UI::Slider vertical => 1),
… …
2153 2376
2154 $self->{fontsize} = $fontsize; 2377 $self->{fontsize} = $fontsize;
2155 $self->reflow; 2378 $self->reflow;
2156} 2379}
2157 2380
2158sub text_height {
2159 my ($self, $text) = @_;
2160
2161 my $layout = $self->{layout};
2162
2163 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2164 $layout->set_width ($self->{children}[0]{w});
2165 $layout->set_text ($text);
2166
2167 ($layout->size)[1]
2168}
2169
2170sub reflow {
2171 my ($self) = @_;
2172
2173 $self->{need_reflow}++;
2174 $self->update;
2175}
2176
2177sub size_allocate { 2381sub size_allocate {
2178 my ($self, $w, $h) = @_; 2382 my ($self, $w, $h, $changed) = @_;
2179 2383
2180 $self->SUPER::size_allocate ($w, $h); 2384 $self->SUPER::size_allocate ($w, $h, $changed);
2385
2386 return unless $changed;
2181 2387
2182 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2388 $self->{layout}->set_font ($self->{font}) if $self->{font};
2183 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2389 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2184 $self->{layout}->set_width ($self->{children}[0]{w}); 2390 $self->{layout}->set_width ($self->{children}[0]{w});
2185 2391
2186 $self->reflow; 2392 $self->reflow;
2187} 2393}
2188 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
2189sub add_paragraph { 2429sub add_paragraph {
2190 my ($self, $color, $text) = @_; 2430 my ($self, $color, $text, $indent) = @_;
2191 2431
2192 #TODO: intelligently "reformat" paragraph 2432 for my $line (split /\n/, $text) {
2193 2433 my ($w, $h) = $self->text_size ($line);
2194 my $height = $self->text_height ($text);
2195
2196 $self->{height} += $height; 2434 $self->{height} += $h;
2435 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2436 }
2197 2437
2198 push @{$self->{par}}, [$height, $color, $text];
2199
2200 $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]);
2201 $self->{children}[1]->update;
2202} 2439}
2203 2440
2204sub update { 2441sub update {
2205 my ($self) = @_; 2442 my ($self) = @_;
2206 2443
… …
2208 2445
2209 return unless $self->{h} > 0; 2446 return unless $self->{h} > 0;
2210 2447
2211 delete $self->{texture}; 2448 delete $self->{texture};
2212 2449
2213 $ROOT->on_refresh ($self, sub { 2450 $ROOT->on_post_alloc ($self, sub {
2451 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2452
2214 if (delete $self->{need_reflow}) { 2453 if (delete $self->{need_reflow}) {
2215 my $height = 0; 2454 my $height = 0;
2216 2455
2217 $height += $_->[0] = $self->text_height ($_->[2]) 2456 my $layout = $self->{layout};
2457
2458 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2459
2218 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 }
2219 2471
2220 $self->{height} = $height; 2472 $self->{height} = $height;
2221 2473
2222 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2474 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2223 2475
2224 delete $self->{texture}; 2476 delete $self->{texture};
2225 } 2477 }
2226 2478
2227 $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 {
2228 glClearColor 0, 0, 0, 0; 2480 glClearColor 0.5, 0.5, 0.5, 0;
2229 glClear GL_COLOR_BUFFER_BIT; 2481 glClear GL_COLOR_BUFFER_BIT;
2230 2482
2483 my $top = int $self->{children}[1]{range}[0];
2484
2485 my $y0 = $top;
2486 my $y1 = $top + $H;
2487
2488 my $y = 0;
2489
2490 my $layout = $self->{layout};
2491
2492 $layout->set_font ($self->{font}) if $self->{font};
2493
2231 glEnable GL_BLEND; 2494 glEnable GL_BLEND;
2495 #TODO# not correct in windows where rgba is forced off
2232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2496 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2233 glEnable GL_TEXTURE_2D;
2234 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236 my $top = int $self->{children}[1]{range}[0];
2237
2238 my $y0 = $top;
2239 my $y1 = $top + $self->{h};
2240
2241 my $y = 0;
2242
2243 my $layout = $self->{layout};
2244
2245 $layout->set_font ($self->{font}) if $self->{font};
2246 2497
2247 for my $par (@{$self->{par}}) { 2498 for my $par (@{$self->{par}}) {
2248 my $h = $par->[0]; 2499 my $h = $par->[1];
2249 2500
2250 if ($y0 < $y + $h && $y < $y1) { 2501 if ($y0 < $y + $h && $y < $y1) {
2502 $layout->set_foreground (@{ $par->[2] });
2503 $layout->set_width ($W - $par->[3]);
2251 $layout->set_text ($par->[2]); 2504 $layout->set_markup ($par->[4]);
2252 2505
2253 glColor @{ $par->[1] }; 2506 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2254 my ($W, $H) = $layout->size; 2507
2255 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2508 glRasterPos $par->[3], $y - $y0;
2509 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2256 } 2510 }
2257 2511
2258 $y += $h; 2512 $y += $h;
2259 } 2513 }
2260 2514
2261 glDisable GL_TEXTURE_2D;
2262 glDisable GL_BLEND; 2515 glDisable GL_BLEND;
2263 }; 2516 };
2264 }); 2517 });
2265} 2518}
2266 2519
2267sub _draw { 2520sub _draw {
2268 my ($self) = @_; 2521 my ($self) = @_;
2269 2522
2270 glEnable GL_BLEND;
2271 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2272 glEnable GL_TEXTURE_2D; 2523 glEnable GL_TEXTURE_2D;
2273 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2274 glColor 1, 1, 1, 1; 2525 glColor 1, 1, 1, 1;
2275 $self->{texture}->draw_quad (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});
2276 glDisable GL_TEXTURE_2D; 2527 glDisable GL_TEXTURE_2D;
2277 glDisable GL_BLEND;
2278 2528
2279 $self->{children}[1]->draw; 2529 $self->{children}[1]->draw;
2280 2530
2281} 2531}
2282 2532
… …
2330 2580
2331sub new { 2581sub new {
2332 my $class = shift; 2582 my $class = shift;
2333 2583
2334 my $self = $class->SUPER::new ( 2584 my $self = $class->SUPER::new (
2335 state => 0, 2585 state => 0,
2336 connect_activate => \&toggle_flopper, 2586 on_activate => \&toggle_flopper,
2337 @_ 2587 @_
2338 ); 2588 );
2339 2589
2340 if ($self->{state}) {
2341 $self->{state} = 0;
2342 $self->toggle_flopper;
2343 }
2344
2345 $self 2590 $self
2346} 2591}
2347 2592
2348sub toggle_flopper { 2593sub toggle_flopper {
2349 my ($self) = @_; 2594 my ($self) = @_;
2350 2595
2351 # TODO: use animation 2596 $self->{other}->toggle_visibility;
2352 if ($self->{state} = !$self->{state}) {
2353 $CFClient::UI::ROOT->add ($self->{other});
2354 $self->{other}->move ($self->coord2global (0, $self->{h}));
2355 $self->emit ("open");
2356 } else {
2357 $CFClient::UI::ROOT->remove ($self->{other});
2358 $self->emit ("close");
2359 }
2360
2361 $self->emit (changed => $self->{state});
2362} 2597}
2363 2598
2364############################################################################# 2599#############################################################################
2365 2600
2366package CFClient::UI::Tooltip; 2601package CFClient::UI::Tooltip;
… …
2376 @_, 2611 @_,
2377 can_events => 0, 2612 can_events => 0,
2378 ) 2613 )
2379} 2614}
2380 2615
2381sub set_markup { 2616sub set_tooltip_from {
2382 my ($self, $text) = @_; 2617 my ($self, $widget) = @_;
2383 2618
2384 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2619 $self->add (new CFClient::UI::Label
2385 $self->{label}->set_markup ($text); 2620 markup => $widget->{tooltip},
2386 $self->add ($self->{label}); 2621 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2622 fontsize => 0.8,
2623 fg => [0, 0, 0, 1],
2624 ellipsise => 0,
2625 font => ($widget->{tooltip_font} || $::FONT_PROP),
2626 );
2387} 2627}
2388 2628
2389sub size_request { 2629sub size_request {
2390 my ($self) = @_; 2630 my ($self) = @_;
2391 2631
2392 $self->child->set_max_size ($::WIDTH * 0.3);
2393
2394 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2632 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2395 2633
2396 ($w + 4, $h + 4) 2634 ($w + 4, $h + 4)
2397} 2635}
2398 2636
2399sub size_allocate { 2637sub size_allocate {
2400 my ($self, $w, $h) = @_; 2638 my ($self, $w, $h, $changed) = @_;
2401 2639
2640 return unless $changed;
2641
2402 $self->SUPER::size_allocate ($w - 4, $h - 4); 2642 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2403} 2643}
2404 2644
2405sub _draw { 2645sub _draw {
2406 my ($self) = @_; 2646 my ($self) = @_;
2407 2647
2408 glPushMatrix;
2409 glTranslate 0.375, 0.375; 2648 glTranslate 0.375, 0.375;
2410 2649
2411 my ($w, $h) = @$self{qw(w h)}; 2650 my ($w, $h) = @$self{qw(w h)};
2412 2651
2413 glColor 1, 0.8, 0.4; 2652 glColor 1, 0.8, 0.4;
… …
2424 glVertex 0 , $h; 2663 glVertex 0 , $h;
2425 glVertex $w, $h; 2664 glVertex $w, $h;
2426 glVertex $w, 0; 2665 glVertex $w, 0;
2427 glEnd; 2666 glEnd;
2428 2667
2429 glPopMatrix; 2668 glTranslate 2 - 0.375, 2 - 0.375;
2430
2431 glTranslate 2, 2;
2432 $self->SUPER::_draw; 2669 $self->SUPER::_draw;
2433} 2670}
2434 2671
2435############################################################################# 2672#############################################################################
2436 2673
… …
2441use CFClient::OpenGL; 2678use CFClient::OpenGL;
2442 2679
2443sub new { 2680sub new {
2444 my $class = shift; 2681 my $class = shift;
2445 2682
2446 $class->SUPER::new ( 2683 my $self = $class->SUPER::new (
2447 aspect => 1, 2684 aspect => 1,
2685 can_events => 0,
2448 @_, 2686 @_,
2449 ) 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
2450} 2704}
2451 2705
2452sub size_request { 2706sub size_request {
2453 (32, 8) 2707 (32, 8)
2454} 2708}
2455 2709
2710sub update {
2711 my ($self) = @_;
2712
2713 return unless $self->{visible};
2714
2715 $self->SUPER::update;
2716}
2717
2456sub _draw { 2718sub _draw {
2457 my ($self) = @_; 2719 my ($self) = @_;
2458 2720
2459 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
2460 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2732 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2461 2733
2462 # TODO animation
2463 if ($tex) { 2734 if ($tex) {
2464 glEnable GL_BLEND;
2465 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2466 glEnable GL_TEXTURE_2D; 2735 glEnable GL_TEXTURE_2D;
2467 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2736 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2468 glColor 1, 1, 1, 1; 2737 glColor 1, 1, 1, 1;
2469 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2738 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2470 glDisable GL_TEXTURE_2D; 2739 glDisable GL_TEXTURE_2D;
2471 glDisable GL_BLEND;
2472 } 2740 }
2473} 2741}
2474 2742
2475############################################################################# 2743sub DESTROY {
2744 my ($self) = @_;
2476 2745
2746 $self->{timer}->cancel
2747 if $self->{timer};
2748
2749 $self->SUPER::DESTROY;
2750}
2751
2752#############################################################################
2753
2477package CFClient::UI::InventoryItem; 2754package CFClient::UI::Inventory;
2478 2755
2479our @ISA = CFClient::UI::HBox::; 2756our @ISA = CFClient::UI::ScrolledWindow::;
2480 2757
2481sub new { 2758sub new {
2482 my $class = shift; 2759 my $class = shift;
2483 2760
2484 my %args = @_;
2485
2486 my $item = $args{item};
2487
2488 my $desc = $item->{nrof} < 2
2489 ? $item->{name}
2490 : "$item->{nrof} $item->{name_pl}";
2491
2492
2493 my $self = $class->SUPER::new ( 2761 my $self = $class->SUPER::new (
2494 can_hover => 1, 2762 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2495 can_events => 1,
2496 tooltip => (CFClient::UI::Label->escape ($desc)
2497 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2498 connect_button_down => sub {
2499 my ($self, $ev, $x, $y) = @_;
2500
2501 # todo: maybe put examine on 1? but should just be a tooltip :(
2502 if ($ev->{button} == 1) {
2503 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2504 } elsif ($ev->{button} == 2) {
2505 $::CONN->send ("apply $item->{tag}");
2506 } elsif ($ev->{button} == 3) {
2507 CFClient::UI::Menu->new (
2508 items => [
2509 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2510 [
2511 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2512 sub { $::CONN->send ("lock $item->{tag}") },
2513 ],
2514 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2515 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2516 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2517 ],
2518 )->popup ($ev);
2519 }
2520
2521 1
2522 },
2523 %args
2524 );
2525 $self->add(new CFClient::UI::Face
2526 can_events => 0,
2527 face => $item->{face},
2528 anim => $item->{anim},
2529 animspeed => $item->{animspeed});
2530 $self->add(new CFClient::UI::Label
2531 can_events => 0,
2532 text => $desc);
2533
2534 $self
2535}
2536
2537#############################################################################
2538
2539package CFClient::UI::Inventory;
2540
2541our @ISA = CFClient::UI::ScrolledWindow::;
2542
2543sub new {
2544 my $class = shift;
2545
2546 my $self = $class->SUPER::new (
2547 scrolled => (new CFClient::UI::VBox),
2548 @_, 2763 @_,
2549 ); 2764 );
2550 2765
2551 $self 2766 $self
2552} 2767}
… …
2555 my ($self, $items) = @_; 2770 my ($self, $items) = @_;
2556 2771
2557 $self->{scrolled}->clear; 2772 $self->{scrolled}->clear;
2558 return unless $items; 2773 return unless $items;
2559 2774
2560 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;
2561 2779
2562 $self->{real_items} = \@items; 2780 $self->{real_items} = \@items;
2563 2781
2782 my $row = 0;
2564 for my $item (@items) { 2783 for my $item (@items) {
2565 my $desc = $item->{nrof} < 2 2784 CFClient::Item::update_widgets $item;
2566 ? $item->{name}
2567 : "$item->{nrof} $item->{name_pl}";
2568 2785
2569 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2786 $self->{scrolled}->add (0, $row, $item->{face_widget});
2570 } 2787 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2788 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2571 2789
2572# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2790 $row++;
2573} 2791 }
2574
2575sub size_request {
2576 my ($self) = @_;
2577 ($self->{req_w}, $self->{req_h});
2578} 2792}
2579 2793
2580############################################################################# 2794#############################################################################
2581 2795
2582package CFClient::UI::Menu; 2796package CFClient::UI::Menu;
… …
2617 2831
2618# 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)
2619sub popup { 2833sub popup {
2620 my ($self, $ev) = @_; 2834 my ($self, $ev) = @_;
2621 2835
2622 $self->emit ("popdown"); 2836 $self->_emit ("popdown");
2623 2837
2624 # maybe save $GRAB? must be careful about events... 2838 # maybe save $GRAB? must be careful about events...
2625 $GRAB = $self; 2839 $GRAB = $self;
2626 $self->{button} = $ev->{button}; 2840 $self->{button} = $ev->{button};
2627 2841
… …
2642 2856
2643 if ($ev->{button} == $self->{button}) { 2857 if ($ev->{button} == $self->{button}) {
2644 undef $GRAB; 2858 undef $GRAB;
2645 $self->hide; 2859 $self->hide;
2646 2860
2647 $self->emit ("popdown"); 2861 $self->_emit ("popdown");
2648 $self->{hover}[1]->() if $self->{hover}; 2862 $self->{hover}[1]->() if $self->{hover};
2649 } 2863 }
2650} 2864}
2651 2865
2652############################################################################# 2866#############################################################################
2653 2867
2654package CFClient::UI::Root; 2868package CFClient::UI::Statusbox;
2655 2869
2656our @ISA = CFClient::UI::Container::; 2870our @ISA = CFClient::UI::VBox::;
2657
2658use CFClient::OpenGL;
2659 2871
2660sub new { 2872sub new {
2661 my $class = shift; 2873 my $class = shift;
2662 2874
2663 $class->SUPER::new ( 2875 $class->SUPER::new (
2876 fontsize => 0.8,
2664 @_, 2877 @_,
2665 ) 2878 )
2666} 2879}
2667 2880
2881sub reorder {
2882 my ($self) = @_;
2883 my $NOW = time;
2884
2885 while (my ($k, $v) = each %{ $self->{item} }) {
2886 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2887 }
2888
2889 my @widgets;
2890
2891 my @items = sort {
2892 $a->{pri} <=> $b->{pri}
2893 or $b->{id} <=> $a->{id}
2894 } values %{ $self->{item} };
2895
2896 my $count = 10 + 1;
2897 for my $item (@items) {
2898 last unless --$count;
2899
2900 push @widgets, $item->{label} ||= do {
2901 # TODO: doesn't handle markup well (read as: at all)
2902 my $short = $item->{count} > 1
2903 ? "<b>$item->{count} ×</b> $item->{text}"
2904 : $item->{text};
2905
2906 for ($short) {
2907 s/^\s+//;
2908 s/\s+/ /g;
2909 }
2910
2911 new CFClient::UI::Label
2912 markup => $short,
2913 tooltip => $item->{tooltip},
2914 tooltip_font => $::FONT_PROP,
2915 tooltip_width => 0.67,
2916 fontsize => $item->{fontsize} || $self->{fontsize},
2917 max_w => $::WIDTH * 0.44,
2918 fg => $item->{fg},
2919 can_events => 1,
2920 can_hover => 1
2921 };
2922 }
2923
2924 $self->clear;
2925 $self->SUPER::add (reverse @widgets);
2926}
2927
2928sub add {
2929 my ($self, $text, %arg) = @_;
2930
2931 $text =~ s/^\s+//;
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},
2953 text => $text,
2954 timeout => $timeout,
2955 tooltip => $text,
2956 fg => [0.8, 0.8, 0.8, 0.8],
2957 pri => 0,
2958 count => 1,
2959 %arg,
2960 };
2961 }
2962
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;
2974}
2975
2976#############################################################################
2977
2978package CFClient::UI::Root;
2979
2980our @ISA = CFClient::UI::Container::;
2981
2982use CFClient::OpenGL;
2983
2984sub new {
2985 my $class = shift;
2986
2987 my $self = $class->SUPER::new (
2988 visible => 1,
2989 @_,
2990 );
2991
2992 Scalar::Util::weaken ($self->{root} = $self);
2993
2994 $self
2995}
2996
2668sub configure { 2997sub configure {
2669 my ($self, $x, $y, $w, $h) = @_; 2998 my ($self, $x, $y, $w, $h) = @_;
2670 2999
2671 $self->{w} = $w; 3000 $self->{w} = $w;
2672 $self->{h} = $h; 3001 $self->{h} = $h;
2673} 3002}
2674 3003
2675sub check_size { 3004sub reconfigure {
2676 my ($self) = @_; 3005 my ($self) = @_;
2677 3006
3007 $self->SUPER::reconfigure;
3008
2678 $self->size_allocate ($self->{w}, $self->{h}) 3009 $self->size_allocate ($self->{w}, $self->{h}, 1)
2679 if $self->{w}; 3010 if $self->{w};
2680} 3011}
2681 3012
2682sub size_request { 3013sub size_request {
2683 my ($self) = @_; 3014 my ($self) = @_;
2684 3015
2685 ($self->{w}, $self->{h}) 3016 ($self->{w}, $self->{h})
2686} 3017}
2687 3018
2688sub size_allocate { 3019sub size_allocate {
2689 my ($self, $w, $h) = @_; 3020 my ($self, $w, $h, $changed) = @_;
2690
2691 my $old_w = $self->{old_w};
2692 my $old_h = $self->{old_h};
2693
2694 if ($old_w && $old_h) {
2695 for my $child ($self->children) {
2696 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2697 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2698 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2699 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2700 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2701 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2702 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2703 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2704 }
2705 }
2706 3021
2707 for my $child ($self->children) { 3022 for my $child ($self->children) {
2708 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)};
2709 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
2710 $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;
2711 $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
2712 $child->configure ($X, $Y, $W, $H); 3036 $child->configure ($X, $Y, $W, $H);
2713 } 3037 }
2714
2715 $self->{old_w} = $w;
2716 $self->{old_h} = $h;
2717} 3038}
2718 3039
2719sub coord2local { 3040sub coord2local {
2720 my ($self, $x, $y) = @_; 3041 my ($self, $x, $y) = @_;
2721 3042
… …
2729} 3050}
2730 3051
2731sub update { 3052sub update {
2732 my ($self) = @_; 3053 my ($self) = @_;
2733 3054
2734 $self->check_size;
2735 $::WANT_REFRESH++; 3055 $::WANT_REFRESH++;
2736} 3056}
2737 3057
2738sub add { 3058sub add {
2739 my ($self, $child) = @_; 3059 my ($self, @children) = @_;
2740 3060
3061 for my $child (@children) {
3062 $child->{is_toplevel} = 1;
3063
2741 # integerise window positions 3064 # integerise window positions
2742 $child->{x} = int $child->{x}; 3065 $child->{x} = int $child->{x};
2743 $child->{y} = int $child->{y}; 3066 $child->{y} = int $child->{y};
3067 }
2744 3068
2745 $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 }
2746} 3082}
2747 3083
2748sub on_refresh { 3084sub on_refresh {
2749 my ($self, $id, $cb) = @_; 3085 my ($self, $id, $cb) = @_;
2750 3086
2751 $self->{refresh_hook}{$id} = $cb; 3087 $self->{refresh_hook}{$id} = $cb;
2752} 3088}
2753 3089
3090sub on_post_alloc {
3091 my ($self, $id, $cb) = @_;
3092
3093 $self->{post_alloc_hook}{$id} = $cb;
3094}
3095
2754sub draw { 3096sub draw {
2755 my ($self) = @_; 3097 my ($self) = @_;
2756
2757 if ($self->{check_size}) {
2758 my @queue = ([], []);
2759
2760 for (;;) {
2761 if ($self->{check_size}) {
2762 # heuristic: check containers last
2763 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2764 for values %{delete $self->{check_size}}
2765 }
2766
2767 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2768
2769 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2770 ? @$widget{qw(user_w user_h)}
2771 : $widget->size_request;
2772
2773 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2774 $widget->{req_w} = $w;
2775 $widget->{req_h} = $h;
2776
2777 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2778
2779 $widget->{parent}->check_size
2780 if $widget->{parent};
2781 }
2782 }
2783 }
2784
2785 while ($self->{size_alloc}) {
2786 for (values %{delete $self->{size_alloc}}) {
2787 my ($widget, $w, $h) = @$_;
2788
2789 $widget->{w} = $w;
2790 $widget->{h} = $h;
2791 $widget->size_allocate ($w, $h);
2792 $widget->emit (size_allocate => $w, $h);
2793 }
2794 }
2795 3098
2796 while ($self->{refresh_hook}) { 3099 while ($self->{refresh_hook}) {
2797 $_->() 3100 $_->()
2798 for values %{delete $self->{refresh_hook}}; 3101 for values %{delete $self->{refresh_hook}};
2799 } 3102 }
2800 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
2801 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3156 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2802 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3157 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2803 glClear GL_COLOR_BUFFER_BIT; 3158 glClear GL_COLOR_BUFFER_BIT;
2804 3159
2805 glMatrixMode GL_PROJECTION; 3160 glMatrixMode GL_PROJECTION;
2806 glLoadIdentity; 3161 glLoadIdentity;
2807 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3162 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2808 glMatrixMode GL_MODELVIEW; 3163 glMatrixMode GL_MODELVIEW;
2809 glLoadIdentity; 3164 glLoadIdentity;
2810 3165
2811 $self->_draw; 3166 $self->_draw;
2812} 3167}
… …
2814############################################################################# 3169#############################################################################
2815 3170
2816package CFClient::UI; 3171package CFClient::UI;
2817 3172
2818$ROOT = new CFClient::UI::Root; 3173$ROOT = new CFClient::UI::Root;
2819$TOOLTIP = new CFClient::UI::Tooltip; 3174$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2820 3175
28211 31761
2822 3177

Diff Legend

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