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.253 by root, Sun May 28 23:28:12 2006 UTC

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

Diff Legend

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