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.255 by root, Mon May 29 02:01:56 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;
890 1000
891our @ISA = CFClient::UI::Bin::; 1001our @ISA = CFClient::UI::Bin::;
892 1002
893use CFClient::OpenGL; 1003use CFClient::OpenGL;
894 1004
895my @tex = 1005my $bg =
1006 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1007 mipmap => 1, wrap => 1;
1008
1009my @border =
896 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
897 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
898 1012
899sub new { 1013sub new {
900 my $class = shift; 1014 my $class = shift;
901 1015
902 # TODO: user_x, user_y, overwrite moveto?
903
904 my $self = $class->SUPER::new ( 1016 my $self = $class->SUPER::new (
905 bg => [1, 1, 1, 1], 1017 bg => [1, 1, 1, 1],
906 border_bg => [1, 1, 1, 1], 1018 border_bg => [1, 1, 1, 1],
907 border => 0.6, 1019 border => 0.6,
1020 is_toplevel => 1,
908 can_events => 1, 1021 can_events => 1,
909 @_ 1022 @_
910 ); 1023 );
911 1024
912 $self->{title} &&= new CFClient::UI::Label 1025 $self->{title} &&= new CFClient::UI::Label
913 align => 0, 1026 align => 0,
… …
932 $h + $self->border * 2, 1045 $h + $self->border * 2,
933 ) 1046 )
934} 1047}
935 1048
936sub size_allocate { 1049sub size_allocate {
937 my ($self, $w, $h) = @_; 1050 my ($self, $w, $h, $changed) = @_;
1051
1052 return unless $changed;
938 1053
939 $h -= List::Util::max 0, $self->border * 2; 1054 $h -= List::Util::max 0, $self->border * 2;
940 $w -= List::Util::max 0, $self->border * 2; 1055 $w -= List::Util::max 0, $self->border * 2;
941 1056
942 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
943 if $self->{title}; 1058 if $self->{title};
944 1059
945 $self->child->configure ($self->border, $self->border, $w, $h); 1060 $self->child->configure ($self->border, $self->border, $w, $h);
946} 1061}
947 1062
… …
966 my ($ev, $x, $y) = @_; 1081 my ($ev, $x, $y) = @_;
967 1082
968 my $dx = $ev->{x} - $ox; 1083 my $dx = $ev->{x} - $ox;
969 my $dy = $ev->{y} - $oy; 1084 my $dy = $ev->{y} - $oy;
970 1085
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
971 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1);
972 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1);
973 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1090 $self->move ($self->{user_x}, $self->{user_y});
974 $self->check_size; 1091 $self->realloc;
975 }; 1092 };
976 1093
977 } elsif ($lr ^ $td) { 1094 } elsif ($lr ^ $td) {
978 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1095 my ($ox, $oy) = ($ev->{x}, $ev->{y});
979 my ($bx, $by) = ($self->{x}, $self->{y}); 1096 my ($bx, $by) = ($self->{x}, $self->{y});
… …
981 $self->{motion} = sub { 1098 $self->{motion} = sub {
982 my ($ev, $x, $y) = @_; 1099 my ($ev, $x, $y) = @_;
983 1100
984 ($x, $y) = ($ev->{x}, $ev->{y}); 1101 ($x, $y) = ($ev->{x}, $ev->{y});
985 1102
986 $self->move ($bx + $x - $ox, $by + $y - $oy); 1103 $self->{user_x} = $bx + $x - $ox;
1104 $self->{user_y} = $by + $y - $oy;
1105
1106 $self->move ($self->{user_x}, $self->{user_y});
987 $self->update; 1107 $self->realloc;
988 }; 1108 };
989 } 1109 }
990} 1110}
991 1111
992sub button_up { 1112sub button_up {
… …
1005 my ($self) = @_; 1125 my ($self) = @_;
1006 1126
1007 my ($w, $h ) = ($self->{w}, $self->{h}); 1127 my ($w, $h ) = ($self->{w}, $self->{h});
1008 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
1009 1129
1010 glEnable GL_BLEND;
1011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1012 glEnable GL_TEXTURE_2D; 1130 glEnable GL_TEXTURE_2D;
1013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1014 1132
1015 my $border = $self->border; 1133 my $border = $self->border;
1016 1134
1017 glColor @{ $self->{border_bg} }; 1135 glColor @{ $self->{border_bg} };
1018 $tex[1]->draw_quad (0, 0, $w, $border); 1136 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1019 $tex[3]->draw_quad (0, $border, $border, $ch); 1137 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1020 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1138 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1021 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1139 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1022 1140
1023 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1024 my $bg = $tex[0]; 1142 glColor @{ $self->{bg} };
1025 1143
1026 # TODO: repeat texture not scale 1144 # TODO: repeat texture not scale
1145 # solve this better(?)
1027 my $rep_x = $cw / $bg->{w}; 1146 $bg->{s} = $cw / $bg->{w};
1028 my $rep_y = $ch / $bg->{h}; 1147 $bg->{t} = $ch / $bg->{h};
1029
1030 glColor @{ $self->{bg} };
1031
1032 $bg->{s} = $rep_x;
1033 $bg->{t} = $rep_y;
1034 $bg->{wrap_mode} = 1;
1035 $bg->draw_quad ($border, $border, $cw, $ch); 1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 }
1036 1150
1037 glDisable GL_TEXTURE_2D; 1151 glDisable GL_TEXTURE_2D;
1038 glDisable GL_BLEND;
1039 }
1040 1152
1041 $self->{title}->draw if $self->{title}; 1153 $self->{title}->draw if $self->{title};
1042 1154
1043 $self->child->draw; 1155 $self->child->draw;
1044} 1156}
… …
1056sub new { 1168sub new {
1057 my $class = shift; 1169 my $class = shift;
1058 1170
1059 $class->SUPER::new ( 1171 $class->SUPER::new (
1060 col_expand => [], 1172 col_expand => [],
1061 @_ 1173 @_,
1062 ) 1174 )
1175}
1176
1177sub children {
1178 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1063} 1179}
1064 1180
1065sub add { 1181sub add {
1066 my ($self, $x, $y, $child) = @_; 1182 my ($self, $x, $y, $child) = @_;
1067 1183
1068 $child->set_parent ($self); 1184 $child->set_parent ($self);
1069 $self->{children}[$y][$x] = $child; 1185 $self->{children}[$y][$x] = $child;
1070 1186
1071 $child->check_size; 1187 $self->realloc;
1072} 1188}
1073 1189
1074sub children {
1075 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1076}
1077
1078# TODO: move to container class maybe? send childs a signal on removal? 1190# TODO: move to container class maybe? send children a signal on removal?
1079sub clear { 1191sub clear {
1080 my ($self) = @_; 1192 my ($self) = @_;
1081 1193
1082 my @children = $self->children; 1194 my @children = $self->children;
1083 delete $self->{children}; 1195 delete $self->{children};
… …
1085 for (@children) { 1197 for (@children) {
1086 delete $_->{parent}; 1198 delete $_->{parent};
1087 $_->hide; 1199 $_->hide;
1088 } 1200 }
1089 1201
1090 $self->update; 1202 $self->realloc;
1091} 1203}
1092 1204
1093sub get_wh { 1205sub get_wh {
1094 my ($self) = @_; 1206 my ($self) = @_;
1095 1207
… …
1122 (sum @$hs), 1234 (sum @$hs),
1123 ) 1235 )
1124} 1236}
1125 1237
1126sub size_allocate { 1238sub size_allocate {
1127 my ($self, $w, $h) = @_; 1239 my ($self, $w, $h, $changed) = @_;
1128 1240
1129 my ($ws, $hs) = $self->get_wh; 1241 my ($ws, $hs) = $self->get_wh;
1130 1242
1131 my $req_w = sum @$ws; 1243 my $req_w = (sum @$ws) || 1;
1132 my $req_h = sum @$hs; 1244 my $req_h = (sum @$hs) || 1;
1133 1245
1134 # TODO: nicer code && do row_expand 1246 # TODO: nicer code && do row_expand
1135 my @col_expand = @{$self->{col_expand}}; 1247 my @col_expand = @{$self->{col_expand}};
1136 @col_expand = (1) x @$ws unless @col_expand; 1248 @col_expand = (1) x @$ws unless @col_expand;
1137 my $col_expand = (sum @col_expand) || 1; 1249 my $col_expand = (sum @col_expand) || 1;
… …
1191 } 1303 }
1192} 1304}
1193 1305
1194############################################################################# 1306#############################################################################
1195 1307
1308package CFClient::UI::Box;
1309
1310our @ISA = CFClient::UI::Container::;
1311
1312sub size_request {
1313 my ($self) = @_;
1314
1315 $self->{vertical}
1316 ? (
1317 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1318 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1319 )
1320 : (
1321 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 )
1324}
1325
1326sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_;
1328
1329 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children};
1331
1332 my @req;
1333
1334 if ($self->{homogeneous}) {
1335 @req = ($space / (@$children || 1)) x @$children;
1336 } else {
1337 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1338 my $req = List::Util::sum @req;
1339
1340 if ($req > $space) {
1341 # ah well, not enough space
1342 $_ *= $space / $req for @req;
1343 } else {
1344 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1345
1346 $space = ($space - $req) / $expand; # remaining space to give away
1347
1348 $req[$_] += $space * $children->[$_]{expand}
1349 for 0 .. $#$children;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@req;
1354
1355 my $pos = 0;
1356 for (0 .. $#$children) {
1357 my $alloc = $req[$_];
1358 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1359
1360 $pos += $alloc;
1361 }
1362
1363 1
1364}
1365
1366#############################################################################
1367
1196package CFClient::UI::HBox; 1368package CFClient::UI::HBox;
1197 1369
1198# TODO: wrap into common Box base class
1199
1200our @ISA = CFClient::UI::Container::; 1370our @ISA = CFClient::UI::Box::;
1201 1371
1202sub size_request { 1372sub new {
1203 my ($self) = @_; 1373 my $class = shift;
1204 1374
1205 my @alloc = map [$_->size_request], @{$self->{children}}; 1375 $class->SUPER::new (
1206 1376 vertical => 0,
1207 ( 1377 @_,
1208 (List::Util::sum map $_->[0], @alloc),
1209 (List::Util::max map $_->[1], @alloc),
1210 ) 1378 )
1211} 1379}
1212 1380
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############################################################################# 1381#############################################################################
1255 1382
1256package CFClient::UI::VBox; 1383package CFClient::UI::VBox;
1257 1384
1258# TODO: wrap into common Box base class
1259
1260our @ISA = CFClient::UI::Container::; 1385our @ISA = CFClient::UI::Box::;
1261 1386
1262sub size_request { 1387sub new {
1263 my ($self) = @_; 1388 my $class = shift;
1264 1389
1265 my @alloc = map [$_->size_request], @{$self->{children}}; 1390 $class->SUPER::new (
1266 1391 vertical => 1,
1267 ( 1392 @_,
1268 (List::Util::max map $_->[0], @alloc),
1269 (List::Util::sum map $_->[1], @alloc),
1270 ) 1393 )
1271} 1394}
1272 1395
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############################################################################# 1396#############################################################################
1311 1397
1312package CFClient::UI::Label; 1398package CFClient::UI::Label;
1313 1399
1314our @ISA = CFClient::UI::Base::; 1400our @ISA = CFClient::UI::DrawBG::;
1315 1401
1316use CFClient::OpenGL; 1402use CFClient::OpenGL;
1317 1403
1318sub new { 1404sub new {
1319 my ($class, %arg) = @_; 1405 my ($class, %arg) = @_;
1320 1406
1321 my $self = $class->SUPER::new ( 1407 my $self = $class->SUPER::new (
1322 fg => [1, 1, 1], 1408 fg => [1, 1, 1],
1409 #bg => none
1410 #active_bg => none
1323 #font => default_font 1411 #font => default_font
1412 #text => initial text
1413 #markup => initial narkup
1414 #max_w => maximum pixel width
1415 ellipsise => 3, # end
1416 layout => (new CFClient::Layout),
1324 fontsize => 1, 1417 fontsize => 1,
1325 text => "",
1326 align => -1, 1418 align => -1,
1327 valign => -1, 1419 valign => -1,
1328 padding => 2, 1420 padding => 2,
1329 layout => new CFClient::Layout,
1330 can_events => 0, 1421 can_events => 0,
1331 %arg 1422 %arg
1332 ); 1423 );
1333 1424
1334 if (exists $self->{template}) { 1425 if (exists $self->{template}) {
1335 my $layout = new CFClient::Layout; 1426 my $layout = new CFClient::Layout;
1336 $layout->set_text (delete $self->{template}); 1427 $layout->set_text (delete $self->{template});
1337 $self->{template} = $layout; 1428 $self->{template} = $layout;
1338 } 1429 }
1339 1430
1340 $self->set_text (delete $self->{text}) if exists $self->{text}; 1431 if (exists $self->{markup}) {
1341 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1432 $self->set_markup (delete $self->{markup});
1433 } else {
1434 $self->set_text (delete $self->{text});
1435 }
1342 1436
1343 $self 1437 $self
1344} 1438}
1345 1439
1346sub escape { 1440sub escape($) {
1347 local $_ = $_[1]; 1441 local $_ = $_[0];
1348 1442
1349 s/&/&amp;/g; 1443 s/&/&amp;/g;
1350 s/>/&gt;/g; 1444 s/>/&gt;/g;
1351 s/</&lt;/g; 1445 s/</&lt;/g;
1352 1446
1353 $_[1] 1447 $_
1354} 1448}
1355 1449
1356sub update { 1450sub update {
1357 my ($self) = @_; 1451 my ($self) = @_;
1358 1452
… …
1364 my ($self, $text) = @_; 1458 my ($self, $text) = @_;
1365 1459
1366 return if $self->{text} eq "T$text"; 1460 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1461 $self->{text} = "T$text";
1368 1462
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1369 $self->{layout}->set_text ($text); 1464 $self->{layout}->set_text ($text);
1370 1465
1371 delete $self->{texture}; 1466 $self->realloc;
1372 $self->update; 1467 $self->update;
1373 $self->check_size;
1374} 1468}
1375 1469
1376sub set_markup { 1470sub set_markup {
1377 my ($self, $markup) = @_; 1471 my ($self, $markup) = @_;
1378 1472
1379 return if $self->{text} eq "M$markup"; 1473 return if $self->{text} eq "M$markup";
1380 $self->{text} = "M$markup"; 1474 $self->{text} = "M$markup";
1381 1475
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477
1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1382 $self->{layout}->set_markup ($markup); 1479 $self->{layout}->set_markup ($markup);
1383 1480
1384 delete $self->{texture}; 1481 $self->realloc;
1385 $self->update; 1482 $self->update;
1386 $self->check_size;
1387} 1483}
1388 1484
1389sub size_request { 1485sub size_request {
1390 my ($self) = @_; 1486 my ($self) = @_;
1391 1487
1392 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1488 $self->{layout}->set_font ($self->{font}) if $self->{font};
1393 $self->{layout}->set_width ($self->{max_w} || -1); 1489 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1395 1493
1396 my ($w, $h) = $self->{layout}->size; 1494 my ($w, $h) = $self->{layout}->size;
1397 1495
1398 if (exists $self->{template}) { 1496 if (exists $self->{template}) {
… …
1410 $h + $self->{padding} * 2, 1508 $h + $self->{padding} * 2,
1411 ) 1509 )
1412} 1510}
1413 1511
1414sub size_allocate { 1512sub size_allocate {
1415 my ($self, $w, $h) = @_; 1513 my ($self, $w, $h, $changed) = @_;
1416 1514
1417 delete $self->{texture}; 1515 delete $self->{texture}
1516 if $changed;
1418} 1517}
1419 1518
1420sub set_fontsize { 1519sub set_fontsize {
1421 my ($self, $fontsize) = @_; 1520 my ($self, $fontsize) = @_;
1422 1521
1423 $self->{fontsize} = $fontsize; 1522 $self->{fontsize} = $fontsize;
1424 delete $self->{texture}; 1523 delete $self->{texture};
1425 1524
1426 $self->update; 1525 $self->realloc;
1427 $self->check_size;
1428} 1526}
1429 1527
1430sub _draw { 1528sub _draw {
1431 my ($self) = @_; 1529 my ($self) = @_;
1432 1530
1531 $self->SUPER::_draw; # draw background, if applicable
1532
1433 my $tex = $self->{texture} ||= do { 1533 my $tex = $self->{texture} ||= do {
1534 $self->{layout}->set_foreground (@{$self->{fg}});
1434 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1535 $self->{layout}->set_font ($self->{font}) if $self->{font};
1435 $self->{layout}->set_width ($self->{w}); 1536 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1436 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540
1437 new_from_layout CFClient::Texture $self->{layout} 1541 my $tex = new_from_layout CFClient::Texture $self->{layout};
1542
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1545 : ($self->{w} - $tex->{w}) * 0.5);
1546
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1549 : ($self->{h} - $tex->{h}) * 0.5);
1550
1551 $tex
1438 }; 1552 };
1439 1553
1440 glEnable GL_BLEND;
1441 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1442 glEnable GL_TEXTURE_2D; 1554 glEnable GL_TEXTURE_2D;
1443 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1444 1556
1557 if ($tex->{format} == GL_ALPHA) {
1445 glColor @{$self->{fg}}; 1558 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}); 1559 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1560 } else {
1561 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1562 }
1460 1563
1461 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
1462 glDisable GL_BLEND;
1463} 1565}
1464 1566
1465############################################################################# 1567#############################################################################
1466 1568
1467package CFClient::UI::EntryBase; 1569package CFClient::UI::EntryBase;
… …
1480 active_fg => [0, 0, 0], 1582 active_fg => [0, 0, 0],
1481 can_hover => 1, 1583 can_hover => 1,
1482 can_focus => 1, 1584 can_focus => 1,
1483 valign => 0, 1585 valign => 0,
1484 can_events => 1, 1586 can_events => 1,
1587 #text => ...
1485 @_ 1588 @_
1486 ) 1589 )
1487} 1590}
1488 1591
1489sub _set_text { 1592sub _set_text {
… …
1499 $self->{text} = $text; 1602 $self->{text} = $text;
1500 1603
1501 $text =~ s/./*/g if $self->{hidden}; 1604 $text =~ s/./*/g if $self->{hidden};
1502 $self->{layout}->set_text ("$text "); 1605 $self->{layout}->set_text ("$text ");
1503 1606
1504 $self->emit (changed => $self->{text}); 1607 $self->_emit (changed => $self->{text});
1608}
1609
1610sub set_text {
1611 my ($self, $text) = @_;
1612
1613 $self->{cursor} = length $text;
1614 $self->_set_text ($text);
1615
1616 $self->realloc;
1505} 1617}
1506 1618
1507sub get_text { 1619sub get_text {
1508 $_[0]{text} 1620 $_[0]{text}
1509} 1621}
… …
1512 my ($self) = @_; 1624 my ($self) = @_;
1513 1625
1514 my ($w, $h) = $self->SUPER::size_request; 1626 my ($w, $h) = $self->SUPER::size_request;
1515 1627
1516 ($w + 1, $h) # add 1 for cursor 1628 ($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} 1629}
1532 1630
1533sub key_down { 1631sub key_down {
1534 my ($self, $ev) = @_; 1632 my ($self, $ev) = @_;
1535 1633
… …
1537 my $sym = $ev->{sym}; 1635 my $sym = $ev->{sym};
1538 my $uni = $ev->{unicode}; 1636 my $uni = $ev->{unicode};
1539 1637
1540 my $text = $self->get_text; 1638 my $text = $self->get_text;
1541 1639
1542 if ($sym == 8) { 1640 if ($uni == 8) {
1543 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1641 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1544 } elsif ($sym == 127) { 1642 } elsif ($uni == 127) {
1545 substr $text, $self->{cursor}, 1, ""; 1643 substr $text, $self->{cursor}, 1, "";
1546 } elsif ($sym == CFClient::SDLK_LEFT) { 1644 } elsif ($sym == CFClient::SDLK_LEFT) {
1547 --$self->{cursor} if $self->{cursor}; 1645 --$self->{cursor} if $self->{cursor};
1548 } elsif ($sym == CFClient::SDLK_RIGHT) { 1646 } elsif ($sym == CFClient::SDLK_RIGHT) {
1549 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1647 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1550 } elsif ($sym == CFClient::SDLK_HOME) { 1648 } elsif ($sym == CFClient::SDLK_HOME) {
1551 $self->{cursor} = 0; 1649 $self->{cursor} = 0;
1552 } elsif ($sym == CFClient::SDLK_END) { 1650 } elsif ($sym == CFClient::SDLK_END) {
1553 $self->{cursor} = length $text; 1651 $self->{cursor} = length $text;
1554 } elsif ($sym == 27) { 1652 } elsif ($uni == 27) {
1555 $self->emit ('escape'); 1653 $self->_emit ('escape');
1556 } elsif ($uni) { 1654 } elsif ($uni) {
1557 substr $text, $self->{cursor}++, 0, chr $uni; 1655 substr $text, $self->{cursor}++, 0, chr $uni;
1558 } 1656 }
1559 1657
1560 $self->_set_text ($text); 1658 $self->_set_text ($text);
1561 $self->update; 1659
1660 $self->realloc;
1562} 1661}
1563 1662
1564sub focus_in { 1663sub focus_in {
1565 my ($self) = @_; 1664 my ($self) = @_;
1566 1665
… …
1646 if ($sym == 13) { 1745 if ($sym == 13) {
1647 unshift @{$self->{history}}, 1746 unshift @{$self->{history}},
1648 my $txt = $self->get_text; 1747 my $txt = $self->get_text;
1649 $self->{history_pointer} = -1; 1748 $self->{history_pointer} = -1;
1650 $self->{history_saveback} = ''; 1749 $self->{history_saveback} = '';
1651 $self->emit (activate => $txt); 1750 $self->_emit (activate => $txt);
1652 $self->update; 1751 $self->update;
1653 1752
1654 } elsif ($sym == CFClient::SDLK_UP) { 1753 } elsif ($sym == CFClient::SDLK_UP) {
1655 if ($self->{history_pointer} < 0) { 1754 if ($self->{history_pointer} < 0) {
1656 $self->{history_saveback} = $self->get_text; 1755 $self->{history_saveback} = $self->get_text;
… …
1695 my $class = shift; 1794 my $class = shift;
1696 1795
1697 $class->SUPER::new ( 1796 $class->SUPER::new (
1698 padding => 4, 1797 padding => 4,
1699 fg => [1, 1, 1], 1798 fg => [1, 1, 1],
1700 bg => [1, 1, 1, 0.2],
1701 active_fg => [0, 0, 1], 1799 active_fg => [0, 0, 1],
1702 can_hover => 1, 1800 can_hover => 1,
1703 align => 0, 1801 align => 0,
1704 valign => 0, 1802 valign => 0,
1705 can_events => 1, 1803 can_events => 1,
1706 @_ 1804 @_
1707 ) 1805 )
1708} 1806}
1709 1807
1808sub activate { }
1809
1710sub button_up { 1810sub button_up {
1711 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1712 1812
1813 $self->emit ("activate")
1713 if ($x >= 0 && $x < $self->{w} 1814 if $x >= 0 && $x < $self->{w}
1714 && $y >= 0 && $y < $self->{h}) { 1815 && $y >= 0 && $y < $self->{h};
1715 $self->emit ("activate");
1716 }
1717} 1816}
1718 1817
1719sub _draw { 1818sub _draw {
1720 my ($self) = @_; 1819 my ($self) = @_;
1721 1820
… …
1723 1822
1724 if ($GRAB == $self) { 1823 if ($GRAB == $self) {
1725 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1726 } 1825 }
1727 1826
1728 glEnable GL_BLEND;
1729 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1730 glEnable GL_TEXTURE_2D; 1827 glEnable GL_TEXTURE_2D;
1731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1732 glColor 0, 0, 0, 1; 1829 glColor 0, 0, 0, 1;
1733 1830
1734 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1831 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1735 1832
1736 glDisable GL_TEXTURE_2D; 1833 glDisable GL_TEXTURE_2D;
1737 glDisable GL_BLEND;
1738 1834
1739 $self->SUPER::_draw; 1835 $self->SUPER::_draw;
1740} 1836}
1741 1837
1742############################################################################# 1838#############################################################################
… …
1756 1852
1757 $class->SUPER::new ( 1853 $class->SUPER::new (
1758 padding => 2, 1854 padding => 2,
1759 fg => [1, 1, 1], 1855 fg => [1, 1, 1],
1760 active_fg => [1, 1, 0], 1856 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5],
1761 state => 0, 1859 state => 0,
1762 can_hover => 1, 1860 can_hover => 1,
1763 @_ 1861 @_
1764 ) 1862 )
1765} 1863}
… …
1774 my ($self, $ev, $x, $y) = @_; 1872 my ($self, $ev, $x, $y) = @_;
1775 1873
1776 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1777 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1778 $self->{state} = !$self->{state}; 1876 $self->{state} = !$self->{state};
1779 $self->emit (changed => $self->{state}); 1877 $self->_emit (changed => $self->{state});
1780 } 1878 }
1781} 1879}
1782 1880
1783sub _draw { 1881sub _draw {
1784 my ($self) = @_; 1882 my ($self) = @_;
… …
1789 1887
1790 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1791 1889
1792 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1793 1891
1794 glEnable GL_BLEND; 1892 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893
1795 glEnable GL_TEXTURE_2D; 1894 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); 1895 $tex->draw_quad_alpha (0, 0, $s, $s);
1801
1802 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1803 glDisable GL_BLEND;
1804} 1897}
1805 1898
1806############################################################################# 1899#############################################################################
1807 1900
1808package CFClient::UI::Image; 1901package CFClient::UI::Image;
… …
1851 glTranslate 0, -$self->{w}, 0; 1944 glTranslate 0, -$self->{w}, 0;
1852 1945
1853 ($w, $h) = ($h, $w); 1946 ($w, $h) = ($h, $w);
1854 } 1947 }
1855 1948
1856 glEnable GL_BLEND;
1857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1858 glEnable GL_TEXTURE_2D; 1949 glEnable GL_TEXTURE_2D;
1859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1950 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1860 1951
1861 $tex->draw_quad (0, 0, $w, $h); 1952 $tex->draw_quad_alpha (0, 0, $w, $h);
1862 1953
1863 glDisable GL_BLEND;
1864 glDisable GL_TEXTURE_2D; 1954 glDisable GL_TEXTURE_2D;
1865} 1955}
1866 1956
1867############################################################################# 1957#############################################################################
1868 1958
… …
2057 qw(s1_slider.png s1_slider_bg.png); 2147 qw(s1_slider.png s1_slider_bg.png);
2058 2148
2059sub new { 2149sub new {
2060 my $class = shift; 2150 my $class = shift;
2061 2151
2062 # range [value, low, high, page] 2152 # range [value, low, high, page, unit]
2063 2153
2064 # TODO: 0-width page 2154 # TODO: 0-width page
2065 # TODO: req_w/h are wrong with vertical 2155 # TODO: req_w/h are wrong with vertical
2066 # TODO: calculations are off 2156 # TODO: calculations are off
2067 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2158 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2159 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5],
2070 range => [0, 0, 100, 10], 2162 range => [0, 0, 100, 10, 0],
2071 req_w => $::WIDTH / 80, 2163 req_w => $::WIDTH / 80,
2072 req_h => $::WIDTH / 80, 2164 req_h => $::WIDTH / 80,
2073 vertical => 0, 2165 vertical => 0,
2074 can_hover => 1, 2166 can_hover => 1,
2075 inner_pad => 5, 2167 inner_pad => 0.02,
2076 @_ 2168 @_
2077 ); 2169 );
2078 2170
2171 $self->set_value ($self->{range}[0]);
2172 $self->update;
2173
2079 $self 2174 $self
2175}
2176
2177sub changed { }
2178
2179sub set_range {
2180 my ($self, $range) = @_;
2181
2182 ($range, $self->{range}) = ($self->{range}, $range);
2183
2184 $self->update
2185 if "@$range" ne "@{$self->{range}}";
2186}
2187
2188sub set_value {
2189 my ($self, $value) = @_;
2190
2191 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2192
2193 $hi = $lo + 1 if $hi <= $lo;
2194
2195 $page = $hi - $lo if $page > $hi - $lo;
2196
2197 $value = $lo if $value < $lo;
2198 $value = $hi - $page if $value > $hi - $page;
2199
2200 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2201 if $unit;
2202
2203 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2204
2205 if ($value != $old_value) {
2206 $self->_emit (changed => $value);
2207 $self->update;
2208 }
2080} 2209}
2081 2210
2082sub size_request { 2211sub size_request {
2083 my ($self) = @_; 2212 my ($self) = @_;
2084 2213
… …
2090 2219
2091sub button_down { 2220sub button_down {
2092 my ($self, $ev, $x, $y) = @_; 2221 my ($self, $ev, $x, $y) = @_;
2093 2222
2094 $self->SUPER::button_down ($ev, $x, $y); 2223 $self->SUPER::button_down ($ev, $x, $y);
2224
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226
2095 $self->mouse_motion ($ev, $x, $y); 2227 $self->mouse_motion ($ev, $x, $y);
2096} 2228}
2097 2229
2098sub mouse_motion { 2230sub mouse_motion {
2099 my ($self, $ev, $x, $y) = @_; 2231 my ($self, $ev, $x, $y) = @_;
2100 2232
2101 if ($GRAB == $self) { 2233 if ($GRAB == $self) {
2234 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2235
2236 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2241 }
2242}
2243
2244sub update {
2245 my ($self) = @_;
2246
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2248 $self->set_value ($self->{range}[0]);
2249
2102 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2250 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100;
2103 2252
2104 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2253 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2105 2254
2106 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2255 $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 2256 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2108 2257
2109 $x -= $inner_pad_px; # substract the padding 2258 $value = ($value - $lo) / $range;
2110 $x = $x * ($hi - $lo) / $inner_w + $lo; 2259 $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 2260
2115 $self->emit (changed => $x); 2261 $self->{knob_x} = $value - $knob_w * 0.5;
2116 $self->update; 2262 $self->{knob_w} = $knob_w;
2117 } 2263 });
2118}
2119 2264
2120# the inner_* stuff is for generating a padding for the slider handle, 2265 $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} 2266}
2127 2267
2128sub _draw { 2268sub _draw {
2129 my ($self) = @_; 2269 my ($self) = @_;
2130 2270
2131 $self->SUPER::_draw (); 2271 $self->SUPER::_draw ();
2132 2272
2133 my ($w, $h) = @$self{qw(w h)}; 2273 glScale $self->{w}, $self->{h};
2134 2274
2135 if ($self->{vertical}) { 2275 if ($self->{vertical}) {
2136 # draw a vertical slider like a rotated horizontal slider 2276 # draw a vertical slider like a rotated horizontal slider
2137 2277
2278 glTranslate 1, 0, 0;
2138 glRotate 90, 0, 0, 1; 2279 glRotate 90, 0, 0, 1;
2139 glTranslate 0, -$self->{w}, 0;
2140
2141 ($w, $h) = ($h, $w);
2142 } 2280 }
2143 2281
2144 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2282 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2145 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2283 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2146 2284
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; 2285 glEnable GL_TEXTURE_2D;
2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2169 2287
2170 # draw background 2288 # draw background
2171 $tex[1]->draw_quad (0, 0, $w, $h); 2289 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2172 2290
2173 # draw handle 2291 # draw handle
2174 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2292 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2175 2293
2176 glDisable GL_BLEND;
2177 glDisable GL_TEXTURE_2D; 2294 glDisable GL_TEXTURE_2D;
2178} 2295}
2296
2297#############################################################################
2298
2299package CFClient::UI::ValSlider;
2300
2301our @ISA = CFClient::UI::HBox::;
2302
2303sub new {
2304 my ($class, %arg) = @_;
2305
2306 my $range = delete $arg{range};
2307
2308 my $self = $class->SUPER::new (
2309 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2310 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2311 to_value => sub { shift },
2312 from_value => sub { shift },
2313 %arg,
2314 );
2315
2316 $self->{slider}->connect (changed => sub {
2317 my ($self, $value) = @_;
2318 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2319 $self->{parent}->emit (changed => $value);
2320 });
2321
2322# $self->{entry}->connect (changed => sub {
2323# my ($self, $value) = @_;
2324# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2325# $self->{parent}->emit (changed => $value);
2326# });
2327
2328 $self->add ($self->{slider}, $self->{entry});
2329
2330 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2331
2332 $self
2333}
2334
2335sub set_range { shift->{slider}->set_range (@_) }
2336sub set_value { shift->{slider}->set_value (@_) }
2179 2337
2180############################################################################# 2338#############################################################################
2181 2339
2182package CFClient::UI::TextView; 2340package CFClient::UI::TextView;
2183 2341
… …
2192 fontsize => 1, 2350 fontsize => 1,
2193 can_events => 0, 2351 can_events => 0,
2194 #font => default_font 2352 #font => default_font
2195 @_, 2353 @_,
2196 2354
2197 layout => (new CFClient::Layout), 2355 layout => (new CFClient::Layout 1),
2198 par => [], 2356 par => [],
2199 height => 0, 2357 height => 0,
2200 children => [ 2358 children => [
2201 (new CFClient::UI::Empty expand => 1), 2359 (new CFClient::UI::Empty expand => 1),
2202 (new CFClient::UI::Slider vertical => 1), 2360 (new CFClient::UI::Slider vertical => 1),
… …
2213 2371
2214 $self->{fontsize} = $fontsize; 2372 $self->{fontsize} = $fontsize;
2215 $self->reflow; 2373 $self->reflow;
2216} 2374}
2217 2375
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 { 2376sub size_allocate {
2238 my ($self, $w, $h) = @_; 2377 my ($self, $w, $h, $changed) = @_;
2239 2378
2240 $self->SUPER::size_allocate ($w, $h); 2379 $self->SUPER::size_allocate ($w, $h, $changed);
2380
2381 return unless $changed;
2241 2382
2242 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2383 $self->{layout}->set_font ($self->{font}) if $self->{font};
2243 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2244 $self->{layout}->set_width ($self->{children}[0]{w}); 2385 $self->{layout}->set_width ($self->{children}[0]{w});
2245 2386
2246 $self->reflow; 2387 $self->reflow;
2247} 2388}
2248 2389
2390sub text_size {
2391 my ($self, $text, $indent) = @_;
2392
2393 my $layout = $self->{layout};
2394
2395 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2396 $layout->set_width ($self->{children}[0]{w} - $indent);
2397 $layout->set_markup ($text);
2398
2399 $layout->size
2400}
2401
2402sub reflow {
2403 my ($self) = @_;
2404
2405 $self->{need_reflow}++;
2406 $self->update;
2407}
2408
2409sub set_offset {
2410 my ($self, $offset) = @_;
2411
2412 # todo: base offset on lines or so, not on pixels
2413 $self->{children}[1]->set_value ($offset);
2414}
2415
2416sub clear {
2417 my ($self) = @_;
2418
2419 $self->{par} = [];
2420 $self->{height} = 0;
2421 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2422}
2423
2249sub add_paragraph { 2424sub add_paragraph {
2250 my ($self, $color, $text) = @_; 2425 my ($self, $color, $text, $indent) = @_;
2251 2426
2252 #TODO: intelligently "reformat" paragraph 2427 for my $line (split /\n/, $text) {
2253 2428 my ($w, $h) = $self->text_size ($line);
2254 my $height = $self->text_height ($text);
2255
2256 $self->{height} += $height; 2429 $self->{height} += $h;
2430 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2431 }
2257 2432
2258 push @{$self->{par}}, [$height, $color, $text];
2259
2260 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2433 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2261 $self->{children}[1]->update;
2262} 2434}
2263 2435
2264sub update { 2436sub update {
2265 my ($self) = @_; 2437 my ($self) = @_;
2266 2438
… …
2268 2440
2269 return unless $self->{h} > 0; 2441 return unless $self->{h} > 0;
2270 2442
2271 delete $self->{texture}; 2443 delete $self->{texture};
2272 2444
2273 $ROOT->on_refresh ($self, sub { 2445 $ROOT->on_post_alloc ($self, sub {
2446 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2447
2274 if (delete $self->{need_reflow}) { 2448 if (delete $self->{need_reflow}) {
2275 my $height = 0; 2449 my $height = 0;
2276 2450
2277 $height += $_->[0] = $self->text_height ($_->[2]) 2451 my $layout = $self->{layout};
2452
2453 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2454
2278 for @{$self->{par}}; 2455 for (@{$self->{par}}) {
2456 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2457 $layout->set_width ($W - $_->[3]);
2458 $layout->set_markup ($_->[4]);
2459 my ($w, $h) = $layout->size;
2460 $_->[0] = $w + $_->[3];
2461 $_->[1] = $h;
2462 }
2463
2464 $height += $_->[1];
2465 }
2279 2466
2280 $self->{height} = $height; 2467 $self->{height} = $height;
2281 2468
2282 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2469 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2283 2470
2284 delete $self->{texture}; 2471 delete $self->{texture};
2285 } 2472 }
2286 2473
2287 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2288 glClearColor 0, 0, 0, 0; 2475 glClearColor 0.5, 0.5, 0.5, 0;
2289 glClear GL_COLOR_BUFFER_BIT; 2476 glClear GL_COLOR_BUFFER_BIT;
2290 2477
2478 my $top = int $self->{children}[1]{range}[0];
2479
2480 my $y0 = $top;
2481 my $y1 = $top + $H;
2482
2483 my $y = 0;
2484
2485 my $layout = $self->{layout};
2486
2487 $layout->set_font ($self->{font}) if $self->{font};
2488
2291 glEnable GL_BLEND; 2489 glEnable GL_BLEND;
2490 #TODO# not correct in windows where rgba is forced off
2292 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2491 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 2492
2307 for my $par (@{$self->{par}}) { 2493 for my $par (@{$self->{par}}) {
2308 my $h = $par->[0]; 2494 my $h = $par->[1];
2309 2495
2310 if ($y0 < $y + $h && $y < $y1) { 2496 if ($y0 < $y + $h && $y < $y1) {
2497 $layout->set_foreground (@{ $par->[2] });
2498 $layout->set_width ($W - $par->[3]);
2311 $layout->set_text ($par->[2]); 2499 $layout->set_markup ($par->[4]);
2312 2500
2313 glColor @{ $par->[1] }; 2501 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2314 my ($W, $H) = $layout->size; 2502
2315 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2503 glRasterPos $par->[3], $y - $y0;
2504 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2316 } 2505 }
2317 2506
2318 $y += $h; 2507 $y += $h;
2319 } 2508 }
2320 2509
2321 glDisable GL_TEXTURE_2D;
2322 glDisable GL_BLEND; 2510 glDisable GL_BLEND;
2323 }; 2511 };
2324 }); 2512 });
2325} 2513}
2326 2514
2327sub _draw { 2515sub _draw {
2328 my ($self) = @_; 2516 my ($self) = @_;
2329 2517
2330 glEnable GL_BLEND;
2331 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2332 glEnable GL_TEXTURE_2D; 2518 glEnable GL_TEXTURE_2D;
2333 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2334 glColor 1, 1, 1, 1; 2520 glColor 1, 1, 1, 1;
2335 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2336 glDisable GL_TEXTURE_2D; 2522 glDisable GL_TEXTURE_2D;
2337 glDisable GL_BLEND;
2338 2523
2339 $self->{children}[1]->draw; 2524 $self->{children}[1]->draw;
2340 2525
2341} 2526}
2342 2527
… …
2390 2575
2391sub new { 2576sub new {
2392 my $class = shift; 2577 my $class = shift;
2393 2578
2394 my $self = $class->SUPER::new ( 2579 my $self = $class->SUPER::new (
2395 state => 0, 2580 state => 0,
2396 connect_activate => \&toggle_flopper, 2581 on_activate => \&toggle_flopper,
2397 @_ 2582 @_
2398 ); 2583 );
2399 2584
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2585 $self
2406} 2586}
2407 2587
2408sub toggle_flopper { 2588sub toggle_flopper {
2409 my ($self) = @_; 2589 my ($self) = @_;
2410 2590
2411 # TODO: use animation 2591 $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} 2592}
2423 2593
2424############################################################################# 2594#############################################################################
2425 2595
2426package CFClient::UI::Tooltip; 2596package CFClient::UI::Tooltip;
… …
2436 @_, 2606 @_,
2437 can_events => 0, 2607 can_events => 0,
2438 ) 2608 )
2439} 2609}
2440 2610
2441sub set_markup { 2611sub set_tooltip_from {
2442 my ($self, $text) = @_; 2612 my ($self, $widget) = @_;
2443 2613
2444 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2614 $self->add (new CFClient::UI::Label
2445 $self->{label}->set_markup ($text); 2615 markup => $widget->{tooltip},
2446 $self->add ($self->{label}); 2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8,
2618 fg => [0, 0, 0, 1],
2619 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP),
2621 );
2447} 2622}
2448 2623
2449sub size_request { 2624sub size_request {
2450 my ($self) = @_; 2625 my ($self) = @_;
2451 2626
2452 $self->child->set_max_size ($::WIDTH * 0.3);
2453
2454 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2627 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2455 2628
2456 ($w + 4, $h + 4) 2629 ($w + 4, $h + 4)
2457} 2630}
2458 2631
2459sub size_allocate { 2632sub size_allocate {
2460 my ($self, $w, $h) = @_; 2633 my ($self, $w, $h, $changed) = @_;
2461 2634
2635 return unless $changed;
2636
2462 $self->SUPER::size_allocate ($w - 4, $h - 4); 2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2638}
2639
2640sub visibility_change {
2641 my ($self, $visible) = @_;
2642
2643 return unless $visible;
2644
2645 $self->{root}->on_post_alloc ("move_$self" => sub {
2646 my $widget = $self->{owner}
2647 or return;
2648
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH;
2653
2654 $self->move ($x, $y);
2655 });
2463} 2656}
2464 2657
2465sub _draw { 2658sub _draw {
2466 my ($self) = @_; 2659 my ($self) = @_;
2467 2660
2468 glPushMatrix;
2469 glTranslate 0.375, 0.375; 2661 glTranslate 0.375, 0.375;
2470 2662
2471 my ($w, $h) = @$self{qw(w h)}; 2663 my ($w, $h) = @$self{qw(w h)};
2472 2664
2473 glColor 1, 0.8, 0.4; 2665 glColor 1, 0.8, 0.4;
… …
2484 glVertex 0 , $h; 2676 glVertex 0 , $h;
2485 glVertex $w, $h; 2677 glVertex $w, $h;
2486 glVertex $w, 0; 2678 glVertex $w, 0;
2487 glEnd; 2679 glEnd;
2488 2680
2489 glPopMatrix; 2681 glTranslate 2 - 0.375, 2 - 0.375;
2490 2682
2491 glTranslate 2, 2;
2492 $self->SUPER::_draw; 2683 $self->SUPER::_draw;
2493} 2684}
2494 2685
2495############################################################################# 2686#############################################################################
2496 2687
… …
2501use CFClient::OpenGL; 2692use CFClient::OpenGL;
2502 2693
2503sub new { 2694sub new {
2504 my $class = shift; 2695 my $class = shift;
2505 2696
2506 $class->SUPER::new ( 2697 my $self = $class->SUPER::new (
2507 aspect => 1, 2698 aspect => 1,
2699 can_events => 0,
2508 @_, 2700 @_,
2509 ) 2701 );
2702
2703 if ($self->{anim} && $self->{animspeed}) {
2704 Scalar::Util::weaken (my $widget = $self);
2705
2706 $self->{timer} = Event->timer (
2707 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2708 hard => 1,
2709 interval => $self->{animspeed},
2710 cb => sub {
2711 ++$widget->{frame};
2712 $widget->update;
2713 },
2714 );
2715 }
2716
2717 $self
2510} 2718}
2511 2719
2512sub size_request { 2720sub size_request {
2513 (32, 8) 2721 (32, 8)
2514} 2722}
2515 2723
2724sub update {
2725 my ($self) = @_;
2726
2727 return unless $self->{visible};
2728
2729 $self->SUPER::update;
2730}
2731
2516sub _draw { 2732sub _draw {
2517 my ($self) = @_; 2733 my ($self) = @_;
2518 2734
2519 return unless $::CONN;#d# manage and cache textures differently 2735 return unless $::CONN;
2736
2737 my $face;
2738
2739 if ($self->{frame}) {
2740 my $anim = $::CONN->{anim}[$self->{anim}];
2741
2742 $face = $anim->[ $self->{frame} % @$anim ]
2743 if $anim && @$anim;
2744 }
2745
2520 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2521 2747
2522 # TODO animation
2523 if ($tex) { 2748 if ($tex) {
2524 glEnable GL_BLEND;
2525 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2526 glEnable GL_TEXTURE_2D; 2749 glEnable GL_TEXTURE_2D;
2527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2528 glColor 1, 1, 1, 1; 2751 glColor 1, 1, 1, 1;
2529 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2530 glDisable GL_TEXTURE_2D; 2753 glDisable GL_TEXTURE_2D;
2531 glDisable GL_BLEND;
2532 } 2754 }
2533} 2755}
2534 2756
2535############################################################################# 2757sub DESTROY {
2758 my ($self) = @_;
2536 2759
2760 $self->{timer}->cancel
2761 if $self->{timer};
2762
2763 $self->SUPER::DESTROY;
2764}
2765
2766#############################################################################
2767
2537package CFClient::UI::InventoryItem; 2768package CFClient::UI::Inventory;
2538 2769
2539our @ISA = CFClient::UI::HBox::; 2770our @ISA = CFClient::UI::ScrolledWindow::;
2540 2771
2541sub new { 2772sub new {
2542 my $class = shift; 2773 my $class = shift;
2543 2774
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 ( 2775 my $self = $class->SUPER::new (
2554 can_hover => 1, 2776 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 @_, 2777 @_,
2609 ); 2778 );
2610 2779
2611 $self 2780 $self
2612} 2781}
… …
2615 my ($self, $items) = @_; 2784 my ($self, $items) = @_;
2616 2785
2617 $self->{scrolled}->clear; 2786 $self->{scrolled}->clear;
2618 return unless $items; 2787 return unless $items;
2619 2788
2620 my @items = sort { $a->{type} <=> $b->{type} } @$items; 2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2621 2793
2622 $self->{real_items} = \@items; 2794 $self->{real_items} = \@items;
2623 2795
2796 my $row = 0;
2624 for my $item (@items) { 2797 for my $item (@items) {
2625 my $desc = $item->{nrof} < 2 2798 CFClient::Item::update_widgets $item;
2626 ? $item->{name}
2627 : "$item->{nrof} $item->{name_pl}";
2628 2799
2629 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item); 2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2630 } 2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2631 2803
2632# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page]; 2804 $row++;
2633} 2805 }
2634
2635sub size_request {
2636 my ($self) = @_;
2637 ($self->{req_w}, $self->{req_h});
2638} 2806}
2639 2807
2640############################################################################# 2808#############################################################################
2641 2809
2642package CFClient::UI::Menu; 2810package CFClient::UI::Menu;
… …
2677 2845
2678# popup given the event (must be a mouse button down event currently) 2846# popup given the event (must be a mouse button down event currently)
2679sub popup { 2847sub popup {
2680 my ($self, $ev) = @_; 2848 my ($self, $ev) = @_;
2681 2849
2682 $self->emit ("popdown"); 2850 $self->_emit ("popdown");
2683 2851
2684 # maybe save $GRAB? must be careful about events... 2852 # maybe save $GRAB? must be careful about events...
2685 $GRAB = $self; 2853 $GRAB = $self;
2686 $self->{button} = $ev->{button}; 2854 $self->{button} = $ev->{button};
2687 2855
… …
2702 2870
2703 if ($ev->{button} == $self->{button}) { 2871 if ($ev->{button} == $self->{button}) {
2704 undef $GRAB; 2872 undef $GRAB;
2705 $self->hide; 2873 $self->hide;
2706 2874
2707 $self->emit ("popdown"); 2875 $self->_emit ("popdown");
2708 $self->{hover}[1]->() if $self->{hover}; 2876 $self->{hover}[1]->() if $self->{hover};
2709 } 2877 }
2710} 2878}
2711 2879
2712############################################################################# 2880#############################################################################
2713 2881
2882package CFClient::UI::Statusbox;
2883
2884our @ISA = CFClient::UI::VBox::;
2885
2886sub new {
2887 my $class = shift;
2888
2889 $class->SUPER::new (
2890 fontsize => 0.8,
2891 @_,
2892 )
2893}
2894
2895sub reorder {
2896 my ($self) = @_;
2897 my $NOW = time;
2898
2899 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 }
2902
2903 my @widgets;
2904
2905 my @items = sort {
2906 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} };
2909
2910 my $count = 10 + 1;
2911 for my $item (@items) {
2912 last unless --$count;
2913
2914 push @widgets, $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text};
2919
2920 for ($short) {
2921 s/^\s+//;
2922 s/\s+/ /g;
2923 }
2924
2925 new CFClient::UI::Label
2926 markup => $short,
2927 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg},
2933 can_events => 1,
2934 can_hover => 1
2935 };
2936 }
2937
2938 $self->clear;
2939 $self->SUPER::add (reverse @widgets);
2940}
2941
2942sub add {
2943 my ($self, $text, %arg) = @_;
2944
2945 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//;
2947
2948 return unless $text;
2949
2950 my $timeout = time + ((delete $arg{timeout}) || 60);
2951
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953
2954 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) {
2956 $item->{count}++;
2957 } else {
2958 $item->{count} = 1;
2959 $item->{text} = $item->{tooltip} = $text;
2960 }
2961 $item->{id} = ++$self->{id};
2962 $item->{timeout} = $timeout;
2963 delete $item->{label};
2964 } else {
2965 $self->{item}{$group} = {
2966 id => ++$self->{id},
2967 text => $text,
2968 timeout => $timeout,
2969 tooltip => $text,
2970 fg => [0.8, 0.8, 0.8, 0.8],
2971 pri => 0,
2972 count => 1,
2973 %arg,
2974 };
2975 }
2976
2977 $self->reorder;
2978}
2979
2980sub reconfigure {
2981 my ($self) = @_;
2982
2983 delete $_->{label}
2984 for values %{ $self->{item} || {} };
2985
2986 $self->reorder;
2987 $self->SUPER::reconfigure;
2988}
2989
2990#############################################################################
2991
2714package CFClient::UI::Root; 2992package CFClient::UI::Root;
2715 2993
2716our @ISA = CFClient::UI::Container::; 2994our @ISA = CFClient::UI::Container::;
2717 2995
2718use CFClient::OpenGL; 2996use CFClient::OpenGL;
2719 2997
2720sub check_size { 2998sub new {
2721 my ($self) = @_; 2999 my $class = shift;
2722 3000
2723 $self->configure (0, 0, $self->{w}, $self->{h}); 3001 my $self = $class->SUPER::new (
2724} 3002 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 } 3003 @_,
2749 } 3004 );
2750 3005
2751 $self->{old_w} = $w; 3006 Scalar::Util::weaken ($self->{root} = $self);
2752 $self->{old_h} = $h; 3007
3008 $self
2753} 3009}
2754 3010
2755sub configure { 3011sub configure {
2756 my ($self, $x, $y, $w, $h) = @_; 3012 my ($self, $x, $y, $w, $h) = @_;
2757 3013
2758 $self->SUPER::configure ($x, $y, $w, $h); 3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request {
3028 my ($self) = @_;
3029
3030 ($self->{w}, $self->{h})
3031}
3032
3033sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_;
2759 3035
2760 for my $child ($self->children) { 3036 for my $child ($self->children) {
2761 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2762 3038
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
3040 if exists $child->{req_x};
3041
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3043 if exists $child->{req_y};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
2763 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2764 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049
2765 $child->configure ($X, $Y, $W, $H); 3050 $child->configure ($X, $Y, $W, $H);
2766 } 3051 }
2767} 3052}
2768 3053
2769sub _topleft { 3054sub coord2local {
2770 my ($self, $x, $y) = @_; 3055 my ($self, $x, $y) = @_;
2771 3056
2772 ($x, $y) 3057 ($x, $y)
2773} 3058}
2774 3059
3060sub coord2global {
3061 my ($self, $x, $y) = @_;
3062
3063 ($x, $y)
3064}
3065
2775sub update { 3066sub update {
2776 my ($self) = @_; 3067 my ($self) = @_;
2777 3068
2778 $self->check_size; 3069 $::WANT_REFRESH++;
2779 ::refresh ();
2780} 3070}
2781 3071
2782sub add { 3072sub add {
2783 my ($self, $child) = @_; 3073 my ($self, @children) = @_;
2784 3074
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1;
3077
2785 # integerize window positions 3078 # integerise window positions
2786 $child->{x} = int $child->{x}; 3079 $child->{x} = int $child->{x};
2787 $child->{y} = int $child->{y}; 3080 $child->{y} = int $child->{y};
3081 }
2788 3082
2789 $self->SUPER::add ($child); 3083 $self->SUPER::add (@children);
3084}
3085
3086sub remove {
3087 my ($self, @children) = @_;
3088
3089 $self->SUPER::remove (@children);
3090
3091 while (@children) {
3092 my $w = pop @children;
3093 push @children, $w->children;
3094 $w->set_invisible;
3095 }
2790} 3096}
2791 3097
2792sub on_refresh { 3098sub on_refresh {
2793 my ($self, $id, $cb) = @_; 3099 my ($self, $id, $cb) = @_;
2794 3100
2795 $self->{refresh_hook}{$id} = $cb; 3101 $self->{refresh_hook}{$id} = $cb;
2796} 3102}
2797 3103
3104sub on_post_alloc {
3105 my ($self, $id, $cb) = @_;
3106
3107 $self->{post_alloc_hook}{$id} = $cb;
3108}
3109
2798sub draw { 3110sub draw {
2799 my ($self) = @_; 3111 my ($self) = @_;
2800 3112
2801 while (my $rcb = delete $self->{refresh_hook}) { 3113 while ($self->{refresh_hook}) {
2802 $_->() for values %$rcb; 3114 $_->()
3115 for values %{delete $self->{refresh_hook}};
3116 }
3117
3118 if ($self->{realloc}) {
3119 my @queue;
3120
3121 while () {
3122 if ($self->{realloc}) {
3123 #TODO use array-of-depth approach
3124
3125 @queue = sort { $a->{visible} <=> $b->{visible} }
3126 @queue, values %{delete $self->{realloc}};
3127 }
3128
3129 my $widget = pop @queue || last;
3130
3131 $widget->{visible} or last; # do not resize invisible widgets
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155
3156 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0;
3158
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3160
3161 $widget->{w} = $w;
3162 $widget->{h} = $h;
3163
3164 $widget->emit (size_allocate => $w, $h, $changed);
3165 }
3166 }
3167
3168 while ($self->{post_alloc_hook}) {
3169 $_->()
3170 for values %{delete $self->{post_alloc_hook}};
2803 } 3171 }
2804 3172
2805 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3173 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2806 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2807 glClear GL_COLOR_BUFFER_BIT; 3175 glClear GL_COLOR_BUFFER_BIT;
2808 3176
2809 glMatrixMode GL_PROJECTION; 3177 glMatrixMode GL_PROJECTION;
2810 glLoadIdentity; 3178 glLoadIdentity;
2811 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2812 glMatrixMode GL_MODELVIEW; 3180 glMatrixMode GL_MODELVIEW;
2813 glLoadIdentity; 3181 glLoadIdentity;
2814 3182
2815 $self->_draw; 3183 $self->_draw;
2816} 3184}
… …
2818############################################################################# 3186#############################################################################
2819 3187
2820package CFClient::UI; 3188package CFClient::UI;
2821 3189
2822$ROOT = new CFClient::UI::Root; 3190$ROOT = new CFClient::UI::Root;
2823$TOOLTIP = new CFClient::UI::Tooltip; 3191$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2824 3192
28251 31931
2826 3194

Diff Legend

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