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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.254 by root, Mon May 29 01:53:23 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 } 357 }
243} 358}
244 359
245sub size_allocate { 360sub size_allocate {
246 # nothing to be done 361 # nothing to be done
247} 362}
248 363
249sub children { 364sub children {
250} 365}
251 366
252# call when resoltuion changes etc.
253sub reconfigure {
254 my ($self) = @_;
255
256 $_->reconfigure
257 for $self->children;
258
259 $_->check_size;
260}
261
262sub set_max_size { 367sub set_max_size {
263 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
264 369
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
267} 372}
268 373
269# return top left coordinates 374sub set_tooltip {
270sub _topleft {
271 my ($self, $x, $y) = @_; 375 my ($self, $tooltip) = @_;
272 376
273 $self->{parent} 377 $tooltip =~ s/^\s+//;
274 or Carp::confess "no parent widget in _topleft\n";#d# 378 $tooltip =~ s/\s+$//;
275 379
276 $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 }
277} 388}
278 389
279# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
280sub coord2local { 391sub coord2local {
281 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
282 393
283 my ($X, $Y) = $self->_topleft; 394 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
284 ($x - $X, $y - $Y)
285} 395}
286 396
287# translate local coordinates to global coordinate system 397# translate local coordinates to global coordinate system
288sub coord2global { 398sub coord2global {
289 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
290 400
291 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
292 ($x + $X, $y + $Y)
293} 402}
294 403
295sub focus_in { 404sub focus_in {
296 my ($self) = @_; 405 my ($self) = @_;
297 406
298 return if $FOCUS == $self; 407 return if $FOCUS == $self;
299 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
300 409
301 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
302 411
303 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
304 413
305 $focus->update if $focus; 414 $focus->update if $focus;
306 $FOCUS->update; 415 $FOCUS->update;
307} 416}
308 417
… …
311 420
312 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
313 422
314 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
315 424
316 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
317 426
318 $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;
319} 431}
320 432
321sub mouse_motion { } 433sub mouse_motion { }
322sub button_up { } 434sub button_up { }
323sub key_down { } 435sub key_down { }
324sub key_up { } 436sub key_up { }
325 437
326sub button_down { 438sub button_down {
327 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
328 440
329 $self->focus_in; 441 $self->focus_in;
… …
332sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
333sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
334sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
335sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
336sub 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}
337 512
338sub draw { 513sub draw {
339 my ($self) = @_; 514 my ($self) = @_;
340 515
341 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
363 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
364 glPushMatrix; 539 glPushMatrix;
365 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
366 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
367 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
368 glVertex 0 , 0; 543 glVertex 0 , 0;
369 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
370 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
371 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
372 glEnd; 547 glEnd;
373 glPopMatrix; 548 glPopMatrix;
374 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;
375 } 550 }
376} 551}
377 552
378sub _draw { 553sub _draw {
379 my ($self) = @_; 554 my ($self) = @_;
380 555
381 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
382} 557}
383 558
384sub find_widget {
385 my ($self, $x, $y) = @_;
386
387 return () unless $self->{can_events};
388
389 return $self
390 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
391 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
392
393 ()
394}
395
396sub set_parent {
397 my ($self, $parent) = @_;
398
399 Scalar::Util::weaken ($self->{parent} = $parent);
400}
401
402sub check_size {
403 my ($self) = @_;
404
405 $self->{parent}
406 or return 1;
407
408 my ($w, $h) = $self->{user_w} && $self->{user_h}
409 ? @$self{qw(user_w user_h)}
410 : $self->size_request;
411
412 if ($w != $self->{req_w} || $h != $self->{req_h}) {
413 $self->{req_w} = $w;
414 $self->{req_h} = $h;
415
416 $self->{parent}->check_size
417 or $self->size_allocate (
418 (List::Util::max $self->{w}, $w),
419 (List::Util::max $self->{h}, $h),
420 );
421
422 1
423 } else {
424 0
425 }
426}
427
428sub update {
429 my ($self) = @_;
430
431 $self->{parent}->update
432 if $self->{parent};
433}
434
435sub connect {
436 my ($self, $signal, $cb) = @_;
437
438 push @{ $self->{signal_cb}{$signal} }, $cb;
439}
440
441sub emit {
442 my ($self, $signal, @args) = @_;
443
444 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
445}
446
447sub DESTROY { 559sub DESTROY {
448 my ($self) = @_; 560 my ($self) = @_;
449 561
562 delete $WIDGET{$self+0};
450 #$self->deactivate; 563 #$self->deactivate;
451} 564}
452 565
453############################################################################# 566#############################################################################
454 567
… …
463 my $class = shift; 576 my $class = shift;
464 577
465 # range [value, low, high, page] 578 # range [value, low, high, page]
466 579
467 $class->SUPER::new ( 580 $class->SUPER::new (
468 bg => [0, 0, 0, 0.2], 581 #bg => [0, 0, 0, 0.2],
469 active_bg => [1, 1, 1, 0.5], 582 #active_bg => [1, 1, 1, 0.5],
470 @_ 583 @_
471 ) 584 )
472} 585}
473 586
474sub _draw { 587sub _draw {
475 my ($self) = @_; 588 my ($self) = @_;
476 589
590 my $color = $FOCUS == $self && $self->{active_bg}
591 ? $self->{active_bg}
592 : $self->{bg};
593
594 if ($color && (@$color < 4 || $color->[3])) {
477 my ($w, $h) = @$self{qw(w h)}; 595 my ($w, $h) = @$self{qw(w h)};
478 596
479 glEnable GL_BLEND; 597 glEnable GL_BLEND;
480 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
481 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 599 glColor @$color;
482 600
483 glBegin GL_QUADS; 601 glBegin GL_QUADS;
484 glVertex 0 , 0; 602 glVertex 0 , 0;
485 glVertex 0 , $h; 603 glVertex 0 , $h;
486 glVertex $w, $h; 604 glVertex $w, $h;
487 glVertex $w, 0; 605 glVertex $w, 0;
488 glEnd; 606 glEnd;
489 607
490 glDisable GL_BLEND; 608 glDisable GL_BLEND;
609 }
491} 610}
492 611
493############################################################################# 612#############################################################################
494 613
495package CFClient::UI::Empty; 614package CFClient::UI::Empty;
… …
527 646
528 $self 647 $self
529} 648}
530 649
531sub add { 650sub add {
532 my ($self, $child) = @_; 651 my ($self, @widgets) = @_;
533 652
534 $child->set_parent ($self); 653 $_->set_parent ($self)
654 for @widgets;
535 655
536 use sort 'stable'; 656 use sort 'stable';
537 657
538 $self->{children} = [ 658 $self->{children} = [
539 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
540 @{$self->{children}}, $child 660 @{$self->{children}}, @widgets
541 ]; 661 ];
542 662
543 $child->check_size; 663 $self->realloc;
544} 664}
545 665
546sub children { 666sub children {
547 @{ $_[0]{children} } 667 @{ $_[0]{children} }
548} 668}
… …
553 delete $child->{parent}; 673 delete $child->{parent};
554 $child->hide; 674 $child->hide;
555 675
556 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
557 677
558 $self->check_size; 678 $self->realloc;
559 $self->update;
560} 679}
561 680
562sub clear { 681sub clear {
563 my ($self) = @_; 682 my ($self) = @_;
564 683
… …
567 686
568 for (@$children) { 687 for (@$children) {
569 delete $_->{parent}; 688 delete $_->{parent};
570 $_->hide; 689 $_->hide;
571 } 690 }
691
692 $self->realloc;
572} 693}
573 694
574sub find_widget { 695sub find_widget {
575 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
576 697
… …
629sub size_request { 750sub size_request {
630 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
631} 752}
632 753
633sub size_allocate { 754sub size_allocate {
634 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
635 756
636 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
637} 758}
638 759
639############################################################################# 760#############################################################################
… …
651} 772}
652 773
653sub update { 774sub update {
654 my ($self) = @_; 775 my ($self) = @_;
655 776
656 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
657 $self->SUPER::update; 778 $self->SUPER::update;
658} 779}
659 780
660sub size_allocate { 781sub size_allocate {
661 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
662 783
663 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
664 $self->update; 785 $self->update
786 if $changed;
787}
788
789sub _render {
790 $_[0]{children}[0]->draw;
665} 791}
666 792
667sub render_child { 793sub render_child {
668 my ($self) = @_; 794 my ($self) = @_;
669 795
670 $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 {
671 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
672 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
673 $self->child->draw; 799
674# glColorMask 1, 1, 1, 0; 800 $self->_render;
675# glEnable GL_BLEND;
676# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
677# glRasterPos 0, 0;
678# glCopyPixels 0, 0, $self->{w}, $self->{h};
679# glDisable GL_BLEND;
680# glColorMask 1, 1, 1, 1;
681 }; 801 };
682} 802}
683 803
684sub _draw { 804sub _draw {
685 my ($self) = @_; 805 my ($self) = @_;
… …
687 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
688 808
689 my $tex = $self->{texture} 809 my $tex = $self->{texture}
690 or return; 810 or return;
691 811
692 glEnable GL_BLEND;
693 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
696 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
697 815
698 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
699 817
700 glDisable GL_BLEND;
701 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
702} 819}
703 820
704############################################################################# 821#############################################################################
705 822
706package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
707 824
708our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
709
710sub new { die }
711
712sub size_request {
713 my ($self) = @_;
714
715 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
716 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
717
718 @$self{qw(child_w child_h)}
719}
720
721sub _draw {
722 my ($self) = @_;
723
724 $self->{children}[1]->draw;
725}
726
727
728#############################################################################
729
730package CFClient::UI::Frame;
731
732our @ISA = CFClient::UI::Bin::;
733
734use CFClient::OpenGL;
735 826
736sub new { 827sub new {
737 my $class = shift; 828 my $class = shift;
738 829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
837sub size_request {
838 my ($self) = @_;
839
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
841
842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
846}
847
848sub size_allocate {
849 my ($self, $w, $h, $changed) = @_;
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);
855 $self->update;
856}
857
858sub set_offset {
859 my ($self, $x, $y) = @_;
860
861 $self->{view_x} = int $x;
862 $self->{view_y} = int $y;
863
864 $self->update;
865}
866
867# hmm, this does not work for topleft of $self... but we should not ask for that
868sub coord2local {
869 my ($self, $x, $y) = @_;
870
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)
881}
882
883sub find_widget {
884 my ($self, $x, $y) = @_;
885
886 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
887 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
888 ) {
889 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
890 } else {
891 $self->CFClient::UI::Base::find_widget ($x, $y)
892 }
893}
894
895sub _render {
896 my ($self) = @_;
897
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899
900 $self->SUPER::_render;
901}
902
903#############################################################################
904
905package CFClient::UI::ScrolledWindow;
906
907our @ISA = CFClient::UI::HBox::;
908
909sub new {
910 my $class = shift;
911
912 my $self;
913
914 my $slider = new CFClient::UI::Slider
915 vertical => 1,
916 range => [0, 0, 1, 0.01], # HACK fix
917 on_changed => sub {
918 $self->{vp}->set_offset (0, $_[1]);
919 },
920 ;
921
739 my $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
740 bg => [1, 1, 1, 1], 923 vp => (new CFClient::UI::ViewPort expand => 1),
741 border_bg => [1, 1, 1, 1], 924 slider => $slider,
742 border => 0.8,
743 @_ 925 @_,
744 ); 926 );
745 927
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider});
931
746 $self 932 $self
747} 933}
748 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
954#TODO# update range on size_allocate depending on child
955# update viewport offset on scroll
956
957#############################################################################
958
959package CFClient::UI::Frame;
960
961our @ISA = CFClient::UI::Bin::;
962
963use CFClient::OpenGL;
964
965sub new {
966 my $class = shift;
967
968 $class->SUPER::new (
969 bg => undef,
970 @_,
971 )
972}
973
749sub _draw { 974sub _draw {
750 my ($self) = @_; 975 my ($self) = @_;
751 976
752 my ($w, $h) = ($self->{w}, $self->{h}); 977 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)};
753 979
754 glEnable GL_BLEND; 980 glEnable GL_BLEND;
755 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
756 glEnable GL_TEXTURE_2D; 982 glColor @{ $self->{bg} };
757 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
758 983
759# glBegin GL_QUADS; 984 glBegin GL_QUADS;
760# glColor 0, 0, 0, 0;
761# glVertex 0 , 0; 985 glVertex 0 , 0;
762# glVertex 0 , $h; 986 glVertex 0 , $h;
763# glVertex $w, $h; 987 glVertex $w, $h;
764# glVertex $w, 0; 988 glVertex $w, 0;
765# glEnd; 989 glEnd;
766 990
767
768 $self->child->draw;
769 glDisable GL_BLEND; 991 glDisable GL_BLEND;
770 glDisable GL_TEXTURE_2D; 992 }
993
994 $self->SUPER::_draw;
771} 995}
772 996
773############################################################################# 997#############################################################################
774 998
775package CFClient::UI::FancyFrame; 999package CFClient::UI::FancyFrame;
… …
783 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);
784 1008
785sub new { 1009sub new {
786 my $class = shift; 1010 my $class = shift;
787 1011
788 # TODO: user_x, user_y, overwrite moveto?
789
790 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1015 border => 0.6,
1016 is_toplevel => 1,
794 can_events => 1, 1017 can_events => 1,
795 @_ 1018 @_
796 ); 1019 );
797 1020
798 $self->{title} &&= new CFClient::UI::Label 1021 $self->{title} &&= new CFClient::UI::Label
799 align => 0, 1022 align => 0,
… …
818 $h + $self->border * 2, 1041 $h + $self->border * 2,
819 ) 1042 )
820} 1043}
821 1044
822sub size_allocate { 1045sub size_allocate {
823 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
824 1049
825 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
827 1052
828 $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)
829 if $self->{title}; 1054 if $self->{title};
830 1055
831 $self->child->configure ($self->border, $self->border, $w, $h); 1056 $self->child->configure ($self->border, $self->border, $w, $h);
832} 1057}
833 1058
… …
852 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
853 1078
854 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
856 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
860 $self->check_size; 1087 $self->realloc;
861 }; 1088 };
862 1089
863 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1094 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
869 1096
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
871 1098
872 $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});
873 $self->update; 1103 $self->realloc;
874 }; 1104 };
875 } 1105 }
876} 1106}
877 1107
878sub button_up { 1108sub button_up {
… …
891 my ($self) = @_; 1121 my ($self) = @_;
892 1122
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1123 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
895 1125
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1126 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1128
901 my $border = $self->border; 1129 my $border = $self->border;
902 1130
903 glColor @{ $self->{border_bg} }; 1131 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1136
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1138 my $bg = $tex[0];
911 1139
912 # TODO: repeat texture not scale 1140 # TODO: repeat texture not scale
… …
916 glColor @{ $self->{bg} }; 1144 glColor @{ $self->{bg} };
917 1145
918 $bg->{s} = $rep_x; 1146 $bg->{s} = $rep_x;
919 $bg->{t} = $rep_y; 1147 $bg->{t} = $rep_y;
920 $bg->{wrap_mode} = 1; 1148 $bg->{wrap_mode} = 1;
921 $bg->draw_quad ($border, $border, $cw, $ch); 1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 }
922 1151
923 glDisable GL_TEXTURE_2D; 1152 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1153
927 $self->{title}->draw if $self->{title}; 1154 $self->{title}->draw if $self->{title};
928 1155
929 $self->child->draw; 1156 $self->child->draw;
930} 1157}
… …
942sub new { 1169sub new {
943 my $class = shift; 1170 my $class = shift;
944 1171
945 $class->SUPER::new ( 1172 $class->SUPER::new (
946 col_expand => [], 1173 col_expand => [],
947 @_ 1174 @_,
948 ) 1175 )
1176}
1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
949} 1180}
950 1181
951sub add { 1182sub add {
952 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
953 1184
954 $child->set_parent ($self); 1185 $child->set_parent ($self);
955 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
956 1187
957 $child->check_size; 1188 $self->realloc;
958} 1189}
959 1190
960sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962}
963
964# 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?
965sub clear { 1192sub clear {
966 my ($self) = @_; 1193 my ($self) = @_;
967 1194
968 my @children = $self->children; 1195 my @children = $self->children;
969 delete $self->{children}; 1196 delete $self->{children};
… …
971 for (@children) { 1198 for (@children) {
972 delete $_->{parent}; 1199 delete $_->{parent};
973 $_->hide; 1200 $_->hide;
974 } 1201 }
975 1202
976 $self->update; 1203 $self->realloc;
977} 1204}
978 1205
979sub get_wh { 1206sub get_wh {
980 my ($self) = @_; 1207 my ($self) = @_;
981 1208
… …
1008 (sum @$hs), 1235 (sum @$hs),
1009 ) 1236 )
1010} 1237}
1011 1238
1012sub size_allocate { 1239sub size_allocate {
1013 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1014 1241
1015 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1016 1243
1017 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1019 1246
1020 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1077 } 1304 }
1078} 1305}
1079 1306
1080############################################################################# 1307#############################################################################
1081 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
1082package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1083 1370
1084# TODO: wrap into common Box base class
1085
1086our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1087 1372
1088sub size_request { 1373sub new {
1089 my ($self) = @_; 1374 my $class = shift;
1090 1375
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1092 1377 vertical => 0,
1093 ( 1378 @_,
1094 (List::Util::sum map $_->[0], @alloc),
1095 (List::Util::max map $_->[1], @alloc),
1096 ) 1379 )
1097} 1380}
1098 1381
1099sub size_allocate {
1100 my ($self, $w, $h) = @_;
1101
1102 ($h, $w) = ($w, $h);
1103
1104 my $children = $self->{children};
1105
1106 my @h = map $_->{req_w}, @$children;
1107
1108 my $req_h = List::Util::sum @h;
1109
1110 if ($req_h > $h) {
1111 # ah well, not enough space
1112 $_ *= $h / $req_h for @h;
1113 } else {
1114 my $exp = List::Util::sum map $_->{expand}, @$children;
1115 $exp ||= 1;
1116
1117 for (0 .. $#$children) {
1118 my $child = $children->[$_];
1119
1120 my $alloc_h = $h[$_];
1121 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1122 $h[$_] = $alloc_h;
1123 }
1124 }
1125
1126 CFClient::UI::harmonize \@h;
1127
1128 my $y = 0;
1129 for (0 .. $#$children) {
1130 my $child = $children->[$_];
1131 my $h = $h[$_];
1132 $child->configure ($y, 0, $h, $w);
1133
1134 $y += $h;
1135 }
1136
1137 1
1138}
1139
1140############################################################################# 1382#############################################################################
1141 1383
1142package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1143 1385
1144# TODO: wrap into common Box base class
1145
1146our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1147 1387
1148sub size_request { 1388sub new {
1149 my ($self) = @_; 1389 my $class = shift;
1150 1390
1151 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1152 1392 vertical => 1,
1153 ( 1393 @_,
1154 (List::Util::max map $_->[0], @alloc),
1155 (List::Util::sum map $_->[1], @alloc),
1156 ) 1394 )
1157} 1395}
1158 1396
1159sub size_allocate {
1160 my ($self, $w, $h) = @_;
1161
1162 my $children = $self->{children};
1163
1164 my @h = map $_->{req_h}, @$children;
1165
1166 my $req_h = List::Util::sum @h;
1167
1168 if ($req_h > $h) {
1169 # ah well, not enough space
1170 $_ *= $h / $req_h for @h;
1171 } else {
1172 my $exp = List::Util::sum map $_->{expand}, @$children;
1173 $exp ||= 1;
1174
1175 for (0 .. $#$children) {
1176 my $child = $children->[$_];
1177
1178 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1179 }
1180 }
1181
1182 CFClient::UI::harmonize \@h;
1183
1184 my $y = 0;
1185 for (0 .. $#$children) {
1186 my $child = $children->[$_];
1187 my $h = $h[$_];
1188 $child->configure (0, $y, $w, $h);
1189
1190 $y += $h;
1191 }
1192
1193 1
1194}
1195
1196############################################################################# 1397#############################################################################
1197 1398
1198package CFClient::UI::Label; 1399package CFClient::UI::Label;
1199 1400
1200our @ISA = CFClient::UI::Base::; 1401our @ISA = CFClient::UI::DrawBG::;
1201 1402
1202use CFClient::OpenGL; 1403use CFClient::OpenGL;
1203 1404
1204sub new { 1405sub new {
1205 my ($class, %arg) = @_; 1406 my ($class, %arg) = @_;
1206 1407
1207 my $self = $class->SUPER::new ( 1408 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1409 fg => [1, 1, 1],
1410 #bg => none
1411 #active_bg => none
1209 #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),
1210 fontsize => 1, 1418 fontsize => 1,
1211 text => "",
1212 align => -1, 1419 align => -1,
1213 valign => -1, 1420 valign => -1,
1214 padding => 2, 1421 padding => 2,
1215 layout => new CFClient::Layout,
1216 can_events => 0, 1422 can_events => 0,
1217 %arg 1423 %arg
1218 ); 1424 );
1219 1425
1220 if (exists $self->{template}) { 1426 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1427 my $layout = new CFClient::Layout;
1222 $layout->set_text (delete $self->{template}); 1428 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1429 $self->{template} = $layout;
1224 } 1430 }
1225 1431
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1432 if (exists $self->{markup}) {
1227 $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 }
1228 1437
1229 $self 1438 $self
1230} 1439}
1231 1440
1232sub escape { 1441sub escape($) {
1233 local $_ = $_[1]; 1442 local $_ = $_[0];
1234 1443
1235 s/&/&amp;/g; 1444 s/&/&amp;/g;
1236 s/>/&gt;/g; 1445 s/>/&gt;/g;
1237 s/</&lt;/g; 1446 s/</&lt;/g;
1238 1447
1239 $_[1] 1448 $_
1240} 1449}
1241 1450
1242sub update { 1451sub update {
1243 my ($self) = @_; 1452 my ($self) = @_;
1244 1453
1245 delete $self->{texture}; 1454 delete $self->{texture};
1246 $self->SUPER::update; 1455 $self->SUPER::update;
1247} 1456}
1248 1457
1249sub reconfigure {
1250 my ($self) = @_;
1251
1252 delete $self->{texture};
1253}
1254
1255sub set_text { 1458sub set_text {
1256 my ($self, $text) = @_; 1459 my ($self, $text) = @_;
1257 1460
1258 return if $self->{text} eq "T$text"; 1461 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1260 1463
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1261 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1262 1466
1263 delete $self->{texture}; 1467 $self->realloc;
1264 $self->update; 1468 $self->update;
1265 $self->check_size;
1266} 1469}
1267 1470
1268sub set_markup { 1471sub set_markup {
1269 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1270 1473
1271 return if $self->{text} eq "M$markup"; 1474 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1475 $self->{text} = "M$markup";
1273 1476
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1274 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1275 1481
1276 delete $self->{texture}; 1482 $self->realloc;
1277 $self->update; 1483 $self->update;
1278 $self->check_size;
1279} 1484}
1280 1485
1281sub size_request { 1486sub size_request {
1282 my ($self) = @_; 1487 my ($self) = @_;
1283 1488
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1489 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $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});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1494
1288 my ($w, $h) = $self->{layout}->size; 1495 my ($w, $h) = $self->{layout}->size;
1289 1496
1290 if (exists $self->{template}) { 1497 if (exists $self->{template}) {
… …
1302 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1303 ) 1510 )
1304} 1511}
1305 1512
1306sub size_allocate { 1513sub size_allocate {
1307 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1308 1515
1309 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1310} 1518}
1311 1519
1312sub set_fontsize { 1520sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1314 1522
1315 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1316 delete $self->{texture}; 1524 delete $self->{texture};
1317 $self->check_size; 1525
1318 $self->update; 1526 $self->realloc;
1319} 1527}
1320 1528
1321sub _draw { 1529sub _draw {
1322 my ($self) = @_; 1530 my ($self) = @_;
1323 1531
1532 $self->SUPER::_draw; # draw background, if applicable
1533
1324 my $tex = $self->{texture} ||= do { 1534 my $tex = $self->{texture} ||= do {
1535 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1536 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $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});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541
1328 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
1329 }; 1553 };
1330 1554
1331 glEnable GL_BLEND;
1332 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1333 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1335 1557
1558 if ($tex->{format} == GL_ALPHA) {
1336 glColor @{$self->{fg}}; 1559 glColor @{$self->{fg}};
1337
1338 $self->{ox} = int (
1339 $self->{align} < 0 ? $self->{padding}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1341 : ($self->{w} - $tex->{w}) * 0.5
1342 );
1343
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1347 : ($self->{h} - $tex->{h}) * 0.5
1348 );
1349
1350 $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 }
1351 1564
1352 glDisable GL_TEXTURE_2D; 1565 glDisable GL_TEXTURE_2D;
1353 glDisable GL_BLEND;
1354} 1566}
1355 1567
1356############################################################################# 1568#############################################################################
1357 1569
1358package CFClient::UI::EntryBase; 1570package CFClient::UI::EntryBase;
… …
1371 active_fg => [0, 0, 0], 1583 active_fg => [0, 0, 0],
1372 can_hover => 1, 1584 can_hover => 1,
1373 can_focus => 1, 1585 can_focus => 1,
1374 valign => 0, 1586 valign => 0,
1375 can_events => 1, 1587 can_events => 1,
1588 #text => ...
1376 @_ 1589 @_
1377 ) 1590 )
1378} 1591}
1379 1592
1380sub _set_text { 1593sub _set_text {
… …
1390 $self->{text} = $text; 1603 $self->{text} = $text;
1391 1604
1392 $text =~ s/./*/g if $self->{hidden}; 1605 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1606 $self->{layout}->set_text ("$text ");
1394 1607
1395 $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;
1396} 1618}
1397 1619
1398sub get_text { 1620sub get_text {
1399 $_[0]{text} 1621 $_[0]{text}
1400} 1622}
… …
1403 my ($self) = @_; 1625 my ($self) = @_;
1404 1626
1405 my ($w, $h) = $self->SUPER::size_request; 1627 my ($w, $h) = $self->SUPER::size_request;
1406 1628
1407 ($w + 1, $h) # add 1 for cursor 1629 ($w + 1, $h) # add 1 for cursor
1408}
1409
1410sub size_allocate {
1411 my ($self, $w, $h) = @_;
1412
1413 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1414}
1415
1416sub set_text {
1417 my ($self, $text) = @_;
1418
1419 $self->{cursor} = length $text;
1420 $self->_set_text ($text);
1421 $self->update;
1422} 1630}
1423 1631
1424sub key_down { 1632sub key_down {
1425 my ($self, $ev) = @_; 1633 my ($self, $ev) = @_;
1426 1634
… …
1428 my $sym = $ev->{sym}; 1636 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1637 my $uni = $ev->{unicode};
1430 1638
1431 my $text = $self->get_text; 1639 my $text = $self->get_text;
1432 1640
1433 if ($sym == 8) { 1641 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1642 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1643 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1644 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1645 } elsif ($sym == CFClient::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1646 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1647 } elsif ($sym == CFClient::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1648 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1649 } elsif ($sym == CFClient::SDLK_HOME) {
1442 $self->{cursor} = 0; 1650 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1651 } elsif ($sym == CFClient::SDLK_END) {
1444 $self->{cursor} = length $text; 1652 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1653 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1654 $self->_emit ('escape');
1447 } elsif ($uni) { 1655 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1449 } 1657 }
1450 1658
1451 $self->_set_text ($text); 1659 $self->_set_text ($text);
1452 $self->update; 1660
1661 $self->realloc;
1453} 1662}
1454 1663
1455sub focus_in { 1664sub focus_in {
1456 my ($self) = @_; 1665 my ($self) = @_;
1457 1666
… …
1537 if ($sym == 13) { 1746 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1747 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1748 my $txt = $self->get_text;
1540 $self->{history_pointer} = -1; 1749 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1750 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1751 $self->_emit (activate => $txt);
1543 $self->update; 1752 $self->update;
1544 1753
1545 } elsif ($sym == CFClient::SDLK_UP) { 1754 } elsif ($sym == CFClient::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1755 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1756 $self->{history_saveback} = $self->get_text;
… …
1586 my $class = shift; 1795 my $class = shift;
1587 1796
1588 $class->SUPER::new ( 1797 $class->SUPER::new (
1589 padding => 4, 1798 padding => 4,
1590 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 1800 active_fg => [0, 0, 1],
1593 can_hover => 1, 1801 can_hover => 1,
1594 align => 0, 1802 align => 0,
1595 valign => 0, 1803 valign => 0,
1596 can_events => 1, 1804 can_events => 1,
1597 @_ 1805 @_
1598 ) 1806 )
1599} 1807}
1600 1808
1809sub activate { }
1810
1601sub button_up { 1811sub button_up {
1602 my ($self, $ev, $x, $y) = @_; 1812 my ($self, $ev, $x, $y) = @_;
1603 1813
1814 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 1815 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 1816 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate");
1607 }
1608} 1817}
1609 1818
1610sub _draw { 1819sub _draw {
1611 my ($self) = @_; 1820 my ($self) = @_;
1612 1821
… …
1614 1823
1615 if ($GRAB == $self) { 1824 if ($GRAB == $self) {
1616 $self->{fg} = $self->{active_fg}; 1825 $self->{fg} = $self->{active_fg};
1617 } 1826 }
1618 1827
1619 glEnable GL_BLEND;
1620 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1621 glEnable GL_TEXTURE_2D; 1828 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 1830 glColor 0, 0, 0, 1;
1624 1831
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1832 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 1833
1627 glDisable GL_TEXTURE_2D; 1834 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 1835
1630 $self->SUPER::_draw; 1836 $self->SUPER::_draw;
1631} 1837}
1632 1838
1633############################################################################# 1839#############################################################################
… …
1647 1853
1648 $class->SUPER::new ( 1854 $class->SUPER::new (
1649 padding => 2, 1855 padding => 2,
1650 fg => [1, 1, 1], 1856 fg => [1, 1, 1],
1651 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],
1652 state => 0, 1860 state => 0,
1653 can_hover => 1, 1861 can_hover => 1,
1654 @_ 1862 @_
1655 ) 1863 )
1656} 1864}
… …
1665 my ($self, $ev, $x, $y) = @_; 1873 my ($self, $ev, $x, $y) = @_;
1666 1874
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1669 $self->{state} = !$self->{state}; 1877 $self->{state} = !$self->{state};
1670 $self->emit (changed => $self->{state}); 1878 $self->_emit (changed => $self->{state});
1671 } 1879 }
1672} 1880}
1673 1881
1674sub _draw { 1882sub _draw {
1675 my ($self) = @_; 1883 my ($self) = @_;
… …
1680 1888
1681 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;
1682 1890
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 1892
1685 glEnable GL_BLEND; 1893 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894
1686 glEnable GL_TEXTURE_2D; 1895 glEnable GL_TEXTURE_2D;
1687 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1688
1689 my $tex = $self->{state} ? $tex[1] : $tex[0];
1690
1691 $tex->draw_quad (0, 0, $s, $s); 1896 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 1897 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 1898}
1696 1899
1697############################################################################# 1900#############################################################################
1698 1901
1699package CFClient::UI::Image; 1902package CFClient::UI::Image;
… …
1742 glTranslate 0, -$self->{w}, 0; 1945 glTranslate 0, -$self->{w}, 0;
1743 1946
1744 ($w, $h) = ($h, $w); 1947 ($w, $h) = ($h, $w);
1745 } 1948 }
1746 1949
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 1950 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 1952
1752 $tex->draw_quad (0, 0, $w, $h); 1953 $tex->draw_quad_alpha (0, 0, $w, $h);
1753 1954
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 1955 glDisable GL_TEXTURE_2D;
1756} 1956}
1757 1957
1758############################################################################# 1958#############################################################################
1759 1959
… …
1948 qw(s1_slider.png s1_slider_bg.png); 2148 qw(s1_slider.png s1_slider_bg.png);
1949 2149
1950sub new { 2150sub new {
1951 my $class = shift; 2151 my $class = shift;
1952 2152
1953 # range [value, low, high, page] 2153 # range [value, low, high, page, unit]
1954 2154
1955 # TODO: 0-width page 2155 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2156 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2157 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2158 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2159 fg => [1, 1, 1],
1960 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],
1961 range => [0, 0, 100, 10], 2163 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2164 req_w => $::WIDTH / 80,
1963 req_h => 20, 2165 req_h => $::WIDTH / 80,
1964 vertical => 0, 2166 vertical => 0,
1965 can_hover => 1, 2167 can_hover => 1,
1966 inner_pad => 5, 2168 inner_pad => 0.02,
1967 @_ 2169 @_
1968 ); 2170 );
1969 2171
2172 $self->set_value ($self->{range}[0]);
2173 $self->update;
2174
1970 $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 }
1971} 2210}
1972 2211
1973sub size_request { 2212sub size_request {
1974 my ($self) = @_; 2213 my ($self) = @_;
1975 2214
… …
1981 2220
1982sub button_down { 2221sub button_down {
1983 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1984 2223
1985 $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
1986 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
1987} 2229}
1988 2230
1989sub mouse_motion { 2231sub mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
1991 2233
1992 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
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
1994 2253
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2255
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1998 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2258
2000 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
2002 $x = $lo if $x < $lo;
2003 $x = $hi - $page if $x > $hi - $page;
2004 $self->{range}[0] = $x;
2005 2261
2006 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2263 $self->{knob_w} = $knob_w;
2008 } 2264 });
2009}
2010 2265
2011# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
2012# so that the handle doesn't leave the texture. This calculation isn't 100%
2013# correct propably, but it does the job for now
2014sub _calc_inner_pad_px {
2015 my ($self, $w) = @_;
2016 ($w / 100) * $self->{inner_pad} # % to pixels
2017} 2267}
2018 2268
2019sub _draw { 2269sub _draw {
2020 my ($self) = @_; 2270 my ($self) = @_;
2021 2271
2022 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
2023 2273
2024 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
2025 2275
2026 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
2028 2278
2279 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2281 }
2034 2282
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2285
2038 my ($value, $lo, $hi, $page) = @{$self->{range}};
2039
2040 $hi = $value + 1 if $lo == $hi;
2041
2042 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2043 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2044
2045 $page = int $page * $inner_w / ($hi - $lo);
2046 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2047
2048 $w -= $page;
2049 $page &= ~1;
2050 glTranslate $page * 0.5, 0, 0;
2051 $page ||= 2;
2052
2053 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2054 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2055
2056 glEnable GL_BLEND;
2057 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2058 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2288
2061 # draw background 2289 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2291
2064 # draw handle 2292 # draw handle
2065 $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);
2066 2294
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
2069} 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 (@_) }
2070 2338
2071############################################################################# 2339#############################################################################
2072 2340
2073package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
2074 2342
… …
2083 fontsize => 1, 2351 fontsize => 1,
2084 can_events => 0, 2352 can_events => 0,
2085 #font => default_font 2353 #font => default_font
2086 @_, 2354 @_,
2087 2355
2088 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
2089 par => [], 2357 par => [],
2090 height => 0, 2358 height => 0,
2091 children => [ 2359 children => [
2092 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
… …
2104 2372
2105 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2374 $self->reflow;
2107} 2375}
2108 2376
2109sub text_height {
2110 my ($self, $text) = @_;
2111
2112 my $layout = $self->{layout};
2113
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w});
2116 $layout->set_text ($text);
2117
2118 ($layout->size)[1]
2119}
2120
2121sub reflow {
2122 my ($self) = @_;
2123
2124 $self->{need_reflow}++;
2125 $self->update;
2126}
2127
2128sub size_allocate { 2377sub size_allocate {
2129 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2130 2379
2131 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2132 2383
2133 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2135 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2387
2137 $self->reflow; 2388 $self->reflow;
2138} 2389}
2139 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
2140sub add_paragraph { 2425sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2426 my ($self, $color, $text, $indent) = @_;
2142 2427
2143 #TODO: intelligently "reformat" paragraph 2428 for my $line (split /\n/, $text) {
2144 2429 my ($w, $h) = $self->text_size ($line);
2145 my $height = $self->text_height ($text);
2146
2147 $self->{height} += $height; 2430 $self->{height} += $h;
2431 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2432 }
2148 2433
2149 push @{$self->{par}}, [$height, $color, $text];
2150
2151 $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]);
2152 $self->{children}[1]->update;
2153} 2435}
2154 2436
2155sub update { 2437sub update {
2156 my ($self) = @_; 2438 my ($self) = @_;
2157 2439
… …
2159 2441
2160 return unless $self->{h} > 0; 2442 return unless $self->{h} > 0;
2161 2443
2162 delete $self->{texture}; 2444 delete $self->{texture};
2163 2445
2164 $ROOT->on_refresh ($self, sub { 2446 $ROOT->on_post_alloc ($self, sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448
2165 if (delete $self->{need_reflow}) { 2449 if (delete $self->{need_reflow}) {
2166 my $height = 0; 2450 my $height = 0;
2167 2451
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2452 my $layout = $self->{layout};
2453
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2169 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 }
2170 2467
2171 $self->{height} = $height; 2468 $self->{height} = $height;
2172 2469
2173 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2174 2471
2175 delete $self->{texture}; 2472 delete $self->{texture};
2176 } 2473 }
2177 2474
2178 $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 {
2179 glClearColor 0, 0, 0, 0; 2476 glClearColor 0.5, 0.5, 0.5, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2477 glClear GL_COLOR_BUFFER_BIT;
2181 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
2182 glEnable GL_BLEND; 2490 glEnable GL_BLEND;
2491 #TODO# not correct in windows where rgba is forced off
2183 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2492 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2184 glEnable GL_TEXTURE_2D;
2185 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2186
2187 my $top = int $self->{children}[1]{range}[0];
2188
2189 my $y0 = $top;
2190 my $y1 = $top + $self->{h};
2191
2192 my $y = 0;
2193
2194 my $layout = $self->{layout};
2195
2196 $layout->set_font ($self->{font}) if $self->{font};
2197 2493
2198 for my $par (@{$self->{par}}) { 2494 for my $par (@{$self->{par}}) {
2199 my $h = $par->[0]; 2495 my $h = $par->[1];
2200 2496
2201 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]);
2202 $layout->set_text ($par->[2]); 2500 $layout->set_markup ($par->[4]);
2203 2501
2204 glColor @{ $par->[1] }; 2502 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2205 my ($W, $H) = $layout->size; 2503
2206 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;
2207 } 2506 }
2208 2507
2209 $y += $h; 2508 $y += $h;
2210 } 2509 }
2211 2510
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND; 2511 glDisable GL_BLEND;
2214 }; 2512 };
2215 }); 2513 });
2216} 2514}
2217 2515
2218sub _draw { 2516sub _draw {
2219 my ($self) = @_; 2517 my ($self) = @_;
2220 2518
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2226 $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});
2227 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2524
2230 $self->{children}[1]->draw; 2525 $self->{children}[1]->draw;
2231 2526
2232} 2527}
2233 2528
… …
2281 2576
2282sub new { 2577sub new {
2283 my $class = shift; 2578 my $class = shift;
2284 2579
2285 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2286 state => 0, 2581 state => 0,
2287 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2288 @_ 2583 @_
2289 ); 2584 );
2290 2585
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2586 $self
2297} 2587}
2298 2588
2299sub toggle_flopper { 2589sub toggle_flopper {
2300 my ($self) = @_; 2590 my ($self) = @_;
2301 2591
2302 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2593}
2314 2594
2315############################################################################# 2595#############################################################################
2316 2596
2317package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2327 @_, 2607 @_,
2328 can_events => 0, 2608 can_events => 0,
2329 ) 2609 )
2330} 2610}
2331 2611
2332sub set_markup { 2612sub set_tooltip_from {
2333 my ($self, $text) = @_; 2613 my ($self, $widget) = @_;
2334 2614
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2615 $self->add (new CFClient::UI::Label
2336 $self->{label}->set_markup ($text); 2616 markup => $widget->{tooltip},
2337 $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 );
2338} 2623}
2339 2624
2340sub size_request { 2625sub size_request {
2341 my ($self) = @_; 2626 my ($self) = @_;
2342 2627
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 2629
2347 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2348} 2631}
2349 2632
2350sub size_allocate { 2633sub size_allocate {
2351 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2352 2635
2636 return unless $changed;
2637
2353 $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 or return;
2649
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH;
2654
2655 $self->move ($x, $y);
2656 });
2354} 2657}
2355 2658
2356sub _draw { 2659sub _draw {
2357 my ($self) = @_; 2660 my ($self) = @_;
2358 2661
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 2662 glTranslate 0.375, 0.375;
2361 2663
2362 my ($w, $h) = @$self{qw(w h)}; 2664 my ($w, $h) = @$self{qw(w h)};
2363 2665
2364 glColor 1, 0.8, 0.4; 2666 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 2677 glVertex 0 , $h;
2376 glVertex $w, $h; 2678 glVertex $w, $h;
2377 glVertex $w, 0; 2679 glVertex $w, 0;
2378 glEnd; 2680 glEnd;
2379 2681
2380 glPopMatrix; 2682 glTranslate 2 - 0.375, 2 - 0.375;
2381 2683
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2384} 2685}
2385 2686
2386############################################################################# 2687#############################################################################
2387 2688
… …
2392use CFClient::OpenGL; 2693use CFClient::OpenGL;
2393 2694
2394sub new { 2695sub new {
2395 my $class = shift; 2696 my $class = shift;
2396 2697
2397 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2398 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2399 @_, 2701 @_,
2400 ) 2702 );
2703
2704 if ($self->{anim} && $self->{animspeed}) {
2705 Scalar::Util::weaken (my $widget = $self);
2706
2707 $self->{timer} = Event->timer (
2708 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2709 hard => 1,
2710 interval => $self->{animspeed},
2711 cb => sub {
2712 ++$widget->{frame};
2713 $widget->update;
2714 },
2715 );
2716 }
2717
2718 $self
2401} 2719}
2402 2720
2403sub size_request { 2721sub size_request {
2404 (32, 8) 2722 (32, 8)
2405} 2723}
2406 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2407sub _draw { 2733sub _draw {
2408 my ($self) = @_; 2734 my ($self) = @_;
2409 2735
2736 return unless $::CONN;
2737
2738 my $face;
2739
2740 if ($self->{frame}) {
2741 my $anim = $::CONN->{anim}[$self->{anim}];
2742
2743 $face = $anim->[ $self->{frame} % @$anim ]
2744 if $anim && @$anim;
2745 }
2746
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2748
2412 # TODO animation
2413 if ($tex) { 2749 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND; 2755 }
2756}
2757
2758sub DESTROY {
2759 my ($self) = @_;
2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2765}
2766
2767#############################################################################
2768
2769package CFClient::UI::Inventory;
2770
2771our @ISA = CFClient::UI::ScrolledWindow::;
2772
2773sub new {
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2422 } 2806 }
2423} 2807}
2424 2808
2425############################################################################# 2809#############################################################################
2426 2810
… …
2462 2846
2463# popup given the event (must be a mouse button down event currently) 2847# popup given the event (must be a mouse button down event currently)
2464sub popup { 2848sub popup {
2465 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2466 2850
2467 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2468 2852
2469 # maybe save $GRAB? must be careful about events... 2853 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 2854 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 2855 $self->{button} = $ev->{button};
2472 2856
… …
2475} 2859}
2476 2860
2477sub mouse_motion { 2861sub mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 2862 my ($self, $ev, $x, $y) = @_;
2479 2863
2480 # TODO: should use vbox->fdind_widget or so 2864 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 2866 $self->{hover} = $self->{item}{$HOVER};
2483} 2867}
2484 2868
2485sub button_up { 2869sub button_up {
… …
2487 2871
2488 if ($ev->{button} == $self->{button}) { 2872 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 2873 undef $GRAB;
2490 $self->hide; 2874 $self->hide;
2491 2875
2492 $self->emit ("popdown"); 2876 $self->_emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 2877 $self->{hover}[1]->() if $self->{hover};
2494 } 2878 }
2495} 2879}
2496 2880
2497############################################################################# 2881#############################################################################
2498 2882
2883package CFClient::UI::Statusbox;
2884
2885our @ISA = CFClient::UI::VBox::;
2886
2887sub new {
2888 my $class = shift;
2889
2890 $class->SUPER::new (
2891 fontsize => 0.8,
2892 @_,
2893 )
2894}
2895
2896sub reorder {
2897 my ($self) = @_;
2898 my $NOW = time;
2899
2900 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 }
2903
2904 my @widgets;
2905
2906 my @items = sort {
2907 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} };
2910
2911 my $count = 10 + 1;
2912 for my $item (@items) {
2913 last unless --$count;
2914
2915 push @widgets, $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text};
2920
2921 for ($short) {
2922 s/^\s+//;
2923 s/\s+/ /g;
2924 }
2925
2926 new CFClient::UI::Label
2927 markup => $short,
2928 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg},
2934 can_events => 1,
2935 can_hover => 1
2936 };
2937 }
2938
2939 $self->clear;
2940 $self->SUPER::add (reverse @widgets);
2941}
2942
2943sub add {
2944 my ($self, $text, %arg) = @_;
2945
2946 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//;
2948
2949 return unless $text;
2950
2951 my $timeout = time + ((delete $arg{timeout}) || 60);
2952
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954
2955 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) {
2957 $item->{count}++;
2958 } else {
2959 $item->{count} = 1;
2960 $item->{text} = $item->{tooltip} = $text;
2961 }
2962 $item->{id} = ++$self->{id};
2963 $item->{timeout} = $timeout;
2964 delete $item->{label};
2965 } else {
2966 $self->{item}{$group} = {
2967 id => ++$self->{id},
2968 text => $text,
2969 timeout => $timeout,
2970 tooltip => $text,
2971 fg => [0.8, 0.8, 0.8, 0.8],
2972 pri => 0,
2973 count => 1,
2974 %arg,
2975 };
2976 }
2977
2978 $self->reorder;
2979}
2980
2981sub reconfigure {
2982 my ($self) = @_;
2983
2984 delete $_->{label}
2985 for values %{ $self->{item} || {} };
2986
2987 $self->reorder;
2988 $self->SUPER::reconfigure;
2989}
2990
2991#############################################################################
2992
2499package CFClient::UI::Root; 2993package CFClient::UI::Root;
2500 2994
2501our @ISA = CFClient::UI::Container::; 2995our @ISA = CFClient::UI::Container::;
2502 2996
2503use CFClient::OpenGL; 2997use CFClient::OpenGL;
2504 2998
2505sub check_size { 2999sub new {
2506 my ($self) = @_; 3000 my $class = shift;
2507 3001
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3002 my $self = $class->SUPER::new (
2509} 3003 visible => 1,
3004 @_,
3005 );
2510 3006
2511sub size_request { 3007 Scalar::Util::weaken ($self->{root} = $self);
2512 ($::WIDTH, $::HEIGHT) 3008
3009 $self
2513} 3010}
2514 3011
2515sub configure { 3012sub configure {
2516 my ($self, $x, $y, $w, $h) = @_; 3013 my ($self, $x, $y, $w, $h) = @_;
2517 3014
2518 $self->SUPER::configure ($x, $y, $w, $h); 3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
2519 3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request {
3029 my ($self) = @_;
3030
3031 ($self->{w}, $self->{h})
3032}
3033
3034sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_;
3036
2520 for my $child (@{$self->{children}}) { 3037 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3039
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3041 if exists $child->{req_x};
3042
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3044 if exists $child->{req_y};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050
2525 $child->configure ($X, $Y, $W,$H); 3051 $child->configure ($X, $Y, $W, $H);
2526 } 3052 }
2527} 3053}
2528 3054
2529sub _topleft { 3055sub coord2local {
2530 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2531 3057
2532 ($x, $y) 3058 ($x, $y)
2533} 3059}
2534 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2535sub update { 3067sub update {
2536 my ($self) = @_; 3068 my ($self) = @_;
2537 3069
2538 $self->check_size; 3070 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3071}
2541 3072
2542sub add { 3073sub add {
2543 my ($self, $child) = @_; 3074 my ($self, @children) = @_;
2544 3075
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1;
3078
2545 # integerize window positions 3079 # integerise window positions
2546 $child->{x} = int $child->{x}; 3080 $child->{x} = int $child->{x};
2547 $child->{y} = int $child->{y}; 3081 $child->{y} = int $child->{y};
3082 }
2548 3083
2549 $self->SUPER::add ($child); 3084 $self->SUPER::add (@children);
3085}
3086
3087sub remove {
3088 my ($self, @children) = @_;
3089
3090 $self->SUPER::remove (@children);
3091
3092 while (@children) {
3093 my $w = pop @children;
3094 push @children, $w->children;
3095 $w->set_invisible;
3096 }
2550} 3097}
2551 3098
2552sub on_refresh { 3099sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3100 my ($self, $id, $cb) = @_;
2554 3101
2555 $self->{refresh_hook}{$id} = $cb; 3102 $self->{refresh_hook}{$id} = $cb;
2556} 3103}
2557 3104
3105sub on_post_alloc {
3106 my ($self, $id, $cb) = @_;
3107
3108 $self->{post_alloc_hook}{$id} = $cb;
3109}
3110
2558sub draw { 3111sub draw {
2559 my ($self) = @_; 3112 my ($self) = @_;
2560 3113
2561 while (my $rcb = delete $self->{refresh_hook}) { 3114 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3115 $_->()
3116 for values %{delete $self->{refresh_hook}};
3117 }
3118
3119 if ($self->{realloc}) {
3120 my @queue;
3121
3122 while () {
3123 if ($self->{realloc}) {
3124 #TODO use array-of-depth approach
3125
3126 @queue = sort { $a->{visible} <=> $b->{visible} }
3127 @queue, values %{delete $self->{realloc}};
3128 }
3129
3130 my $widget = pop @queue || last;
3131
3132 $widget->{visible} or last; # do not resize invisible widgets
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156
3157 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0;
3159
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3161
3162 $widget->{w} = $w;
3163 $widget->{h} = $h;
3164
3165 $widget->emit (size_allocate => $w, $h, $changed);
3166 }
3167 }
3168
3169 while ($self->{post_alloc_hook}) {
3170 $_->()
3171 for values %{delete $self->{post_alloc_hook}};
2563 } 3172 }
2564 3173
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3174 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 3176 glClear GL_COLOR_BUFFER_BIT;
2568 3177
2569 glMatrixMode GL_PROJECTION; 3178 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 3179 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 3181 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 3182 glLoadIdentity;
2574 3183
2575 $self->_draw; 3184 $self->_draw;
2576} 3185}
2577 3186
2578############################################################################# 3187#############################################################################
2579 3188
2580package CFClient::UI::Inventory;
2581
2582our @ISA = CFClient::UI::Container::;
2583
2584use CFClient::OpenGL;
2585
2586sub new {
2587 my $class = shift;
2588
2589 my $self = $class->SUPER::new (@_);
2590
2591 $self
2592}
2593
2594sub size_allocate {
2595 my ($self, $w, $h) = @_;
2596
2597 $self->{w} = $w;
2598 $self->{h} = $h;
2599
2600 $self->check_size;
2601}
2602
2603sub set_items {
2604 my ($self, $items) = @_;
2605 my @items = values %{$items};
2606 @items = sort { $a->{type} <=> $b->{type} } @items;
2607
2608 $self->{real_items} = \@items;
2609
2610 for my $item (@items) {
2611 my $desc = $item->{nrof} < 2
2612 ? $item->{name}
2613 : "$item->{nrof} $item->{name_pl}";
2614
2615 $self->add (my $hb = new CFClient::UI::HBox);
2616
2617 $hb->add (my $f = new CFClient::UI::Face
2618 can_events => 0,
2619 face => $item->{face},
2620 anim => $item->{anim},
2621 animspeed => $item->{animspeed},
2622 expand => 1
2623 );
2624 $hb->add (new CFClient::UI::Label text => $desc, expand => 1);
2625 }
2626
2627 $self->{max_pos} = (scalar @items) - 1;
2628
2629 my $range = $self->{range};
2630 my $page = $self->{h} / 32; # waht information souce to use for face size?
2631 # it should be configurable i guess...
2632 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2633 $range->update;
2634}
2635
2636sub size_request {
2637 my ($self) = @_;
2638 (100, 200)
2639}
2640
2641sub set_range {
2642 my ($self, $range) = @_;
2643
2644 $self->{range} = $range;
2645 $range->connect (changed => sub { $self->update });
2646
2647 my $page = $self->{h} / 32; # waht information souce to use for face size?
2648 # it should be configurable i guess...
2649
2650 $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2651 $range->update;
2652
2653 $self->update;
2654}
2655
2656sub _draw {
2657 my ($self) = @_;
2658
2659 my ($w, $h) = ($self->{w}, $self->{h});
2660
2661 $self->{pos} = int $self->{range}{range}[0];
2662
2663 my $y = 0;
2664 my $cnt = 0;
2665 my $hrem = $self->{h}; # horiz. remaining space
2666
2667 for (my $i = $self->{pos}; $i < @{$self->{children} || []}; $i++) {
2668 my $chld = $self->{children}->[$i];
2669
2670 if ($hrem >= $chld->{h}) {
2671 $chld->configure (0, $y, $chld->{w}, $chld->{h});
2672
2673 $chld->show;
2674 $chld->draw;
2675
2676 $hrem -= $chld->{h};
2677 $y += $chld->{h};
2678 } else {
2679 last
2680 }
2681 }
2682}
2683
2684
2685#############################################################################
2686
2687package CFClient::UI; 3189package CFClient::UI;
2688 3190
2689$ROOT = new CFClient::UI::Root; 3191$ROOT = new CFClient::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 3192$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2691 3193
26921 31941
2693 3195

Diff Legend

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