ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

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

Diff Legend

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