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.140 by root, Thu Apr 20 04:20:52 2006 UTC vs.
Revision 1.198 by root, Fri May 12 02:08:52 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;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17sub check_tooltip {
18 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) {
23 $TOOLTIP->{owner} = $widget;
24
25 my $tip = $widget->{tooltip};
26
27 $tip = $tip->($widget) if CODE:: eq ref $tip;
28
29 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 }
42
43 return;
44 }
45 }
46 }
47
48 $TOOLTIP->hide;
49 delete $TOOLTIP->{owner};
50}
14 51
15# class methods for events 52# class methods for events
16sub feed_sdl_key_down_event { 53sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
55 if $FOCUS;
18} 56}
19 57
20sub feed_sdl_key_up_event { 58sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
60 if $FOCUS;
22} 61}
23 62
24sub feed_sdl_button_down_event { 63sub feed_sdl_button_down_event {
25 my ($ev) = @_; 64 my ($ev) = @_;
26 my ($x, $y) = ($ev->{x}, $ev->{y}); 65 my ($x, $y) = ($ev->{x}, $ev->{y});
… …
28 if (!$BUTTON_STATE) { 67 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 68 my $widget = $ROOT->find_widget ($x, $y);
30 69
31 $GRAB = $widget; 70 $GRAB = $widget;
32 $GRAB->update if $GRAB; 71 $GRAB->update if $GRAB;
72
73 check_tooltip;
33 } 74 }
34 75
35 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 76 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 77
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 78 if ($GRAB) {
79 ($x, $y) = $GRAB->coord2local ($x, $y);
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
38} 82}
39 83
40sub feed_sdl_button_up_event { 84sub feed_sdl_button_up_event {
41 my ($ev) = @_; 85 my ($ev) = @_;
42 my ($x, $y) = ($ev->{x}, $ev->{y}); 86 my ($x, $y) = ($ev->{x}, $ev->{y});
43 87
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 88 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 89
46 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 91
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 92 if ($GRAB) {
93 ($x, $y) = $GRAB->coord2local ($x, $y);
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
49 96
50 if (!$BUTTON_STATE) { 97 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 98 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 99 $grab->update if $grab;
53 $GRAB->update if $GRAB; 100 $GRAB->update if $GRAB;
101
102 check_tooltip;
54 } 103 }
55} 104}
56 105
57sub feed_sdl_motion_event { 106sub feed_sdl_motion_event {
58 my ($ev) = @_; 107 my ($ev) = @_;
… …
63 if ($widget != $HOVER) { 112 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 113 my $hover = $HOVER; $HOVER = $widget;
65 114
66 $hover->update if $hover && $hover->{can_hover}; 115 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 116 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 117
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 118 check_tooltip;
119 }
120
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
124 }
71} 125}
72 126
73# convert position array to integers 127# convert position array to integers
74sub harmonize { 128sub harmonize {
75 my ($vals) = @_; 129 my ($vals) = @_;
… …
93 147
94sub new { 148sub new {
95 my $class = shift; 149 my $class = shift;
96 150
97 my $self = bless { 151 my $self = bless {
98 x => 0, 152 x => 0,
99 y => 0, 153 y => 0,
100 z => 0, 154 z => 0,
155 can_events => 1,
101 @_ 156 @_
102 }, $class; 157 }, $class;
103 158
104 for (keys %$self) { 159 for (keys %$self) {
105 if (/^connect_(.*)$/) { 160 if (/^connect_(.*)$/) {
… …
108 } 163 }
109 164
110 $self 165 $self
111} 166}
112 167
168sub destroy {
169 my ($self) = @_;
170
171 $self->hide;
172 %$self = ();
173}
174
113sub show { 175sub show {
114 my ($self) = @_; 176 my ($self) = @_;
115 177
116 return if $self->{parent}; 178 return if $self->{parent};
117 179
… …
119} 181}
120 182
121sub hide { 183sub hide {
122 my ($self) = @_; 184 my ($self) = @_;
123 185
124 return unless $self->{parent}; 186 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self;
125 188
126 $self->{parent}->remove ($self); 189 $self->{parent}->remove ($self)
190 if $self->{parent};
127} 191}
128 192
129sub move { 193sub move {
130 my ($self, $x, $y, $z) = @_; 194 my ($self, $x, $y, $z) = @_;
131 195
… …
134 $self->{z} = $z if defined $z; 198 $self->{z} = $z if defined $z;
135 199
136 $self->update; 200 $self->update;
137} 201}
138 202
139sub needs_redraw { 203sub set_size {
140 0 204 my ($self, $w, $h) = @_;
205
206 $self->{user_w} = $w;
207 $self->{user_h} = $h;
208
209 $self->check_size;
141} 210}
142 211
143sub size_request { 212sub size_request {
144 require Carp; 213 require Carp;
145 Carp::confess "size_request is abtract"; 214 Carp::confess "size_request is abstract";
146} 215}
147 216
148sub configure { 217sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 218 my ($self, $x, $y, $w, $h) = @_;
150 219
151 $self->{x} = $x;
152 $self->{y} = $y;
153
154 if ($self->{aspect}) { 220 if ($self->{aspect}) {
155 $w = List::Util::min $w, int $h * $self->{aspect}; 221 my $w2 = List::Util::min $w, int $h * $self->{aspect};
156 $h = List::Util::min $h, int $w / $self->{aspect}; 222 my $h2 = List::Util::min $h, int $w / $self->{aspect};
157 }
158 223
159 return unless $self->{w} != $w || $self->{h} != $h; 224 # use alignment to adjust x, y
160 225
226 $x += int +($w - $w2) * 0.5;
227 $y += int +($h - $h2) * 0.5;
228
229 ($w, $h) = ($w2, $h2);
230 }
231
232 if ($self->{x} != $x || $self->{y} != $y) {
161 $self->{w} = $w; 233 $self->{x} = $x;
162 $self->{h} = $h; 234 $self->{y} = $y;
163
164 $self->size_allocate ($w, $h);
165 $self->update; 235 $self->update;
236 }
237
238 if ($self->{w} != $w || $self->{h} != $h) {
239 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
240 }
166} 241}
167 242
168sub size_allocate { 243sub size_allocate {
169 # nothing to be done 244 # nothing to be done
170} 245}
171 246
172# return top left coordinates 247sub children {
173sub _topleft { 248}
249
250# call when resolution changes etc.
251sub reconfigure {
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size (1);
258 $self->update;
259}
260
261sub set_max_size {
174 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
175 263
176 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 264 delete $self->{max_w}; $self->{max_w} = $w if $w;
265 delete $self->{max_h}; $self->{max_h} = $h if $h;
177} 266}
178 267
179# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
180sub coord2local { 269sub coord2local {
181 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
182 271
183 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
184 ($x - $X, $y - $Y)
185} 273}
186 274
187# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
188sub coord2global { 276sub coord2global {
189 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
190 278
191 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
192 ($x + $X, $y + $Y)
193} 280}
194 281
195sub focus_in { 282sub focus_in {
196 my ($self) = @_; 283 my ($self) = @_;
197 284
… …
257 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
258 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
259 glEnd; 346 glEnd;
260 glDisable GL_BLEND; 347 glDisable GL_BLEND;
261 } 348 }
349
350 if ($ENV{PCLIENT_DEBUG}) {
351 glPushMatrix;
352 glColor 1, 1, 0, 1;
353 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
354 glBegin GL_LINE_LOOP;
355 glVertex 0 , 0;
356 glVertex $self->{w}, 0;
357 glVertex $self->{w}, $self->{h};
358 glVertex 0 , $self->{h};
359 glEnd;
360 glPopMatrix;
361 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
362 }
262} 363}
263 364
264sub _draw { 365sub _draw {
265 my ($self) = @_; 366 my ($self) = @_;
266 367
267 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
268} 369}
269 370
270sub find_widget { 371sub find_widget {
271 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
272 375
273 return $self 376 return $self
274 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
275 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
276 379
… …
279 382
280sub set_parent { 383sub set_parent {
281 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
282 385
283 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388
389 # TODO: req_w _does_change after ->reconfigure
390 $self->check_size
391 unless exists $self->{req_w};
284} 392}
285 393
286sub check_size { 394sub check_size {
287 my ($self) = @_; 395 my ($self, $forced) = @_;
288 396
289 my ($w, $h) = $self->size_request; 397 $self->{force_alloc} = 1 if $forced;
290 398 $CFClient::UI::ROOT->{check_size}{$self} = $self;
291 if ($w != $self->{req_w} || $h != $self->{req_h}) {
292 $self->{req_w} = $w;
293 $self->{req_h} = $h;
294
295 $self->{parent}->check_size
296 if $self->{parent};
297 }
298} 399}
299 400
300sub update { 401sub update {
301 my ($self) = @_; 402 my ($self) = @_;
302 403
… …
311} 412}
312 413
313sub emit { 414sub emit {
314 my ($self, $signal, @args) = @_; 415 my ($self, $signal, @args) = @_;
315 416
316 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 417 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
317 $cb->($self, @args);
318 }
319} 418}
320 419
321sub DESTROY { 420sub DESTROY {
322 my ($self) = @_; 421 my ($self) = @_;
323 422
… …
368 467
369package CFClient::UI::Empty; 468package CFClient::UI::Empty;
370 469
371our @ISA = CFClient::UI::Base::; 470our @ISA = CFClient::UI::Base::;
372 471
472sub new {
473 my ($class, %arg) = @_;
474 $class->SUPER::new (can_events => 0, %arg);
475}
476
373sub size_request { 477sub size_request {
374 (0, 0) 478 (0, 0)
375} 479}
376 480
377sub draw { } 481sub draw { }
… …
385sub new { 489sub new {
386 my ($class, %arg) = @_; 490 my ($class, %arg) = @_;
387 491
388 my $children = delete $arg{children} || []; 492 my $children = delete $arg{children} || [];
389 493
390 my $self = $class->SUPER::new (children => [], %arg); 494 my $self = $class->SUPER::new (
495 children => [],
496 can_events => 0,
497 %arg,
498 );
391 $self->add ($_) for @$children; 499 $self->add ($_) for @$children;
392 500
393 $self 501 $self
394} 502}
395 503
396sub add { 504sub add {
397 my ($self, $child) = @_; 505 my ($self, @widgets) = @_;
398 506
399 $child->set_parent ($self); 507 $_->set_parent ($self)
508 for @widgets;
400 509
401 use sort 'stable'; 510 use sort 'stable';
402 511
403 $self->{children} = [ 512 $self->{children} = [
404 sort { $a->{z} <=> $b->{z} } 513 sort { $a->{z} <=> $b->{z} }
405 @{$self->{children}}, $child 514 @{$self->{children}}, @widgets
406 ]; 515 ];
407 516
408 $child->check_size; 517 $self->check_size (1);
518 $self->update;
519}
520
521sub children {
522 @{ $_[0]{children} }
409} 523}
410 524
411sub remove { 525sub remove {
412 my ($self, $child) = @_; 526 my ($self, $child) = @_;
413 527
414 delete $child->{parent}; 528 delete $child->{parent};
529 $child->hide;
415 530
416 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 531 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
417 532
418 $self->check_size; 533 $self->check_size;
534 $self->update;
535}
536
537sub clear {
538 my ($self) = @_;
539
540 my $children = delete $self->{children};
541 $self->{children} = [];
542
543 for (@$children) {
544 delete $_->{parent};
545 $_->hide;
546 }
547
548 $self->check_size;
549 $self->update;
419} 550}
420 551
421sub find_widget { 552sub find_widget {
422 my ($self, $x, $y) = @_; 553 my ($self, $x, $y) = @_;
423 554
… …
498} 629}
499 630
500sub update { 631sub update {
501 my ($self) = @_; 632 my ($self) = @_;
502 633
503 # we want to do this delayed... 634 $ROOT->on_post_alloc ($self => sub { $self->render_child });
504 $self->render_chld;
505 $self->SUPER::update; 635 $self->SUPER::update;
506}
507
508sub render_chld {
509 my ($self) = @_;
510
511 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
512 glClearColor 0, 0, 0, 1;
513 glClear GL_COLOR_BUFFER_BIT;
514 $self->child->draw;
515 };
516} 636}
517 637
518sub size_allocate { 638sub size_allocate {
519 my ($self, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
520 640
521 $self->child->configure (0, 0, $w, $h); 641 $self->SUPER::size_allocate ($w, $h);
642 $self->update;
643}
522 644
645sub _render {
646 $_[0]{children}[0]->draw;
647}
648
649sub render_child {
650 my ($self) = @_;
651
652 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
653 glClearColor 0, 0, 0, 0;
654 glClear GL_COLOR_BUFFER_BIT;
655
523 $self->render_chld; 656 $self->_render;
657# glColorMask 1, 1, 1, 0;
658# glEnable GL_BLEND;
659# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
660# glRasterPos 0, 0;
661# glCopyPixels 0, 0, $self->{w}, $self->{h};
662# glDisable GL_BLEND;
663# glColorMask 1, 1, 1, 1;
664 };
524} 665}
525 666
526sub _draw { 667sub _draw {
527 my ($self) = @_; 668 my ($self) = @_;
528 669
529 my ($w, $h) = ($self->w, $self->h); 670 my ($w, $h) = ($self->w, $self->h);
530 671
531 my $tex = $self->{texture} 672 my $tex = $self->{texture}
532 or return; 673 or return;
533 674
534 glEnable GL_BLEND;
535 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
536 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
537 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
677 glColor 0, 0, 0, 1;
538 678
539 $tex->draw_quad (0, 0, $w, $h); 679 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
540 680
541 glDisable GL_BLEND;
542 glDisable GL_TEXTURE_2D; 681 glDisable GL_TEXTURE_2D;
543} 682}
544 683
545############################################################################# 684#############################################################################
546 685
547package CFClient::UI::ViewPort; 686package CFClient::UI::ViewPort;
548 687
549our @ISA = CFClient::UI::Window::; 688our @ISA = CFClient::UI::Window::;
550 689
551sub new { die }
552
553sub size_request { 690sub size_request {
554 my ($self) = @_; 691 my ($self) = @_;
555 692
556 @$self{qw(child_w child_h)} = $self->child->size_request; 693 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
557 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)}); 694 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
558 695
559 @$self{qw(child_w child_h)} 696 @$self{qw(child_w child_h)}
560} 697}
561 698
562sub _draw {
563 my ($self) = @_;
564
565 $self->{children}[1]->draw;
566}
567
568
569#############################################################################
570
571package CFClient::UI::Frame;
572
573our @ISA = CFClient::UI::Bin::;
574
575use CFClient::OpenGL;
576
577sub size_request {
578 my ($self) = @_;
579 my $chld = $self->child
580 or return (0, 0);
581
582 $chld->move (2, 2);
583
584 map { $_ + 4 } $chld->size_request;
585}
586
587sub size_allocate { 699sub size_allocate {
588 my ($self, $x, $y, $w, $h) = @_; 700 my ($self, $w, $h) = @_;
701
702 $self->update;
703}
704
705sub set_offset {
706 my ($self, $x, $y) = @_;
707
708 $self->{view_x} = int $x;
709 $self->{view_y} = int $y;
710
711 $self->update;
712}
713
714# hmm, this does not work for topleft of $self... but we should not ask for that
715sub coord2local {
716 my ($self, $x, $y) = @_;
717
718 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
719}
720
721sub coord2global {
722 my ($self, $x, $y) = @_;
723
724 $x = List::Util::min $self->{w}, $x - $self->{view_x};
725 $y = List::Util::min $self->{h}, $y - $self->{view_y};
726
727 $self->SUPER::coord2global ($x, $y)
728}
729
730sub find_widget {
731 my ($self, $x, $y) = @_;
732
733 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
734 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
735 ) {
736 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
737 } else {
738 $self->CFClient::UI::Base::find_widget ($x, $y)
589 739 }
590 $self->child->configure (2, 2, $w - 4, $h - 4);
591} 740}
592 741
593sub _draw { 742sub _render {
594 my ($self) = @_; 743 my ($self) = @_;
595 744
596 my $chld = $self->child; 745 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
597 746
598 my ($w, $h) = $chld->size_request; 747 $self->SUPER::_render;
599
600 glBegin GL_QUADS;
601 glColor 0, 0, 0;
602 glVertex 0 , 0;
603 glVertex 0 , $h + 4;
604 glVertex $w + 4 , $h + 4;
605 glVertex $w + 4 , 0;
606 glEnd;
607
608 $chld->draw;
609} 748}
610 749
611############################################################################# 750#############################################################################
612 751
613package CFClient::UI::FancyFrame; 752package CFClient::UI::ScrolledWindow;
614 753
615our @ISA = CFClient::UI::Bin::; 754our @ISA = CFClient::UI::HBox::;
616
617use CFClient::OpenGL;
618
619my @tex =
620 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
621 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
622 755
623sub new { 756sub new {
624 my $class = shift; 757 my $class = shift;
625 758
759 my $self;
760
761 my $slider = new CFClient::UI::Slider
762 vertical => 1,
763 range => [0, 0, 1, 0.01], # HACK fix
764 connect_changed => sub {
765 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
766 },
767 ;
768
769 $self = $class->SUPER::new (
770 vp => (new CFClient::UI::ViewPort),
771 slider => $slider,
772 @_,
773 );
774
775 $self->{vp}->add ($self->{scrolled});
776 $self->add ($self->{vp});
777 $self->add ($self->{slider});
778
779 $self
780}
781
782#TODO# update range on size_allocate depeneing on child
783# update viewport offset on scroll
784
785#############################################################################
786
787package CFClient::UI::Frame;
788
789our @ISA = CFClient::UI::Bin::;
790
791use CFClient::OpenGL;
792
793#############################################################################
794
795package CFClient::UI::FancyFrame;
796
797our @ISA = CFClient::UI::Bin::;
798
799use CFClient::OpenGL;
800
801my @tex =
802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
803 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
804
805sub new {
806 my $class = shift;
807
626 # TODO: user_x, user_y, overwrite moveto? 808 # TODO: user_x, user_y, overwrite moveto?
627 809
628 $class->SUPER::new ( 810 my $self = $class->SUPER::new (
629 bg => [1, 1, 1, 1], 811 bg => [1, 1, 1, 1],
630 border_bg => [1, 1, 1, 1], 812 border_bg => [1, 1, 1, 1],
631 border => 0.8, 813 border => 0.6,
814 can_events => 1,
632 @_ 815 @_
633 ) 816 );
817
818 $self->{title} &&= new CFClient::UI::Label
819 align => 0,
820 valign => 1,
821 text => $self->{title},
822 fontsize => $self->{border};
823
824 $self
634} 825}
635 826
636sub border { 827sub border {
637 int $_[0]{border} * $::FONTSIZE 828 int $_[0]{border} * $::FONTSIZE
638} 829}
639 830
640sub size_request { 831sub size_request {
641 my ($self) = @_; 832 my ($self) = @_;
642
643 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
644 833
645 my ($w, $h) = $self->SUPER::size_request; 834 my ($w, $h) = $self->SUPER::size_request;
646 835
647 ( 836 (
648 $w + $self->border * 2, 837 $w + $self->border * 2,
… …
654 my ($self, $w, $h) = @_; 843 my ($self, $w, $h) = @_;
655 844
656 $h -= List::Util::max 0, $self->border * 2; 845 $h -= List::Util::max 0, $self->border * 2;
657 $w -= List::Util::max 0, $self->border * 2; 846 $w -= List::Util::max 0, $self->border * 2;
658 847
848 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
849 if $self->{title};
850
659 $self->child->configure ($self->border, $self->border, $w, $h); 851 $self->child->configure ($self->border, $self->border, $w, $h);
660} 852}
661 853
662sub button_down { 854sub button_down {
663 my ($self, $ev, $x, $y) = @_; 855 my ($self, $ev, $x, $y) = @_;
664 856
857 my ($w, $h) = @$self{qw(w h)};
665 my $border = $self->border; 858 my $border = $self->border;
666 859
667 if ($x < $self->{w} && $x >= $self->{w} - $border 860 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
668 && $y < $self->{h} && $y >= $self->{h} - $border) { 861 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
669 862
863 if ($lr & $td) {
864 my ($wx, $wy) = ($self->{x}, $self->{y});
670 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 865 my ($ox, $oy) = ($ev->{x}, $ev->{y});
671 my ($bw, $bh) = ($self->{w}, $self->{h}); 866 my ($bw, $bh) = ($self->{w}, $self->{h});
672 867
868 my $mx = $x < $border;
869 my $my = $y < $border;
870
673 $self->{motion} = sub { 871 $self->{motion} = sub {
674 my ($ev, $x, $y) = @_; 872 my ($ev, $x, $y) = @_;
675 873
676 ($x, $y) = ($ev->{x}, $ev->{y}); 874 my $dx = $ev->{x} - $ox;
875 my $dy = $ev->{y} - $oy;
677 876
678 $self->{user_w} = $bw + $x - $ox; 877 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
679 $self->{user_h} = $bh + $y - $oy; 878 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
879 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
680 $self->check_size; 880 $self->check_size;
681 }; 881 };
682 882
683 } elsif ($x >= 0 && $x < $self->{w} 883 } elsif ($lr ^ $td) {
684 && $y >= 0 && $y < $border) {
685
686 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 884 my ($ox, $oy) = ($ev->{x}, $ev->{y});
687 my ($bx, $by) = ($self->{x}, $self->{y}); 885 my ($bx, $by) = ($self->{x}, $self->{y});
688 886
689 $self->{motion} = sub { 887 $self->{motion} = sub {
690 my ($ev, $x, $y) = @_; 888 my ($ev, $x, $y) = @_;
… …
713 my ($self) = @_; 911 my ($self) = @_;
714 912
715 my ($w, $h ) = ($self->{w}, $self->{h}); 913 my ($w, $h ) = ($self->{w}, $self->{h});
716 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 914 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
717 915
718 glEnable GL_BLEND;
719 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
720 glEnable GL_TEXTURE_2D; 916 glEnable GL_TEXTURE_2D;
721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
722 918
723 my $border = $self->border; 919 my $border = $self->border;
724 920
725 glColor @{ $self->{border_bg} }; 921 glColor @{ $self->{border_bg} };
726 $tex[1]->draw_quad (0, 0, $w, $border); 922 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
727 $tex[3]->draw_quad (0, $border, $border, $ch); 923 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
728 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 924 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
729 $tex[4]->draw_quad (0, $h - $border, $w, $border); 925 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
730 926
927 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
731 my $bg = $tex[0]; 928 my $bg = $tex[0];
732 929
733 # TODO: repeat texture not scale 930 # TODO: repeat texture not scale
734 my $rep_x = $cw / $bg->{w}; 931 my $rep_x = $cw / $bg->{w};
735 my $rep_y = $ch / $bg->{h}; 932 my $rep_y = $ch / $bg->{h};
736 933
737 glColor @{ $self->{bg} }; 934 glColor @{ $self->{bg} };
738 935
739 $bg->{s} = $rep_x; 936 $bg->{s} = $rep_x;
740 $bg->{t} = $rep_y; 937 $bg->{t} = $rep_y;
741 $bg->{wrap_mode} = 1; 938 $bg->{wrap_mode} = 1;
742 $bg->draw_quad ($border, $border, $cw, $ch); 939 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
940 }
743 941
744 glDisable GL_TEXTURE_2D; 942 glDisable GL_TEXTURE_2D;
745 glDisable GL_BLEND; 943
944 $self->{title}->draw if $self->{title};
746 945
747 $self->child->draw; 946 $self->child->draw;
748} 947}
749 948
750############################################################################# 949#############################################################################
… …
773 $self->{children}[$y][$x] = $child; 972 $self->{children}[$y][$x] = $child;
774 973
775 $child->check_size; 974 $child->check_size;
776} 975}
777 976
977sub children {
978 grep $_, map @$_, grep $_, @{ $_[0]{children} }
979}
980
778# TODO: move to container class maybe? send childs a signal on removal? 981# TODO: move to container class maybe? send childs a signal on removal?
779sub clear { 982sub clear {
780 my ($self) = @_; 983 my ($self) = @_;
781 984
985 my @children = $self->children;
782 delete $self->{children}; 986 delete $self->{children};
987
988 for (@children) {
989 delete $_->{parent};
990 $_->hide;
991 }
992
783 $self->update; 993 $self->update;
784} 994}
785 995
786sub get_wh { 996sub get_wh {
787 my ($self) = @_; 997 my ($self) = @_;
… …
793 or next; 1003 or next;
794 1004
795 for my $x (0 .. $#$row) { 1005 for my $x (0 .. $#$row) {
796 my $widget = $row->[$x] 1006 my $widget = $row->[$x]
797 or next; 1007 or next;
798 my ($w, $h) = $widget->size_request; 1008 my ($w, $h) = @$widget{qw(req_w req_h)};
799 1009
800 $w[$x] = max $w[$x], $w; 1010 $w[$x] = max $w[$x], $w;
801 $h[$y] = max $h[$y], $h; 1011 $h[$y] = max $h[$y], $h;
802 } 1012 }
803 } 1013 }
… …
908 1118
909 ($h, $w) = ($w, $h); 1119 ($h, $w) = ($w, $h);
910 1120
911 my $children = $self->{children}; 1121 my $children = $self->{children};
912 1122
913 my @h = map +($_->size_request)[0], @$children; 1123 my @h = map $_->{req_w}, @$children;
914 1124
915 my $req_h = List::Util::sum @h; 1125 my $req_h = List::Util::sum @h;
916 1126
917 if ($req_h > $h) { 1127 if ($req_h > $h) {
918 # ah well, not enough space 1128 # ah well, not enough space
… …
964} 1174}
965 1175
966sub size_allocate { 1176sub size_allocate {
967 my ($self, $w, $h) = @_; 1177 my ($self, $w, $h) = @_;
968 1178
1179 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1180
969 my $children = $self->{children}; 1181 my $children = $self->{children};
970 1182
971 my @h = map +($_->size_request)[1], @$children; 1183 my @h = map $_->{req_h}, @$children;
972 1184
973 my $req_h = List::Util::sum @h; 1185 my $req_h = List::Util::sum @h;
974 1186
975 if ($req_h > $h) { 1187 if ($req_h > $h) {
976 # ah well, not enough space 1188 # ah well, not enough space
… …
1010 1222
1011sub new { 1223sub new {
1012 my ($class, %arg) = @_; 1224 my ($class, %arg) = @_;
1013 1225
1014 my $self = $class->SUPER::new ( 1226 my $self = $class->SUPER::new (
1015 fg => [1, 1, 1], 1227 fg => [1, 1, 1],
1228 #font => default_font
1229 #text => initial text
1230 #markup => initial narkup
1231 layout => (new CFClient::Layout),
1016 fontsize => 1, 1232 fontsize => 1,
1017 text => "",
1018 align => -1, 1233 align => -1,
1019 valign => -1, 1234 valign => -1,
1020 padding => 2, 1235 padding => 2,
1021 layout => new CFClient::Layout, 1236 can_events => 0,
1022 %arg 1237 %arg
1023 ); 1238 );
1024 1239
1025 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1240 if (exists $self->{template}) {
1241 my $layout = new CFClient::Layout;
1242 $layout->set_text (delete $self->{template});
1243 $self->{template} = $layout;
1244 }
1026 1245
1027 $self->set_text (delete $self->{text}) if exists $self->{text}; 1246 if (exists $self->{markup}) {
1028 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1247 $self->set_markup (delete $self->{markup});
1248 } else {
1249 $self->set_text (delete $self->{text});
1250 }
1029 1251
1030 $self 1252 $self
1031} 1253}
1032 1254
1033sub escape_text { 1255sub escape {
1034 local $_ = $_[1]; 1256 local $_ = $_[1];
1035 1257
1036 s/&/&amp;/g; 1258 s/&/&amp;/g;
1037 s/>/&gt;/g; 1259 s/>/&gt;/g;
1038 s/</&lt;/g; 1260 s/</&lt;/g;
1039 1261
1040 $_[1] 1262 $_[1]
1041} 1263}
1042 1264
1265sub update {
1266 my ($self) = @_;
1267
1268 delete $self->{texture};
1269 $self->SUPER::update;
1270}
1271
1043sub set_text { 1272sub set_text {
1044 my ($self, $text) = @_; 1273 my ($self, $text) = @_;
1045 1274
1275 return if $self->{text} eq "T$text";
1276 $self->{text} = "T$text";
1277
1278 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1046 $self->{layout}->set_text ($text); 1279 $self->{layout}->set_text ($text);
1047 1280
1048 delete $self->{texture};
1049 $self->update; 1281 $self->update;
1282 $self->check_size;
1050} 1283}
1051 1284
1052sub set_markup { 1285sub set_markup {
1053 my ($self, $markup) = @_; 1286 my ($self, $markup) = @_;
1054 1287
1288 return if $self->{text} eq "M$markup";
1289 $self->{text} = "M$markup";
1290
1291 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1292
1293 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1055 $self->{layout}->set_markup ($markup); 1294 $self->{layout}->set_markup ($markup);
1056 1295
1057 delete $self->{texture};
1058 $self->update; 1296 $self->update;
1297 $self->check_size;
1059} 1298}
1060 1299
1061sub size_request { 1300sub size_request {
1062 my ($self) = @_; 1301 my ($self) = @_;
1063 1302
1064 $self->{layout}->set_width; 1303 $self->{layout}->set_font ($self->{font}) if $self->{font};
1304 $self->{layout}->set_width ($self->{max_w} || -1);
1065 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1305 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1066 1306
1067 my ($w, $h) = $self->{layout}->size; 1307 my ($w, $h) = $self->{layout}->size;
1308
1309 if (exists $self->{template}) {
1310 $self->{template}->set_font ($self->{font}) if $self->{font};
1311 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1312
1313 my ($w2, $h2) = $self->{template}->size;
1314
1315 $w = List::Util::max $w, $w2;
1316 $h = List::Util::max $h, $h2;
1317 }
1068 1318
1069 ( 1319 (
1070 $w + $self->{padding} * 2, 1320 $w + $self->{padding} * 2,
1071 $h + $self->{padding} * 2, 1321 $h + $self->{padding} * 2,
1072 ) 1322 )
… …
1076 my ($self, $w, $h) = @_; 1326 my ($self, $w, $h) = @_;
1077 1327
1078 delete $self->{texture}; 1328 delete $self->{texture};
1079} 1329}
1080 1330
1331sub set_fontsize {
1332 my ($self, $fontsize) = @_;
1333
1334 $self->{fontsize} = $fontsize;
1335 delete $self->{texture};
1336
1337 $self->update;
1338 $self->check_size;
1339}
1340
1081sub _draw { 1341sub _draw {
1082 my ($self) = @_; 1342 my ($self) = @_;
1083 1343
1084 my $tex = $self->{texture} ||= do { 1344 my $tex = $self->{texture} ||= do {
1345 $self->{layout}->set_foreground (@{$self->{fg}});
1346 $self->{layout}->set_font ($self->{font}) if $self->{font};
1085 $self->{layout}->set_width ($self->{w}); 1347 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1348 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1349
1087 new_from_layout CFClient::Texture $self->{layout} 1350 my $tex = new_from_layout CFClient::Texture $self->{layout};
1351
1352 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1353 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1354 : ($self->{w} - $tex->{w}) * 0.5;
1355
1356 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1357 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1358 : ($self->{h} - $tex->{h}) * 0.5;
1359
1360 $tex
1088 }; 1361 };
1089 1362
1090 glEnable GL_BLEND;
1091 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1092 glEnable GL_TEXTURE_2D; 1363 glEnable GL_TEXTURE_2D;
1093 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1364 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1094 1365
1366 if ($tex->{format} == GL_ALPHA) {
1095 glColor @{$self->{fg}}; 1367 glColor @{$self->{fg}};
1096
1097 $self->{ox} = int (
1098 $self->{align} < 0 ? $self->{padding}
1099 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1100 : ($self->{w} - $tex->{w}) * 0.5
1101 );
1102
1103 $self->{oy} = int (
1104 $self->{valign} < 0 ? $self->{padding}
1105 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1106 : ($self->{h} - $tex->{h}) * 0.5
1107 );
1108
1109 $tex->draw_quad ($self->{ox}, $self->{oy}); 1368 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1369 } else {
1370 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1371 }
1110 1372
1111 glDisable GL_TEXTURE_2D; 1373 glDisable GL_TEXTURE_2D;
1112 glDisable GL_BLEND;
1113} 1374}
1114 1375
1115############################################################################# 1376#############################################################################
1116 1377
1117package CFClient::UI::EntryBase; 1378package CFClient::UI::EntryBase;
… …
1122 1383
1123sub new { 1384sub new {
1124 my $class = shift; 1385 my $class = shift;
1125 1386
1126 $class->SUPER::new ( 1387 $class->SUPER::new (
1127 fg => [1, 1, 1], 1388 fg => [1, 1, 1],
1128 bg => [0, 0, 0, 0.2], 1389 bg => [0, 0, 0, 0.2],
1129 active_bg => [1, 1, 1, 0.5], 1390 active_bg => [1, 1, 1, 0.5],
1130 active_fg => [0, 0, 0], 1391 active_fg => [0, 0, 0],
1131 can_hover => 1, 1392 can_hover => 1,
1132 can_focus => 1, 1393 can_focus => 1,
1133 valign => 0, 1394 valign => 0,
1395 can_events => 1,
1134 @_ 1396 @_
1135 ) 1397 )
1136} 1398}
1137 1399
1138sub _set_text { 1400sub _set_text {
… …
1151 $self->{layout}->set_text ("$text "); 1413 $self->{layout}->set_text ("$text ");
1152 1414
1153 $self->emit (changed => $self->{text}); 1415 $self->emit (changed => $self->{text});
1154} 1416}
1155 1417
1418sub set_text {
1419 my ($self, $text) = @_;
1420
1421 $self->{cursor} = length $text;
1422 $self->_set_text ($text);
1423 $self->check_size;
1424 $self->update;
1425}
1426
1156sub get_text { 1427sub get_text {
1157 $_[0]{text} 1428 $_[0]{text}
1158} 1429}
1159 1430
1160sub size_request { 1431sub size_request {
… …
1166} 1437}
1167 1438
1168sub size_allocate { 1439sub size_allocate {
1169 my ($self, $w, $h) = @_; 1440 my ($self, $w, $h) = @_;
1170 1441
1171 $self->_set_text ($self->{text}); 1442 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172}
1173
1174sub set_text {
1175 my ($self, $text) = @_;
1176
1177 $self->{cursor} = length $text;
1178 $self->_set_text ($text);
1179 $self->update;
1180} 1443}
1181 1444
1182sub key_down { 1445sub key_down {
1183 my ($self, $ev) = @_; 1446 my ($self, $ev) = @_;
1184 1447
… …
1291 my ($self, $ev) = @_; 1554 my ($self, $ev) = @_;
1292 1555
1293 my $sym = $ev->{sym}; 1556 my $sym = $ev->{sym};
1294 1557
1295 if ($sym == 13) { 1558 if ($sym == 13) {
1559 unshift @{$self->{history}},
1560 my $txt = $self->get_text;
1561 $self->{history_pointer} = -1;
1562 $self->{history_saveback} = '';
1296 $self->emit (activate => $self->get_text); 1563 $self->emit (activate => $txt);
1297 $self->update; 1564 $self->update;
1565
1566 } elsif ($sym == CFClient::SDLK_UP) {
1567 if ($self->{history_pointer} < 0) {
1568 $self->{history_saveback} = $self->get_text;
1569 }
1570 if (@{$self->{history} || []} > 0) {
1571 $self->{history_pointer}++;
1572 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1573 $self->{history_pointer} = @{$self->{history} || []} - 1;
1574 }
1575 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1576 }
1577
1578 } elsif ($sym == CFClient::SDLK_DOWN) {
1579 $self->{history_pointer}--;
1580 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1581
1582 if ($self->{history_pointer} >= 0) {
1583 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1584 } else {
1585 $self->set_text ($self->{history_saveback});
1586 }
1298 1587
1299 } else { 1588 } else {
1300 $self->SUPER::key_down ($ev); 1589 $self->SUPER::key_down ($ev);
1301 } 1590 }
1302 1591
… …
1309our @ISA = CFClient::UI::Label::; 1598our @ISA = CFClient::UI::Label::;
1310 1599
1311use CFClient::OpenGL; 1600use CFClient::OpenGL;
1312 1601
1313my @tex = 1602my @tex =
1314 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1315 qw(b1_button_active.png); 1604 qw(b1_button_active.png);
1316 1605
1317sub new { 1606sub new {
1318 my $class = shift; 1607 my $class = shift;
1319 1608
1320 $class->SUPER::new ( 1609 $class->SUPER::new (
1321 padding => 4, 1610 padding => 4,
1322 fg => [1, 1, 1], 1611 fg => [1, 1, 1],
1323 bg => [1, 1, 1, 0.2], 1612 bg => [1, 1, 1, 0.2],
1324 active_fg => [0, 0, 1], 1613 active_fg => [0, 0, 1],
1325 can_hover => 1, 1614 can_hover => 1,
1326 align => 0, 1615 align => 0,
1327 valign => 0, 1616 valign => 0,
1617 can_events => 1,
1328 @_ 1618 @_
1329 ) 1619 )
1330} 1620}
1331 1621
1332sub button_up { 1622sub button_up {
… …
1345 1635
1346 if ($GRAB == $self) { 1636 if ($GRAB == $self) {
1347 $self->{fg} = $self->{active_fg}; 1637 $self->{fg} = $self->{active_fg};
1348 } 1638 }
1349 1639
1350 glEnable GL_BLEND;
1351 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1352 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1353 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1354 glColor 0, 0, 0, 1; 1642 glColor 0, 0, 0, 1;
1355 1643
1356 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1644 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1357 1645
1358 glDisable GL_TEXTURE_2D; 1646 glDisable GL_TEXTURE_2D;
1359 glDisable GL_BLEND;
1360 1647
1361 $self->SUPER::_draw; 1648 $self->SUPER::_draw;
1362} 1649}
1363 1650
1364############################################################################# 1651#############################################################################
… …
1366package CFClient::UI::CheckBox; 1653package CFClient::UI::CheckBox;
1367 1654
1368our @ISA = CFClient::UI::DrawBG::; 1655our @ISA = CFClient::UI::DrawBG::;
1369 1656
1370my @tex = 1657my @tex =
1371 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1658 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1372 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1659 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1373 1660
1374use CFClient::OpenGL; 1661use CFClient::OpenGL;
1375 1662
1376sub new { 1663sub new {
… …
1411 1698
1412 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1699 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1413 1700
1414 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1701 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1415 1702
1416 glEnable GL_BLEND; 1703 my $tex = $self->{state} ? $tex[1] : $tex[0];
1704
1417 glEnable GL_TEXTURE_2D; 1705 glEnable GL_TEXTURE_2D;
1418 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1419
1420 my $tex = $self->{state} ? $tex[1] : $tex[0];
1421
1422 $tex->draw_quad (0, 0, $s, $s); 1706 $tex->draw_quad_alpha (0, 0, $s, $s);
1423
1424 glDisable GL_TEXTURE_2D; 1707 glDisable GL_TEXTURE_2D;
1708}
1709
1710#############################################################################
1711
1712package CFClient::UI::Image;
1713
1714our @ISA = CFClient::UI::Base::;
1715
1716use CFClient::OpenGL;
1717use Carp qw/confess/;
1718
1719our %loaded_images;
1720
1721sub new {
1722 my $class = shift;
1723
1724 my $self = $class->SUPER::new (can_events => 0, @_);
1725
1726 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1727
1728 $loaded_images{$self->{image}} ||=
1729 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1730
1731 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1732
1733 Scalar::Util::weaken $loaded_images{$self->{image}};
1734
1735 $self->{aspect} = $tex->{w} / $tex->{h};
1736
1737 $self
1738}
1739
1740sub size_request {
1741 my ($self) = @_;
1742
1743 ($self->{tex}->{w}, $self->{tex}->{h})
1744}
1745
1746sub _draw {
1747 my ($self) = @_;
1748
1749 my $tex = $self->{tex};
1750
1751 my ($w, $h) = ($self->{w}, $self->{h});
1752
1753 if ($self->{rot90}) {
1754 glRotate 90, 0, 0, 1;
1755 glTranslate 0, -$self->{w}, 0;
1756
1757 ($w, $h) = ($h, $w);
1758 }
1759
1760 glEnable GL_TEXTURE_2D;
1761 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1762
1763 $tex->draw_quad_alpha (0, 0, $w, $h);
1764
1425 glDisable GL_BLEND; 1765 glDisable GL_TEXTURE_2D;
1426} 1766}
1427 1767
1428############################################################################# 1768#############################################################################
1429 1769
1430package CFClient::UI::VGauge; 1770package CFClient::UI::VGauge;
1431 1771
1432our @ISA = CFClient::UI::Base::; 1772our @ISA = CFClient::UI::Base::;
1773
1774use List::Util qw(min max);
1433 1775
1434use CFClient::OpenGL; 1776use CFClient::OpenGL;
1435 1777
1436my %tex = ( 1778my %tex = (
1437 food => [ 1779 food => [
1438 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1780 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1439 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 1781 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1440 ], 1782 ],
1441 grace => [ 1783 grace => [
1442 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1784 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1443 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/ 1785 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1444 ], 1786 ],
1445 hp => [ 1787 hp => [
1446 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1788 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1447 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 1789 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1448 ], 1790 ],
1449 mana => [ 1791 mana => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1792 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1451 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/ 1793 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1452 ], 1794 ],
1453); 1795);
1454 1796
1455# eg. VGauge->new (gauge => 'food'), default gauge: food 1797# eg. VGauge->new (gauge => 'food'), default gauge: food
1456sub new { 1798sub new {
1457 my $class = shift; 1799 my $class = shift;
1458 1800
1459 my $self = $class->SUPER::new ( 1801 my $self = $class->SUPER::new (
1460 gauge => 'food', 1802 type => 'food',
1461 @_ 1803 @_
1462 ); 1804 );
1463 1805
1464 $self->{aspect} = $tex{$self->{gauge}}[0]{w} / $tex{$self->{gauge}}[0]{h}; 1806 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1465 1807
1466 $self 1808 $self
1467} 1809}
1468 1810
1469sub size_request { 1811sub size_request {
1470 my ($self) = @_; 1812 my ($self) = @_;
1471 1813
1472 my $tex = $tex{$self->{gauge}}[0]; 1814 #my $tex = $tex{$self->{type}}[0];
1473
1474 @$tex{qw(w h)} 1815 #@$tex{qw(w h)}
1816 (0, 0)
1475} 1817}
1476 1818
1477sub set_max { 1819sub set_max {
1478 my ($self, $max) = @_; 1820 my ($self, $max) = @_;
1479 1821
1822 return if $self->{max_val} == $max;
1823
1480 $self->{max_val} = $max; 1824 $self->{max_val} = $max;
1825 $self->update;
1481} 1826}
1482 1827
1483sub set_value { 1828sub set_value {
1484 my ($self, $val, $max) = @_; 1829 my ($self, $val, $max) = @_;
1485 1830
1486 $self->set_max ($max) 1831 $self->set_max ($max)
1487 if defined $max; 1832 if defined $max;
1488 1833
1489 $max = $self->{max_val}; 1834 return if $self->{val} == $val;
1835
1490 $self->{val} = $val; 1836 $self->{val} = $val;
1491
1492 $self->update; 1837 $self->update;
1493} 1838}
1494 1839
1495sub _draw { 1840sub _draw {
1496 my ($self) = @_; 1841 my ($self) = @_;
1497 1842
1498 my $tex = $tex{$self->{gauge}}; 1843 my $tex = $tex{$self->{type}};
1844 my ($t1, $t2, $t3) = @$tex;
1499 1845
1500 my ($w, $h) = ($self->{w}, $self->{h}); 1846 my ($w, $h) = ($self->{w}, $self->{h});
1501 1847
1848 if ($self->{vertical}) {
1849 glRotate 90, 0, 0, 1;
1850 glTranslate 0, -$self->{w}, 0;
1851
1852 ($w, $h) = ($h, $w);
1853 }
1854
1502 my $ycut = $self->{val} / ($self->{max_val} || 1); 1855 my $ycut = $self->{val} / ($self->{max_val} || 1);
1503 $ycut = 1 if $self->{val} > $self->{max_val};
1504 1856
1505 my $t1 = $tex->[0]; 1857 my $ycut1 = max 0, min 1, $ycut;
1506 my $t2 = $tex->[1]; 1858 my $ycut2 = max 0, min 1, $ycut - 1;
1859
1860 my $h1 = $self->{h} * (1 - $ycut1);
1861 my $h2 = $self->{h} * (1 - $ycut2);
1507 1862
1508 glEnable GL_BLEND; 1863 glEnable GL_BLEND;
1509 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1864 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1510 glEnable GL_TEXTURE_2D; 1865 glEnable GL_TEXTURE_2D;
1511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1512 1867
1513 my $h1 = $self->{h} - $ycut * $self->{h};
1514 my $h2 = $ycut * $self->{h};
1515
1516 my $yp = 0;
1517
1518 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1868 glBindTexture GL_TEXTURE_2D, $t1->{name};
1519 glBegin GL_QUADS; 1869 glBegin GL_QUADS;
1520 glTexCoord 0 , 0; glVertex 0 , $yp; 1870 glTexCoord 0 , 0; glVertex 0 , 0;
1521 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1871 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1522 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1872 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1523 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1873 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1524 glEnd; 1874 glEnd;
1525 1875
1526 $yp += $h1; 1876 my $ycut1 = List::Util::min 1, $ycut;
1527
1528 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1877 glBindTexture GL_TEXTURE_2D, $t2->{name};
1529 glBegin GL_QUADS; 1878 glBegin GL_QUADS;
1530 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1879 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1531 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1880 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1532 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1533 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1881 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1534 glEnd; 1883 glEnd;
1884
1885 if ($t3) {
1886 glBindTexture GL_TEXTURE_2D, $t3->{name};
1887 glBegin GL_QUADS;
1888 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1889 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1890 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1891 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1892 glEnd;
1893 }
1535 1894
1536 glDisable GL_BLEND; 1895 glDisable GL_BLEND;
1537 glDisable GL_TEXTURE_2D; 1896 glDisable GL_TEXTURE_2D;
1897}
1898
1899#############################################################################
1900
1901package CFClient::UI::Gauge;
1902
1903our @ISA = CFClient::UI::VBox::;
1904
1905sub new {
1906 my ($class, %arg) = @_;
1907
1908 my $self = $class->SUPER::new (
1909 tooltip => $arg{type},
1910 can_hover => 1,
1911 can_events => 1,
1912 %arg,
1913 );
1914
1915 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1916 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1917 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1918
1919 $self
1920}
1921
1922sub set_fontsize {
1923 my ($self, $fsize) = @_;
1924
1925 $self->{value}->set_fontsize ($fsize);
1926 $self->{max} ->set_fontsize ($fsize);
1927}
1928
1929sub set_max {
1930 my ($self, $max) = @_;
1931
1932 $self->{gauge}->set_max ($max);
1933 $self->{max}->set_text ($max);
1934}
1935
1936sub set_value {
1937 my ($self, $val, $max) = @_;
1938
1939 $self->set_max ($max)
1940 if defined $max;
1941
1942 $self->{gauge}->set_value ($val, $max);
1943 $self->{value}->set_text ($val);
1538} 1944}
1539 1945
1540############################################################################# 1946#############################################################################
1541 1947
1542package CFClient::UI::Slider; 1948package CFClient::UI::Slider;
… …
1561 # TODO: calculations are off 1967 # TODO: calculations are off
1562 my $self = $class->SUPER::new ( 1968 my $self = $class->SUPER::new (
1563 fg => [1, 1, 1], 1969 fg => [1, 1, 1],
1564 active_fg => [0, 0, 0], 1970 active_fg => [0, 0, 0],
1565 range => [0, 0, 100, 10], 1971 range => [0, 0, 100, 10],
1566 req_w => 20, 1972 req_w => $::WIDTH / 80,
1567 req_h => 20, 1973 req_h => $::WIDTH / 80,
1568 vertical => 0, 1974 vertical => 0,
1569 can_hover => 1, 1975 can_hover => 1,
1570 inner_pad => 5, 1976 inner_pad => 5,
1571 @_ 1977 @_
1572 ); 1978 );
… …
1655 $page ||= 2; 2061 $page ||= 2;
1656 2062
1657 my $knob_a = $inner_pad_px + ($value - $page * 0.5); 2063 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1658 my $knob_b = $inner_pad_px + ($value + $page * 0.5); 2064 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1659 2065
1660 glEnable GL_BLEND;
1661 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1662 glEnable GL_TEXTURE_2D; 2066 glEnable GL_TEXTURE_2D;
1663 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2067 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1664 2068
1665 # draw background 2069 # draw background
1666 $tex[1]->draw_quad (0, 0, $w, $h); 2070 $tex[1]->draw_quad_alpha (0, 0, $w, $h);
1667 2071
1668 # draw handle 2072 # draw handle
1669 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2073 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
1670 2074
1671 glDisable GL_BLEND;
1672 glDisable GL_TEXTURE_2D; 2075 glDisable GL_TEXTURE_2D;
1673} 2076}
1674 2077
1675############################################################################# 2078#############################################################################
1676 2079
… …
1682 2085
1683sub new { 2086sub new {
1684 my $class = shift; 2087 my $class = shift;
1685 2088
1686 my $self = $class->SUPER::new ( 2089 my $self = $class->SUPER::new (
1687 fontsize => 1, 2090 fontsize => 1,
2091 can_events => 0,
2092 #font => default_font
1688 @_, 2093 @_,
1689 2094
1690 layout => (new CFClient::Layout), 2095 layout => (new CFClient::Layout 1),
1691 par => [], 2096 par => [],
1692 height => 0, 2097 height => 0,
1693 children => [ 2098 children => [
1694 (new CFClient::UI::Empty expand => 1), 2099 (new CFClient::UI::Empty expand => 1),
1695 (new CFClient::UI::Slider vertical => 1), 2100 (new CFClient::UI::Slider vertical => 1),
1696 ], 2101 ],
1697 ); 2102 );
1698 2103
1699 $self->{children}[1]->connect (changed => sub { 2104 $self->{children}[1]->connect (changed => sub { $self->update });
1700 $self->update;
1701 });
1702 2105
1703 $self 2106 $self
1704} 2107}
1705 2108
1706sub set_fontsize { 2109sub set_fontsize {
… …
1714 my ($self, $text) = @_; 2117 my ($self, $text) = @_;
1715 2118
1716 my $layout = $self->{layout}; 2119 my $layout = $self->{layout};
1717 2120
1718 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2121 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1719 $layout->set_width ($self->{w}); 2122 $layout->set_width ($self->{children}[0]{w});
1720 $layout->set_text ($text); 2123 $layout->set_markup ($text);
1721 2124
1722 ($layout->size)[1] 2125 ($layout->size)[1]
1723} 2126}
1724 2127
1725sub reflow { 2128sub reflow {
… …
1732sub size_allocate { 2135sub size_allocate {
1733 my ($self, $w, $h) = @_; 2136 my ($self, $w, $h) = @_;
1734 2137
1735 $self->SUPER::size_allocate ($w, $h); 2138 $self->SUPER::size_allocate ($w, $h);
1736 2139
2140 $self->{layout}->set_font ($self->{font}) if $self->{font};
1737 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2141 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1738 $self->{layout}->set_width ($self->{children}[0]{w}); 2142 $self->{layout}->set_width ($self->{children}[0]{w});
1739 2143
1740 $self->reflow; 2144 $self->reflow;
1741} 2145}
… …
1762 2166
1763 return unless $self->{h} > 0; 2167 return unless $self->{h} > 0;
1764 2168
1765 delete $self->{texture}; 2169 delete $self->{texture};
1766 2170
1767 $ROOT->on_refresh ($self, sub { 2171 $ROOT->on_post_alloc ($self, sub {
1768 if (delete $self->{need_reflow}) { 2172 if (delete $self->{need_reflow}) {
1769 my $height = 0; 2173 my $height = 0;
1770 2174
1771 $height += $_->[0] = $self->text_height ($_->[2]) 2175 $height += $_->[0] = $self->text_height ($_->[2])
1772 for @{$self->{par}}; 2176 for @{$self->{par}};
… …
1776 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2180 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1777 2181
1778 delete $self->{texture}; 2182 delete $self->{texture};
1779 } 2183 }
1780 2184
1781 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2185 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1782 glClearColor 0, 0, 0, 1; 2186 glClearColor 0, 0, 0, 0;
1783 glClear GL_COLOR_BUFFER_BIT; 2187 glClear GL_COLOR_BUFFER_BIT;
1784 2188
1785 glEnable GL_BLEND;
1786 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1787 glEnable GL_TEXTURE_2D; 2189 glEnable GL_TEXTURE_2D;
1788 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2190 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1789 2191
1790 my $top = int $self->{children}[1]{range}[0]; 2192 my $top = int $self->{children}[1]{range}[0];
1791 2193
… …
1794 2196
1795 my $y = 0; 2197 my $y = 0;
1796 2198
1797 my $layout = $self->{layout}; 2199 my $layout = $self->{layout};
1798 2200
2201 $layout->set_font ($self->{font}) if $self->{font};
2202
1799 for my $par (@{$self->{par}}) { 2203 for my $par (@{$self->{par}}) {
1800 my $h = $par->[0]; 2204 my $h = $par->[0];
1801 2205
1802 if ($y0 < $y + $h && $y < $y1) { 2206 if ($y0 < $y + $h && $y < $y1) {
2207 $layout->set_foreground (@{ $par->[1] });
1803 $layout->set_text ($par->[2]); 2208 $layout->set_markup ($par->[2]);
1804 2209
1805 glColor @{ $par->[1] };
1806 my ($W, $H) = $layout->size; 2210 my ($W, $H) = $layout->size;
1807 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2211 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1808 } 2212 }
1809 2213
1810 $y += $h; 2214 $y += $h;
1811 } 2215 }
1812 2216
1813 glDisable GL_TEXTURE_2D; 2217 glDisable GL_TEXTURE_2D;
1814 glDisable GL_BLEND;
1815 }; 2218 };
1816 }); 2219 });
1817} 2220}
1818 2221
1819sub _draw { 2222sub _draw {
1820 my ($self) = @_; 2223 my ($self) = @_;
1821 2224
1822 if ($self->{texture}) {
1823 glEnable GL_TEXTURE_2D; 2225 glEnable GL_TEXTURE_2D;
1824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2226 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1825 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2227 glColor 1, 1, 1, 1;
2228 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1826 glDisable GL_TEXTURE_2D; 2229 glDisable GL_TEXTURE_2D;
1827 }
1828 2230
1829 $self->{children}[1]->draw; 2231 $self->{children}[1]->draw;
1830 2232
1831} 2233}
1832 2234
… …
1880 2282
1881sub new { 2283sub new {
1882 my $class = shift; 2284 my $class = shift;
1883 2285
1884 my $self = $class->SUPER::new ( 2286 my $self = $class->SUPER::new (
1885 state => 0, 2287 state => 0,
1886 connect_activate => \&toggle_flopper, 2288 connect_activate => \&toggle_flopper,
1887 @_ 2289 @_
1888 ); 2290 );
1889 2291
1890 if ($self->{state}) { 2292 if ($self->{state}) {
… …
1911 $self->emit (changed => $self->{state}); 2313 $self->emit (changed => $self->{state});
1912} 2314}
1913 2315
1914############################################################################# 2316#############################################################################
1915 2317
2318package CFClient::UI::Tooltip;
2319
2320our @ISA = CFClient::UI::Bin::;
2321
2322use CFClient::OpenGL;
2323
2324sub new {
2325 my $class = shift;
2326
2327 $class->SUPER::new (
2328 @_,
2329 can_events => 0,
2330 )
2331}
2332
2333sub set_tooltip_from {
2334 my ($self, $widget) = @_;
2335
2336 $self->add (new CFClient::UI::Label
2337 markup => $widget->{tooltip},
2338 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2339 fontsize => 0.8,
2340 fg => [0, 0, 0, 1],
2341 font => ($widget->{tooltip_font} || $::FONT_PROP),
2342 );
2343}
2344
2345sub size_request {
2346 my ($self) = @_;
2347
2348 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2349
2350 ($w + 4, $h + 4)
2351}
2352
2353sub size_allocate {
2354 my ($self, $w, $h) = @_;
2355
2356 $self->SUPER::size_allocate ($w - 4, $h - 4);
2357}
2358
2359sub _draw {
2360 my ($self) = @_;
2361
2362 glTranslate 0.375, 0.375;
2363
2364 my ($w, $h) = @$self{qw(w h)};
2365
2366 glColor 1, 0.8, 0.4;
2367 glBegin GL_QUADS;
2368 glVertex 0 , 0;
2369 glVertex 0 , $h;
2370 glVertex $w, $h;
2371 glVertex $w, 0;
2372 glEnd;
2373
2374 glColor 0, 0, 0;
2375 glBegin GL_LINE_LOOP;
2376 glVertex 0 , 0;
2377 glVertex 0 , $h;
2378 glVertex $w, $h;
2379 glVertex $w, 0;
2380 glEnd;
2381
2382 glTranslate 2 - 0.375, 2 - 0.375;
2383 $self->SUPER::_draw;
2384}
2385
2386#############################################################################
2387
2388package CFClient::UI::Face;
2389
2390our @ISA = CFClient::UI::Base::;
2391
2392use CFClient::OpenGL;
2393
2394sub new {
2395 my $class = shift;
2396
2397 $class->SUPER::new (
2398 aspect => 1,
2399 @_,
2400 )
2401}
2402
2403sub size_request {
2404 (32, 8)
2405}
2406
2407sub _draw {
2408 my ($self) = @_;
2409
2410 return unless $::CONN;#d# manage and cache textures differently
2411 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2412
2413 # TODO animation
2414 if ($tex) {
2415 glEnable GL_TEXTURE_2D;
2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2417 glColor 1, 1, 1, 1;
2418 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419 glDisable GL_TEXTURE_2D;
2420 }
2421}
2422
2423#############################################################################
2424
2425package CFClient::UI::InventoryItem;
2426
2427our @ISA = CFClient::UI::HBox::;
2428
2429sub new {
2430 my $class = shift;
2431
2432 my %args = @_;
2433
2434 my $item = delete $args{item};
2435
2436 my $desc = $item->{nrof} < 2
2437 ? $item->{name}
2438 : "$item->{nrof} $item->{name_pl}";
2439
2440
2441 my $self = $class->SUPER::new (
2442 can_hover => 1,
2443 can_events => 1,
2444 tooltip => (CFClient::UI::Label->escape ($desc)
2445 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2446 connect_button_down => sub {
2447 my ($self, $ev, $x, $y) = @_;
2448
2449 # todo: maybe put examine on 1? but should just be a tooltip :(
2450 if ($ev->{button} == 1) {
2451 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2452 } elsif ($ev->{button} == 2) {
2453 $::CONN->send ("apply $item->{tag}");
2454 } elsif ($ev->{button} == 3) {
2455 CFClient::UI::Menu->new (
2456 items => [
2457 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2458 [
2459 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2460 sub { $::CONN->send ("lock $item->{tag}") },
2461 ],
2462 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2463 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2464 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2465 ],
2466 )->popup ($ev);
2467 }
2468
2469 1
2470 },
2471 %args
2472 );
2473
2474 $self->add (new CFClient::UI::Face
2475 can_events => 0,
2476 face => $item->{face},
2477 anim => $item->{anim},
2478 animspeed => $item->{animspeed},
2479 );
2480
2481 $self->add (new CFClient::UI::Label
2482 can_events => 0,
2483 text => $desc,
2484 );
2485
2486 $self
2487}
2488
2489#############################################################################
2490
2491package CFClient::UI::Inventory;
2492
2493our @ISA = CFClient::UI::ScrolledWindow::;
2494
2495sub new {
2496 my $class = shift;
2497
2498 my $self = $class->SUPER::new (
2499 scrolled => (new CFClient::UI::VBox),
2500 @_,
2501 );
2502
2503 $self
2504}
2505
2506sub set_items {
2507 my ($self, $items) = @_;
2508
2509 $self->{scrolled}->clear;
2510 return unless $items;
2511
2512 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2513
2514 $self->{real_items} = \@items;
2515
2516 for my $item (@items) {
2517 my $desc = $item->{nrof} < 2
2518 ? $item->{name}
2519 : "$item->{nrof} $item->{name_pl}";
2520
2521 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2522 }
2523
2524# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2525}
2526
2527sub size_request {
2528 my ($self) = @_;
2529 ($self->{req_w}, $self->{req_h});
2530}
2531
2532#############################################################################
2533
2534package CFClient::UI::Menu;
2535
2536our @ISA = CFClient::UI::FancyFrame::;
2537
2538use CFClient::OpenGL;
2539
2540sub new {
2541 my $class = shift;
2542
2543 my $self = $class->SUPER::new (
2544 items => [],
2545 z => 100,
2546 @_,
2547 );
2548
2549 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2550
2551 for my $item (@{ $self->{items} }) {
2552 my ($widget, $cb) = @$item;
2553
2554 # handle various types of items, only text for now
2555 if (!ref $widget) {
2556 $widget = new CFClient::UI::Label
2557 can_hover => 1,
2558 can_events => 1,
2559 text => $widget;
2560 }
2561
2562 $self->{item}{$widget} = $item;
2563
2564 $self->{vbox}->add ($widget);
2565 }
2566
2567 $self
2568}
2569
2570# popup given the event (must be a mouse button down event currently)
2571sub popup {
2572 my ($self, $ev) = @_;
2573
2574 $self->emit ("popdown");
2575
2576 # maybe save $GRAB? must be careful about events...
2577 $GRAB = $self;
2578 $self->{button} = $ev->{button};
2579
2580 $self->show;
2581 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2582}
2583
2584sub mouse_motion {
2585 my ($self, $ev, $x, $y) = @_;
2586
2587 # TODO: should use vbox->find_widget or so
2588 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2589 $self->{hover} = $self->{item}{$HOVER};
2590}
2591
2592sub button_up {
2593 my ($self, $ev, $x, $y) = @_;
2594
2595 if ($ev->{button} == $self->{button}) {
2596 undef $GRAB;
2597 $self->hide;
2598
2599 $self->emit ("popdown");
2600 $self->{hover}[1]->() if $self->{hover};
2601 }
2602}
2603
2604#############################################################################
2605
2606package CFClient::UI::Statusbox;
2607
2608our @ISA = CFClient::UI::VBox::;
2609
2610sub reorder {
2611 my ($self) = @_;
2612 my $NOW = time;
2613
2614 while (my ($k, $v) = each %{ $self->{item} }) {
2615 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2616 }
2617
2618 my @widgets;
2619
2620 my @items = sort {
2621 $a->{pri} <=> $b->{pri}
2622 or $b->{id} <=> $a->{id}
2623 } values %{ $self->{item} };
2624
2625 my $count = 10 + 1;
2626 for my $item (@items) {
2627 last unless --$count;
2628
2629 push @widgets, $item->{label} ||= do {
2630 # TODO: doesn't handle markup well (read as: at all)
2631 my $short = $item->{count} > 1
2632 ? "<b>$item->{count} ×</b> $item->{text}"
2633 : $item->{text};
2634
2635 for ($short) {
2636 s/^\s+//;
2637 s/\012.*/…/s;
2638 my $len = int 40 / $item->{fontsize};
2639 substr $_, $len, length, "…" if $len < length;
2640 }
2641
2642 new CFClient::UI::Label
2643 markup => $short,
2644 tooltip => $item->{tooltip},
2645 tooltip_font => $::FONT_PROP,
2646 tooltip_width => 0.67,
2647 fontsize => $item->{fontsize},
2648 color => $item->{color},
2649 can_events => 1,
2650 can_hover => 1
2651 };
2652 }
2653
2654 $self->clear;
2655 $self->SUPER::add (reverse @widgets);
2656}
2657
2658sub add {
2659 my ($self, $text, %arg) = @_;
2660
2661 $text =~ s/^\s+//;
2662 $text =~ s/\s+$//;
2663
2664 my $timeout = time + ((delete $arg{timeout}) || 60);
2665
2666 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2667
2668 if (my $item = $self->{item}{$group}) {
2669 if ($item->{text} eq $text) {
2670 $item->{count}++;
2671 } else {
2672 $item->{count} = 1;
2673 $item->{text} = $item->{tooltip} = $text;
2674 }
2675 $item->{id} = ++$self->{id};
2676 $item->{timeout} = $timeout;
2677 delete $item->{label};
2678 } else {
2679 $self->{item}{$group} = {
2680 id => ++$self->{id},
2681 text => $text,
2682 timeout => $timeout,
2683 tooltip => $text,
2684 fontsize => 0.8,
2685 color => [0.8, 0.8, 0.8, 0.8],
2686 pri => 0,
2687 count => 1,
2688 %arg,
2689 };
2690 }
2691
2692 $self->reorder;
2693}
2694
2695#############################################################################
2696
1916package CFClient::UI::Root; 2697package CFClient::UI::Root;
1917 2698
1918our @ISA = CFClient::UI::Container::; 2699our @ISA = CFClient::UI::Container::;
1919 2700
1920use CFClient::OpenGL; 2701use CFClient::OpenGL;
1921 2702
1922sub check_size { 2703sub new {
1923 my ($self) = @_; 2704 my $class = shift;
1924 2705
1925 $self->configure (0, 0, $::WITH, $::HEIGHT); 2706 $class->SUPER::new (
1926} 2707 @_,
1927 2708 )
1928sub size_request {
1929 ($::WIDTH, $::HEIGHT)
1930} 2709}
1931 2710
1932sub configure { 2711sub configure {
1933 my ($self, $x, $y, $w, $h) = @_; 2712 my ($self, $x, $y, $w, $h) = @_;
1934 2713
1935 $self->SUPER::configure ($x, $y, $w, $h); 2714 $self->{w} = $w;
1936 2715 $self->{h} = $h;
1937 $_->configure ($_->{x}, $_->{y}, $_->size_request)
1938 for @{$self->{children}};
1939} 2716}
1940 2717
1941sub _topleft { 2718sub check_size {
2719 my ($self) = @_;
2720
2721 $self->size_allocate ($self->{w}, $self->{h})
2722 if $self->{w};
2723}
2724
2725sub size_request {
2726 my ($self) = @_;
2727
2728 ($self->{w}, $self->{h})
2729}
2730
2731sub size_allocate {
2732 my ($self, $w, $h) = @_;
2733
2734 my $old_w = $self->{old_w};
2735 my $old_h = $self->{old_h};
2736
2737 if ($old_w && $old_h) {
2738 for my $child ($self->children) {
2739 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2740 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2741 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2742 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2743 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2744 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2745 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2746 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2747 }
2748 }
2749
2750 for my $child ($self->children) {
2751 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2752
2753 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2754 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2755 $child->configure ($X, $Y, $W, $H);
2756 }
2757
2758 $self->{old_w} = $w;
2759 $self->{old_h} = $h;
2760}
2761
2762sub coord2local {
1942 my ($self, $x, $y) = @_; 2763 my ($self, $x, $y) = @_;
1943 2764
1944 ($x, $y) 2765 ($x, $y)
1945} 2766}
1946 2767
2768sub coord2global {
2769 my ($self, $x, $y) = @_;
2770
2771 ($x, $y)
2772}
2773
1947sub update { 2774sub update {
1948 my ($self) = @_; 2775 my ($self) = @_;
1949 2776
1950 $self->check_size; 2777 $self->check_size;
1951 ::refresh (); 2778 $::WANT_REFRESH++;
1952} 2779}
1953 2780
1954sub add { 2781sub add {
1955 my ($self, $child) = @_; 2782 my ($self, $child) = @_;
1956 2783
2784 # integerise window positions
2785 $child->{x} = int $child->{x};
2786 $child->{y} = int $child->{y};
2787
1957 $self->SUPER::add ($child); 2788 $self->SUPER::add ($child);
1958} 2789}
1959 2790
1960sub on_refresh { 2791sub on_refresh {
1961 my ($self, $id, $cb) = @_; 2792 my ($self, $id, $cb) = @_;
1962 2793
1963 $self->{refresh_hook}{$id} = $cb; 2794 $self->{refresh_hook}{$id} = $cb;
1964} 2795}
1965 2796
2797sub on_post_alloc {
2798 my ($self, $id, $cb) = @_;
2799
2800 $self->{post_alloc_hook}{$id} = $cb;
2801}
2802
1966sub draw { 2803sub draw {
1967 my ($self) = @_; 2804 my ($self) = @_;
1968 2805
1969 while (my $rcb = delete $self->{refresh_hook}) { 2806 while ($self->{refresh_hook}) {
1970 $_->() for values %$rcb; 2807 $_->()
2808 for values %{delete $self->{refresh_hook}};
2809 }
2810
2811 if ($self->{check_size}) {
2812 my @queue = ([], []);
2813
2814 for (;;) {
2815 if ($self->{check_size}) {
2816 # heuristic: check containers last
2817 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2818 for values %{delete $self->{check_size}}
2819 }
2820
2821 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2822
2823 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2824 ? @$widget{qw(user_w user_h)}
2825 : $widget->size_request;
2826
2827 if (delete $widget->{force_alloc}
2828 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2829 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2830
2831 $widget->{req_w} = $w;
2832 $widget->{req_h} = $h;
2833
2834 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2835
2836 $widget->{parent}->check_size
2837 if $widget->{parent};
2838 }
2839 }
2840 }
2841
2842 while ($self->{size_alloc}) {
2843 for (values %{delete $self->{size_alloc}}) {
2844 my ($widget, $w, $h) = @$_;
2845
2846 $w = 0 if $w < 0;
2847 $h = 0 if $h < 0;
2848
2849 $widget->{w} = $w;
2850 $widget->{h} = $h;
2851 $widget->size_allocate ($w, $h);
2852 $widget->emit (size_allocate => $w, $h);
2853 }
2854 }
2855
2856 while ($self->{post_alloc_hook}) {
2857 $_->()
2858 for values %{delete $self->{post_alloc_hook}};
1971 } 2859 }
1972 2860
1973 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2861 glViewport 0, 0, $::WIDTH, $::HEIGHT;
1974 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2862 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
1975 glClear GL_COLOR_BUFFER_BIT; 2863 glClear GL_COLOR_BUFFER_BIT;
… …
1986############################################################################# 2874#############################################################################
1987 2875
1988package CFClient::UI; 2876package CFClient::UI;
1989 2877
1990$ROOT = new CFClient::UI::Root; 2878$ROOT = new CFClient::UI::Root;
2879$TOOLTIP = new CFClient::UI::Tooltip;
1991 2880
19921 28811
1993 2882

Diff Legend

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