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

Diff Legend

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