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.189 by root, Mon May 8 22:17:24 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 $self->emit (size_allocate => $w, $h);
243 } 357 }
244} 358}
245 359
246sub size_allocate { 360sub size_allocate {
247 # nothing to be done 361 # nothing to be done
248} 362}
249 363
250sub children { 364sub children {
251} 365}
252 366
253# call when resolution changes etc.
254sub reconfigure {
255 my ($self) = @_;
256
257 $_->reconfigure
258 for $self->children;
259
260 $self->check_size;
261 $self->size_allocate ($self->{w}, $self->{h});
262 $self->update;
263}
264
265sub set_max_size { 367sub set_max_size {
266 my ($self, $w, $h) = @_; 368 my ($self, $w, $h) = @_;
267 369
268 delete $self->{max_w}; $self->{max_w} = $w if $w; 370 delete $self->{max_w}; $self->{max_w} = $w if $w;
269 delete $self->{max_h}; $self->{max_h} = $h if $h; 371 delete $self->{max_h}; $self->{max_h} = $h if $h;
270} 372}
271 373
272# return top left coordinates 374sub set_tooltip {
273sub _topleft {
274 my ($self, $x, $y) = @_; 375 my ($self, $tooltip) = @_;
275 376
276 $self->{parent} 377 $tooltip =~ s/^\s+//;
277 or Carp::confess "no parent widget in _topleft\n";#d# 378 $tooltip =~ s/\s+$//;
278 379
279 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 return if $self->{tooltip} eq $tooltip;
381
382 $self->{tooltip} = $tooltip;
383
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip;
387 }
280} 388}
281 389
282# translate global coordinates to local coordinate system 390# translate global coordinates to local coordinate system
283sub coord2local { 391sub coord2local {
284 my ($self, $x, $y) = @_; 392 my ($self, $x, $y) = @_;
285 393
286 my ($X, $Y) = $self->_topleft; 394 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
287 ($x - $X, $y - $Y)
288} 395}
289 396
290# translate local coordinates to global coordinate system 397# translate local coordinates to global coordinate system
291sub coord2global { 398sub coord2global {
292 my ($self, $x, $y) = @_; 399 my ($self, $x, $y) = @_;
293 400
294 my ($X, $Y) = $self->_topleft; 401 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
295 ($x + $X, $y + $Y)
296} 402}
297 403
298sub focus_in { 404sub focus_in {
299 my ($self) = @_; 405 my ($self) = @_;
300 406
301 return if $FOCUS == $self; 407 return if $FOCUS == $self;
302 return unless $self->{can_focus}; 408 return unless $self->{can_focus};
303 409
304 my $focus = $FOCUS; $FOCUS = $self; 410 my $focus = $FOCUS; $FOCUS = $self;
305 411
306 $self->emit (focus_in => $focus); 412 $self->_emit (focus_in => $focus);
307 413
308 $focus->update if $focus; 414 $focus->update if $focus;
309 $FOCUS->update; 415 $FOCUS->update;
310} 416}
311 417
… …
314 420
315 return unless $FOCUS == $self; 421 return unless $FOCUS == $self;
316 422
317 my $focus = $FOCUS; undef $FOCUS; 423 my $focus = $FOCUS; undef $FOCUS;
318 424
319 $self->emit (focus_out => $focus); 425 $self->_emit (focus_out => $focus);
320 426
321 $focus->update if $focus; #? 427 $focus->update if $focus; #?
428
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS;
322} 431}
323 432
324sub mouse_motion { } 433sub mouse_motion { }
325sub button_up { } 434sub button_up { }
326sub key_down { } 435sub key_down { }
327sub key_up { } 436sub key_up { }
328 437
329sub button_down { 438sub button_down {
330 my ($self, $ev, $x, $y) = @_; 439 my ($self, $ev, $x, $y) = @_;
331 440
332 $self->focus_in; 441 $self->focus_in;
… …
335sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
336sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
337sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
338sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
339sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449
450sub find_widget {
451 my ($self, $x, $y) = @_;
452
453 return () unless $self->{can_events};
454
455 return $self
456 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
457 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
458
459 ()
460}
461
462sub set_parent {
463 my ($self, $parent) = @_;
464
465 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible};
468}
469
470sub connect {
471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub _emit {
477 my ($self, $signal, @args) = @_;
478
479 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
480}
481
482sub emit {
483 my ($self, $signal, @args) = @_;
484
485 $self->_emit ($signal, @args)
486 || $self->$signal (@args);
487}
488
489sub visibility_change {
490 #my ($self, $visible) = @_;
491}
492
493sub realloc {
494 my ($self) = @_;
495
496 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self};
498
499 $self->{root}{realloc}{$self} = $self;
500 $self->{root}->update;
501 } else {
502 delete $self->{req_w};
503 }
504}
505
506sub update {
507 my ($self) = @_;
508
509 $self->{parent}->update
510 if $self->{parent};
511}
340 512
341sub draw { 513sub draw {
342 my ($self) = @_; 514 my ($self) = @_;
343 515
344 return unless $self->{h} && $self->{w}; 516 return unless $self->{h} && $self->{w};
… …
366 if ($ENV{PCLIENT_DEBUG}) { 538 if ($ENV{PCLIENT_DEBUG}) {
367 glPushMatrix; 539 glPushMatrix;
368 glColor 1, 1, 0, 1; 540 glColor 1, 1, 0, 1;
369 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
370 glBegin GL_LINE_LOOP; 542 glBegin GL_LINE_LOOP;
371 glVertex 0 , 0; 543 glVertex 0 , 0;
372 glVertex $self->{w}, 0; 544 glVertex $self->{w} - 1, 0;
373 glVertex $self->{w}, $self->{h}; 545 glVertex $self->{w} - 1, $self->{h} - 1;
374 glVertex 0 , $self->{h}; 546 glVertex 0 , $self->{h} - 1;
375 glEnd; 547 glEnd;
376 glPopMatrix; 548 glPopMatrix;
377 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
378 } 550 }
379} 551}
380 552
381sub _draw { 553sub _draw {
382 my ($self) = @_; 554 my ($self) = @_;
383 555
384 warn "no draw defined for $self\n"; 556 warn "no draw defined for $self\n";
385} 557}
386 558
387sub find_widget {
388 my ($self, $x, $y) = @_;
389
390 return () unless $self->{can_events};
391
392 return $self
393 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
394 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
395
396 ()
397}
398
399sub set_parent {
400 my ($self, $parent) = @_;
401
402 Scalar::Util::weaken ($self->{parent} = $parent);
403}
404
405sub check_size {
406 my ($self) = @_;
407
408 $self->_check_size;
409 return;
410 my $check_size = $CFClient::UI::ROOT->{_check_size} ||= {};
411
412 $check_size->{$self} = $self;
413
414 $CFClient::UI::ROOT->on_refresh (_check_size => sub {
415 while (%$check_size) {
416 my @widgets = values %$check_size;
417 $_->_check_size
418 for @widgets;
419 }
420 });
421}
422
423sub _check_size {
424 my ($self) = @_;
425
426 delete $CFClient::UI::ROOT->{_check_size}{$self};
427
428 $self->{parent}
429 or return 1;
430
431 my ($w, $h) = $self->{user_w} && $self->{user_h}
432 ? @$self{qw(user_w user_h)}
433 : $self->size_request;
434
435 if ($w != $self->{req_w} || $h != $self->{req_h}) {
436 $self->{req_w} = $w;
437 $self->{req_h} = $h;
438
439 $self->{parent}->_check_size
440 or $self->size_allocate (
441 (List::Util::max $self->{w}, $w),
442 (List::Util::max $self->{h}, $h),
443 );
444
445 1
446 } else {
447 0
448 }
449}
450
451sub update {
452 my ($self) = @_;
453
454 my $update = $CFClient::UI::ROOT->{_update} ||= {};
455
456 $update->{$self} = $self;
457
458 $CFClient::UI::ROOT->on_refresh (_update => sub {
459 while (%$update) {
460 my @widgets = values %$update;
461 %$update = ();
462
463 $_->{parent} && $_->{parent}->update
464 for @widgets;
465 }
466 });
467}
468
469sub connect {
470 my ($self, $signal, $cb) = @_;
471
472 push @{ $self->{signal_cb}{$signal} }, $cb;
473}
474
475sub emit {
476 my ($self, $signal, @args) = @_;
477
478 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
479}
480
481sub DESTROY { 559sub DESTROY {
482 my ($self) = @_; 560 my ($self) = @_;
483 561
562 delete $WIDGET{$self+0};
484 #$self->deactivate; 563 #$self->deactivate;
485} 564}
486 565
487############################################################################# 566#############################################################################
488 567
… …
497 my $class = shift; 576 my $class = shift;
498 577
499 # range [value, low, high, page] 578 # range [value, low, high, page]
500 579
501 $class->SUPER::new ( 580 $class->SUPER::new (
502 bg => [0, 0, 0, 0.2], 581 #bg => [0, 0, 0, 0.2],
503 active_bg => [1, 1, 1, 0.5], 582 #active_bg => [1, 1, 1, 0.5],
504 @_ 583 @_
505 ) 584 )
506} 585}
507 586
508sub _draw { 587sub _draw {
509 my ($self) = @_; 588 my ($self) = @_;
510 589
590 my $color = $FOCUS == $self && $self->{active_bg}
591 ? $self->{active_bg}
592 : $self->{bg};
593
594 if ($color && (@$color < 4 || $color->[3])) {
511 my ($w, $h) = @$self{qw(w h)}; 595 my ($w, $h) = @$self{qw(w h)};
512 596
513 glEnable GL_BLEND; 597 glEnable GL_BLEND;
514 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
515 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 599 glColor @$color;
516 600
517 glBegin GL_QUADS; 601 glBegin GL_QUADS;
518 glVertex 0 , 0; 602 glVertex 0 , 0;
519 glVertex 0 , $h; 603 glVertex 0 , $h;
520 glVertex $w, $h; 604 glVertex $w, $h;
521 glVertex $w, 0; 605 glVertex $w, 0;
522 glEnd; 606 glEnd;
523 607
524 glDisable GL_BLEND; 608 glDisable GL_BLEND;
609 }
525} 610}
526 611
527############################################################################# 612#############################################################################
528 613
529package CFClient::UI::Empty; 614package CFClient::UI::Empty;
… …
573 $self->{children} = [ 658 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 659 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 660 @{$self->{children}}, @widgets
576 ]; 661 ];
577 662
578 $_->check_size 663 $self->realloc;
579 for @widgets;
580
581 $self->update;
582} 664}
583 665
584sub children { 666sub children {
585 @{ $_[0]{children} } 667 @{ $_[0]{children} }
586} 668}
… …
591 delete $child->{parent}; 673 delete $child->{parent};
592 $child->hide; 674 $child->hide;
593 675
594 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 676 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
595 677
596 $self->check_size; 678 $self->realloc;
597 $self->update;
598} 679}
599 680
600sub clear { 681sub clear {
601 my ($self) = @_; 682 my ($self) = @_;
602 683
… …
606 for (@$children) { 687 for (@$children) {
607 delete $_->{parent}; 688 delete $_->{parent};
608 $_->hide; 689 $_->hide;
609 } 690 }
610 691
611 $self->check_size; 692 $self->realloc;
612 $self->update;
613} 693}
614 694
615sub find_widget { 695sub find_widget {
616 my ($self, $x, $y) = @_; 696 my ($self, $x, $y) = @_;
617 697
… …
670sub size_request { 750sub size_request {
671 $_[0]{children}[0]->size_request 751 $_[0]{children}[0]->size_request
672} 752}
673 753
674sub size_allocate { 754sub size_allocate {
675 my ($self, $w, $h) = @_; 755 my ($self, $w, $h, $changed) = @_;
676 756
677 $self->{children}[0]->configure (0, 0, $w, $h); 757 $self->{children}[0]->configure (0, 0, $w, $h);
678} 758}
679 759
680############################################################################# 760#############################################################################
… …
692} 772}
693 773
694sub update { 774sub update {
695 my ($self) = @_; 775 my ($self) = @_;
696 776
697 $ROOT->on_refresh ($self => sub { $self->render_child }); 777 $ROOT->on_post_alloc ($self => sub { $self->render_child });
698 $self->SUPER::update; 778 $self->SUPER::update;
699} 779}
700 780
701sub size_allocate { 781sub size_allocate {
702 my ($self, $w, $h) = @_; 782 my ($self, $w, $h, $changed) = @_;
703 783
704 $self->SUPER::size_allocate ($w, $h); 784 $self->SUPER::size_allocate ($w, $h, $changed);
705 $self->update; 785 $self->update
786 if $changed;
706} 787}
707 788
708sub _render { 789sub _render {
709 $_[0]{children}[0]->draw; 790 $_[0]{children}[0]->draw;
710} 791}
… …
715 $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 {
716 glClearColor 0, 0, 0, 0; 797 glClearColor 0, 0, 0, 0;
717 glClear GL_COLOR_BUFFER_BIT; 798 glClear GL_COLOR_BUFFER_BIT;
718 799
719 $self->_render; 800 $self->_render;
720# glColorMask 1, 1, 1, 0;
721# glEnable GL_BLEND;
722# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
723# glRasterPos 0, 0;
724# glCopyPixels 0, 0, $self->{w}, $self->{h};
725# glDisable GL_BLEND;
726# glColorMask 1, 1, 1, 1;
727 }; 801 };
728} 802}
729 803
730sub _draw { 804sub _draw {
731 my ($self) = @_; 805 my ($self) = @_;
… …
733 my ($w, $h) = ($self->w, $self->h); 807 my ($w, $h) = ($self->w, $self->h);
734 808
735 my $tex = $self->{texture} 809 my $tex = $self->{texture}
736 or return; 810 or return;
737 811
738 glEnable GL_BLEND;
739 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
740 glEnable GL_TEXTURE_2D; 812 glEnable GL_TEXTURE_2D;
741 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
742 glColor 0, 0, 0, 1; 814 glColor 1, 1, 1, 1;
743 815
744 $tex->draw_quad (0, 0, $w, $h); 816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
745 817
746 glDisable GL_BLEND;
747 glDisable GL_TEXTURE_2D; 818 glDisable GL_TEXTURE_2D;
748} 819}
749 820
750############################################################################# 821#############################################################################
751 822
752package CFClient::UI::ViewPort; 823package CFClient::UI::ViewPort;
753 824
754our @ISA = CFClient::UI::Window::; 825our @ISA = CFClient::UI::Window::;
755 826
827sub new {
828 my $class = shift;
829
830 $class->SUPER::new (
831 scroll_x => 0,
832 scroll_y => 1,
833 @_,
834 )
835}
836
756sub size_request { 837sub size_request {
757 my ($self) = @_; 838 my ($self) = @_;
758 839
759 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
760 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
761 841
762 @$self{qw(child_w child_h)} 842 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y};
844
845 ($w, $h)
763} 846}
764 847
765sub size_allocate { 848sub size_allocate {
766 my ($self, $w, $h) = @_; 849 my ($self, $w, $h, $changed) = @_;
767 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);
768 $self->update; 855 $self->update;
769} 856}
770 857
771sub set_offset { 858sub set_offset {
772 my ($self, $x, $y) = @_; 859 my ($self, $x, $y) = @_;
… …
775 $self->{view_y} = int $y; 862 $self->{view_y} = int $y;
776 863
777 $self->update; 864 $self->update;
778} 865}
779 866
780# hmm, this does not work for topleft of $self... but we should not aks for that 867# hmm, this does not work for topleft of $self... but we should not ask for that
781sub _topleft { 868sub coord2local {
782 my ($self, $x, $y) = @_; 869 my ($self, $x, $y) = @_;
783 870
784 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y}) 871 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
872}
873
874sub coord2global {
875 my ($self, $x, $y) = @_;
876
877 $x = List::Util::min $self->{w}, $x - $self->{view_x};
878 $y = List::Util::min $self->{h}, $y - $self->{view_y};
879
880 $self->SUPER::coord2global ($x, $y)
785} 881}
786 882
787sub find_widget { 883sub find_widget {
788 my ($self, $x, $y) = @_; 884 my ($self, $x, $y) = @_;
789 885
… …
814 my $class = shift; 910 my $class = shift;
815 911
816 my $self; 912 my $self;
817 913
818 my $slider = new CFClient::UI::Slider 914 my $slider = new CFClient::UI::Slider
819 vertical => 1, 915 vertical => 1,
820 range => [0, 0, 1, 0.01], # HACK fix 916 range => [0, 0, 1, 0.01], # HACK fix
821 connect_changed => sub { 917 on_changed => sub {
822 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 918 $self->{vp}->set_offset (0, $_[1]);
823 }, 919 },
824 ; 920 ;
825 921
826 $self = $class->SUPER::new ( 922 $self = $class->SUPER::new (
827 vp => (new CFClient::UI::ViewPort), 923 vp => (new CFClient::UI::ViewPort expand => 1),
828 slider => $slider, 924 slider => $slider,
829 @_, 925 @_,
830 ); 926 );
831 927
832 $self->{vp}->add ($self->{scrolled}); 928 $self->{vp}->add ($self->{scrolled});
… …
834 $self->add ($self->{slider}); 930 $self->add ($self->{slider});
835 931
836 $self 932 $self
837} 933}
838 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
839#TODO# update range on size_allocate depeneing on child 954#TODO# update range on size_allocate depending on child
840# update viewport offset on scroll 955# update viewport offset on scroll
841 956
842############################################################################# 957#############################################################################
843 958
844package CFClient::UI::Frame; 959package CFClient::UI::Frame;
… …
848use CFClient::OpenGL; 963use CFClient::OpenGL;
849 964
850sub new { 965sub new {
851 my $class = shift; 966 my $class = shift;
852 967
853 my $self = $class->SUPER::new ( 968 $class->SUPER::new (
854 bg => [1, 1, 1, 1], 969 bg => undef,
855 border_bg => [1, 1, 1, 1],
856 border => 0.8,
857 @_ 970 @_,
858 ); 971 )
859
860 $self
861} 972}
862 973
863sub _draw { 974sub _draw {
864 my ($self) = @_; 975 my ($self) = @_;
865 976
866 my ($w, $h) = ($self->{w}, $self->{h}); 977 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)};
867 979
868 glEnable GL_BLEND; 980 glEnable GL_BLEND;
869 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
870 glEnable GL_TEXTURE_2D; 982 glColor @{ $self->{bg} };
871 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
872 983
873# glBegin GL_QUADS; 984 glBegin GL_QUADS;
874# glColor 0, 0, 0, 0;
875# glVertex 0 , 0; 985 glVertex 0 , 0;
876# glVertex 0 , $h; 986 glVertex 0 , $h;
877# glVertex $w, $h; 987 glVertex $w, $h;
878# glVertex $w, 0; 988 glVertex $w, 0;
879# glEnd; 989 glEnd;
880 990
881
882 $self->child->draw;
883 glDisable GL_BLEND; 991 glDisable GL_BLEND;
884 glDisable GL_TEXTURE_2D; 992 }
993
994 $self->SUPER::_draw;
885} 995}
886 996
887############################################################################# 997#############################################################################
888 998
889package CFClient::UI::FancyFrame; 999package CFClient::UI::FancyFrame;
… …
897 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);
898 1008
899sub new { 1009sub new {
900 my $class = shift; 1010 my $class = shift;
901 1011
902 # TODO: user_x, user_y, overwrite moveto?
903
904 my $self = $class->SUPER::new ( 1012 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 1013 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 1014 border_bg => [1, 1, 1, 1],
907 border => 0.6, 1015 border => 0.6,
1016 is_toplevel => 1,
908 can_events => 1, 1017 can_events => 1,
909 @_ 1018 @_
910 ); 1019 );
911 1020
912 $self->{title} &&= new CFClient::UI::Label 1021 $self->{title} &&= new CFClient::UI::Label
913 align => 0, 1022 align => 0,
… …
932 $h + $self->border * 2, 1041 $h + $self->border * 2,
933 ) 1042 )
934} 1043}
935 1044
936sub size_allocate { 1045sub size_allocate {
937 my ($self, $w, $h) = @_; 1046 my ($self, $w, $h, $changed) = @_;
1047
1048 return unless $changed;
938 1049
939 $h -= List::Util::max 0, $self->border * 2; 1050 $h -= List::Util::max 0, $self->border * 2;
940 $w -= List::Util::max 0, $self->border * 2; 1051 $w -= List::Util::max 0, $self->border * 2;
941 1052
942 $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)
943 if $self->{title}; 1054 if $self->{title};
944 1055
945 $self->child->configure ($self->border, $self->border, $w, $h); 1056 $self->child->configure ($self->border, $self->border, $w, $h);
946} 1057}
947 1058
… …
966 my ($ev, $x, $y) = @_; 1077 my ($ev, $x, $y) = @_;
967 1078
968 my $dx = $ev->{x} - $ox; 1079 my $dx = $ev->{x} - $ox;
969 my $dy = $ev->{y} - $oy; 1080 my $dy = $ev->{y} - $oy;
970 1081
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
971 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
972 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
973 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1086 $self->move ($self->{user_x}, $self->{user_y});
974 $self->check_size; 1087 $self->realloc;
975 }; 1088 };
976 1089
977 } elsif ($lr ^ $td) { 1090 } elsif ($lr ^ $td) {
978 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1091 my ($ox, $oy) = ($ev->{x}, $ev->{y});
979 my ($bx, $by) = ($self->{x}, $self->{y}); 1092 my ($bx, $by) = ($self->{x}, $self->{y});
… …
981 $self->{motion} = sub { 1094 $self->{motion} = sub {
982 my ($ev, $x, $y) = @_; 1095 my ($ev, $x, $y) = @_;
983 1096
984 ($x, $y) = ($ev->{x}, $ev->{y}); 1097 ($x, $y) = ($ev->{x}, $ev->{y});
985 1098
986 $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});
987 $self->update; 1103 $self->realloc;
988 }; 1104 };
989 } 1105 }
990} 1106}
991 1107
992sub button_up { 1108sub button_up {
… …
1005 my ($self) = @_; 1121 my ($self) = @_;
1006 1122
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 1123 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 1125
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 1126 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 1128
1015 my $border = $self->border; 1129 my $border = $self->border;
1016 1130
1017 glColor @{ $self->{border_bg} }; 1131 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 1136
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 1138 my $bg = $tex[0];
1025 1139
1026 # TODO: repeat texture not scale 1140 # TODO: repeat texture not scale
… …
1030 glColor @{ $self->{bg} }; 1144 glColor @{ $self->{bg} };
1031 1145
1032 $bg->{s} = $rep_x; 1146 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y; 1147 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1; 1148 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 }
1036 1151
1037 glDisable GL_TEXTURE_2D; 1152 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 1153
1041 $self->{title}->draw if $self->{title}; 1154 $self->{title}->draw if $self->{title};
1042 1155
1043 $self->child->draw; 1156 $self->child->draw;
1044} 1157}
… …
1056sub new { 1169sub new {
1057 my $class = shift; 1170 my $class = shift;
1058 1171
1059 $class->SUPER::new ( 1172 $class->SUPER::new (
1060 col_expand => [], 1173 col_expand => [],
1061 @_ 1174 @_,
1062 ) 1175 )
1176}
1177
1178sub children {
1179 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1063} 1180}
1064 1181
1065sub add { 1182sub add {
1066 my ($self, $x, $y, $child) = @_; 1183 my ($self, $x, $y, $child) = @_;
1067 1184
1068 $child->set_parent ($self); 1185 $child->set_parent ($self);
1069 $self->{children}[$y][$x] = $child; 1186 $self->{children}[$y][$x] = $child;
1070 1187
1071 $child->check_size; 1188 $self->realloc;
1072} 1189}
1073 1190
1074sub children {
1075 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076}
1077
1078# 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?
1079sub clear { 1192sub clear {
1080 my ($self) = @_; 1193 my ($self) = @_;
1081 1194
1082 my @children = $self->children; 1195 my @children = $self->children;
1083 delete $self->{children}; 1196 delete $self->{children};
… …
1085 for (@children) { 1198 for (@children) {
1086 delete $_->{parent}; 1199 delete $_->{parent};
1087 $_->hide; 1200 $_->hide;
1088 } 1201 }
1089 1202
1090 $self->update; 1203 $self->realloc;
1091} 1204}
1092 1205
1093sub get_wh { 1206sub get_wh {
1094 my ($self) = @_; 1207 my ($self) = @_;
1095 1208
… …
1122 (sum @$hs), 1235 (sum @$hs),
1123 ) 1236 )
1124} 1237}
1125 1238
1126sub size_allocate { 1239sub size_allocate {
1127 my ($self, $w, $h) = @_; 1240 my ($self, $w, $h, $changed) = @_;
1128 1241
1129 my ($ws, $hs) = $self->get_wh; 1242 my ($ws, $hs) = $self->get_wh;
1130 1243
1131 my $req_w = sum @$ws; 1244 my $req_w = (sum @$ws) || 1;
1132 my $req_h = sum @$hs; 1245 my $req_h = (sum @$hs) || 1;
1133 1246
1134 # TODO: nicer code && do row_expand 1247 # TODO: nicer code && do row_expand
1135 my @col_expand = @{$self->{col_expand}}; 1248 my @col_expand = @{$self->{col_expand}};
1136 @col_expand = (1) x @$ws unless @col_expand; 1249 @col_expand = (1) x @$ws unless @col_expand;
1137 my $col_expand = (sum @col_expand) || 1; 1250 my $col_expand = (sum @col_expand) || 1;
… …
1191 } 1304 }
1192} 1305}
1193 1306
1194############################################################################# 1307#############################################################################
1195 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
1196package CFClient::UI::HBox; 1369package CFClient::UI::HBox;
1197 1370
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1371our @ISA = CFClient::UI::Box::;
1201 1372
1202sub size_request { 1373sub new {
1203 my ($self) = @_; 1374 my $class = shift;
1204 1375
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1376 $class->SUPER::new (
1206 1377 vertical => 0,
1207 ( 1378 @_,
1208 (List::Util::sum map $_->[0], @alloc),
1209 (List::Util::max map $_->[1], @alloc),
1210 ) 1379 )
1211} 1380}
1212 1381
1213sub size_allocate {
1214 my ($self, $w, $h) = @_;
1215
1216 ($h, $w) = ($w, $h);
1217
1218 my $children = $self->{children};
1219
1220 my @h = map $_->{req_w}, @$children;
1221
1222 my $req_h = List::Util::sum @h;
1223
1224 if ($req_h > $h) {
1225 # ah well, not enough space
1226 $_ *= $h / $req_h for @h;
1227 } else {
1228 my $exp = List::Util::sum map $_->{expand}, @$children;
1229 $exp ||= 1;
1230
1231 for (0 .. $#$children) {
1232 my $child = $children->[$_];
1233
1234 my $alloc_h = $h[$_];
1235 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1236 $h[$_] = $alloc_h;
1237 }
1238 }
1239
1240 CFClient::UI::harmonize \@h;
1241
1242 my $y = 0;
1243 for (0 .. $#$children) {
1244 my $child = $children->[$_];
1245 my $h = $h[$_];
1246 $child->configure ($y, 0, $h, $w);
1247
1248 $y += $h;
1249 }
1250
1251 1
1252}
1253
1254############################################################################# 1382#############################################################################
1255 1383
1256package CFClient::UI::VBox; 1384package CFClient::UI::VBox;
1257 1385
1258# TODO: wrap into common Box base class
1259
1260our @ISA = CFClient::UI::Container::; 1386our @ISA = CFClient::UI::Box::;
1261 1387
1262sub size_request { 1388sub new {
1263 my ($self) = @_; 1389 my $class = shift;
1264 1390
1265 my @alloc = map [$_->size_request], @{$self->{children}}; 1391 $class->SUPER::new (
1266 1392 vertical => 1,
1267 ( 1393 @_,
1268 (List::Util::max map $_->[0], @alloc),
1269 (List::Util::sum map $_->[1], @alloc),
1270 ) 1394 )
1271} 1395}
1272 1396
1273sub size_allocate {
1274 my ($self, $w, $h) = @_;
1275
1276 my $children = $self->{children};
1277
1278 my @h = map $_->{req_h}, @$children;
1279
1280 my $req_h = List::Util::sum @h;
1281
1282 if ($req_h > $h) {
1283 # ah well, not enough space
1284 $_ *= $h / $req_h for @h;
1285 } else {
1286 my $exp = List::Util::sum map $_->{expand}, @$children;
1287 $exp ||= 1;
1288
1289 for (0 .. $#$children) {
1290 my $child = $children->[$_];
1291
1292 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1293 }
1294 }
1295
1296 CFClient::UI::harmonize \@h;
1297
1298 my $y = 0;
1299 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_];
1302 $child->configure (0, $y, $w, $h);
1303
1304 $y += $h;
1305 }
1306
1307 1
1308}
1309
1310############################################################################# 1397#############################################################################
1311 1398
1312package CFClient::UI::Label; 1399package CFClient::UI::Label;
1313 1400
1314our @ISA = CFClient::UI::Base::; 1401our @ISA = CFClient::UI::DrawBG::;
1315 1402
1316use CFClient::OpenGL; 1403use CFClient::OpenGL;
1317 1404
1318sub new { 1405sub new {
1319 my ($class, %arg) = @_; 1406 my ($class, %arg) = @_;
1320 1407
1321 my $self = $class->SUPER::new ( 1408 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1409 fg => [1, 1, 1],
1410 #bg => none
1411 #active_bg => none
1323 #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),
1324 fontsize => 1, 1418 fontsize => 1,
1325 text => "",
1326 align => -1, 1419 align => -1,
1327 valign => -1, 1420 valign => -1,
1328 padding => 2, 1421 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1422 can_events => 0,
1331 %arg 1423 %arg
1332 ); 1424 );
1333 1425
1334 if (exists $self->{template}) { 1426 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1427 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1428 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1429 $self->{template} = $layout;
1338 } 1430 }
1339 1431
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1432 if (exists $self->{markup}) {
1341 $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 }
1342 1437
1343 $self 1438 $self
1344} 1439}
1345 1440
1346sub escape { 1441sub escape($) {
1347 local $_ = $_[1]; 1442 local $_ = $_[0];
1348 1443
1349 s/&/&amp;/g; 1444 s/&/&amp;/g;
1350 s/>/&gt;/g; 1445 s/>/&gt;/g;
1351 s/</&lt;/g; 1446 s/</&lt;/g;
1352 1447
1353 $_[1] 1448 $_
1354} 1449}
1355 1450
1356sub update { 1451sub update {
1357 my ($self) = @_; 1452 my ($self) = @_;
1358 1453
… …
1364 my ($self, $text) = @_; 1459 my ($self, $text) = @_;
1365 1460
1366 return if $self->{text} eq "T$text"; 1461 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1462 $self->{text} = "T$text";
1368 1463
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1465 $self->{layout}->set_text ($text);
1370 1466
1371 delete $self->{texture}; 1467 $self->realloc;
1372 $self->update; 1468 $self->update;
1373 $self->check_size;
1374} 1469}
1375 1470
1376sub set_markup { 1471sub set_markup {
1377 my ($self, $markup) = @_; 1472 my ($self, $markup) = @_;
1378 1473
1379 return if $self->{text} eq "M$markup"; 1474 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1475 $self->{text} = "M$markup";
1381 1476
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1480 $self->{layout}->set_markup ($markup);
1383 1481
1384 delete $self->{texture}; 1482 $self->realloc;
1385 $self->update; 1483 $self->update;
1386 $self->check_size;
1387} 1484}
1388 1485
1389sub size_request { 1486sub size_request {
1390 my ($self) = @_; 1487 my ($self) = @_;
1391 1488
1392 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1489 $self->{layout}->set_font ($self->{font}) if $self->{font};
1393 $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});
1394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395 1494
1396 my ($w, $h) = $self->{layout}->size; 1495 my ($w, $h) = $self->{layout}->size;
1397 1496
1398 if (exists $self->{template}) { 1497 if (exists $self->{template}) {
… …
1410 $h + $self->{padding} * 2, 1509 $h + $self->{padding} * 2,
1411 ) 1510 )
1412} 1511}
1413 1512
1414sub size_allocate { 1513sub size_allocate {
1415 my ($self, $w, $h) = @_; 1514 my ($self, $w, $h, $changed) = @_;
1416 1515
1417 delete $self->{texture}; 1516 delete $self->{texture}
1517 if $changed;
1418} 1518}
1419 1519
1420sub set_fontsize { 1520sub set_fontsize {
1421 my ($self, $fontsize) = @_; 1521 my ($self, $fontsize) = @_;
1422 1522
1423 $self->{fontsize} = $fontsize; 1523 $self->{fontsize} = $fontsize;
1424 delete $self->{texture}; 1524 delete $self->{texture};
1425 1525
1426 $self->update; 1526 $self->realloc;
1427 $self->check_size;
1428} 1527}
1429 1528
1430sub _draw { 1529sub _draw {
1431 my ($self) = @_; 1530 my ($self) = @_;
1432 1531
1532 $self->SUPER::_draw; # draw background, if applicable
1533
1433 my $tex = $self->{texture} ||= do { 1534 my $tex = $self->{texture} ||= do {
1535 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1536 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $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});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541
1437 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
1438 }; 1553 };
1439 1554
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1555 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1557
1558 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1559 glColor @{$self->{fg}};
1446
1447 $self->{ox} = int (
1448 $self->{align} < 0 ? $self->{padding}
1449 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1450 : ($self->{w} - $tex->{w}) * 0.5
1451 );
1452
1453 $self->{oy} = int (
1454 $self->{valign} < 0 ? $self->{padding}
1455 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1456 : ($self->{h} - $tex->{h}) * 0.5
1457 );
1458
1459 $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 }
1460 1564
1461 glDisable GL_TEXTURE_2D; 1565 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1566}
1464 1567
1465############################################################################# 1568#############################################################################
1466 1569
1467package CFClient::UI::EntryBase; 1570package CFClient::UI::EntryBase;
… …
1480 active_fg => [0, 0, 0], 1583 active_fg => [0, 0, 0],
1481 can_hover => 1, 1584 can_hover => 1,
1482 can_focus => 1, 1585 can_focus => 1,
1483 valign => 0, 1586 valign => 0,
1484 can_events => 1, 1587 can_events => 1,
1588 #text => ...
1485 @_ 1589 @_
1486 ) 1590 )
1487} 1591}
1488 1592
1489sub _set_text { 1593sub _set_text {
… …
1499 $self->{text} = $text; 1603 $self->{text} = $text;
1500 1604
1501 $text =~ s/./*/g if $self->{hidden}; 1605 $text =~ s/./*/g if $self->{hidden};
1502 $self->{layout}->set_text ("$text "); 1606 $self->{layout}->set_text ("$text ");
1503 1607
1504 $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;
1505} 1618}
1506 1619
1507sub get_text { 1620sub get_text {
1508 $_[0]{text} 1621 $_[0]{text}
1509} 1622}
… …
1512 my ($self) = @_; 1625 my ($self) = @_;
1513 1626
1514 my ($w, $h) = $self->SUPER::size_request; 1627 my ($w, $h) = $self->SUPER::size_request;
1515 1628
1516 ($w + 1, $h) # add 1 for cursor 1629 ($w + 1, $h) # add 1 for cursor
1517}
1518
1519sub size_allocate {
1520 my ($self, $w, $h) = @_;
1521
1522 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1523}
1524
1525sub set_text {
1526 my ($self, $text) = @_;
1527
1528 $self->{cursor} = length $text;
1529 $self->_set_text ($text);
1530 $self->update;
1531} 1630}
1532 1631
1533sub key_down { 1632sub key_down {
1534 my ($self, $ev) = @_; 1633 my ($self, $ev) = @_;
1535 1634
… …
1537 my $sym = $ev->{sym}; 1636 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1637 my $uni = $ev->{unicode};
1539 1638
1540 my $text = $self->get_text; 1639 my $text = $self->get_text;
1541 1640
1542 if ($sym == 8) { 1641 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1642 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1643 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1644 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1645 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1646 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1647 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1648 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1649 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1650 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1651 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1652 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1653 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1654 $self->_emit ('escape');
1556 } elsif ($uni) { 1655 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1656 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1657 }
1559 1658
1560 $self->_set_text ($text); 1659 $self->_set_text ($text);
1561 $self->update; 1660
1661 $self->realloc;
1562} 1662}
1563 1663
1564sub focus_in { 1664sub focus_in {
1565 my ($self) = @_; 1665 my ($self) = @_;
1566 1666
… …
1646 if ($sym == 13) { 1746 if ($sym == 13) {
1647 unshift @{$self->{history}}, 1747 unshift @{$self->{history}},
1648 my $txt = $self->get_text; 1748 my $txt = $self->get_text;
1649 $self->{history_pointer} = -1; 1749 $self->{history_pointer} = -1;
1650 $self->{history_saveback} = ''; 1750 $self->{history_saveback} = '';
1651 $self->emit (activate => $txt); 1751 $self->_emit (activate => $txt);
1652 $self->update; 1752 $self->update;
1653 1753
1654 } elsif ($sym == CFClient::SDLK_UP) { 1754 } elsif ($sym == CFClient::SDLK_UP) {
1655 if ($self->{history_pointer} < 0) { 1755 if ($self->{history_pointer} < 0) {
1656 $self->{history_saveback} = $self->get_text; 1756 $self->{history_saveback} = $self->get_text;
… …
1695 my $class = shift; 1795 my $class = shift;
1696 1796
1697 $class->SUPER::new ( 1797 $class->SUPER::new (
1698 padding => 4, 1798 padding => 4,
1699 fg => [1, 1, 1], 1799 fg => [1, 1, 1],
1700 bg => [1, 1, 1, 0.2],
1701 active_fg => [0, 0, 1], 1800 active_fg => [0, 0, 1],
1702 can_hover => 1, 1801 can_hover => 1,
1703 align => 0, 1802 align => 0,
1704 valign => 0, 1803 valign => 0,
1705 can_events => 1, 1804 can_events => 1,
1706 @_ 1805 @_
1707 ) 1806 )
1708} 1807}
1709 1808
1809sub activate { }
1810
1710sub button_up { 1811sub button_up {
1711 my ($self, $ev, $x, $y) = @_; 1812 my ($self, $ev, $x, $y) = @_;
1712 1813
1814 $self->emit ("activate")
1713 if ($x >= 0 && $x < $self->{w} 1815 if $x >= 0 && $x < $self->{w}
1714 && $y >= 0 && $y < $self->{h}) { 1816 && $y >= 0 && $y < $self->{h};
1715 $self->emit ("activate");
1716 }
1717} 1817}
1718 1818
1719sub _draw { 1819sub _draw {
1720 my ($self) = @_; 1820 my ($self) = @_;
1721 1821
… …
1723 1823
1724 if ($GRAB == $self) { 1824 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1825 $self->{fg} = $self->{active_fg};
1726 } 1826 }
1727 1827
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1828 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1830 glColor 0, 0, 0, 1;
1733 1831
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1832 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1833
1736 glDisable GL_TEXTURE_2D; 1834 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1835
1739 $self->SUPER::_draw; 1836 $self->SUPER::_draw;
1740} 1837}
1741 1838
1742############################################################################# 1839#############################################################################
… …
1756 1853
1757 $class->SUPER::new ( 1854 $class->SUPER::new (
1758 padding => 2, 1855 padding => 2,
1759 fg => [1, 1, 1], 1856 fg => [1, 1, 1],
1760 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],
1761 state => 0, 1860 state => 0,
1762 can_hover => 1, 1861 can_hover => 1,
1763 @_ 1862 @_
1764 ) 1863 )
1765} 1864}
… …
1774 my ($self, $ev, $x, $y) = @_; 1873 my ($self, $ev, $x, $y) = @_;
1775 1874
1776 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1777 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1778 $self->{state} = !$self->{state}; 1877 $self->{state} = !$self->{state};
1779 $self->emit (changed => $self->{state}); 1878 $self->_emit (changed => $self->{state});
1780 } 1879 }
1781} 1880}
1782 1881
1783sub _draw { 1882sub _draw {
1784 my ($self) = @_; 1883 my ($self) = @_;
… …
1789 1888
1790 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;
1791 1890
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1892
1794 glEnable GL_BLEND; 1893 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894
1795 glEnable GL_TEXTURE_2D; 1895 glEnable GL_TEXTURE_2D;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797
1798 my $tex = $self->{state} ? $tex[1] : $tex[0];
1799
1800 $tex->draw_quad (0, 0, $s, $s); 1896 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1897 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1898}
1805 1899
1806############################################################################# 1900#############################################################################
1807 1901
1808package CFClient::UI::Image; 1902package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1945 glTranslate 0, -$self->{w}, 0;
1852 1946
1853 ($w, $h) = ($h, $w); 1947 ($w, $h) = ($h, $w);
1854 } 1948 }
1855 1949
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1950 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1952
1861 $tex->draw_quad (0, 0, $w, $h); 1953 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1954
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1955 glDisable GL_TEXTURE_2D;
1865} 1956}
1866 1957
1867############################################################################# 1958#############################################################################
1868 1959
… …
2057 qw(s1_slider.png s1_slider_bg.png); 2148 qw(s1_slider.png s1_slider_bg.png);
2058 2149
2059sub new { 2150sub new {
2060 my $class = shift; 2151 my $class = shift;
2061 2152
2062 # range [value, low, high, page] 2153 # range [value, low, high, page, unit]
2063 2154
2064 # TODO: 0-width page 2155 # TODO: 0-width page
2065 # TODO: req_w/h are wrong with vertical 2156 # TODO: req_w/h are wrong with vertical
2066 # TODO: calculations are off 2157 # TODO: calculations are off
2067 my $self = $class->SUPER::new ( 2158 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2159 fg => [1, 1, 1],
2069 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],
2070 range => [0, 0, 100, 10], 2163 range => [0, 0, 100, 10, 0],
2071 req_w => $::WIDTH / 80, 2164 req_w => $::WIDTH / 80,
2072 req_h => $::WIDTH / 80, 2165 req_h => $::WIDTH / 80,
2073 vertical => 0, 2166 vertical => 0,
2074 can_hover => 1, 2167 can_hover => 1,
2075 inner_pad => 5, 2168 inner_pad => 0.02,
2076 @_ 2169 @_
2077 ); 2170 );
2078 2171
2172 $self->set_value ($self->{range}[0]);
2173 $self->update;
2174
2079 $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 }
2080} 2210}
2081 2211
2082sub size_request { 2212sub size_request {
2083 my ($self) = @_; 2213 my ($self) = @_;
2084 2214
… …
2090 2220
2091sub button_down { 2221sub button_down {
2092 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
2093 2223
2094 $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
2095 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
2096} 2229}
2097 2230
2098sub mouse_motion { 2231sub mouse_motion {
2099 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
2100 2233
2101 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
2102 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
2103 2253
2104 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2105 2255
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2107 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2108 2258
2109 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
2110 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
2111 $x = $lo if $x < $lo;
2112 $x = $hi - $page if $x > $hi - $page;
2113 $self->{range}[0] = $x;
2114 2261
2115 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
2116 $self->update; 2263 $self->{knob_w} = $knob_w;
2117 } 2264 });
2118}
2119 2265
2120# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
2121# so that the handle doesn't leave the texture. This calculation isn't 100%
2122# correct propably, but it does the job for now
2123sub _calc_inner_pad_px {
2124 my ($self, $w) = @_;
2125 ($w / 100) * $self->{inner_pad} # % to pixels
2126} 2267}
2127 2268
2128sub _draw { 2269sub _draw {
2129 my ($self) = @_; 2270 my ($self) = @_;
2130 2271
2131 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
2132 2273
2133 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
2134 2275
2135 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
2136 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
2137 2278
2279 glTranslate 1, 0, 0;
2138 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
2139 glTranslate 0, -$self->{w}, 0;
2140
2141 ($w, $h) = ($h, $w);
2142 } 2281 }
2143 2282
2144 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146 2285
2147 my ($value, $lo, $hi, $page) = @{$self->{range}};
2148
2149 $hi = $value + 1 if $lo == $hi;
2150
2151 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2152 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2153
2154 $page = int $page * $inner_w / ($hi - $lo);
2155 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2156
2157 $w -= $page;
2158 $page &= ~1;
2159 glTranslate $page * 0.5, 0, 0;
2160 $page ||= 2;
2161
2162 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2163 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2164
2165 glEnable GL_BLEND;
2166 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2167 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2288
2170 # draw background 2289 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172 2291
2173 # draw handle 2292 # draw handle
2174 $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);
2175 2294
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
2178} 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 (@_) }
2179 2338
2180############################################################################# 2339#############################################################################
2181 2340
2182package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
2183 2342
… …
2192 fontsize => 1, 2351 fontsize => 1,
2193 can_events => 0, 2352 can_events => 0,
2194 #font => default_font 2353 #font => default_font
2195 @_, 2354 @_,
2196 2355
2197 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
2198 par => [], 2357 par => [],
2199 height => 0, 2358 height => 0,
2200 children => [ 2359 children => [
2201 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
… …
2213 2372
2214 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
2215 $self->reflow; 2374 $self->reflow;
2216} 2375}
2217 2376
2218sub text_height {
2219 my ($self, $text) = @_;
2220
2221 my $layout = $self->{layout};
2222
2223 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2224 $layout->set_width ($self->{children}[0]{w});
2225 $layout->set_text ($text);
2226
2227 ($layout->size)[1]
2228}
2229
2230sub reflow {
2231 my ($self) = @_;
2232
2233 $self->{need_reflow}++;
2234 $self->update;
2235}
2236
2237sub size_allocate { 2377sub size_allocate {
2238 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h, $changed) = @_;
2239 2379
2240 $self->SUPER::size_allocate ($w, $h); 2380 $self->SUPER::size_allocate ($w, $h, $changed);
2381
2382 return unless $changed;
2241 2383
2242 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2384 $self->{layout}->set_font ($self->{font}) if $self->{font};
2243 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2244 $self->{layout}->set_width ($self->{children}[0]{w}); 2386 $self->{layout}->set_width ($self->{children}[0]{w});
2245 2387
2246 $self->reflow; 2388 $self->reflow;
2247} 2389}
2248 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
2249sub add_paragraph { 2425sub add_paragraph {
2250 my ($self, $color, $text) = @_; 2426 my ($self, $color, $text, $indent) = @_;
2251 2427
2252 #TODO: intelligently "reformat" paragraph 2428 for my $line (split /\n/, $text) {
2253 2429 my ($w, $h) = $self->text_size ($line);
2254 my $height = $self->text_height ($text);
2255
2256 $self->{height} += $height; 2430 $self->{height} += $h;
2431 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2432 }
2257 2433
2258 push @{$self->{par}}, [$height, $color, $text];
2259
2260 $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]);
2261 $self->{children}[1]->update;
2262} 2435}
2263 2436
2264sub update { 2437sub update {
2265 my ($self) = @_; 2438 my ($self) = @_;
2266 2439
… …
2268 2441
2269 return unless $self->{h} > 0; 2442 return unless $self->{h} > 0;
2270 2443
2271 delete $self->{texture}; 2444 delete $self->{texture};
2272 2445
2273 $ROOT->on_refresh ($self, sub { 2446 $ROOT->on_post_alloc ($self, sub {
2447 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2448
2274 if (delete $self->{need_reflow}) { 2449 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2450 my $height = 0;
2276 2451
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2452 my $layout = $self->{layout};
2453
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455
2278 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 }
2279 2467
2280 $self->{height} = $height; 2468 $self->{height} = $height;
2281 2469
2282 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2470 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2283 2471
2284 delete $self->{texture}; 2472 delete $self->{texture};
2285 } 2473 }
2286 2474
2287 $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 {
2288 glClearColor 0, 0, 0, 0; 2476 glClearColor 0.5, 0.5, 0.5, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2477 glClear GL_COLOR_BUFFER_BIT;
2290 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
2291 glEnable GL_BLEND; 2490 glEnable GL_BLEND;
2491 #TODO# not correct in windows where rgba is forced off
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2492 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2293 glEnable GL_TEXTURE_2D;
2294 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2295
2296 my $top = int $self->{children}[1]{range}[0];
2297
2298 my $y0 = $top;
2299 my $y1 = $top + $self->{h};
2300
2301 my $y = 0;
2302
2303 my $layout = $self->{layout};
2304
2305 $layout->set_font ($self->{font}) if $self->{font};
2306 2493
2307 for my $par (@{$self->{par}}) { 2494 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2495 my $h = $par->[1];
2309 2496
2310 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]);
2311 $layout->set_text ($par->[2]); 2500 $layout->set_markup ($par->[4]);
2312 2501
2313 glColor @{ $par->[1] }; 2502 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 my ($W, $H) = $layout->size; 2503
2315 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;
2316 } 2506 }
2317 2507
2318 $y += $h; 2508 $y += $h;
2319 } 2509 }
2320 2510
2321 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND; 2511 glDisable GL_BLEND;
2323 }; 2512 };
2324 }); 2513 });
2325} 2514}
2326 2515
2327sub _draw { 2516sub _draw {
2328 my ($self) = @_; 2517 my ($self) = @_;
2329 2518
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2519 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2521 glColor 1, 1, 1, 1;
2335 $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});
2336 glDisable GL_TEXTURE_2D; 2523 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2524
2339 $self->{children}[1]->draw; 2525 $self->{children}[1]->draw;
2340 2526
2341} 2527}
2342 2528
… …
2390 2576
2391sub new { 2577sub new {
2392 my $class = shift; 2578 my $class = shift;
2393 2579
2394 my $self = $class->SUPER::new ( 2580 my $self = $class->SUPER::new (
2395 state => 0, 2581 state => 0,
2396 connect_activate => \&toggle_flopper, 2582 on_activate => \&toggle_flopper,
2397 @_ 2583 @_
2398 ); 2584 );
2399 2585
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2586 $self
2406} 2587}
2407 2588
2408sub toggle_flopper { 2589sub toggle_flopper {
2409 my ($self) = @_; 2590 my ($self) = @_;
2410 2591
2411 # TODO: use animation 2592 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2593}
2423 2594
2424############################################################################# 2595#############################################################################
2425 2596
2426package CFClient::UI::Tooltip; 2597package CFClient::UI::Tooltip;
… …
2436 @_, 2607 @_,
2437 can_events => 0, 2608 can_events => 0,
2438 ) 2609 )
2439} 2610}
2440 2611
2441sub set_markup { 2612sub set_tooltip_from {
2442 my ($self, $text) = @_; 2613 my ($self, $widget) = @_;
2443 2614
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2615 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2616 markup => $widget->{tooltip},
2446 $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 );
2447} 2623}
2448 2624
2449sub size_request { 2625sub size_request {
2450 my ($self) = @_; 2626 my ($self) = @_;
2451 2627
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2628 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2629
2456 ($w + 4, $h + 4) 2630 ($w + 4, $h + 4)
2457} 2631}
2458 2632
2459sub size_allocate { 2633sub size_allocate {
2460 my ($self, $w, $h) = @_; 2634 my ($self, $w, $h, $changed) = @_;
2461 2635
2636 return unless $changed;
2637
2462 $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 });
2463} 2657}
2464 2658
2465sub _draw { 2659sub _draw {
2466 my ($self) = @_; 2660 my ($self) = @_;
2467 2661
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2662 glTranslate 0.375, 0.375;
2470 2663
2471 my ($w, $h) = @$self{qw(w h)}; 2664 my ($w, $h) = @$self{qw(w h)};
2472 2665
2473 glColor 1, 0.8, 0.4; 2666 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2677 glVertex 0 , $h;
2485 glVertex $w, $h; 2678 glVertex $w, $h;
2486 glVertex $w, 0; 2679 glVertex $w, 0;
2487 glEnd; 2680 glEnd;
2488 2681
2489 glPopMatrix; 2682 glTranslate 2 - 0.375, 2 - 0.375;
2490 2683
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2684 $self->SUPER::_draw;
2493} 2685}
2494 2686
2495############################################################################# 2687#############################################################################
2496 2688
… …
2501use CFClient::OpenGL; 2693use CFClient::OpenGL;
2502 2694
2503sub new { 2695sub new {
2504 my $class = shift; 2696 my $class = shift;
2505 2697
2506 $class->SUPER::new ( 2698 my $self = $class->SUPER::new (
2507 aspect => 1, 2699 aspect => 1,
2700 can_events => 0,
2508 @_, 2701 @_,
2509 ) 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
2510} 2719}
2511 2720
2512sub size_request { 2721sub size_request {
2513 (32, 8) 2722 (32, 8)
2514} 2723}
2515 2724
2725sub update {
2726 my ($self) = @_;
2727
2728 return unless $self->{visible};
2729
2730 $self->SUPER::update;
2731}
2732
2516sub _draw { 2733sub _draw {
2517 my ($self) = @_; 2734 my ($self) = @_;
2518 2735
2519 return unless $::CONN;#d# manage and cache textures differently 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
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521 2748
2522 # TODO animation
2523 if ($tex) { 2749 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2750 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2752 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2754 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2755 }
2533} 2756}
2534 2757
2535############################################################################# 2758sub DESTROY {
2759 my ($self) = @_;
2536 2760
2761 $self->{timer}->cancel
2762 if $self->{timer};
2763
2764 $self->SUPER::DESTROY;
2765}
2766
2767#############################################################################
2768
2537package CFClient::UI::InventoryItem; 2769package CFClient::UI::Inventory;
2538 2770
2539our @ISA = CFClient::UI::HBox::; 2771our @ISA = CFClient::UI::ScrolledWindow::;
2540 2772
2541sub new { 2773sub new {
2542 my $class = shift; 2774 my $class = shift;
2543 2775
2544 my %args = @_;
2545
2546 my $item = $args{item};
2547
2548 my $desc = $item->{nrof} < 2
2549 ? $item->{name}
2550 : "$item->{nrof} $item->{name_pl}";
2551
2552
2553 my $self = $class->SUPER::new ( 2776 my $self = $class->SUPER::new (
2554 can_hover => 1, 2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2555 can_events => 1,
2556 tooltip => (CFClient::UI::Label->escape ($desc)
2557 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2558 connect_button_down => sub {
2559 my ($self, $ev, $x, $y) = @_;
2560
2561 # todo: maybe put examine on 1? but should just be a tooltip :(
2562 if ($ev->{button} == 1) {
2563 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2564 } elsif ($ev->{button} == 2) {
2565 $::CONN->send ("apply $item->{tag}");
2566 } elsif ($ev->{button} == 3) {
2567 CFClient::UI::Menu->new (
2568 items => [
2569 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2570 [
2571 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2572 sub { $::CONN->send ("lock $item->{tag}") },
2573 ],
2574 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2575 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2576 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2577 ],
2578 )->popup ($ev);
2579 }
2580
2581 1
2582 },
2583 %args
2584 );
2585 $self->add(new CFClient::UI::Face
2586 can_events => 0,
2587 face => $item->{face},
2588 anim => $item->{anim},
2589 animspeed => $item->{animspeed});
2590 $self->add(new CFClient::UI::Label
2591 can_events => 0,
2592 text => $desc);
2593
2594 $self
2595}
2596
2597#############################################################################
2598
2599package CFClient::UI::Inventory;
2600
2601our @ISA = CFClient::UI::ScrolledWindow::;
2602
2603sub new {
2604 my $class = shift;
2605
2606 my $self = $class->SUPER::new (
2607 scrolled => (new CFClient::UI::VBox),
2608 @_, 2778 @_,
2609 ); 2779 );
2610 2780
2611 $self 2781 $self
2612} 2782}
… …
2615 my ($self, $items) = @_; 2785 my ($self, $items) = @_;
2616 2786
2617 $self->{scrolled}->clear; 2787 $self->{scrolled}->clear;
2618 return unless $items; 2788 return unless $items;
2619 2789
2620 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2621 2794
2622 $self->{real_items} = \@items; 2795 $self->{real_items} = \@items;
2623 2796
2797 my $row = 0;
2624 for my $item (@items) { 2798 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2799 CFClient::Item::update_widgets $item;
2626 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}";
2628 2800
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2630 } 2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2631 2804
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2805 $row++;
2633} 2806 }
2634
2635sub size_request {
2636 my ($self) = @_;
2637 ($self->{req_w}, $self->{req_h});
2638} 2807}
2639 2808
2640############################################################################# 2809#############################################################################
2641 2810
2642package CFClient::UI::Menu; 2811package CFClient::UI::Menu;
… …
2677 2846
2678# 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)
2679sub popup { 2848sub popup {
2680 my ($self, $ev) = @_; 2849 my ($self, $ev) = @_;
2681 2850
2682 $self->emit ("popdown"); 2851 $self->_emit ("popdown");
2683 2852
2684 # maybe save $GRAB? must be careful about events... 2853 # maybe save $GRAB? must be careful about events...
2685 $GRAB = $self; 2854 $GRAB = $self;
2686 $self->{button} = $ev->{button}; 2855 $self->{button} = $ev->{button};
2687 2856
… …
2702 2871
2703 if ($ev->{button} == $self->{button}) { 2872 if ($ev->{button} == $self->{button}) {
2704 undef $GRAB; 2873 undef $GRAB;
2705 $self->hide; 2874 $self->hide;
2706 2875
2707 $self->emit ("popdown"); 2876 $self->_emit ("popdown");
2708 $self->{hover}[1]->() if $self->{hover}; 2877 $self->{hover}[1]->() if $self->{hover};
2709 } 2878 }
2710} 2879}
2711 2880
2712############################################################################# 2881#############################################################################
2713 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
2714package CFClient::UI::Root; 2993package CFClient::UI::Root;
2715 2994
2716our @ISA = CFClient::UI::Container::; 2995our @ISA = CFClient::UI::Container::;
2717 2996
2718use CFClient::OpenGL; 2997use CFClient::OpenGL;
2719 2998
2720sub check_size { 2999sub new {
2721 my ($self) = @_; 3000 my $class = shift;
2722 3001
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 3002 my $self = $class->SUPER::new (
2724} 3003 visible => 1,
2725
2726sub size_request {
2727 my ($self) = @_;
2728
2729 ($self->{w}, $self->{h})
2730}
2731
2732sub size_allocate {
2733 my ($self, $w, $h) = @_;
2734
2735 my $old_w = $self->{old_w};
2736 my $old_h = $self->{old_h};
2737
2738 if ($old_w && $old_h) {
2739 for my $child ($self->children) {
2740 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2741 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2742 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2743 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2744 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2745 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2746 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2747 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2748 } 3004 @_,
2749 } 3005 );
2750 3006
2751 $self->{old_w} = $w; 3007 Scalar::Util::weaken ($self->{root} = $self);
2752 $self->{old_h} = $h; 3008
3009 $self
2753} 3010}
2754 3011
2755sub configure { 3012sub configure {
2756 my ($self, $x, $y, $w, $h) = @_; 3013 my ($self, $x, $y, $w, $h) = @_;
2757 3014
2758 $self->SUPER::configure ($x, $y, $w, $h); 3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
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) = @_;
2759 3036
2760 for my $child ($self->children) { 3037 for my $child ($self->children) {
2761 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)};
2762 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
2763 $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;
2764 $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
2765 $child->configure ($X, $Y, $W, $H); 3051 $child->configure ($X, $Y, $W, $H);
2766 } 3052 }
2767} 3053}
2768 3054
2769sub _topleft { 3055sub coord2local {
2770 my ($self, $x, $y) = @_; 3056 my ($self, $x, $y) = @_;
2771 3057
2772 ($x, $y) 3058 ($x, $y)
2773} 3059}
2774 3060
3061sub coord2global {
3062 my ($self, $x, $y) = @_;
3063
3064 ($x, $y)
3065}
3066
2775sub update { 3067sub update {
2776 my ($self) = @_; 3068 my ($self) = @_;
2777 3069
2778 $self->check_size; 3070 $::WANT_REFRESH++;
2779 ::refresh ();
2780} 3071}
2781 3072
2782sub add { 3073sub add {
2783 my ($self, $child) = @_; 3074 my ($self, @children) = @_;
2784 3075
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1;
3078
2785 # integerize window positions 3079 # integerise window positions
2786 $child->{x} = int $child->{x}; 3080 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 3081 $child->{y} = int $child->{y};
3082 }
2788 3083
2789 $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 }
2790} 3097}
2791 3098
2792sub on_refresh { 3099sub on_refresh {
2793 my ($self, $id, $cb) = @_; 3100 my ($self, $id, $cb) = @_;
2794 3101
2795 $self->{refresh_hook}{$id} = $cb; 3102 $self->{refresh_hook}{$id} = $cb;
2796} 3103}
2797 3104
3105sub on_post_alloc {
3106 my ($self, $id, $cb) = @_;
3107
3108 $self->{post_alloc_hook}{$id} = $cb;
3109}
3110
2798sub draw { 3111sub draw {
2799 my ($self) = @_; 3112 my ($self) = @_;
2800 3113
2801 while (my $rcb = delete $self->{refresh_hook}) { 3114 while ($self->{refresh_hook}) {
2802 $_->() 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}};
2803 } 3172 }
2804 3173
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3174 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 3176 glClear GL_COLOR_BUFFER_BIT;
2808 3177
2809 glMatrixMode GL_PROJECTION; 3178 glMatrixMode GL_PROJECTION;
2810 glLoadIdentity; 3179 glLoadIdentity;
2811 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812 glMatrixMode GL_MODELVIEW; 3181 glMatrixMode GL_MODELVIEW;
2813 glLoadIdentity; 3182 glLoadIdentity;
2814 3183
2815 $self->_draw; 3184 $self->_draw;
2816} 3185}
… …
2818############################################################################# 3187#############################################################################
2819 3188
2820package CFClient::UI; 3189package CFClient::UI;
2821 3190
2822$ROOT = new CFClient::UI::Root; 3191$ROOT = new CFClient::UI::Root;
2823$TOOLTIP = new CFClient::UI::Tooltip; 3192$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824 3193
28251 31941
2826 3195

Diff Legend

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