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.188 by root, Mon May 8 21:16:09 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->{parent}
409 or return 1;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
428 }
429}
430
431sub update {
432 my ($self) = @_;
433
434 $self->{parent}->update
435 if $self->{parent};
436}
437
438sub connect {
439 my ($self, $signal, $cb) = @_;
440
441 push @{ $self->{signal_cb}{$signal} }, $cb;
442}
443
444sub emit {
445 my ($self, $signal, @args) = @_;
446
447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
448}
449
450sub DESTROY { 564sub DESTROY {
451 my ($self) = @_; 565 my ($self) = @_;
452 566
567 delete $WIDGET{$self+0};
453 #$self->deactivate; 568 #$self->deactivate;
454} 569}
455 570
456############################################################################# 571#############################################################################
457 572
… …
466 my $class = shift; 581 my $class = shift;
467 582
468 # range [value, low, high, page] 583 # range [value, low, high, page]
469 584
470 $class->SUPER::new ( 585 $class->SUPER::new (
471 bg => [0, 0, 0, 0.2], 586 #bg => [0, 0, 0, 0.2],
472 active_bg => [1, 1, 1, 0.5], 587 #active_bg => [1, 1, 1, 0.5],
473 @_ 588 @_
474 ) 589 )
475} 590}
476 591
477sub _draw { 592sub _draw {
478 my ($self) = @_; 593 my ($self) = @_;
479 594
595 my $color = $FOCUS == $self && $self->{active_bg}
596 ? $self->{active_bg}
597 : $self->{bg};
598
599 if ($color && (@$color < 4 || $color->[3])) {
480 my ($w, $h) = @$self{qw(w h)}; 600 my ($w, $h) = @$self{qw(w h)};
481 601
482 glEnable GL_BLEND; 602 glEnable GL_BLEND;
483 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
484 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 604 glColor @$color;
485 605
486 glBegin GL_QUADS; 606 glBegin GL_QUADS;
487 glVertex 0 , 0; 607 glVertex 0 , 0;
488 glVertex 0 , $h; 608 glVertex 0 , $h;
489 glVertex $w, $h; 609 glVertex $w, $h;
490 glVertex $w, 0; 610 glVertex $w, 0;
491 glEnd; 611 glEnd;
492 612
493 glDisable GL_BLEND; 613 glDisable GL_BLEND;
614 }
494} 615}
495 616
496############################################################################# 617#############################################################################
497 618
498package CFClient::UI::Empty; 619package CFClient::UI::Empty;
… …
542 $self->{children} = [ 663 $self->{children} = [
543 sort { $a->{z} <=> $b->{z} } 664 sort { $a->{z} <=> $b->{z} }
544 @{$self->{children}}, @widgets 665 @{$self->{children}}, @widgets
545 ]; 666 ];
546 667
547 $_->check_size 668 $self->realloc;
548 for @widgets;
549
550 $self->update;
551} 669}
552 670
553sub children { 671sub children {
554 @{ $_[0]{children} } 672 @{ $_[0]{children} }
555} 673}
… …
560 delete $child->{parent}; 678 delete $child->{parent};
561 $child->hide; 679 $child->hide;
562 680
563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
564 682
565 $self->check_size; 683 $self->realloc;
566 $self->update;
567} 684}
568 685
569sub clear { 686sub clear {
570 my ($self) = @_; 687 my ($self) = @_;
571 688
… …
575 for (@$children) { 692 for (@$children) {
576 delete $_->{parent}; 693 delete $_->{parent};
577 $_->hide; 694 $_->hide;
578 } 695 }
579 696
580 $self->check_size; 697 $self->realloc;
581 $self->update;
582} 698}
583 699
584sub find_widget { 700sub find_widget {
585 my ($self, $x, $y) = @_; 701 my ($self, $x, $y) = @_;
586 702
… …
639sub size_request { 755sub size_request {
640 $_[0]{children}[0]->size_request 756 $_[0]{children}[0]->size_request
641} 757}
642 758
643sub size_allocate { 759sub size_allocate {
644 my ($self, $w, $h) = @_; 760 my ($self, $w, $h, $changed) = @_;
645 761
646 $self->{children}[0]->configure (0, 0, $w, $h); 762 $self->{children}[0]->configure (0, 0, $w, $h);
647} 763}
648 764
649############################################################################# 765#############################################################################
… …
661} 777}
662 778
663sub update { 779sub update {
664 my ($self) = @_; 780 my ($self) = @_;
665 781
666 $ROOT->on_refresh ($self => sub { $self->render_child }); 782 $ROOT->on_post_alloc ($self => sub { $self->render_child });
667 $self->SUPER::update; 783 $self->SUPER::update;
668} 784}
669 785
670sub size_allocate { 786sub size_allocate {
671 my ($self, $w, $h) = @_; 787 my ($self, $w, $h, $changed) = @_;
672 788
673 $self->SUPER::size_allocate ($w, $h); 789 $self->SUPER::size_allocate ($w, $h, $changed);
674 $self->update; 790 $self->update
791 if $changed;
675} 792}
676 793
677sub _render { 794sub _render {
678 $_[0]{children}[0]->draw; 795 $_[0]{children}[0]->draw;
679} 796}
… …
684 $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 {
685 glClearColor 0, 0, 0, 0; 802 glClearColor 0, 0, 0, 0;
686 glClear GL_COLOR_BUFFER_BIT; 803 glClear GL_COLOR_BUFFER_BIT;
687 804
688 $self->_render; 805 $self->_render;
689# glColorMask 1, 1, 1, 0;
690# glEnable GL_BLEND;
691# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
692# glRasterPos 0, 0;
693# glCopyPixels 0, 0, $self->{w}, $self->{h};
694# glDisable GL_BLEND;
695# glColorMask 1, 1, 1, 1;
696 }; 806 };
697} 807}
698 808
699sub _draw { 809sub _draw {
700 my ($self) = @_; 810 my ($self) = @_;
… …
702 my ($w, $h) = ($self->w, $self->h); 812 my ($w, $h) = ($self->w, $self->h);
703 813
704 my $tex = $self->{texture} 814 my $tex = $self->{texture}
705 or return; 815 or return;
706 816
707 glEnable GL_BLEND;
708 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
709 glEnable GL_TEXTURE_2D; 817 glEnable GL_TEXTURE_2D;
710 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 818 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
711 glColor 0, 0, 0, 1; 819 glColor 1, 1, 1, 1;
712 820
713 $tex->draw_quad (0, 0, $w, $h); 821 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
714 822
715 glDisable GL_BLEND;
716 glDisable GL_TEXTURE_2D; 823 glDisable GL_TEXTURE_2D;
717} 824}
718 825
719############################################################################# 826#############################################################################
720 827
721package CFClient::UI::ViewPort; 828package CFClient::UI::ViewPort;
722 829
723our @ISA = CFClient::UI::Window::; 830our @ISA = CFClient::UI::Window::;
724 831
832sub new {
833 my $class = shift;
834
835 $class->SUPER::new (
836 scroll_x => 0,
837 scroll_y => 1,
838 @_,
839 )
840}
841
725sub size_request { 842sub size_request {
726 my ($self) = @_; 843 my ($self) = @_;
727 844
728 @$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)};
729 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
730 846
731 @$self{qw(child_w child_h)} 847 $w = 10 if $self->{scroll_x};
848 $h = 10 if $self->{scroll_y};
849
850 ($w, $h)
732} 851}
733 852
734sub size_allocate { 853sub size_allocate {
735 my ($self, $w, $h) = @_; 854 my ($self, $w, $h, $changed) = @_;
736 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);
737 $self->update; 860 $self->update;
738} 861}
739 862
740sub set_offset { 863sub set_offset {
741 my ($self, $x, $y) = @_; 864 my ($self, $x, $y) = @_;
… …
744 $self->{view_y} = int $y; 867 $self->{view_y} = int $y;
745 868
746 $self->update; 869 $self->update;
747} 870}
748 871
749# 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
750sub _topleft { 873sub coord2local {
751 my ($self, $x, $y) = @_; 874 my ($self, $x, $y) = @_;
752 875
753 $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)
754} 886}
755 887
756sub find_widget { 888sub find_widget {
757 my ($self, $x, $y) = @_; 889 my ($self, $x, $y) = @_;
758 890
… …
783 my $class = shift; 915 my $class = shift;
784 916
785 my $self; 917 my $self;
786 918
787 my $slider = new CFClient::UI::Slider 919 my $slider = new CFClient::UI::Slider
788 vertical => 1, 920 vertical => 1,
789 range => [0, 0, 1, 0.01], # HACK fix 921 range => [0, 0, 1, 0.01], # HACK fix
790 connect_changed => sub { 922 on_changed => sub {
791 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 923 $self->{vp}->set_offset (0, $_[1]);
792 }, 924 },
793 ; 925 ;
794 926
795 $self = $class->SUPER::new ( 927 $self = $class->SUPER::new (
796 vp => (new CFClient::UI::ViewPort), 928 vp => (new CFClient::UI::ViewPort expand => 1),
797 slider => $slider, 929 slider => $slider,
798 @_, 930 @_,
799 ); 931 );
800 932
801 $self->{vp}->add ($self->{scrolled}); 933 $self->{vp}->add ($self->{scrolled});
… …
803 $self->add ($self->{slider}); 935 $self->add ($self->{slider});
804 936
805 $self 937 $self
806} 938}
807 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
808#TODO# update range on size_allocate depeneing on child 959#TODO# update range on size_allocate depending on child
809# update viewport offset on scroll 960# update viewport offset on scroll
810 961
811############################################################################# 962#############################################################################
812 963
813package CFClient::UI::Frame; 964package CFClient::UI::Frame;
… …
817use CFClient::OpenGL; 968use CFClient::OpenGL;
818 969
819sub new { 970sub new {
820 my $class = shift; 971 my $class = shift;
821 972
822 my $self = $class->SUPER::new ( 973 $class->SUPER::new (
823 bg => [1, 1, 1, 1], 974 bg => undef,
824 border_bg => [1, 1, 1, 1],
825 border => 0.8,
826 @_ 975 @_,
827 ); 976 )
828
829 $self
830} 977}
831 978
832sub _draw { 979sub _draw {
833 my ($self) = @_; 980 my ($self) = @_;
834 981
835 my ($w, $h) = ($self->{w}, $self->{h}); 982 if ($self->{bg}) {
983 my ($w, $h) = @$self{qw(w h)};
836 984
837 glEnable GL_BLEND; 985 glEnable GL_BLEND;
838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 986 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
839 glEnable GL_TEXTURE_2D; 987 glColor @{ $self->{bg} };
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
841 988
842# glBegin GL_QUADS; 989 glBegin GL_QUADS;
843# glColor 0, 0, 0, 0;
844# glVertex 0 , 0; 990 glVertex 0 , 0;
845# glVertex 0 , $h; 991 glVertex 0 , $h;
846# glVertex $w, $h; 992 glVertex $w, $h;
847# glVertex $w, 0; 993 glVertex $w, 0;
848# glEnd; 994 glEnd;
849 995
850
851 $self->child->draw;
852 glDisable GL_BLEND; 996 glDisable GL_BLEND;
853 glDisable GL_TEXTURE_2D; 997 }
998
999 $self->SUPER::_draw;
854} 1000}
855 1001
856############################################################################# 1002#############################################################################
857 1003
858package CFClient::UI::FancyFrame; 1004package CFClient::UI::FancyFrame;
… …
866 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);
867 1013
868sub new { 1014sub new {
869 my $class = shift; 1015 my $class = shift;
870 1016
871 # TODO: user_x, user_y, overwrite moveto?
872
873 my $self = $class->SUPER::new ( 1017 my $self = $class->SUPER::new (
874 bg => [1, 1, 1, 1], 1018 bg => [1, 1, 1, 1],
875 border_bg => [1, 1, 1, 1], 1019 border_bg => [1, 1, 1, 1],
876 border => 0.6, 1020 border => 0.6,
1021 is_toplevel => 1,
877 can_events => 1, 1022 can_events => 1,
878 @_ 1023 @_
879 ); 1024 );
880 1025
881 $self->{title} &&= new CFClient::UI::Label 1026 $self->{title} &&= new CFClient::UI::Label
882 align => 0, 1027 align => 0,
… …
901 $h + $self->border * 2, 1046 $h + $self->border * 2,
902 ) 1047 )
903} 1048}
904 1049
905sub size_allocate { 1050sub size_allocate {
906 my ($self, $w, $h) = @_; 1051 my ($self, $w, $h, $changed) = @_;
1052
1053 return unless $changed;
907 1054
908 $h -= List::Util::max 0, $self->border * 2; 1055 $h -= List::Util::max 0, $self->border * 2;
909 $w -= List::Util::max 0, $self->border * 2; 1056 $w -= List::Util::max 0, $self->border * 2;
910 1057
911 $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)
912 if $self->{title}; 1059 if $self->{title};
913 1060
914 $self->child->configure ($self->border, $self->border, $w, $h); 1061 $self->child->configure ($self->border, $self->border, $w, $h);
915} 1062}
916 1063
… …
935 my ($ev, $x, $y) = @_; 1082 my ($ev, $x, $y) = @_;
936 1083
937 my $dx = $ev->{x} - $ox; 1084 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy; 1085 my $dy = $ev->{y} - $oy;
939 1086
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
942 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1091 $self->move ($self->{user_x}, $self->{user_y});
943 $self->check_size; 1092 $self->realloc;
944 }; 1093 };
945 1094
946 } elsif ($lr ^ $td) { 1095 } elsif ($lr ^ $td) {
947 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1096 my ($ox, $oy) = ($ev->{x}, $ev->{y});
948 my ($bx, $by) = ($self->{x}, $self->{y}); 1097 my ($bx, $by) = ($self->{x}, $self->{y});
… …
950 $self->{motion} = sub { 1099 $self->{motion} = sub {
951 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
952 1101
953 ($x, $y) = ($ev->{x}, $ev->{y}); 1102 ($x, $y) = ($ev->{x}, $ev->{y});
954 1103
955 $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});
956 $self->update; 1108 $self->realloc;
957 }; 1109 };
958 } 1110 }
959} 1111}
960 1112
961sub button_up { 1113sub button_up {
… …
974 my ($self) = @_; 1126 my ($self) = @_;
975 1127
976 my ($w, $h ) = ($self->{w}, $self->{h}); 1128 my ($w, $h ) = ($self->{w}, $self->{h});
977 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1129 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
978 1130
979 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
981 glEnable GL_TEXTURE_2D; 1131 glEnable GL_TEXTURE_2D;
982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
983 1133
984 my $border = $self->border; 1134 my $border = $self->border;
985 1135
986 glColor @{ $self->{border_bg} }; 1136 glColor @{ $self->{border_bg} };
987 $tex[1]->draw_quad (0, 0, $w, $border); 1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
988 $tex[3]->draw_quad (0, $border, $border, $ch); 1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
990 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
991 1141
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
993 my $bg = $tex[0]; 1143 my $bg = $tex[0];
994 1144
995 # TODO: repeat texture not scale 1145 # TODO: repeat texture not scale
… …
999 glColor @{ $self->{bg} }; 1149 glColor @{ $self->{bg} };
1000 1150
1001 $bg->{s} = $rep_x; 1151 $bg->{s} = $rep_x;
1002 $bg->{t} = $rep_y; 1152 $bg->{t} = $rep_y;
1003 $bg->{wrap_mode} = 1; 1153 $bg->{wrap_mode} = 1;
1004 $bg->draw_quad ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 }
1005 1156
1006 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1007 glDisable GL_BLEND;
1008 }
1009 1158
1010 $self->{title}->draw if $self->{title}; 1159 $self->{title}->draw if $self->{title};
1011 1160
1012 $self->child->draw; 1161 $self->child->draw;
1013} 1162}
… …
1025sub new { 1174sub new {
1026 my $class = shift; 1175 my $class = shift;
1027 1176
1028 $class->SUPER::new ( 1177 $class->SUPER::new (
1029 col_expand => [], 1178 col_expand => [],
1030 @_ 1179 @_,
1031 ) 1180 )
1181}
1182
1183sub children {
1184 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032} 1185}
1033 1186
1034sub add { 1187sub add {
1035 my ($self, $x, $y, $child) = @_; 1188 my ($self, $x, $y, $child) = @_;
1036 1189
1037 $child->set_parent ($self); 1190 $child->set_parent ($self);
1038 $self->{children}[$y][$x] = $child; 1191 $self->{children}[$y][$x] = $child;
1039 1192
1040 $child->check_size; 1193 $self->realloc;
1041} 1194}
1042 1195
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1045}
1046
1047# 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?
1048sub clear { 1197sub clear {
1049 my ($self) = @_; 1198 my ($self) = @_;
1050 1199
1051 my @children = $self->children; 1200 my @children = $self->children;
1052 delete $self->{children}; 1201 delete $self->{children};
… …
1054 for (@children) { 1203 for (@children) {
1055 delete $_->{parent}; 1204 delete $_->{parent};
1056 $_->hide; 1205 $_->hide;
1057 } 1206 }
1058 1207
1059 $self->update; 1208 $self->realloc;
1060} 1209}
1061 1210
1062sub get_wh { 1211sub get_wh {
1063 my ($self) = @_; 1212 my ($self) = @_;
1064 1213
… …
1091 (sum @$hs), 1240 (sum @$hs),
1092 ) 1241 )
1093} 1242}
1094 1243
1095sub size_allocate { 1244sub size_allocate {
1096 my ($self, $w, $h) = @_; 1245 my ($self, $w, $h, $changed) = @_;
1097 1246
1098 my ($ws, $hs) = $self->get_wh; 1247 my ($ws, $hs) = $self->get_wh;
1099 1248
1100 my $req_w = sum @$ws; 1249 my $req_w = (sum @$ws) || 1;
1101 my $req_h = sum @$hs; 1250 my $req_h = (sum @$hs) || 1;
1102 1251
1103 # TODO: nicer code && do row_expand 1252 # TODO: nicer code && do row_expand
1104 my @col_expand = @{$self->{col_expand}}; 1253 my @col_expand = @{$self->{col_expand}};
1105 @col_expand = (1) x @$ws unless @col_expand; 1254 @col_expand = (1) x @$ws unless @col_expand;
1106 my $col_expand = (sum @col_expand) || 1; 1255 my $col_expand = (sum @col_expand) || 1;
… …
1160 } 1309 }
1161} 1310}
1162 1311
1163############################################################################# 1312#############################################################################
1164 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
1165package CFClient::UI::HBox; 1374package CFClient::UI::HBox;
1166 1375
1167# TODO: wrap into common Box base class
1168
1169our @ISA = CFClient::UI::Container::; 1376our @ISA = CFClient::UI::Box::;
1170 1377
1171sub size_request { 1378sub new {
1172 my ($self) = @_; 1379 my $class = shift;
1173 1380
1174 my @alloc = map [$_->size_request], @{$self->{children}}; 1381 $class->SUPER::new (
1175 1382 vertical => 0,
1176 ( 1383 @_,
1177 (List::Util::sum map $_->[0], @alloc),
1178 (List::Util::max map $_->[1], @alloc),
1179 ) 1384 )
1180} 1385}
1181 1386
1182sub size_allocate {
1183 my ($self, $w, $h) = @_;
1184
1185 ($h, $w) = ($w, $h);
1186
1187 my $children = $self->{children};
1188
1189 my @h = map $_->{req_w}, @$children;
1190
1191 my $req_h = List::Util::sum @h;
1192
1193 if ($req_h > $h) {
1194 # ah well, not enough space
1195 $_ *= $h / $req_h for @h;
1196 } else {
1197 my $exp = List::Util::sum map $_->{expand}, @$children;
1198 $exp ||= 1;
1199
1200 for (0 .. $#$children) {
1201 my $child = $children->[$_];
1202
1203 my $alloc_h = $h[$_];
1204 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1205 $h[$_] = $alloc_h;
1206 }
1207 }
1208
1209 CFClient::UI::harmonize \@h;
1210
1211 my $y = 0;
1212 for (0 .. $#$children) {
1213 my $child = $children->[$_];
1214 my $h = $h[$_];
1215 $child->configure ($y, 0, $h, $w);
1216
1217 $y += $h;
1218 }
1219
1220 1
1221}
1222
1223############################################################################# 1387#############################################################################
1224 1388
1225package CFClient::UI::VBox; 1389package CFClient::UI::VBox;
1226 1390
1227# TODO: wrap into common Box base class
1228
1229our @ISA = CFClient::UI::Container::; 1391our @ISA = CFClient::UI::Box::;
1230 1392
1231sub size_request { 1393sub new {
1232 my ($self) = @_; 1394 my $class = shift;
1233 1395
1234 my @alloc = map [$_->size_request], @{$self->{children}}; 1396 $class->SUPER::new (
1235 1397 vertical => 1,
1236 ( 1398 @_,
1237 (List::Util::max map $_->[0], @alloc),
1238 (List::Util::sum map $_->[1], @alloc),
1239 ) 1399 )
1240} 1400}
1241 1401
1242sub size_allocate {
1243 my ($self, $w, $h) = @_;
1244
1245 my $children = $self->{children};
1246
1247 my @h = map $_->{req_h}, @$children;
1248
1249 my $req_h = List::Util::sum @h;
1250
1251 if ($req_h > $h) {
1252 # ah well, not enough space
1253 $_ *= $h / $req_h for @h;
1254 } else {
1255 my $exp = List::Util::sum map $_->{expand}, @$children;
1256 $exp ||= 1;
1257
1258 for (0 .. $#$children) {
1259 my $child = $children->[$_];
1260
1261 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1262 }
1263 }
1264
1265 CFClient::UI::harmonize \@h;
1266
1267 my $y = 0;
1268 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_];
1271 $child->configure (0, $y, $w, $h);
1272
1273 $y += $h;
1274 }
1275
1276 1
1277}
1278
1279############################################################################# 1402#############################################################################
1280 1403
1281package CFClient::UI::Label; 1404package CFClient::UI::Label;
1282 1405
1283our @ISA = CFClient::UI::Base::; 1406our @ISA = CFClient::UI::DrawBG::;
1284 1407
1285use CFClient::OpenGL; 1408use CFClient::OpenGL;
1286 1409
1287sub new { 1410sub new {
1288 my ($class, %arg) = @_; 1411 my ($class, %arg) = @_;
1289 1412
1290 my $self = $class->SUPER::new ( 1413 my $self = $class->SUPER::new (
1291 fg => [1, 1, 1], 1414 fg => [1, 1, 1],
1415 #bg => none
1416 #active_bg => none
1292 #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),
1293 fontsize => 1, 1423 fontsize => 1,
1294 text => "",
1295 align => -1, 1424 align => -1,
1296 valign => -1, 1425 valign => -1,
1297 padding => 2, 1426 padding => 2,
1298 layout => new CFClient::Layout,
1299 can_events => 0, 1427 can_events => 0,
1300 %arg 1428 %arg
1301 ); 1429 );
1302 1430
1303 if (exists $self->{template}) { 1431 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout; 1432 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template}); 1433 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout; 1434 $self->{template} = $layout;
1307 } 1435 }
1308 1436
1309 $self->set_text (delete $self->{text}) if exists $self->{text}; 1437 if (exists $self->{markup}) {
1310 $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 }
1311 1442
1312 $self 1443 $self
1313} 1444}
1314 1445
1315sub escape { 1446sub escape($) {
1316 local $_ = $_[1]; 1447 local $_ = $_[0];
1317 1448
1318 s/&/&amp;/g; 1449 s/&/&amp;/g;
1319 s/>/&gt;/g; 1450 s/>/&gt;/g;
1320 s/</&lt;/g; 1451 s/</&lt;/g;
1321 1452
1322 $_[1] 1453 $_
1323} 1454}
1324 1455
1325sub update { 1456sub update {
1326 my ($self) = @_; 1457 my ($self) = @_;
1327 1458
… …
1333 my ($self, $text) = @_; 1464 my ($self, $text) = @_;
1334 1465
1335 return if $self->{text} eq "T$text"; 1466 return if $self->{text} eq "T$text";
1336 $self->{text} = "T$text"; 1467 $self->{text} = "T$text";
1337 1468
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1338 $self->{layout}->set_text ($text); 1470 $self->{layout}->set_text ($text);
1339 1471
1340 delete $self->{texture}; 1472 $self->realloc;
1341 $self->update; 1473 $self->update;
1342 $self->check_size;
1343} 1474}
1344 1475
1345sub set_markup { 1476sub set_markup {
1346 my ($self, $markup) = @_; 1477 my ($self, $markup) = @_;
1347 1478
1348 return if $self->{text} eq "M$markup"; 1479 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup"; 1480 $self->{text} = "M$markup";
1350 1481
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1351 $self->{layout}->set_markup ($markup); 1485 $self->{layout}->set_markup ($markup);
1352 1486
1353 delete $self->{texture}; 1487 $self->realloc;
1354 $self->update; 1488 $self->update;
1355 $self->check_size;
1356} 1489}
1357 1490
1358sub size_request { 1491sub size_request {
1359 my ($self) = @_; 1492 my ($self) = @_;
1360 1493
1361 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1494 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $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});
1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364 1499
1365 my ($w, $h) = $self->{layout}->size; 1500 my ($w, $h) = $self->{layout}->size;
1366 1501
1367 if (exists $self->{template}) { 1502 if (exists $self->{template}) {
… …
1379 $h + $self->{padding} * 2, 1514 $h + $self->{padding} * 2,
1380 ) 1515 )
1381} 1516}
1382 1517
1383sub size_allocate { 1518sub size_allocate {
1384 my ($self, $w, $h) = @_; 1519 my ($self, $w, $h, $changed) = @_;
1385 1520
1386 delete $self->{texture}; 1521 delete $self->{texture}
1522 if $changed;
1387} 1523}
1388 1524
1389sub set_fontsize { 1525sub set_fontsize {
1390 my ($self, $fontsize) = @_; 1526 my ($self, $fontsize) = @_;
1391 1527
1392 $self->{fontsize} = $fontsize; 1528 $self->{fontsize} = $fontsize;
1393 delete $self->{texture}; 1529 delete $self->{texture};
1394 1530
1395 $self->update; 1531 $self->realloc;
1396 $self->check_size;
1397} 1532}
1398 1533
1399sub _draw { 1534sub _draw {
1400 my ($self) = @_; 1535 my ($self) = @_;
1401 1536
1537 $self->SUPER::_draw; # draw background, if applicable
1538
1402 my $tex = $self->{texture} ||= do { 1539 my $tex = $self->{texture} ||= do {
1540 $self->{layout}->set_foreground (@{$self->{fg}});
1403 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1541 $self->{layout}->set_font ($self->{font}) if $self->{font};
1404 $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});
1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546
1406 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
1407 }; 1558 };
1408 1559
1409 glEnable GL_BLEND;
1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1411 glEnable GL_TEXTURE_2D; 1560 glEnable GL_TEXTURE_2D;
1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1413 1562
1563 if ($tex->{format} == GL_ALPHA) {
1414 glColor @{$self->{fg}}; 1564 glColor @{$self->{fg}};
1415
1416 $self->{ox} = int (
1417 $self->{align} < 0 ? $self->{padding}
1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1421
1422 $self->{oy} = int (
1423 $self->{valign} < 0 ? $self->{padding}
1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1427
1428 $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 }
1429 1569
1430 glDisable GL_TEXTURE_2D; 1570 glDisable GL_TEXTURE_2D;
1431 glDisable GL_BLEND;
1432} 1571}
1433 1572
1434############################################################################# 1573#############################################################################
1435 1574
1436package CFClient::UI::EntryBase; 1575package CFClient::UI::EntryBase;
… …
1449 active_fg => [0, 0, 0], 1588 active_fg => [0, 0, 0],
1450 can_hover => 1, 1589 can_hover => 1,
1451 can_focus => 1, 1590 can_focus => 1,
1452 valign => 0, 1591 valign => 0,
1453 can_events => 1, 1592 can_events => 1,
1593 #text => ...
1454 @_ 1594 @_
1455 ) 1595 )
1456} 1596}
1457 1597
1458sub _set_text { 1598sub _set_text {
… …
1468 $self->{text} = $text; 1608 $self->{text} = $text;
1469 1609
1470 $text =~ s/./*/g if $self->{hidden}; 1610 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text "); 1611 $self->{layout}->set_text ("$text ");
1472 1612
1473 $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;
1474} 1623}
1475 1624
1476sub get_text { 1625sub get_text {
1477 $_[0]{text} 1626 $_[0]{text}
1478} 1627}
… …
1481 my ($self) = @_; 1630 my ($self) = @_;
1482 1631
1483 my ($w, $h) = $self->SUPER::size_request; 1632 my ($w, $h) = $self->SUPER::size_request;
1484 1633
1485 ($w + 1, $h) # add 1 for cursor 1634 ($w + 1, $h) # add 1 for cursor
1486}
1487
1488sub size_allocate {
1489 my ($self, $w, $h) = @_;
1490
1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1492}
1493
1494sub set_text {
1495 my ($self, $text) = @_;
1496
1497 $self->{cursor} = length $text;
1498 $self->_set_text ($text);
1499 $self->update;
1500} 1635}
1501 1636
1502sub key_down { 1637sub key_down {
1503 my ($self, $ev) = @_; 1638 my ($self, $ev) = @_;
1504 1639
… …
1506 my $sym = $ev->{sym}; 1641 my $sym = $ev->{sym};
1507 my $uni = $ev->{unicode}; 1642 my $uni = $ev->{unicode};
1508 1643
1509 my $text = $self->get_text; 1644 my $text = $self->get_text;
1510 1645
1511 if ($sym == 8) { 1646 if ($uni == 8) {
1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1647 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1513 } elsif ($sym == 127) { 1648 } elsif ($uni == 127) {
1514 substr $text, $self->{cursor}, 1, ""; 1649 substr $text, $self->{cursor}, 1, "";
1515 } elsif ($sym == CFClient::SDLK_LEFT) { 1650 } elsif ($sym == CFClient::SDLK_LEFT) {
1516 --$self->{cursor} if $self->{cursor}; 1651 --$self->{cursor} if $self->{cursor};
1517 } elsif ($sym == CFClient::SDLK_RIGHT) { 1652 } elsif ($sym == CFClient::SDLK_RIGHT) {
1518 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1653 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1519 } elsif ($sym == CFClient::SDLK_HOME) { 1654 } elsif ($sym == CFClient::SDLK_HOME) {
1520 $self->{cursor} = 0; 1655 $self->{cursor} = 0;
1521 } elsif ($sym == CFClient::SDLK_END) { 1656 } elsif ($sym == CFClient::SDLK_END) {
1522 $self->{cursor} = length $text; 1657 $self->{cursor} = length $text;
1523 } elsif ($sym == 27) { 1658 } elsif ($uni == 27) {
1524 $self->emit ('escape'); 1659 $self->_emit ('escape');
1525 } elsif ($uni) { 1660 } elsif ($uni) {
1526 substr $text, $self->{cursor}++, 0, chr $uni; 1661 substr $text, $self->{cursor}++, 0, chr $uni;
1527 } 1662 }
1528 1663
1529 $self->_set_text ($text); 1664 $self->_set_text ($text);
1530 $self->update; 1665
1666 $self->realloc;
1531} 1667}
1532 1668
1533sub focus_in { 1669sub focus_in {
1534 my ($self) = @_; 1670 my ($self) = @_;
1535 1671
… …
1615 if ($sym == 13) { 1751 if ($sym == 13) {
1616 unshift @{$self->{history}}, 1752 unshift @{$self->{history}},
1617 my $txt = $self->get_text; 1753 my $txt = $self->get_text;
1618 $self->{history_pointer} = -1; 1754 $self->{history_pointer} = -1;
1619 $self->{history_saveback} = ''; 1755 $self->{history_saveback} = '';
1620 $self->emit (activate => $txt); 1756 $self->_emit (activate => $txt);
1621 $self->update; 1757 $self->update;
1622 1758
1623 } elsif ($sym == CFClient::SDLK_UP) { 1759 } elsif ($sym == CFClient::SDLK_UP) {
1624 if ($self->{history_pointer} < 0) { 1760 if ($self->{history_pointer} < 0) {
1625 $self->{history_saveback} = $self->get_text; 1761 $self->{history_saveback} = $self->get_text;
… …
1664 my $class = shift; 1800 my $class = shift;
1665 1801
1666 $class->SUPER::new ( 1802 $class->SUPER::new (
1667 padding => 4, 1803 padding => 4,
1668 fg => [1, 1, 1], 1804 fg => [1, 1, 1],
1669 bg => [1, 1, 1, 0.2],
1670 active_fg => [0, 0, 1], 1805 active_fg => [0, 0, 1],
1671 can_hover => 1, 1806 can_hover => 1,
1672 align => 0, 1807 align => 0,
1673 valign => 0, 1808 valign => 0,
1674 can_events => 1, 1809 can_events => 1,
1675 @_ 1810 @_
1676 ) 1811 )
1677} 1812}
1678 1813
1814sub activate { }
1815
1679sub button_up { 1816sub button_up {
1680 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1681 1818
1819 $self->emit ("activate")
1682 if ($x >= 0 && $x < $self->{w} 1820 if $x >= 0 && $x < $self->{w}
1683 && $y >= 0 && $y < $self->{h}) { 1821 && $y >= 0 && $y < $self->{h};
1684 $self->emit ("activate");
1685 }
1686} 1822}
1687 1823
1688sub _draw { 1824sub _draw {
1689 my ($self) = @_; 1825 my ($self) = @_;
1690 1826
… …
1692 1828
1693 if ($GRAB == $self) { 1829 if ($GRAB == $self) {
1694 $self->{fg} = $self->{active_fg}; 1830 $self->{fg} = $self->{active_fg};
1695 } 1831 }
1696 1832
1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D; 1833 glEnable GL_TEXTURE_2D;
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1; 1835 glColor 0, 0, 0, 1;
1702 1836
1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1837 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1704 1838
1705 glDisable GL_TEXTURE_2D; 1839 glDisable GL_TEXTURE_2D;
1706 glDisable GL_BLEND;
1707 1840
1708 $self->SUPER::_draw; 1841 $self->SUPER::_draw;
1709} 1842}
1710 1843
1711############################################################################# 1844#############################################################################
… …
1725 1858
1726 $class->SUPER::new ( 1859 $class->SUPER::new (
1727 padding => 2, 1860 padding => 2,
1728 fg => [1, 1, 1], 1861 fg => [1, 1, 1],
1729 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],
1730 state => 0, 1865 state => 0,
1731 can_hover => 1, 1866 can_hover => 1,
1732 @_ 1867 @_
1733 ) 1868 )
1734} 1869}
… …
1743 my ($self, $ev, $x, $y) = @_; 1878 my ($self, $ev, $x, $y) = @_;
1744 1879
1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1747 $self->{state} = !$self->{state}; 1882 $self->{state} = !$self->{state};
1748 $self->emit (changed => $self->{state}); 1883 $self->_emit (changed => $self->{state});
1749 } 1884 }
1750} 1885}
1751 1886
1752sub _draw { 1887sub _draw {
1753 my ($self) = @_; 1888 my ($self) = @_;
… …
1758 1893
1759 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;
1760 1895
1761 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1762 1897
1763 glEnable GL_BLEND; 1898 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899
1764 glEnable GL_TEXTURE_2D; 1900 glEnable GL_TEXTURE_2D;
1765 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1766
1767 my $tex = $self->{state} ? $tex[1] : $tex[0];
1768
1769 $tex->draw_quad (0, 0, $s, $s); 1901 $tex->draw_quad_alpha (0, 0, $s, $s);
1770
1771 glDisable GL_TEXTURE_2D; 1902 glDisable GL_TEXTURE_2D;
1772 glDisable GL_BLEND;
1773} 1903}
1774 1904
1775############################################################################# 1905#############################################################################
1776 1906
1777package CFClient::UI::Image; 1907package CFClient::UI::Image;
… …
1820 glTranslate 0, -$self->{w}, 0; 1950 glTranslate 0, -$self->{w}, 0;
1821 1951
1822 ($w, $h) = ($h, $w); 1952 ($w, $h) = ($h, $w);
1823 } 1953 }
1824 1954
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D; 1955 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1956 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 1957
1830 $tex->draw_quad (0, 0, $w, $h); 1958 $tex->draw_quad_alpha (0, 0, $w, $h);
1831 1959
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D; 1960 glDisable GL_TEXTURE_2D;
1834} 1961}
1835 1962
1836############################################################################# 1963#############################################################################
1837 1964
… …
2026 qw(s1_slider.png s1_slider_bg.png); 2153 qw(s1_slider.png s1_slider_bg.png);
2027 2154
2028sub new { 2155sub new {
2029 my $class = shift; 2156 my $class = shift;
2030 2157
2031 # range [value, low, high, page] 2158 # range [value, low, high, page, unit]
2032 2159
2033 # TODO: 0-width page 2160 # TODO: 0-width page
2034 # TODO: req_w/h are wrong with vertical 2161 # TODO: req_w/h are wrong with vertical
2035 # TODO: calculations are off 2162 # TODO: calculations are off
2036 my $self = $class->SUPER::new ( 2163 my $self = $class->SUPER::new (
2037 fg => [1, 1, 1], 2164 fg => [1, 1, 1],
2038 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],
2039 range => [0, 0, 100, 10], 2168 range => [0, 0, 100, 10, 0],
2040 req_w => $::WIDTH / 80, 2169 req_w => $::WIDTH / 80,
2041 req_h => $::WIDTH / 80, 2170 req_h => $::WIDTH / 80,
2042 vertical => 0, 2171 vertical => 0,
2043 can_hover => 1, 2172 can_hover => 1,
2044 inner_pad => 5, 2173 inner_pad => 0.02,
2045 @_ 2174 @_
2046 ); 2175 );
2047 2176
2177 $self->set_value ($self->{range}[0]);
2178 $self->update;
2179
2048 $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 }
2049} 2215}
2050 2216
2051sub size_request { 2217sub size_request {
2052 my ($self) = @_; 2218 my ($self) = @_;
2053 2219
… …
2059 2225
2060sub button_down { 2226sub button_down {
2061 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
2062 2228
2063 $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
2064 $self->mouse_motion ($ev, $x, $y); 2233 $self->mouse_motion ($ev, $x, $y);
2065} 2234}
2066 2235
2067sub mouse_motion { 2236sub mouse_motion {
2068 my ($self, $ev, $x, $y) = @_; 2237 my ($self, $ev, $x, $y) = @_;
2069 2238
2070 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
2071 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2256 my ($value, $lo, $hi, $page) = @{$self->{range}};
2257 my $range = ($hi - $page - $lo) || 1e-100;
2072 2258
2073 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2259 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2074 2260
2075 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2261 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2076 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2262 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2077 2263
2078 $x -= $inner_pad_px; # substract the padding 2264 $value = ($value - $lo) / $range;
2079 $x = $x * ($hi - $lo) / $inner_w + $lo; 2265 $value = $value * $self->{scale} + $self->{offset};
2080 $x = $lo if $x < $lo;
2081 $x = $hi - $page if $x > $hi - $page;
2082 $self->{range}[0] = $x;
2083 2266
2084 $self->emit (changed => $x); 2267 $self->{knob_x} = $value - $knob_w * 0.5;
2085 $self->update; 2268 $self->{knob_w} = $knob_w;
2086 } 2269 });
2087}
2088 2270
2089# the inner_* stuff is for generating a padding for the slider handle, 2271 $self->SUPER::update;
2090# so that the handle doesn't leave the texture. This calculation isn't 100%
2091# correct propably, but it does the job for now
2092sub _calc_inner_pad_px {
2093 my ($self, $w) = @_;
2094 ($w / 100) * $self->{inner_pad} # % to pixels
2095} 2272}
2096 2273
2097sub _draw { 2274sub _draw {
2098 my ($self) = @_; 2275 my ($self) = @_;
2099 2276
2100 $self->SUPER::_draw (); 2277 $self->SUPER::_draw ();
2101 2278
2102 my ($w, $h) = @$self{qw(w h)}; 2279 glScale $self->{w}, $self->{h};
2103 2280
2104 if ($self->{vertical}) { 2281 if ($self->{vertical}) {
2105 # draw a vertical slider like a rotated horizontal slider 2282 # draw a vertical slider like a rotated horizontal slider
2106 2283
2284 glTranslate 1, 0, 0;
2107 glRotate 90, 0, 0, 1; 2285 glRotate 90, 0, 0, 1;
2108 glTranslate 0, -$self->{w}, 0;
2109
2110 ($w, $h) = ($h, $w);
2111 } 2286 }
2112 2287
2113 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2288 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2114 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2289 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2115 2290
2116 my ($value, $lo, $hi, $page) = @{$self->{range}};
2117
2118 $hi = $value + 1 if $lo == $hi;
2119
2120 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2121 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2122
2123 $page = int $page * $inner_w / ($hi - $lo);
2124 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2125
2126 $w -= $page;
2127 $page &= ~1;
2128 glTranslate $page * 0.5, 0, 0;
2129 $page ||= 2;
2130
2131 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2132 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2133
2134 glEnable GL_BLEND;
2135 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2136 glEnable GL_TEXTURE_2D; 2291 glEnable GL_TEXTURE_2D;
2137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2138 2293
2139 # draw background 2294 # draw background
2140 $tex[1]->draw_quad (0, 0, $w, $h); 2295 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2141 2296
2142 # draw handle 2297 # draw handle
2143 $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);
2144 2299
2145 glDisable GL_BLEND;
2146 glDisable GL_TEXTURE_2D; 2300 glDisable GL_TEXTURE_2D;
2147} 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 (@_) }
2148 2343
2149############################################################################# 2344#############################################################################
2150 2345
2151package CFClient::UI::TextView; 2346package CFClient::UI::TextView;
2152 2347
… …
2161 fontsize => 1, 2356 fontsize => 1,
2162 can_events => 0, 2357 can_events => 0,
2163 #font => default_font 2358 #font => default_font
2164 @_, 2359 @_,
2165 2360
2166 layout => (new CFClient::Layout), 2361 layout => (new CFClient::Layout 1),
2167 par => [], 2362 par => [],
2168 height => 0, 2363 height => 0,
2169 children => [ 2364 children => [
2170 (new CFClient::UI::Empty expand => 1), 2365 (new CFClient::UI::Empty expand => 1),
2171 (new CFClient::UI::Slider vertical => 1), 2366 (new CFClient::UI::Slider vertical => 1),
… …
2182 2377
2183 $self->{fontsize} = $fontsize; 2378 $self->{fontsize} = $fontsize;
2184 $self->reflow; 2379 $self->reflow;
2185} 2380}
2186 2381
2187sub text_height {
2188 my ($self, $text) = @_;
2189
2190 my $layout = $self->{layout};
2191
2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2193 $layout->set_width ($self->{children}[0]{w});
2194 $layout->set_text ($text);
2195
2196 ($layout->size)[1]
2197}
2198
2199sub reflow {
2200 my ($self) = @_;
2201
2202 $self->{need_reflow}++;
2203 $self->update;
2204}
2205
2206sub size_allocate { 2382sub size_allocate {
2207 my ($self, $w, $h) = @_; 2383 my ($self, $w, $h, $changed) = @_;
2208 2384
2209 $self->SUPER::size_allocate ($w, $h); 2385 $self->SUPER::size_allocate ($w, $h, $changed);
2386
2387 return unless $changed;
2210 2388
2211 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2389 $self->{layout}->set_font ($self->{font}) if $self->{font};
2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2390 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2213 $self->{layout}->set_width ($self->{children}[0]{w}); 2391 $self->{layout}->set_width ($self->{children}[0]{w});
2214 2392
2215 $self->reflow; 2393 $self->reflow;
2216} 2394}
2217 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
2218sub add_paragraph { 2430sub add_paragraph {
2219 my ($self, $color, $text) = @_; 2431 my ($self, $color, $text, $indent) = @_;
2220 2432
2221 #TODO: intelligently "reformat" paragraph 2433 for my $line (split /\n/, $text) {
2222 2434 my ($w, $h) = $self->text_size ($line);
2223 my $height = $self->text_height ($text);
2224
2225 $self->{height} += $height; 2435 $self->{height} += $h;
2436 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2437 }
2226 2438
2227 push @{$self->{par}}, [$height, $color, $text];
2228
2229 $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]);
2230 $self->{children}[1]->update;
2231} 2440}
2232 2441
2233sub update { 2442sub update {
2234 my ($self) = @_; 2443 my ($self) = @_;
2235 2444
… …
2237 2446
2238 return unless $self->{h} > 0; 2447 return unless $self->{h} > 0;
2239 2448
2240 delete $self->{texture}; 2449 delete $self->{texture};
2241 2450
2242 $ROOT->on_refresh ($self, sub { 2451 $ROOT->on_post_alloc ($self, sub {
2452 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2453
2243 if (delete $self->{need_reflow}) { 2454 if (delete $self->{need_reflow}) {
2244 my $height = 0; 2455 my $height = 0;
2245 2456
2246 $height += $_->[0] = $self->text_height ($_->[2]) 2457 my $layout = $self->{layout};
2458
2459 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2460
2247 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 }
2248 2472
2249 $self->{height} = $height; 2473 $self->{height} = $height;
2250 2474
2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2475 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2252 2476
2253 delete $self->{texture}; 2477 delete $self->{texture};
2254 } 2478 }
2255 2479
2256 $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 {
2257 glClearColor 0, 0, 0, 0; 2481 glClearColor 0.5, 0.5, 0.5, 0;
2258 glClear GL_COLOR_BUFFER_BIT; 2482 glClear GL_COLOR_BUFFER_BIT;
2259 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
2260 glEnable GL_BLEND; 2495 glEnable GL_BLEND;
2496 #TODO# not correct in windows where rgba is forced off
2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2497 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2262 glEnable GL_TEXTURE_2D;
2263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2264
2265 my $top = int $self->{children}[1]{range}[0];
2266
2267 my $y0 = $top;
2268 my $y1 = $top + $self->{h};
2269
2270 my $y = 0;
2271
2272 my $layout = $self->{layout};
2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275 2498
2276 for my $par (@{$self->{par}}) { 2499 for my $par (@{$self->{par}}) {
2277 my $h = $par->[0]; 2500 my $h = $par->[1];
2278 2501
2279 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]);
2280 $layout->set_text ($par->[2]); 2505 $layout->set_markup ($par->[4]);
2281 2506
2282 glColor @{ $par->[1] }; 2507 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2283 my ($W, $H) = $layout->size; 2508
2284 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;
2285 } 2511 }
2286 2512
2287 $y += $h; 2513 $y += $h;
2288 } 2514 }
2289 2515
2290 glDisable GL_TEXTURE_2D;
2291 glDisable GL_BLEND; 2516 glDisable GL_BLEND;
2292 }; 2517 };
2293 }); 2518 });
2294} 2519}
2295 2520
2296sub _draw { 2521sub _draw {
2297 my ($self) = @_; 2522 my ($self) = @_;
2298 2523
2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2301 glEnable GL_TEXTURE_2D; 2524 glEnable GL_TEXTURE_2D;
2302 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2525 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2303 glColor 1, 1, 1, 1; 2526 glColor 1, 1, 1, 1;
2304 $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});
2305 glDisable GL_TEXTURE_2D; 2528 glDisable GL_TEXTURE_2D;
2306 glDisable GL_BLEND;
2307 2529
2308 $self->{children}[1]->draw; 2530 $self->{children}[1]->draw;
2309 2531
2310} 2532}
2311 2533
… …
2359 2581
2360sub new { 2582sub new {
2361 my $class = shift; 2583 my $class = shift;
2362 2584
2363 my $self = $class->SUPER::new ( 2585 my $self = $class->SUPER::new (
2364 state => 0, 2586 state => 0,
2365 connect_activate => \&toggle_flopper, 2587 on_activate => \&toggle_flopper,
2366 @_ 2588 @_
2367 ); 2589 );
2368 2590
2369 if ($self->{state}) {
2370 $self->{state} = 0;
2371 $self->toggle_flopper;
2372 }
2373
2374 $self 2591 $self
2375} 2592}
2376 2593
2377sub toggle_flopper { 2594sub toggle_flopper {
2378 my ($self) = @_; 2595 my ($self) = @_;
2379 2596
2380 # TODO: use animation 2597 $self->{other}->toggle_visibility;
2381 if ($self->{state} = !$self->{state}) {
2382 $CFClient::UI::ROOT->add ($self->{other});
2383 $self->{other}->move ($self->coord2global (0, $self->{h}));
2384 $self->emit ("open");
2385 } else {
2386 $CFClient::UI::ROOT->remove ($self->{other});
2387 $self->emit ("close");
2388 }
2389
2390 $self->emit (changed => $self->{state});
2391} 2598}
2392 2599
2393############################################################################# 2600#############################################################################
2394 2601
2395package CFClient::UI::Tooltip; 2602package CFClient::UI::Tooltip;
… …
2405 @_, 2612 @_,
2406 can_events => 0, 2613 can_events => 0,
2407 ) 2614 )
2408} 2615}
2409 2616
2410sub set_markup { 2617sub set_tooltip_from {
2411 my ($self, $text) = @_; 2618 my ($self, $widget) = @_;
2412 2619
2413 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2620 $self->add (new CFClient::UI::Label
2414 $self->{label}->set_markup ($text); 2621 markup => $widget->{tooltip},
2415 $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 );
2416} 2628}
2417 2629
2418sub size_request { 2630sub size_request {
2419 my ($self) = @_; 2631 my ($self) = @_;
2420 2632
2421 $self->child->set_max_size ($::WIDTH * 0.3);
2422
2423 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2633 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2424 2634
2425 ($w + 4, $h + 4) 2635 ($w + 4, $h + 4)
2426} 2636}
2427 2637
2428sub size_allocate { 2638sub size_allocate {
2429 my ($self, $w, $h) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2430 2640
2641 return unless $changed;
2642
2431 $self->SUPER::size_allocate ($w - 4, $h - 4); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2432} 2644}
2433 2645
2434sub _draw { 2646sub _draw {
2435 my ($self) = @_; 2647 my ($self) = @_;
2436 2648
2437 glPushMatrix;
2438 glTranslate 0.375, 0.375; 2649 glTranslate 0.375, 0.375;
2439 2650
2440 my ($w, $h) = @$self{qw(w h)}; 2651 my ($w, $h) = @$self{qw(w h)};
2441 2652
2442 glColor 1, 0.8, 0.4; 2653 glColor 1, 0.8, 0.4;
… …
2453 glVertex 0 , $h; 2664 glVertex 0 , $h;
2454 glVertex $w, $h; 2665 glVertex $w, $h;
2455 glVertex $w, 0; 2666 glVertex $w, 0;
2456 glEnd; 2667 glEnd;
2457 2668
2458 glPopMatrix; 2669 glTranslate 2 - 0.375, 2 - 0.375;
2459 2670
2460 glTranslate 2, 2;
2461 $self->SUPER::_draw; 2671 $self->SUPER::_draw;
2462} 2672}
2463 2673
2464############################################################################# 2674#############################################################################
2465 2675
… …
2470use CFClient::OpenGL; 2680use CFClient::OpenGL;
2471 2681
2472sub new { 2682sub new {
2473 my $class = shift; 2683 my $class = shift;
2474 2684
2475 $class->SUPER::new ( 2685 my $self = $class->SUPER::new (
2476 aspect => 1, 2686 aspect => 1,
2687 can_events => 0,
2477 @_, 2688 @_,
2478 ) 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
2479} 2706}
2480 2707
2481sub size_request { 2708sub size_request {
2482 (32, 8) 2709 (32, 8)
2483} 2710}
2484 2711
2712sub update {
2713 my ($self) = @_;
2714
2715 return unless $self->{visible};
2716
2717 $self->SUPER::update;
2718}
2719
2485sub _draw { 2720sub _draw {
2486 my ($self) = @_; 2721 my ($self) = @_;
2487 2722
2488 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
2489 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2734 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2490 2735
2491 # TODO animation
2492 if ($tex) { 2736 if ($tex) {
2493 glEnable GL_BLEND;
2494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2495 glEnable GL_TEXTURE_2D; 2737 glEnable GL_TEXTURE_2D;
2496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2497 glColor 1, 1, 1, 1; 2739 glColor 1, 1, 1, 1;
2498 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2740 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2499 glDisable GL_TEXTURE_2D; 2741 glDisable GL_TEXTURE_2D;
2500 glDisable GL_BLEND;
2501 } 2742 }
2502} 2743}
2503 2744
2504############################################################################# 2745sub DESTROY {
2746 my ($self) = @_;
2505 2747
2748 $self->{timer}->cancel
2749 if $self->{timer};
2750
2751 $self->SUPER::DESTROY;
2752}
2753
2754#############################################################################
2755
2506package CFClient::UI::InventoryItem; 2756package CFClient::UI::Inventory;
2507 2757
2508our @ISA = CFClient::UI::HBox::; 2758our @ISA = CFClient::UI::ScrolledWindow::;
2509 2759
2510sub new { 2760sub new {
2511 my $class = shift; 2761 my $class = shift;
2512 2762
2513 my %args = @_;
2514
2515 my $item = $args{item};
2516
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521
2522 my $self = $class->SUPER::new ( 2763 my $self = $class->SUPER::new (
2523 can_hover => 1, 2764 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2524 can_events => 1,
2525 tooltip => (CFClient::UI::Label->escape ($desc)
2526 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2527 connect_button_down => sub {
2528 my ($self, $ev, $x, $y) = @_;
2529
2530 # todo: maybe put examine on 1? but should just be a tooltip :(
2531 if ($ev->{button} == 1) {
2532 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2533 } elsif ($ev->{button} == 2) {
2534 $::CONN->send ("apply $item->{tag}");
2535 } elsif ($ev->{button} == 3) {
2536 CFClient::UI::Menu->new (
2537 items => [
2538 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2539 [
2540 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2541 sub { $::CONN->send ("lock $item->{tag}") },
2542 ],
2543 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2544 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2545 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2546 ],
2547 )->popup ($ev);
2548 }
2549
2550 1
2551 },
2552 %args
2553 );
2554 $self->add(new CFClient::UI::Face
2555 can_events => 0,
2556 face => $item->{face},
2557 anim => $item->{anim},
2558 animspeed => $item->{animspeed});
2559 $self->add(new CFClient::UI::Label
2560 can_events => 0,
2561 text => $desc);
2562
2563 $self
2564}
2565
2566#############################################################################
2567
2568package CFClient::UI::Inventory;
2569
2570our @ISA = CFClient::UI::ScrolledWindow::;
2571
2572sub new {
2573 my $class = shift;
2574
2575 my $self = $class->SUPER::new (
2576 scrolled => (new CFClient::UI::VBox),
2577 @_, 2765 @_,
2578 ); 2766 );
2579 2767
2580 $self 2768 $self
2581} 2769}
… …
2584 my ($self, $items) = @_; 2772 my ($self, $items) = @_;
2585 2773
2586 $self->{scrolled}->clear; 2774 $self->{scrolled}->clear;
2587 return unless $items; 2775 return unless $items;
2588 2776
2589 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;
2590 2781
2591 $self->{real_items} = \@items; 2782 $self->{real_items} = \@items;
2592 2783
2784 my $row = 0;
2593 for my $item (@items) { 2785 for my $item (@items) {
2594 my $desc = $item->{nrof} < 2 2786 CFClient::Item::update_widgets $item;
2595 ? $item->{name}
2596 : "$item->{nrof} $item->{name_pl}";
2597 2787
2598 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2788 $self->{scrolled}->add (0, $row, $item->{face_widget});
2599 } 2789 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2790 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2600 2791
2601# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2792 $row++;
2602} 2793 }
2603
2604sub size_request {
2605 my ($self) = @_;
2606 ($self->{req_w}, $self->{req_h});
2607} 2794}
2608 2795
2609############################################################################# 2796#############################################################################
2610 2797
2611package CFClient::UI::Menu; 2798package CFClient::UI::Menu;
… …
2646 2833
2647# 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)
2648sub popup { 2835sub popup {
2649 my ($self, $ev) = @_; 2836 my ($self, $ev) = @_;
2650 2837
2651 $self->emit ("popdown"); 2838 $self->_emit ("popdown");
2652 2839
2653 # maybe save $GRAB? must be careful about events... 2840 # maybe save $GRAB? must be careful about events...
2654 $GRAB = $self; 2841 $GRAB = $self;
2655 $self->{button} = $ev->{button}; 2842 $self->{button} = $ev->{button};
2656 2843
… …
2671 2858
2672 if ($ev->{button} == $self->{button}) { 2859 if ($ev->{button} == $self->{button}) {
2673 undef $GRAB; 2860 undef $GRAB;
2674 $self->hide; 2861 $self->hide;
2675 2862
2676 $self->emit ("popdown"); 2863 $self->_emit ("popdown");
2677 $self->{hover}[1]->() if $self->{hover}; 2864 $self->{hover}[1]->() if $self->{hover};
2678 } 2865 }
2679} 2866}
2680 2867
2681############################################################################# 2868#############################################################################
2682 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
2683package CFClient::UI::Root; 2980package CFClient::UI::Root;
2684 2981
2685our @ISA = CFClient::UI::Container::; 2982our @ISA = CFClient::UI::Container::;
2686 2983
2687use CFClient::OpenGL; 2984use CFClient::OpenGL;
2688 2985
2689sub check_size { 2986sub new {
2690 my ($self) = @_; 2987 my $class = shift;
2691 2988
2692 $self->configure (0, 0, $self->{w}, $self->{h}); 2989 my $self = $class->SUPER::new (
2693} 2990 visible => 1,
2694
2695sub size_request {
2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2699}
2700
2701sub size_allocate {
2702 my ($self, $w, $h) = @_;
2703
2704 my $old_w = $self->{old_w};
2705 my $old_h = $self->{old_h};
2706
2707 if ($old_w && $old_h) {
2708 for my $child ($self->children) {
2709 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2710 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2711 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2712 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2713 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2714 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2715 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2716 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2717 } 2991 @_,
2718 } 2992 );
2719 2993
2720 $self->{old_w} = $w; 2994 Scalar::Util::weaken ($self->{root} = $self);
2721 $self->{old_h} = $h; 2995
2996 $self
2722} 2997}
2723 2998
2724sub configure { 2999sub configure {
2725 my ($self, $x, $y, $w, $h) = @_; 3000 my ($self, $x, $y, $w, $h) = @_;
2726 3001
2727 $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) = @_;
2728 3023
2729 for my $child ($self->children) { 3024 for my $child ($self->children) {
2730 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)};
2731 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
2732 $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;
2733 $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
2734 $child->configure ($X, $Y, $W, $H); 3038 $child->configure ($X, $Y, $W, $H);
2735 } 3039 }
2736} 3040}
2737 3041
2738sub _topleft { 3042sub coord2local {
2739 my ($self, $x, $y) = @_; 3043 my ($self, $x, $y) = @_;
2740 3044
2741 ($x, $y) 3045 ($x, $y)
2742} 3046}
2743 3047
3048sub coord2global {
3049 my ($self, $x, $y) = @_;
3050
3051 ($x, $y)
3052}
3053
2744sub update { 3054sub update {
2745 my ($self) = @_; 3055 my ($self) = @_;
2746 3056
2747 $self->check_size; 3057 $::WANT_REFRESH++;
2748 ::refresh ();
2749} 3058}
2750 3059
2751sub add { 3060sub add {
2752 my ($self, $child) = @_; 3061 my ($self, @children) = @_;
2753 3062
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1;
3065
2754 # integerize window positions 3066 # integerise window positions
2755 $child->{x} = int $child->{x}; 3067 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y}; 3068 $child->{y} = int $child->{y};
3069 }
2757 3070
2758 $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 }
2759} 3084}
2760 3085
2761sub on_refresh { 3086sub on_refresh {
2762 my ($self, $id, $cb) = @_; 3087 my ($self, $id, $cb) = @_;
2763 3088
2764 $self->{refresh_hook}{$id} = $cb; 3089 $self->{refresh_hook}{$id} = $cb;
2765} 3090}
2766 3091
3092sub on_post_alloc {
3093 my ($self, $id, $cb) = @_;
3094
3095 $self->{post_alloc_hook}{$id} = $cb;
3096}
3097
2767sub draw { 3098sub draw {
2768 my ($self) = @_; 3099 my ($self) = @_;
2769 3100
2770 while (my $rcb = delete $self->{refresh_hook}) { 3101 while ($self->{refresh_hook}) {
2771 $_->() 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}};
2772 } 3159 }
2773 3160
2774 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3161 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2775 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3162 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2776 glClear GL_COLOR_BUFFER_BIT; 3163 glClear GL_COLOR_BUFFER_BIT;
2777 3164
2778 glMatrixMode GL_PROJECTION; 3165 glMatrixMode GL_PROJECTION;
2779 glLoadIdentity; 3166 glLoadIdentity;
2780 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3167 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2781 glMatrixMode GL_MODELVIEW; 3168 glMatrixMode GL_MODELVIEW;
2782 glLoadIdentity; 3169 glLoadIdentity;
2783 3170
2784 $self->_draw; 3171 $self->_draw;
2785} 3172}
… …
2787############################################################################# 3174#############################################################################
2788 3175
2789package CFClient::UI; 3176package CFClient::UI;
2790 3177
2791$ROOT = new CFClient::UI::Root; 3178$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip; 3179$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2793 3180
27941 31811
2795 3182

Diff Legend

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