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.157 by root, Sun Apr 23 21:47:32 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;
15 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}
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 (exists $widget->{tooltip}) { 42 if (length $widget->{tooltip}) {
20 43
21 if ($TOOLTIP->{owner} != $widget) { 44 if ($TOOLTIP->{owner} != $widget) {
22 $TOOLTIP->{owner} = $widget; 45 $TOOLTIP->{owner} = $widget;
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_text ($widget->{tooltip}); 51 $TOOLTIP->set_tooltip_from ($widget);
29 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show; 52 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
31 } 62 }
32 63
33 return; 64 return;
34 } 65 }
35 } 66 }
… …
39 delete $TOOLTIP->{owner}; 70 delete $TOOLTIP->{owner};
40} 71}
41 72
42# class methods for events 73# class methods for events
43sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
44 $FOCUS->key_down ($_[0]) if $FOCUS; 75 $FOCUS->emit (key_down => $_[0])
76 if $FOCUS;
45} 77}
46 78
47sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
48 $FOCUS->key_up ($_[0]) if $FOCUS; 80 $FOCUS->emit (key_up => $_[0])
81 if $FOCUS;
49} 82}
50 83
51sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
52 my ($ev) = @_; 85 my ($ev) = @_;
53 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
61 check_tooltip; 94 check_tooltip;
62 } 95 }
63 96
64 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
65 98
66 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
100 if $GRAB;
67} 101}
68 102
69sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
70 my ($ev) = @_; 104 my ($ev) = @_;
71 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
72 106
73 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
74 108
75 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
76 110
77 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
112 if $GRAB;
78 113
79 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
80 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
81 $grab->update if $grab; 116 $grab->update if $grab;
82 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
… …
98 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
99 134
100 check_tooltip; 135 check_tooltip;
101 } 136 }
102 137
103 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER;
104} 140}
105 141
106# convert position array to integers 142# convert position array to integers
107sub harmonize { 143sub harmonize {
108 my ($vals) = @_; 144 my ($vals) = @_;
… …
114 $rem += $_ - $i; 150 $rem += $_ - $i;
115 $_ = $i; 151 $_ = $i;
116 } 152 }
117} 153}
118 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;
189}
190
119############################################################################# 191#############################################################################
120 192
121package CFClient::UI::Base; 193package CFClient::UI::Base;
122 194
123use strict; 195use strict;
… …
126 198
127sub new { 199sub new {
128 my $class = shift; 200 my $class = shift;
129 201
130 my $self = bless { 202 my $self = bless {
131 x => 0, 203 x => 0,
132 y => 0, 204 y => 0,
133 z => 0, 205 z => 0,
134 can_events => 1, 206 can_events => 1,
135 @_ 207 @_
136 }, $class; 208 }, $class;
137 209
138 for (keys %$self) { 210 for (keys %$self) {
139 if (/^connect_(.*)$/) { 211 if (/^on_(.*)$/) {
140 $self->connect ($1 => delete $self->{$_}); 212 $self->connect ($1 => delete $self->{$_});
141 } 213 }
142 } 214 }
143 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
144 $self 225 $self
145} 226}
146 227
228sub destroy {
229 my ($self) = @_;
230
231 $self->hide;
232 %$self = ();
233}
234
147sub show { 235sub show {
148 my ($self) = @_; 236 my ($self) = @_;
149
150 return if $self->{parent}; 237 return if $self->{parent};
151 238
152 $CFClient::UI::ROOT->add ($self); 239 $CFClient::UI::ROOT->add ($self);
153} 240}
154 241
242sub show_centered {
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};
262
263 undef $GRAB if $GRAB == $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
155sub hide { 272sub hide {
156 my ($self) = @_; 273 my ($self) = @_;
157 274
158 return unless $self->{parent}; 275 $self->set_invisible;
159 276
160 $self->{parent}->remove ($self); 277 $self->{parent}->remove ($self)
278 if $self->{parent};
161} 279}
162 280
163sub move { 281sub move {
164 my ($self, $x, $y, $z) = @_; 282 my ($self, $x, $y, $z) = @_;
165 283
… …
168 $self->{z} = $z if defined $z; 286 $self->{z} = $z if defined $z;
169 287
170 $self->update; 288 $self->update;
171} 289}
172 290
173sub needs_redraw { 291sub set_size {
174 0 292 my ($self, $w, $h) = @_;
293
294 $self->{user_w} = $w;
295 $self->{user_h} = $h;
296
297 $self->check_size;
175} 298}
176 299
177sub size_request { 300sub size_request {
178 require Carp; 301 require Carp;
179 Carp::confess "size_request is abstract"; 302 Carp::confess "size_request is abstract";
… …
199 $self->{y} = $y; 322 $self->{y} = $y;
200 $self->update; 323 $self->update;
201 } 324 }
202 325
203 if ($self->{w} != $w || $self->{h} != $h) { 326 if ($self->{w} != $w || $self->{h} != $h) {
204 $self->{w} = $w; 327 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
205 $self->{h} = $h;
206
207 $self->size_allocate ($w, $h);
208 $self->update;
209 } 328 }
210} 329}
211 330
212sub size_allocate { 331sub size_allocate {
213 # nothing to be done 332 # nothing to be done
214} 333}
215 334
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children {
343}
344
216sub set_max_size { 345sub set_max_size {
217 my ($self, $w, $h) = @_; 346 my ($self, $w, $h) = @_;
218 347
219 delete $self->{max_w}; $self->{max_w} = $w if $w; 348 delete $self->{max_w}; $self->{max_w} = $w if $w;
220 delete $self->{max_h}; $self->{max_h} = $h if $h; 349 delete $self->{max_h}; $self->{max_h} = $h if $h;
221} 350}
222 351
223# return top left coordinates 352sub set_tooltip {
224sub _topleft {
225 my ($self, $x, $y) = @_; 353 my ($self, $tooltip) = @_;
226 354
227 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 355 $tooltip =~ s/^\s+//;
356 $tooltip =~ s/\s+$//;
357
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 }
228} 366}
229 367
230# translate global coordinates to local coordinate system 368# translate global coordinates to local coordinate system
231sub coord2local { 369sub coord2local {
232 my ($self, $x, $y) = @_; 370 my ($self, $x, $y) = @_;
233 371
234 my ($X, $Y) = $self->_topleft; 372 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
235 ($x - $X, $y - $Y)
236} 373}
237 374
238# translate local coordinates to global coordinate system 375# translate local coordinates to global coordinate system
239sub coord2global { 376sub coord2global {
240 my ($self, $x, $y) = @_; 377 my ($self, $x, $y) = @_;
241 378
242 my ($X, $Y) = $self->_topleft; 379 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
243 ($x + $X, $y + $Y)
244} 380}
245 381
246sub focus_in { 382sub focus_in {
247 my ($self) = @_; 383 my ($self) = @_;
248 384
249 return if $FOCUS == $self; 385 return if $FOCUS == $self;
250 return unless $self->{can_focus}; 386 return unless $self->{can_focus};
251 387
252 my $focus = $FOCUS; $FOCUS = $self; 388 my $focus = $FOCUS; $FOCUS = $self;
253 389
254 $self->emit (focus_in => $focus); 390 $self->_emit (focus_in => $focus);
255 391
256 $focus->update if $focus; 392 $focus->update if $focus;
257 $FOCUS->update; 393 $FOCUS->update;
258} 394}
259 395
… …
262 398
263 return unless $FOCUS == $self; 399 return unless $FOCUS == $self;
264 400
265 my $focus = $FOCUS; undef $FOCUS; 401 my $focus = $FOCUS; undef $FOCUS;
266 402
267 $self->emit (focus_out => $focus); 403 $self->_emit (focus_out => $focus);
268 404
269 $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;
270} 409}
271 410
272sub mouse_motion { } 411sub mouse_motion { }
273sub button_up { } 412sub button_up { }
274sub key_down { } 413sub key_down { }
275sub key_up { } 414sub key_up { }
276 415
277sub button_down { 416sub button_down {
278 my ($self, $ev, $x, $y) = @_; 417 my ($self, $ev, $x, $y) = @_;
279 418
280 $self->focus_in; 419 $self->focus_in;
… …
308 glVertex $x + $self->{w}, $y + $self->{h}; 447 glVertex $x + $self->{w}, $y + $self->{h};
309 glVertex $x , $y + $self->{h}; 448 glVertex $x , $y + $self->{h};
310 glEnd; 449 glEnd;
311 glDisable GL_BLEND; 450 glDisable GL_BLEND;
312 } 451 }
452
453 if ($ENV{PCLIENT_DEBUG}) {
454 glPushMatrix;
455 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
457 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1;
462 glEnd;
463 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 }
313} 466}
314 467
315sub _draw { 468sub _draw {
316 my ($self) = @_; 469 my ($self) = @_;
317 470
… …
332 485
333sub set_parent { 486sub set_parent {
334 my ($self, $parent) = @_; 487 my ($self, $parent) = @_;
335 488
336 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;
337} 499}
338 500
339sub check_size { 501sub check_size {
340 my ($self) = @_; 502 my ($self, $forced) = @_;
341 503
342 return unless $self->{parent}; 504 $self->{force_alloc} = 1 if $forced;
343 505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
344 my ($w, $h) = $self->size_request;
345
346 if ($w != $self->{req_w} || $h != $self->{req_h}) {
347 $self->{req_w} = $w;
348 $self->{req_h} = $h;
349
350 $self->{parent}->check_size;
351 }
352} 506}
353 507
354sub update { 508sub update {
355 my ($self) = @_; 509 my ($self) = @_;
356 510
… …
362 my ($self, $signal, $cb) = @_; 516 my ($self, $signal, $cb) = @_;
363 517
364 push @{ $self->{signal_cb}{$signal} }, $cb; 518 push @{ $self->{signal_cb}{$signal} }, $cb;
365} 519}
366 520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
367sub emit { 527sub emit {
368 my ($self, $signal, @args) = @_; 528 my ($self, $signal, @args) = @_;
369 529
370 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 530 $self->_emit ($signal, @args)
371 $cb->($self, @args); 531 || $self->$signal (@args);
372 }
373} 532}
374 533
375sub DESTROY { 534sub DESTROY {
376 my ($self) = @_; 535 my ($self) = @_;
377 536
537 delete $WIDGET{$self+0};
378 #$self->deactivate; 538 #$self->deactivate;
379} 539}
380 540
381############################################################################# 541#############################################################################
382 542
… …
391 my $class = shift; 551 my $class = shift;
392 552
393 # range [value, low, high, page] 553 # range [value, low, high, page]
394 554
395 $class->SUPER::new ( 555 $class->SUPER::new (
396 bg => [0, 0, 0, 0.2], 556 #bg => [0, 0, 0, 0.2],
397 active_bg => [1, 1, 1, 0.5], 557 #active_bg => [1, 1, 1, 0.5],
398 @_ 558 @_
399 ) 559 )
400} 560}
401 561
402sub _draw { 562sub _draw {
403 my ($self) = @_; 563 my ($self) = @_;
404 564
565 my $color = $FOCUS == $self && $self->{active_bg}
566 ? $self->{active_bg}
567 : $self->{bg};
568
569 if ($color && (@$color < 4 || $color->[3])) {
405 my ($w, $h) = @$self{qw(w h)}; 570 my ($w, $h) = @$self{qw(w h)};
406 571
407 glEnable GL_BLEND; 572 glEnable GL_BLEND;
408 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
409 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 574 glColor @$color;
410 575
411 glBegin GL_QUADS; 576 glBegin GL_QUADS;
412 glVertex 0 , 0; 577 glVertex 0 , 0;
413 glVertex 0 , $h; 578 glVertex 0 , $h;
414 glVertex $w, $h; 579 glVertex $w, $h;
415 glVertex $w, 0; 580 glVertex $w, 0;
416 glEnd; 581 glEnd;
417 582
418 glDisable GL_BLEND; 583 glDisable GL_BLEND;
584 }
419} 585}
420 586
421############################################################################# 587#############################################################################
422 588
423package CFClient::UI::Empty; 589package CFClient::UI::Empty;
… …
444sub new { 610sub new {
445 my ($class, %arg) = @_; 611 my ($class, %arg) = @_;
446 612
447 my $children = delete $arg{children} || []; 613 my $children = delete $arg{children} || [];
448 614
449 my $self = $class->SUPER::new (children => [], can_events => 0, %arg); 615 my $self = $class->SUPER::new (
616 children => [],
617 can_events => 0,
618 %arg,
619 );
450 $self->add ($_) for @$children; 620 $self->add ($_) for @$children;
451 621
452 $self 622 $self
453} 623}
454 624
455sub add { 625sub add {
456 my ($self, $child) = @_; 626 my ($self, @widgets) = @_;
457 627
458 $child->set_parent ($self); 628 $_->set_parent ($self)
629 for @widgets;
459 630
460 use sort 'stable'; 631 use sort 'stable';
461 632
462 $self->{children} = [ 633 $self->{children} = [
463 sort { $a->{z} <=> $b->{z} } 634 sort { $a->{z} <=> $b->{z} }
464 @{$self->{children}}, $child 635 @{$self->{children}}, @widgets
465 ]; 636 ];
466 637
467 $child->check_size; 638 $self->check_size (1);
639 $self->update;
640}
641
642sub children {
643 @{ $_[0]{children} }
468} 644}
469 645
470sub remove { 646sub remove {
471 my ($self, $child) = @_; 647 my ($self, $child) = @_;
472 648
473 delete $child->{parent}; 649 delete $child->{parent};
650 $child->hide;
474 651
475 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653
654 $self->check_size (1);
655 $self->update;
656}
657
658sub clear {
659 my ($self) = @_;
660
661 my $children = delete $self->{children};
662 $self->{children} = [];
663
664 for (@$children) {
665 delete $_->{parent};
666 $_->hide;
667 }
476 668
477 $self->check_size; 669 $self->check_size;
478 $self->update; 670 $self->update;
479} 671}
480 672
… …
558} 750}
559 751
560sub update { 752sub update {
561 my ($self) = @_; 753 my ($self) = @_;
562 754
563 # we want to do this delayed... 755 $ROOT->on_post_alloc ($self => sub { $self->render_child });
564 $self->render_chld;
565 $self->SUPER::update; 756 $self->SUPER::update;
566}
567
568sub render_chld {
569 my ($self) = @_;
570
571 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
572 glClearColor 0, 0, 0, 1;
573 glClear GL_COLOR_BUFFER_BIT;
574 $self->child->draw;
575 };
576} 757}
577 758
578sub size_allocate { 759sub size_allocate {
579 my ($self, $w, $h) = @_; 760 my ($self, $w, $h) = @_;
580 761
581 $self->child->configure (0, 0, $w, $h); 762 $self->SUPER::size_allocate ($w, $h);
763 $self->update;
764}
582 765
766sub _render {
767 $_[0]{children}[0]->draw;
768}
769
770sub render_child {
771 my ($self) = @_;
772
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT;
776
583 $self->render_chld; 777 $self->_render;
778 };
584} 779}
585 780
586sub _draw { 781sub _draw {
587 my ($self) = @_; 782 my ($self) = @_;
588 783
589 my ($w, $h) = ($self->w, $self->h); 784 my ($w, $h) = ($self->w, $self->h);
590 785
591 my $tex = $self->{texture} 786 my $tex = $self->{texture}
592 or return; 787 or return;
593 788
594 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
596 glEnable GL_TEXTURE_2D; 789 glEnable GL_TEXTURE_2D;
597 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1;
598 792
599 $tex->draw_quad (0, 0, $w, $h); 793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
600 794
601 glDisable GL_BLEND;
602 glDisable GL_TEXTURE_2D; 795 glDisable GL_TEXTURE_2D;
603} 796}
604 797
605############################################################################# 798#############################################################################
606 799
607package CFClient::UI::ViewPort; 800package CFClient::UI::ViewPort;
608 801
609our @ISA = CFClient::UI::Window::; 802our @ISA = CFClient::UI::Window::;
610
611sub new { die }
612
613sub size_request {
614 my ($self) = @_;
615
616 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
617 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
618
619 @$self{qw(child_w child_h)}
620}
621
622sub _draw {
623 my ($self) = @_;
624
625 $self->{children}[1]->draw;
626}
627
628
629#############################################################################
630
631package CFClient::UI::Frame;
632
633our @ISA = CFClient::UI::Bin::;
634
635use CFClient::OpenGL;
636 803
637sub new { 804sub new {
638 my $class = shift; 805 my $class = shift;
639 806
640 my $self = $class->SUPER::new ( 807 $class->SUPER::new (
641 bg => [1, 1, 1, 1], 808 scroll_x => 0,
642 border_bg => [1, 1, 1, 1], 809 scroll_y => 1,
643 border => 0.8,
644 @_ 810 @_,
645 ); 811 )
646
647 $self
648}
649
650sub set_size {
651 my ($self, $w, $h) = @_;
652 $self->{req_w} = $w;
653 $self->{req_h} = $h;
654 $self->check_size;
655} 812}
656 813
657sub size_request { 814sub size_request {
658 my ($self) = @_; 815 my ($self) = @_;
659 ($self->{req_w}, $self->{req_h}) 816
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
818
819 @$self{qw(child_w child_h)}
660} 820}
661 821
662sub size_allocate { 822sub size_allocate {
663 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
664 $self->{w} = $w; 824
665 $self->{h} = $h; 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
666 $self->child->configure (0, 0, $w, $h); 828 $self->child->configure (0, 0, $w, $h);
829 $self->update;
830}
831
832sub set_offset {
833 my ($self, $x, $y) = @_;
834
835 $self->{view_x} = int $x;
836 $self->{view_y} = int $y;
837
838 $self->update;
839}
840
841# hmm, this does not work for topleft of $self... but we should not ask for that
842sub coord2local {
843 my ($self, $x, $y) = @_;
844
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)
855}
856
857sub find_widget {
858 my ($self, $x, $y) = @_;
859
860 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
861 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
862 ) {
863 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
864 } else {
865 $self->CFClient::UI::Base::find_widget ($x, $y)
866 }
867}
868
869sub _render {
870 my ($self) = @_;
871
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873
874 $self->SUPER::_render;
875}
876
877#############################################################################
878
879package CFClient::UI::ScrolledWindow;
880
881our @ISA = CFClient::UI::HBox::;
882
883sub new {
884 my $class = shift;
885
886 my $self;
887
888 my $slider = new CFClient::UI::Slider
889 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix
891 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]);
893 },
894 ;
895
896 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider,
899 @_,
900 );
901
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider});
905
906 $self
907}
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
928#TODO# update range on size_allocate depending on child
929# update viewport offset on scroll
930
931#############################################################################
932
933package CFClient::UI::Frame;
934
935our @ISA = CFClient::UI::Bin::;
936
937use CFClient::OpenGL;
938
939sub new {
940 my $class = shift;
941
942 $class->SUPER::new (
943 bg => undef,
944 @_,
945 )
667} 946}
668 947
669sub _draw { 948sub _draw {
670 my ($self) = @_; 949 my ($self) = @_;
671 950
672 my ($w, $h) = ($self->{w}, $self->{h}); 951 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)};
673 953
674 glEnable GL_BLEND; 954 glEnable GL_BLEND;
675 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
676 glEnable GL_TEXTURE_2D; 956 glColor @{ $self->{bg} };
677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
678 957
679# glBegin GL_QUADS; 958 glBegin GL_QUADS;
680# glColor 0, 0, 0, 0;
681# glVertex 0 , 0; 959 glVertex 0 , 0;
682# glVertex 0 , $h; 960 glVertex 0 , $h;
683# glVertex $w, $h; 961 glVertex $w, $h;
684# glVertex $w, 0; 962 glVertex $w, 0;
685# glEnd; 963 glEnd;
686 964
687
688 $self->child->draw;
689 glDisable GL_BLEND; 965 glDisable GL_BLEND;
690 glDisable GL_TEXTURE_2D; 966 }
967
968 $self->SUPER::_draw;
691} 969}
692 970
693############################################################################# 971#############################################################################
694 972
695package CFClient::UI::FancyFrame; 973package CFClient::UI::FancyFrame;
… …
706 my $class = shift; 984 my $class = shift;
707 985
708 # TODO: user_x, user_y, overwrite moveto? 986 # TODO: user_x, user_y, overwrite moveto?
709 987
710 my $self = $class->SUPER::new ( 988 my $self = $class->SUPER::new (
711 bg => [1, 1, 1, 1], 989 bg => [1, 1, 1, 1],
712 border_bg => [1, 1, 1, 1], 990 border_bg => [1, 1, 1, 1],
713 border => 0.8, 991 border => 0.6,
992 is_toplevel => 1,
714 can_events => 1, 993 can_events => 1,
715 @_ 994 @_
716 ); 995 );
717 996
718 $self->{title} &&= new CFClient::UI::Label 997 $self->{title} &&= new CFClient::UI::Label
719 align => 0, 998 align => 0,
720 valign => 1, 999 valign => 1,
721 text => $self->{title}, 1000 text => $self->{title},
722 fontsize => 1; 1001 fontsize => $self->{border};
723 1002
724 $self 1003 $self
725} 1004}
726 1005
727sub border { 1006sub border {
728 int $_[0]{border} * $::FONTSIZE 1007 int $_[0]{border} * $::FONTSIZE
729} 1008}
730 1009
731sub size_request { 1010sub size_request {
732 my ($self) = @_; 1011 my ($self) = @_;
733
734 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
735 1012
736 my ($w, $h) = $self->SUPER::size_request; 1013 my ($w, $h) = $self->SUPER::size_request;
737 1014
738 ( 1015 (
739 $w + $self->border * 2, 1016 $w + $self->border * 2,
… …
745 my ($self, $w, $h) = @_; 1022 my ($self, $w, $h) = @_;
746 1023
747 $h -= List::Util::max 0, $self->border * 2; 1024 $h -= List::Util::max 0, $self->border * 2;
748 $w -= List::Util::max 0, $self->border * 2; 1025 $w -= List::Util::max 0, $self->border * 2;
749 1026
750 $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)
751 if $self->{title}; 1028 if $self->{title};
752 1029
753 $self->child->configure ($self->border, $self->border, $w, $h); 1030 $self->child->configure ($self->border, $self->border, $w, $h);
754} 1031}
755 1032
756sub button_down { 1033sub button_down {
757 my ($self, $ev, $x, $y) = @_; 1034 my ($self, $ev, $x, $y) = @_;
758 1035
1036 my ($w, $h) = @$self{qw(w h)};
759 my $border = $self->border; 1037 my $border = $self->border;
760 1038
761 if ($x < $self->{w} && $x >= $self->{w} - $border 1039 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
762 && $y < $self->{h} && $y >= $self->{h} - $border) { 1040 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
763 1041
1042 if ($lr & $td) {
1043 my ($wx, $wy) = ($self->{x}, $self->{y});
764 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1044 my ($ox, $oy) = ($ev->{x}, $ev->{y});
765 my ($bw, $bh) = ($self->{w}, $self->{h}); 1045 my ($bw, $bh) = ($self->{w}, $self->{h});
766 1046
1047 my $mx = $x < $border;
1048 my $my = $y < $border;
1049
767 $self->{motion} = sub { 1050 $self->{motion} = sub {
768 my ($ev, $x, $y) = @_; 1051 my ($ev, $x, $y) = @_;
769 1052
770 ($x, $y) = ($ev->{x}, $ev->{y}); 1053 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy;
771 1055
772 $self->{user_w} = $bw + $x - $ox; 1056 $self->{user_x} = $wx + $dx * $mx;
773 $self->{user_h} = $bh + $y - $oy; 1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y});
774 $self->check_size; 1061 $self->check_size;
775 }; 1062 };
776 1063
777 } elsif ($x >= 0 && $x < $self->{w} 1064 } elsif ($lr ^ $td) {
778 && $y >= 0 && $y < $border) {
779
780 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
781 my ($bx, $by) = ($self->{x}, $self->{y}); 1066 my ($bx, $by) = ($self->{x}, $self->{y});
782 1067
783 $self->{motion} = sub { 1068 $self->{motion} = sub {
784 my ($ev, $x, $y) = @_; 1069 my ($ev, $x, $y) = @_;
785 1070
786 ($x, $y) = ($ev->{x}, $ev->{y}); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
787 1072
788 $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});
789 $self->update; 1076 $self->update;
790 }; 1077 };
791 } 1078 }
792} 1079}
793 1080
… …
807 my ($self) = @_; 1094 my ($self) = @_;
808 1095
809 my ($w, $h ) = ($self->{w}, $self->{h}); 1096 my ($w, $h ) = ($self->{w}, $self->{h});
810 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
811 1098
812 glEnable GL_BLEND;
813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
814 glEnable GL_TEXTURE_2D; 1099 glEnable GL_TEXTURE_2D;
815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
816 1101
817 my $border = $self->border; 1102 my $border = $self->border;
818 1103
819 glColor @{ $self->{border_bg} }; 1104 glColor @{ $self->{border_bg} };
820 $tex[1]->draw_quad (0, 0, $w, $border); 1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
821 $tex[3]->draw_quad (0, $border, $border, $ch); 1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
822 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
823 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
824 1109
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
825 my $bg = $tex[0]; 1111 my $bg = $tex[0];
826 1112
827 # TODO: repeat texture not scale 1113 # TODO: repeat texture not scale
828 my $rep_x = $cw / $bg->{w}; 1114 my $rep_x = $cw / $bg->{w};
829 my $rep_y = $ch / $bg->{h}; 1115 my $rep_y = $ch / $bg->{h};
830 1116
831 glColor @{ $self->{bg} }; 1117 glColor @{ $self->{bg} };
832 1118
833 $bg->{s} = $rep_x; 1119 $bg->{s} = $rep_x;
834 $bg->{t} = $rep_y; 1120 $bg->{t} = $rep_y;
835 $bg->{wrap_mode} = 1; 1121 $bg->{wrap_mode} = 1;
836 $bg->draw_quad ($border, $border, $cw, $ch); 1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 }
837 1124
838 glDisable GL_TEXTURE_2D; 1125 glDisable GL_TEXTURE_2D;
839 glDisable GL_BLEND;
840 1126
841 $self->{title}->draw if $self->{title}; 1127 $self->{title}->draw if $self->{title};
1128
842 $self->child->draw; 1129 $self->child->draw;
843} 1130}
844 1131
845############################################################################# 1132#############################################################################
846 1133
… …
855sub new { 1142sub new {
856 my $class = shift; 1143 my $class = shift;
857 1144
858 $class->SUPER::new ( 1145 $class->SUPER::new (
859 col_expand => [], 1146 col_expand => [],
860 @_ 1147 @_,
861 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
862} 1153}
863 1154
864sub add { 1155sub add {
865 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
866 1157
867 $child->set_parent ($self); 1158 $child->set_parent ($self);
868 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
869 1160
870 $child->check_size; 1161 $self->check_size (1);
871} 1162}
872 1163
873# 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?
874sub clear { 1165sub clear {
875 my ($self) = @_; 1166 my ($self) = @_;
876 1167
1168 my @children = $self->children;
877 delete $self->{children}; 1169 delete $self->{children};
1170
1171 for (@children) {
1172 delete $_->{parent};
1173 $_->hide;
1174 }
1175
1176 $self->check_size (1);
878 $self->update; 1177 $self->update;
879} 1178}
880 1179
881sub get_wh { 1180sub get_wh {
882 my ($self) = @_; 1181 my ($self) = @_;
… …
914sub size_allocate { 1213sub size_allocate {
915 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
916 1215
917 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
918 1217
919 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
920 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
921 1220
922 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
923 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
924 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
925 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
1059} 1358}
1060 1359
1061sub size_allocate { 1360sub size_allocate {
1062 my ($self, $w, $h) = @_; 1361 my ($self, $w, $h) = @_;
1063 1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1064 my $children = $self->{children}; 1365 my $children = $self->{children};
1065 1366
1066 my @h = map $_->{req_h}, @$children; 1367 my @h = map $_->{req_h}, @$children;
1067 1368
1068 my $req_h = List::Util::sum @h; 1369 my $req_h = List::Util::sum @h;
… …
1097 1398
1098############################################################################# 1399#############################################################################
1099 1400
1100package CFClient::UI::Label; 1401package CFClient::UI::Label;
1101 1402
1102our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
1103 1404
1104use CFClient::OpenGL; 1405use CFClient::OpenGL;
1105 1406
1106sub new { 1407sub new {
1107 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
1108 1409
1109 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
1110 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
1412 #bg => none
1413 #active_bg => none
1111 #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),
1112 fontsize => 1, 1420 fontsize => 1,
1113 text => "",
1114 align => -1, 1421 align => -1,
1115 valign => -1, 1422 valign => -1,
1116 padding => 2, 1423 padding => 2,
1117 layout => new CFClient::Layout,
1118 can_events => 0, 1424 can_events => 0,
1119 %arg 1425 %arg
1120 ); 1426 );
1121 1427
1122 if (exists $self->{template}) { 1428 if (exists $self->{template}) {
1123 my $layout = new CFClient::Layout; 1429 my $layout = new CFClient::Layout;
1124 $layout->set_text (delete $self->{template}); 1430 $layout->set_text (delete $self->{template});
1125 $self->{template} = $layout; 1431 $self->{template} = $layout;
1126 } 1432 }
1127 1433
1128 $self->set_text (delete $self->{text}) if exists $self->{text}; 1434 if (exists $self->{markup}) {
1129 $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 }
1130 1439
1131 $self 1440 $self
1132} 1441}
1133 1442
1134sub escape_text { 1443sub escape($) {
1135 local $_ = $_[1]; 1444 local $_ = $_[0];
1136 1445
1137 s/&/&amp;/g; 1446 s/&/&amp;/g;
1138 s/>/&gt;/g; 1447 s/>/&gt;/g;
1139 s/</&lt;/g; 1448 s/</&lt;/g;
1140 1449
1141 $_[1] 1450 $_
1451}
1452
1453sub update {
1454 my ($self) = @_;
1455
1456 delete $self->{texture};
1457 $self->SUPER::update;
1142} 1458}
1143 1459
1144sub set_text { 1460sub set_text {
1145 my ($self, $text) = @_; 1461 my ($self, $text) = @_;
1146 1462
1463 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text";
1465
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1147 $self->{layout}->set_text ($text); 1467 $self->{layout}->set_text ($text);
1148 1468
1149 delete $self->{texture}; 1469 $self->update;
1150 $self->check_size; 1470 $self->check_size;
1151 $self->update;
1152} 1471}
1153 1472
1154sub set_markup { 1473sub set_markup {
1155 my ($self, $markup) = @_; 1474 my ($self, $markup) = @_;
1156 1475
1476 return if $self->{text} eq "M$markup";
1477 $self->{text} = "M$markup";
1478
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1157 $self->{layout}->set_markup ($markup); 1482 $self->{layout}->set_markup ($markup);
1158 1483
1159 delete $self->{texture}; 1484 $self->update;
1160 $self->check_size; 1485 $self->check_size;
1161 $self->update;
1162} 1486}
1163 1487
1164sub size_request { 1488sub size_request {
1165 my ($self) = @_; 1489 my ($self) = @_;
1166 1490
1167 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1168 $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});
1169 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1170 1496
1171 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1172 1498
1173 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1195sub set_fontsize { 1521sub set_fontsize {
1196 my ($self, $fontsize) = @_; 1522 my ($self, $fontsize) = @_;
1197 1523
1198 $self->{fontsize} = $fontsize; 1524 $self->{fontsize} = $fontsize;
1199 delete $self->{texture}; 1525 delete $self->{texture};
1526
1527 $self->update;
1200 $self->check_size; 1528 $self->check_size;
1201 $self->update;
1202} 1529}
1203 1530
1204sub _draw { 1531sub _draw {
1205 my ($self) = @_; 1532 my ($self) = @_;
1206 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1207 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1537 $self->{layout}->set_foreground (@{$self->{fg}});
1208 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1209 $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});
1210 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543
1211 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
1212 }; 1555 };
1213 1556
1214 glEnable GL_BLEND;
1215 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1216 glEnable GL_TEXTURE_2D; 1557 glEnable GL_TEXTURE_2D;
1217 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1218 1559
1560 if ($tex->{format} == GL_ALPHA) {
1219 glColor @{$self->{fg}}; 1561 glColor @{$self->{fg}};
1220
1221 $self->{ox} = int (
1222 $self->{align} < 0 ? $self->{padding}
1223 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1224 : ($self->{w} - $tex->{w}) * 0.5
1225 );
1226
1227 $self->{oy} = int (
1228 $self->{valign} < 0 ? $self->{padding}
1229 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1230 : ($self->{h} - $tex->{h}) * 0.5
1231 );
1232
1233 $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 }
1234 1566
1235 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1236 glDisable GL_BLEND;
1237} 1568}
1238 1569
1239############################################################################# 1570#############################################################################
1240 1571
1241package CFClient::UI::EntryBase; 1572package CFClient::UI::EntryBase;
… …
1246 1577
1247sub new { 1578sub new {
1248 my $class = shift; 1579 my $class = shift;
1249 1580
1250 $class->SUPER::new ( 1581 $class->SUPER::new (
1251 fg => [1, 1, 1], 1582 fg => [1, 1, 1],
1252 bg => [0, 0, 0, 0.2], 1583 bg => [0, 0, 0, 0.2],
1253 active_bg => [1, 1, 1, 0.5], 1584 active_bg => [1, 1, 1, 0.5],
1254 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1255 can_hover => 1, 1586 can_hover => 1,
1256 can_focus => 1, 1587 can_focus => 1,
1257 valign => 0, 1588 valign => 0,
1258 can_events => 1, 1589 can_events => 1,
1590 #text => ...
1259 @_ 1591 @_
1260 ) 1592 )
1261} 1593}
1262 1594
1263sub _set_text { 1595sub _set_text {
… …
1273 $self->{text} = $text; 1605 $self->{text} = $text;
1274 1606
1275 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1276 $self->{layout}->set_text ("$text "); 1608 $self->{layout}->set_text ("$text ");
1277 1609
1278 $self->emit (changed => $self->{text}); 1610 $self->_emit (changed => $self->{text});
1279}
1280
1281sub get_text {
1282 $_[0]{text}
1283}
1284
1285sub size_request {
1286 my ($self) = @_;
1287
1288 my ($w, $h) = $self->SUPER::size_request;
1289
1290 ($w + 1, $h) # add 1 for cursor
1291}
1292
1293sub size_allocate {
1294 my ($self, $w, $h) = @_;
1295
1296 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1297} 1611}
1298 1612
1299sub set_text { 1613sub set_text {
1300 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1301 1615
1302 $self->{cursor} = length $text; 1616 $self->{cursor} = length $text;
1303 $self->_set_text ($text); 1617 $self->_set_text ($text);
1304 $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
1305} 1632}
1306 1633
1307sub key_down { 1634sub key_down {
1308 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1309 1636
… …
1311 my $sym = $ev->{sym}; 1638 my $sym = $ev->{sym};
1312 my $uni = $ev->{unicode}; 1639 my $uni = $ev->{unicode};
1313 1640
1314 my $text = $self->get_text; 1641 my $text = $self->get_text;
1315 1642
1316 if ($sym == 8) { 1643 if ($uni == 8) {
1317 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1644 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1318 } elsif ($sym == 127) { 1645 } elsif ($uni == 127) {
1319 substr $text, $self->{cursor}, 1, ""; 1646 substr $text, $self->{cursor}, 1, "";
1320 } elsif ($sym == CFClient::SDLK_LEFT) { 1647 } elsif ($sym == CFClient::SDLK_LEFT) {
1321 --$self->{cursor} if $self->{cursor}; 1648 --$self->{cursor} if $self->{cursor};
1322 } elsif ($sym == CFClient::SDLK_RIGHT) { 1649 } elsif ($sym == CFClient::SDLK_RIGHT) {
1323 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1650 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1324 } elsif ($sym == CFClient::SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1325 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1326 } elsif ($sym == CFClient::SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1327 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1328 } elsif ($sym == 27) { 1655 } elsif ($uni == 27) {
1329 $self->emit ('escape'); 1656 $self->_emit ('escape');
1330 } elsif ($uni) { 1657 } elsif ($uni) {
1331 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1332 } 1659 }
1333 1660
1334 $self->_set_text ($text); 1661 $self->_set_text ($text);
1335 $self->update; 1662 $self->update;
1663 $self->check_size;
1336} 1664}
1337 1665
1338sub focus_in { 1666sub focus_in {
1339 my ($self) = @_; 1667 my ($self) = @_;
1340 1668
… …
1416 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1417 1745
1418 my $sym = $ev->{sym}; 1746 my $sym = $ev->{sym};
1419 1747
1420 if ($sym == 13) { 1748 if ($sym == 13) {
1749 unshift @{$self->{history}},
1750 my $txt = $self->get_text;
1751 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = '';
1421 $self->emit (activate => $self->get_text); 1753 $self->_emit (activate => $txt);
1422 $self->update; 1754 $self->update;
1755
1756 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text;
1759 }
1760 if (@{$self->{history} || []} > 0) {
1761 $self->{history_pointer}++;
1762 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1763 $self->{history_pointer} = @{$self->{history} || []} - 1;
1764 }
1765 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1766 }
1767
1768 } elsif ($sym == CFClient::SDLK_DOWN) {
1769 $self->{history_pointer}--;
1770 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1771
1772 if ($self->{history_pointer} >= 0) {
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } else {
1775 $self->set_text ($self->{history_saveback});
1776 }
1423 1777
1424 } else { 1778 } else {
1425 $self->SUPER::key_down ($ev); 1779 $self->SUPER::key_down ($ev);
1426 } 1780 }
1427 1781
… …
1441 1795
1442sub new { 1796sub new {
1443 my $class = shift; 1797 my $class = shift;
1444 1798
1445 $class->SUPER::new ( 1799 $class->SUPER::new (
1446 padding => 4, 1800 padding => 4,
1447 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1448 bg => [1, 1, 1, 0.2],
1449 active_fg => [0, 0, 1], 1802 active_fg => [0, 0, 1],
1450 can_hover => 1, 1803 can_hover => 1,
1451 align => 0, 1804 align => 0,
1452 valign => 0, 1805 valign => 0,
1453 can_events => 1, 1806 can_events => 1,
1454 @_ 1807 @_
1455 ) 1808 )
1456} 1809}
1457 1810
1811sub activate { }
1812
1458sub button_up { 1813sub button_up {
1459 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1460 1815
1816 $self->emit ("activate")
1461 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1462 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1463 $self->emit ("activate");
1464 }
1465} 1819}
1466 1820
1467sub _draw { 1821sub _draw {
1468 my ($self) = @_; 1822 my ($self) = @_;
1469 1823
… …
1471 1825
1472 if ($GRAB == $self) { 1826 if ($GRAB == $self) {
1473 $self->{fg} = $self->{active_fg}; 1827 $self->{fg} = $self->{active_fg};
1474 } 1828 }
1475 1829
1476 glEnable GL_BLEND;
1477 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1478 glEnable GL_TEXTURE_2D; 1830 glEnable GL_TEXTURE_2D;
1479 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1480 glColor 0, 0, 0, 1; 1832 glColor 0, 0, 0, 1;
1481 1833
1482 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1834 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1483 1835
1484 glDisable GL_TEXTURE_2D; 1836 glDisable GL_TEXTURE_2D;
1485 glDisable GL_BLEND;
1486 1837
1487 $self->SUPER::_draw; 1838 $self->SUPER::_draw;
1488} 1839}
1489 1840
1490############################################################################# 1841#############################################################################
… …
1504 1855
1505 $class->SUPER::new ( 1856 $class->SUPER::new (
1506 padding => 2, 1857 padding => 2,
1507 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1508 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],
1509 state => 0, 1862 state => 0,
1510 can_hover => 1, 1863 can_hover => 1,
1511 @_ 1864 @_
1512 ) 1865 )
1513} 1866}
… …
1522 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1523 1876
1524 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1525 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1526 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1527 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1528 } 1881 }
1529} 1882}
1530 1883
1531sub _draw { 1884sub _draw {
1532 my ($self) = @_; 1885 my ($self) = @_;
… …
1537 1890
1538 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;
1539 1892
1540 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1541 1894
1542 glEnable GL_BLEND; 1895 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896
1543 glEnable GL_TEXTURE_2D; 1897 glEnable GL_TEXTURE_2D;
1544 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1545
1546 my $tex = $self->{state} ? $tex[1] : $tex[0];
1547
1548 $tex->draw_quad (0, 0, $s, $s); 1898 $tex->draw_quad_alpha (0, 0, $s, $s);
1549
1550 glDisable GL_TEXTURE_2D; 1899 glDisable GL_TEXTURE_2D;
1551 glDisable GL_BLEND;
1552} 1900}
1553 1901
1554############################################################################# 1902#############################################################################
1555 1903
1556package CFClient::UI::Image; 1904package CFClient::UI::Image;
… …
1599 glTranslate 0, -$self->{w}, 0; 1947 glTranslate 0, -$self->{w}, 0;
1600 1948
1601 ($w, $h) = ($h, $w); 1949 ($w, $h) = ($h, $w);
1602 } 1950 }
1603 1951
1604 glEnable GL_BLEND;
1605 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1606 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1607 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1608 1954
1609 $tex->draw_quad (0, 0, $w, $h); 1955 $tex->draw_quad_alpha (0, 0, $w, $h);
1610 1956
1611 glDisable GL_BLEND;
1612 glDisable GL_TEXTURE_2D; 1957 glDisable GL_TEXTURE_2D;
1613} 1958}
1614 1959
1615############################################################################# 1960#############################################################################
1616 1961
1617package CFClient::UI::VGauge; 1962package CFClient::UI::VGauge;
1618 1963
1619our @ISA = CFClient::UI::Base::; 1964our @ISA = CFClient::UI::Base::;
1965
1966use List::Util qw(min max);
1620 1967
1621use CFClient::OpenGL; 1968use CFClient::OpenGL;
1622 1969
1623my %tex = ( 1970my %tex = (
1624 food => [ 1971 food => [
1625 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1972 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1626 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1973 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1627 ], 1974 ],
1628 grace => [ 1975 grace => [
1629 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1976 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1630 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1977 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1631 ], 1978 ],
1632 hp => [ 1979 hp => [
1633 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1634 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1981 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1635 ], 1982 ],
1636 mana => [ 1983 mana => [
1637 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1638 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1985 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1639 ], 1986 ],
1640); 1987);
1641 1988
1642# eg. VGauge->new (gauge => 'food'), default gauge: food 1989# eg. VGauge->new (gauge => 'food'), default gauge: food
1643sub new { 1990sub new {
… …
1662} 2009}
1663 2010
1664sub set_max { 2011sub set_max {
1665 my ($self, $max) = @_; 2012 my ($self, $max) = @_;
1666 2013
2014 return if $self->{max_val} == $max;
2015
1667 $self->{max_val} = $max; 2016 $self->{max_val} = $max;
2017 $self->update;
1668} 2018}
1669 2019
1670sub set_value { 2020sub set_value {
1671 my ($self, $val, $max) = @_; 2021 my ($self, $val, $max) = @_;
1672 2022
1673 $self->set_max ($max) 2023 $self->set_max ($max)
1674 if defined $max; 2024 if defined $max;
1675 2025
1676 $max = $self->{max_val}; 2026 return if $self->{val} == $val;
2027
1677 $self->{val} = $val; 2028 $self->{val} = $val;
1678
1679 $self->update; 2029 $self->update;
1680} 2030}
1681 2031
1682sub _draw { 2032sub _draw {
1683 my ($self) = @_; 2033 my ($self) = @_;
1684 2034
1685 my $tex = $tex{$self->{type}}; 2035 my $tex = $tex{$self->{type}};
2036 my ($t1, $t2, $t3) = @$tex;
1686 2037
1687 my ($w, $h) = ($self->{w}, $self->{h}); 2038 my ($w, $h) = ($self->{w}, $self->{h});
1688 2039
1689 if ($self->{vertical}) { 2040 if ($self->{vertical}) {
1690 glRotate 90, 0, 0, 1; 2041 glRotate 90, 0, 0, 1;
… …
1692 2043
1693 ($w, $h) = ($h, $w); 2044 ($w, $h) = ($h, $w);
1694 } 2045 }
1695 2046
1696 my $ycut = $self->{val} / ($self->{max_val} || 1); 2047 my $ycut = $self->{val} / ($self->{max_val} || 1);
1697 $ycut = 1 if $self->{val} > $self->{max_val};
1698 2048
1699 my $t1 = $tex->[0]; 2049 my $ycut1 = max 0, min 1, $ycut;
1700 my $t2 = $tex->[1]; 2050 my $ycut2 = max 0, min 1, $ycut - 1;
2051
2052 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2);
1701 2054
1702 glEnable GL_BLEND; 2055 glEnable GL_BLEND;
1703 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1704 glEnable GL_TEXTURE_2D; 2057 glEnable GL_TEXTURE_2D;
1705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1706 2059
1707 my $h1 = $self->{h} - $ycut * $self->{h};
1708 my $h2 = $ycut * $self->{h};
1709
1710 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2060 glBindTexture GL_TEXTURE_2D, $t1->{name};
1711 glBegin GL_QUADS; 2061 glBegin GL_QUADS;
1712 glTexCoord 0 , 0; glVertex 0 , 0; 2062 glTexCoord 0 , 0; glVertex 0 , 0;
1713 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $h1; 2063 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1714 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex $w, $h1; 2064 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1715 glTexCoord $t1->{s}, 0; glVertex $w, 0; 2065 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1716 glEnd; 2066 glEnd;
1717 2067
2068 my $ycut1 = List::Util::min 1, $ycut;
1718 glBindTexture GL_TEXTURE_2D, $t2->{name}; 2069 glBindTexture GL_TEXTURE_2D, $t2->{name};
1719 glBegin GL_QUADS; 2070 glBegin GL_QUADS;
1720 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $h1; 2071 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1721 glTexCoord 0 , $t2->{t}; glVertex 0 , $h1 + $h2; 2072 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1722 glTexCoord $t2->{s}, $t2->{t}; glVertex $w, $h1 + $h2; 2073 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1723 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex $w, $h1; 2074 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1724 glEnd; 2075 glEnd;
2076
2077 if ($t3) {
2078 glBindTexture GL_TEXTURE_2D, $t3->{name};
2079 glBegin GL_QUADS;
2080 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2081 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2082 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2083 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2084 glEnd;
2085 }
1725 2086
1726 glDisable GL_BLEND; 2087 glDisable GL_BLEND;
1727 glDisable GL_TEXTURE_2D; 2088 glDisable GL_TEXTURE_2D;
1728} 2089}
1729 2090
… …
1735 2096
1736sub new { 2097sub new {
1737 my ($class, %arg) = @_; 2098 my ($class, %arg) = @_;
1738 2099
1739 my $self = $class->SUPER::new ( 2100 my $self = $class->SUPER::new (
1740 tooltip => $arg{type}, 2101 tooltip => $arg{type},
2102 can_hover => 1,
2103 can_events => 1,
1741 %arg, 2104 %arg,
1742 ); 2105 );
1743 2106
1744 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999", can_events => 1, can_hover => 1); 2107 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1745 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_events => 1, can_hover => 1); 2108 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1746 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999", can_events => 1, can_hover => 1); 2109 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1747 2110
1748 $self 2111 $self
1749} 2112}
1750 2113
1751sub set_fontsize { 2114sub set_fontsize {
… …
1753 2116
1754 $self->{value}->set_fontsize ($fsize); 2117 $self->{value}->set_fontsize ($fsize);
1755 $self->{max} ->set_fontsize ($fsize); 2118 $self->{max} ->set_fontsize ($fsize);
1756} 2119}
1757 2120
2121sub set_max {
2122 my ($self, $max) = @_;
2123
2124 $self->{gauge}->set_max ($max);
2125 $self->{max}->set_text ($max);
2126}
2127
1758sub set_value { 2128sub set_value {
1759 my ($self, $val, $max) = @_; 2129 my ($self, $val, $max) = @_;
1760 2130
1761 $self->set_max ($max) 2131 $self->set_max ($max)
1762 if defined $max; 2132 if defined $max;
1763 2133
1764 $self->{gauge}->set_value ($val, $max); 2134 $self->{gauge}->set_value ($val, $max);
1765 $self->{value}->set_text ($val); 2135 $self->{value}->set_text ($val);
1766}
1767
1768sub set_max {
1769 my ($self, $max) = @_;
1770
1771 $self->{gauge}->set_max ($max);
1772 $self->{max}->set_text ($max);
1773} 2136}
1774 2137
1775############################################################################# 2138#############################################################################
1776 2139
1777package CFClient::UI::Slider; 2140package CFClient::UI::Slider;
… …
1787 qw(s1_slider.png s1_slider_bg.png); 2150 qw(s1_slider.png s1_slider_bg.png);
1788 2151
1789sub new { 2152sub new {
1790 my $class = shift; 2153 my $class = shift;
1791 2154
1792 # range [value, low, high, page] 2155 # range [value, low, high, page, unit]
1793 2156
1794 # TODO: 0-width page 2157 # TODO: 0-width page
1795 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
1796 # TODO: calculations are off 2159 # TODO: calculations are off
1797 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1798 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
1799 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],
1800 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
1801 req_w => 20, 2166 req_w => $::WIDTH / 80,
1802 req_h => 20, 2167 req_h => $::WIDTH / 80,
1803 vertical => 0, 2168 vertical => 0,
1804 can_hover => 1, 2169 can_hover => 1,
1805 inner_pad => 5, 2170 inner_pad => 0.02,
1806 @_ 2171 @_
1807 ); 2172 );
1808 2173
2174 $self->set_value ($self->{range}[0]);
2175 $self->update;
2176
1809 $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 }
1810} 2210}
1811 2211
1812sub size_request { 2212sub size_request {
1813 my ($self) = @_; 2213 my ($self) = @_;
1814 2214
… …
1820 2220
1821sub button_down { 2221sub button_down {
1822 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1823 2223
1824 $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
1825 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
1826} 2229}
1827 2230
1828sub mouse_motion { 2231sub mouse_motion {
1829 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
1830 2233
1831 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
1832 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
1833 2253
1834 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1835 2255
1836 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1837 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1838 2258
1839 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
1840 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
1841 $x = $lo if $x < $lo;
1842 $x = $hi - $page if $x > $hi - $page;
1843 $self->{range}[0] = $x;
1844 2261
1845 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
1846 $self->update; 2263 $self->{knob_w} = $knob_w;
1847 } 2264 });
1848}
1849 2265
1850# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
1851# so that the handle doesn't leave the texture. This calculation isn't 100%
1852# correct propably, but it does the job for now
1853sub _calc_inner_pad_px {
1854 my ($self, $w) = @_;
1855 ($w / 100) * $self->{inner_pad} # % to pixels
1856} 2267}
1857 2268
1858sub _draw { 2269sub _draw {
1859 my ($self) = @_; 2270 my ($self) = @_;
1860 2271
1861 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
1862 2273
1863 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
1864 2275
1865 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
1866 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
1867 2278
2279 glTranslate 1, 0, 0;
1868 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
1869 glTranslate 0, -$self->{w}, 0;
1870
1871 ($w, $h) = ($h, $w);
1872 } 2281 }
1873 2282
1874 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1875 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1876 2285
1877 my ($value, $lo, $hi, $page) = @{$self->{range}};
1878
1879 $hi = $value + 1 if $lo == $hi;
1880
1881 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1882 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1883
1884 $page = int $page * $inner_w / ($hi - $lo);
1885 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1886
1887 $w -= $page;
1888 $page &= ~1;
1889 glTranslate $page * 0.5, 0, 0;
1890 $page ||= 2;
1891
1892 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1893 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1894
1895 glEnable GL_BLEND;
1896 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1897 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
1898 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1899 2288
1900 # draw background 2289 # draw background
1901 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1902 2291
1903 # draw handle 2292 # draw handle
1904 $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);
1905 2294
1906 glDisable GL_BLEND;
1907 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
1908} 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 (@_) }
1909 2338
1910############################################################################# 2339#############################################################################
1911 2340
1912package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
1913 2342
… …
1917 2346
1918sub new { 2347sub new {
1919 my $class = shift; 2348 my $class = shift;
1920 2349
1921 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
1922 fontsize => 1, 2351 fontsize => 1,
2352 can_events => 0,
1923 #font => default_font 2353 #font => default_font
1924 @_, 2354 @_,
1925 2355
1926 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
1927 par => [], 2357 par => [],
1928 height => 0, 2358 height => 0,
1929 children => [ 2359 children => [
1930 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
1931 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
1932 ], 2362 ],
1933 ); 2363 );
1934 2364
1935 $self->{children}[1]->connect (changed => sub { 2365 $self->{children}[1]->connect (changed => sub { $self->update });
1936 $self->update;
1937 });
1938 2366
1939 $self 2367 $self
1940} 2368}
1941 2369
1942sub set_fontsize { 2370sub set_fontsize {
1943 my ($self, $fontsize) = @_; 2371 my ($self, $fontsize) = @_;
1944 2372
1945 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
1946 $self->reflow; 2374 $self->reflow;
1947}
1948
1949sub text_height {
1950 my ($self, $text) = @_;
1951
1952 my $layout = $self->{layout};
1953
1954 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1955 $layout->set_width ($self->{w});
1956 $layout->set_text ($text);
1957
1958 ($layout->size)[1]
1959}
1960
1961sub reflow {
1962 my ($self) = @_;
1963
1964 $self->{need_reflow}++;
1965 $self->update;
1966} 2375}
1967 2376
1968sub size_allocate { 2377sub size_allocate {
1969 my ($self, $w, $h) = @_; 2378 my ($self, $w, $h) = @_;
1970 2379
… …
1975 $self->{layout}->set_width ($self->{children}[0]{w}); 2384 $self->{layout}->set_width ($self->{children}[0]{w});
1976 2385
1977 $self->reflow; 2386 $self->reflow;
1978} 2387}
1979 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
1980sub add_paragraph { 2423sub add_paragraph {
1981 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
1982 2425
1983 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
1984 2427 my ($w, $h) = $self->text_size ($line);
1985 my $height = $self->text_height ($text);
1986
1987 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
1988 2431
1989 push @{$self->{par}}, [$height, $color, $text];
1990
1991 $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]);
1992 $self->{children}[1]->update;
1993} 2433}
1994 2434
1995sub update { 2435sub update {
1996 my ($self) = @_; 2436 my ($self) = @_;
1997 2437
… …
1999 2439
2000 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
2001 2441
2002 delete $self->{texture}; 2442 delete $self->{texture};
2003 2443
2004 $ROOT->on_refresh ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
2005 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
2006 my $height = 0; 2448 my $height = 0;
2007 2449
2008 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
2009 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 }
2010 2465
2011 $self->{height} = $height; 2466 $self->{height} = $height;
2012 2467
2013 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2014 2469
2015 delete $self->{texture}; 2470 delete $self->{texture};
2016 } 2471 }
2017 2472
2018 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2019 glClearColor 0, 0, 0, 1; 2474 glClearColor 0.5, 0.5, 0.5, 0;
2020 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
2021 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
2022 glEnable GL_BLEND; 2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
2023 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2024 glEnable GL_TEXTURE_2D;
2025 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026
2027 my $top = int $self->{children}[1]{range}[0];
2028
2029 my $y0 = $top;
2030 my $y1 = $top + $self->{h};
2031
2032 my $y = 0;
2033
2034 my $layout = $self->{layout};
2035
2036 $layout->set_font ($self->{font}) if $self->{font};
2037 2491
2038 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
2039 my $h = $par->[0]; 2493 my $h = $par->[1];
2040 2494
2041 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]);
2042 $layout->set_text ($par->[2]); 2498 $layout->set_markup ($par->[4]);
2043 2499
2044 glColor @{ $par->[1] }; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2045 my ($W, $H) = $layout->size; 2501
2046 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;
2047 } 2504 }
2048 2505
2049 $y += $h; 2506 $y += $h;
2050 } 2507 }
2051 2508
2052 glDisable GL_TEXTURE_2D;
2053 glDisable GL_BLEND; 2509 glDisable GL_BLEND;
2054 }; 2510 };
2055 }); 2511 });
2056} 2512}
2057 2513
2058sub _draw { 2514sub _draw {
2059 my ($self) = @_; 2515 my ($self) = @_;
2060 2516
2061 if ($self->{texture}) {
2062 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
2063 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1;
2064 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2065 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
2066 }
2067 2522
2068 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
2069 2524
2070} 2525}
2071 2526
… …
2119 2574
2120sub new { 2575sub new {
2121 my $class = shift; 2576 my $class = shift;
2122 2577
2123 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
2124 state => 0, 2579 state => 0,
2125 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
2126 can_events => 1,
2127 @_ 2581 @_
2128 ); 2582 );
2129 2583
2130 if ($self->{state}) { 2584 if ($self->{state}) {
2131 $self->{state} = 0; 2585 $self->{state} = 0;
… …
2140 2594
2141 # TODO: use animation 2595 # TODO: use animation
2142 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
2143 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
2144 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2145 $self->emit ("open"); 2599 $self->_emit ("open");
2146 } else { 2600 } else {
2147 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
2148 $self->emit ("close"); 2602 $self->_emit ("close");
2149 } 2603 }
2150 2604
2151 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
2152} 2606}
2153 2607
2154############################################################################# 2608#############################################################################
2155 2609
2156package CFClient::UI::Tooltip; 2610package CFClient::UI::Tooltip;
… …
2166 @_, 2620 @_,
2167 can_events => 0, 2621 can_events => 0,
2168 ) 2622 )
2169} 2623}
2170 2624
2171sub set_text { 2625sub set_tooltip_from {
2172 my ($self, $text) = @_; 2626 my ($self, $widget) = @_;
2173 2627
2174 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 2628 $self->add (new CFClient::UI::Label
2175 $self->{label}->set_text ($text); 2629 markup => $widget->{tooltip},
2176 $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 );
2177} 2636}
2178 2637
2179sub size_request { 2638sub size_request {
2180 my ($self) = @_; 2639 my ($self) = @_;
2181 2640
2182 $self->child->set_max_size ($::WIDTH * 0.2);
2183
2184 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2185 2642
2186 ($w + 4, $h + 4) 2643 ($w + 4, $h + 4)
2187} 2644}
2188 2645
2646sub size_allocate {
2647 my ($self, $w, $h) = @_;
2648
2649 $self->SUPER::size_allocate ($w - 4, $h - 4);
2650}
2651
2189sub _draw { 2652sub _draw {
2190 my ($self) = @_; 2653 my ($self) = @_;
2191 2654
2192 glPushMatrix;
2193 glTranslate 0.375, 0.375; 2655 glTranslate 0.375, 0.375;
2194 2656
2195 my ($w, $h) = @$self{qw(w h)}; 2657 my ($w, $h) = @$self{qw(w h)};
2196 2658
2197 glColor 1, 0.8, 0.4; 2659 glColor 1, 0.8, 0.4;
… …
2208 glVertex 0 , $h; 2670 glVertex 0 , $h;
2209 glVertex $w, $h; 2671 glVertex $w, $h;
2210 glVertex $w, 0; 2672 glVertex $w, 0;
2211 glEnd; 2673 glEnd;
2212 2674
2213 glPopMatrix; 2675 glTranslate 2 - 0.375, 2 - 0.375;
2214
2215 glTranslate 2, 2;
2216 $self->SUPER::_draw; 2676 $self->SUPER::_draw;
2217} 2677}
2218 2678
2219############################################################################# 2679#############################################################################
2220 2680
2681package CFClient::UI::Face;
2682
2683our @ISA = CFClient::UI::Base::;
2684
2685use CFClient::OpenGL;
2686
2687sub new {
2688 my $class = shift;
2689
2690 my $self = $class->SUPER::new (
2691 aspect => 1,
2692 can_events => 0,
2693 @_,
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
2711}
2712
2713sub size_request {
2714 (32, 8)
2715}
2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2725sub _draw {
2726 my ($self) = @_;
2727
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
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740
2741 if ($tex) {
2742 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D;
2747 }
2748}
2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806#############################################################################
2807
2808package CFClient::UI::Menu;
2809
2810our @ISA = CFClient::UI::FancyFrame::;
2811
2812use CFClient::OpenGL;
2813
2814sub new {
2815 my $class = shift;
2816
2817 my $self = $class->SUPER::new (
2818 items => [],
2819 z => 100,
2820 @_,
2821 );
2822
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824
2825 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item;
2827
2828 # handle various types of items, only text for now
2829 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label
2831 can_hover => 1,
2832 can_events => 1,
2833 text => $widget;
2834 }
2835
2836 $self->{item}{$widget} = $item;
2837
2838 $self->{vbox}->add ($widget);
2839 }
2840
2841 $self
2842}
2843
2844# popup given the event (must be a mouse button down event currently)
2845sub popup {
2846 my ($self, $ev) = @_;
2847
2848 $self->_emit ("popdown");
2849
2850 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self;
2852 $self->{button} = $ev->{button};
2853
2854 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856}
2857
2858sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_;
2860
2861 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER};
2864}
2865
2866sub button_up {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB;
2871 $self->hide;
2872
2873 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover};
2875 }
2876}
2877
2878#############################################################################
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
2221package CFClient::UI::Root; 2990package CFClient::UI::Root;
2222 2991
2223our @ISA = CFClient::UI::Container::; 2992our @ISA = CFClient::UI::Container::;
2224 2993
2225use CFClient::OpenGL; 2994use CFClient::OpenGL;
2226 2995
2227sub check_size { 2996sub new {
2228 my ($self) = @_; 2997 my $class = shift;
2229 2998
2230 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 2999 $class->SUPER::new (
2231} 3000 visible => 1,
2232 3001 @_,
2233sub size_request { 3002 )
2234 ($::WIDTH, $::HEIGHT)
2235} 3003}
2236 3004
2237sub configure { 3005sub configure {
2238 my ($self, $x, $y, $w, $h) = @_; 3006 my ($self, $x, $y, $w, $h) = @_;
2239 3007
2240 $self->SUPER::configure ($x, $y, $w, $h); 3008 $self->{w} = $w;
3009 $self->{h} = $h;
3010}
2241 3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 ($self->{w}, $self->{h})
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
2242 for my $child (@{$self->{children}}) { 3028 for my $child ($self->children) {
2243 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)};
2244 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
2245 $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;
2246 $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
2247 $child->configure ($X, $Y, $W,$H); 3040 $child->configure ($X, $Y, $W, $H);
2248 } 3041 }
2249} 3042}
2250 3043
2251sub _topleft { 3044sub coord2local {
2252 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2253 3046
2254 ($x, $y) 3047 ($x, $y)
2255} 3048}
2256 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2257sub update { 3056sub update {
2258 my ($self) = @_; 3057 my ($self) = @_;
2259 3058
2260 $self->check_size; 3059 $self->check_size;
2261 ::refresh (); 3060 $::WANT_REFRESH++;
2262} 3061}
2263 3062
2264sub add { 3063sub add {
2265 my ($self, $child) = @_; 3064 my ($self, @children) = @_;
2266 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
2267 # integerize window positions 3075 # integerise window positions
2268 $child->{x} = int $child->{x}; 3076 $child->{x} = int $child->{x};
2269 $child->{y} = int $child->{y}; 3077 $child->{y} = int $child->{y};
3078 }
2270 3079
2271 $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 }
2272} 3093}
2273 3094
2274sub on_refresh { 3095sub on_refresh {
2275 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2276 3097
2277 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2278} 3099}
2279 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2280sub draw { 3107sub draw {
2281 my ($self) = @_; 3108 my ($self) = @_;
2282 3109
2283 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2284 $_->() 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}};
2285 } 3165 }
2286 3166
2287 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3167 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2288 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2289 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2290 3170
2291 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2292 glLoadIdentity; 3172 glLoadIdentity;
2293 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2294 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2295 glLoadIdentity; 3175 glLoadIdentity;
2296 3176
2297 $self->_draw; 3177 $self->_draw;
2298} 3178}
… …
2300############################################################################# 3180#############################################################################
2301 3181
2302package CFClient::UI; 3182package CFClient::UI;
2303 3183
2304$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
2305$TOOLTIP = new CFClient::UI::Tooltip; 3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2306 3186
23071 31871
2308 3188

Diff Legend

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