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.243 by root, Sat May 27 20:46:54 2006 UTC

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

Diff Legend

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