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.133 by root, Tue Apr 18 21:39:31 2006 UTC vs.
Revision 1.194 by root, Thu May 11 23:41:47 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_markup ($widget->{tooltip});
30
31 $TOOLTIP->show;
32
33 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
34
35 if ($x + $TOOLTIP->{w} > $::WIDTH) {
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
37 }
38
39 $TOOLTIP->move ($x, $y);
40 }
41
42 return;
43 }
44 }
45 }
46
47 $TOOLTIP->hide;
48 delete $TOOLTIP->{owner};
49}
14 50
15# class methods for events 51# class methods for events
16sub feed_sdl_key_down_event { 52sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 53 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
54 if $FOCUS;
18} 55}
19 56
20sub feed_sdl_key_up_event { 57sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 58 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
59 if $FOCUS;
22} 60}
23 61
24sub feed_sdl_button_down_event { 62sub feed_sdl_button_down_event {
25 my ($ev) = @_; 63 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 64 my ($x, $y) = ($ev->{x}, $ev->{y});
27 65
28 if (!$BUTTON_STATE) { 66 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 67 my $widget = $ROOT->find_widget ($x, $y);
30 68
31 $GRAB = $widget; 69 $GRAB = $widget;
32 $GRAB->update if $GRAB; 70 $GRAB->update if $GRAB;
33 }
34 71
72 check_tooltip;
73 }
74
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 75 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 76
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 77 if ($GRAB) {
78 ($x, $y) = $GRAB->coord2local ($x, $y);
79 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
80 }
38} 81}
39 82
40sub feed_sdl_button_up_event { 83sub feed_sdl_button_up_event {
41 my ($ev) = @_; 84 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 85 my ($x, $y) = ($ev->{x}, $ev->{y});
43 86
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 87 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 88
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 90
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 91 if ($GRAB) {
92 ($x, $y) = $GRAB->coord2local ($x, $y);
93 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
94 }
49 95
50 if (!$BUTTON_STATE) { 96 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 97 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 98 $grab->update if $grab;
53 $GRAB->update if $GRAB; 99 $GRAB->update if $GRAB;
100
101 check_tooltip;
54 } 102 }
55} 103}
56 104
57sub feed_sdl_motion_event { 105sub feed_sdl_motion_event {
58 my ($ev) = @_; 106 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 107 my ($x, $y) = ($ev->{x}, $ev->{y});
60 108
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 109 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 110
63 if ($widget != $HOVER) { 111 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 112 my $hover = $HOVER; $HOVER = $widget;
65 113
66 $hover->update if $hover && $hover->{can_hover}; 114 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 115 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 116
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 117 check_tooltip;
118 }
119
120 if ($HOVER) {
121 ($x, $y) = $HOVER->coord2local ($x, $y);
122 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
123 }
71} 124}
72 125
73# convert position array to integers 126# convert position array to integers
74sub harmonize { 127sub harmonize {
75 my ($vals) = @_; 128 my ($vals) = @_;
… …
87 140
88package CFClient::UI::Base; 141package CFClient::UI::Base;
89 142
90use strict; 143use strict;
91 144
92use SDL::OpenGL; 145use CFClient::OpenGL;
93 146
94sub new { 147sub new {
95 my $class = shift; 148 my $class = shift;
96 149
97 my $self = bless { 150 my $self = bless {
98 x => 0, 151 x => 0,
99 y => 0, 152 y => 0,
100 z => 0, 153 z => 0,
101 w => -1, 154 can_events => 1,
102 h => -1,
103 @_ 155 @_
104 }, $class; 156 }, $class;
105 157
106 for (keys %$self) { 158 for (keys %$self) {
107 if (/^connect_(.*)$/) { 159 if (/^connect_(.*)$/) {
… …
110 } 162 }
111 163
112 $self 164 $self
113} 165}
114 166
167sub destroy {
168 my ($self) = @_;
169
170 $self->hide;
171 %$self = ();
172}
173
174sub show {
175 my ($self) = @_;
176
177 return if $self->{parent};
178
179 $CFClient::UI::ROOT->add ($self);
180}
181
182sub hide {
183 my ($self) = @_;
184
185 undef $GRAB if $GRAB == $self;
186 undef $HOVER if $HOVER == $self;
187
188 $self->{parent}->remove ($self)
189 if $self->{parent};
190}
191
115sub move { 192sub move {
116 my ($self, $x, $y, $z) = @_; 193 my ($self, $x, $y, $z) = @_;
117 194
118 $self->{x} = int $x; 195 $self->{x} = int $x;
119 $self->{y} = int $y; 196 $self->{y} = int $y;
120 $self->{z} = $z if defined $z; 197 $self->{z} = $z if defined $z;
121 198
122 $self->update; 199 $self->update;
123} 200}
124 201
125sub needs_redraw { 202sub set_size {
126 0 203 my ($self, $w, $h) = @_;
204
205 $self->{user_w} = $w;
206 $self->{user_h} = $h;
207
208 $self->check_size;
127} 209}
128 210
129sub size_request { 211sub size_request {
130 require Carp; 212 require Carp;
131 Carp::confess "size_request is abtract"; 213 Carp::confess "size_request is abstract";
132} 214}
133 215
134sub configure { 216sub configure {
135 my ($self, $x, $y, $w, $h) = @_; 217 my ($self, $x, $y, $w, $h) = @_;
136 218
219 if ($self->{aspect}) {
220 my $w2 = List::Util::min $w, int $h * $self->{aspect};
221 my $h2 = List::Util::min $h, int $w / $self->{aspect};
222
223 # use alignment to adjust x, y
224
225 $x += int +($w - $w2) * 0.5;
226 $y += int +($h - $h2) * 0.5;
227
228 ($w, $h) = ($w2, $h2);
229 }
230
231 if ($self->{x} != $x || $self->{y} != $y) {
137 $self->{x} = $x; 232 $self->{x} = $x;
138 $self->{y} = $y; 233 $self->{y} = $y;
234 $self->update;
235 }
139 236
140 return unless $self->{w} != $w || $self->{h} != $h; 237 if ($self->{w} != $w || $self->{h} != $h) {
141 238 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
142 $self->{w} = $w; 239 }
143 $self->{h} = $h;
144
145 $self->size_allocate ($w, $h);
146} 240}
147 241
148sub size_allocate { 242sub size_allocate {
149 # nothing to be done 243 # nothing to be done
150} 244}
151 245
152# return top left coordinates 246sub children {
153sub _topleft { 247}
248
249# call when resolution changes etc.
250sub reconfigure {
251 my ($self) = @_;
252
253 $_->reconfigure
254 for $self->children;
255
256 $self->check_size;
257 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
258 $self->update;
259}
260
261sub set_max_size {
154 my ($self, $x, $y) = @_; 262 my ($self, $w, $h) = @_;
155 263
156 $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;
157} 266}
158 267
159# translate global coordinates to local coordinate system 268# translate global coordinates to local coordinate system
160sub coord2local { 269sub coord2local {
161 my ($self, $x, $y) = @_; 270 my ($self, $x, $y) = @_;
162 271
163 my ($X, $Y) = $self->_topleft; 272 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
164 ($x - $X, $y - $Y)
165} 273}
166 274
167# translate local coordinates to global coordinate system 275# translate local coordinates to global coordinate system
168sub coord2global { 276sub coord2global {
169 my ($self, $x, $y) = @_; 277 my ($self, $x, $y) = @_;
170 278
171 my ($X, $Y) = $self->_topleft; 279 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
172 ($x + $X, $y + $Y)
173} 280}
174 281
175sub focus_in { 282sub focus_in {
176 my ($self) = @_; 283 my ($self) = @_;
177 284
… …
237 glVertex $x + $self->{w}, $y + $self->{h}; 344 glVertex $x + $self->{w}, $y + $self->{h};
238 glVertex $x , $y + $self->{h}; 345 glVertex $x , $y + $self->{h};
239 glEnd; 346 glEnd;
240 glDisable GL_BLEND; 347 glDisable GL_BLEND;
241 } 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 }
242} 363}
243 364
244sub _draw { 365sub _draw {
245 my ($self) = @_; 366 my ($self) = @_;
246 367
247 warn "no draw defined for $self\n"; 368 warn "no draw defined for $self\n";
248} 369}
249 370
250sub find_widget { 371sub find_widget {
251 my ($self, $x, $y) = @_; 372 my ($self, $x, $y) = @_;
373
374 return () unless $self->{can_events};
252 375
253 return $self 376 return $self
254 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 377 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
255 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 378 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
256 379
… …
259 382
260sub set_parent { 383sub set_parent {
261 my ($self, $parent) = @_; 384 my ($self, $parent) = @_;
262 385
263 Scalar::Util::weaken ($self->{parent} = $parent); 386 Scalar::Util::weaken ($self->{parent} = $parent);
387
388 $self->check_size
389 unless exists $self->{req_w};
264} 390}
265 391
266sub check_size { 392sub check_size {
267 my ($self) = @_; 393 my ($self) = @_;
268 394
269 my ($w, $h) = $self->size_request; 395 $CFClient::UI::ROOT->{check_size}{$self} = $self;
270
271 if ($w != $self->{req_w} || $h != $self->{req_h}) {
272 $self->{req_w} = $w;
273 $self->{req_h} = $h;
274
275 $self->{parent}->check_size
276 if $self->{parent};
277
278 $self->size_allocate ($w, $h);
279 $self->update;
280 }
281} 396}
282 397
283sub update { 398sub update {
284 my ($self) = @_; 399 my ($self) = @_;
285 400
… …
294} 409}
295 410
296sub emit { 411sub emit {
297 my ($self, $signal, @args) = @_; 412 my ($self, $signal, @args) = @_;
298 413
299 for my $cb (@{$self->{signal_cb}{$signal} || []}) { 414 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
300 $cb->($self, @args);
301 }
302} 415}
303 416
304sub DESTROY { 417sub DESTROY {
305 my ($self) = @_; 418 my ($self) = @_;
306 419
… …
312package CFClient::UI::DrawBG; 425package CFClient::UI::DrawBG;
313 426
314our @ISA = CFClient::UI::Base::; 427our @ISA = CFClient::UI::Base::;
315 428
316use strict; 429use strict;
317use SDL::OpenGL; 430use CFClient::OpenGL;
318 431
319sub new { 432sub new {
320 my $class = shift; 433 my $class = shift;
321 434
322 # range [value, low, high, page] 435 # range [value, low, high, page]
… …
351 464
352package CFClient::UI::Empty; 465package CFClient::UI::Empty;
353 466
354our @ISA = CFClient::UI::Base::; 467our @ISA = CFClient::UI::Base::;
355 468
469sub new {
470 my ($class, %arg) = @_;
471 $class->SUPER::new (can_events => 0, %arg);
472}
473
356sub size_request { 474sub size_request {
357 (0, 0) 475 (0, 0)
358} 476}
359 477
360sub draw { } 478sub draw { }
… …
368sub new { 486sub new {
369 my ($class, %arg) = @_; 487 my ($class, %arg) = @_;
370 488
371 my $children = delete $arg{children} || []; 489 my $children = delete $arg{children} || [];
372 490
373 my $self = $class->SUPER::new (children => [], %arg); 491 my $self = $class->SUPER::new (
492 children => [],
493 can_events => 0,
494 %arg,
495 );
374 $self->add ($_) for @$children; 496 $self->add ($_) for @$children;
375 497
376 $self 498 $self
377} 499}
378 500
379sub add { 501sub add {
380 my ($self, $child) = @_; 502 my ($self, @widgets) = @_;
381 503
382 $child->set_parent ($self); 504 $_->set_parent ($self)
505 for @widgets;
383 506
384 use sort 'stable'; 507 use sort 'stable';
385 508
386 $self->{children} = [ 509 $self->{children} = [
387 sort { $a->{z} <=> $b->{z} } 510 sort { $a->{z} <=> $b->{z} }
388 @{$self->{children}}, $child 511 @{$self->{children}}, @widgets
389 ]; 512 ];
390 513
391 $self->{w} = $self->{h} = -1;
392
393 $child->check_size; 514 $self->check_size;
515 $self->update;
516}
517
518sub children {
519 @{ $_[0]{children} }
394} 520}
395 521
396sub remove { 522sub remove {
397 my ($self, $widget) = @_; 523 my ($self, $child) = @_;
398 524
525 delete $child->{parent};
526 $child->hide;
527
399 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
400 529
401 $self->check_size; 530 $self->check_size;
531 $self->update;
532}
533
534sub clear {
535 my ($self) = @_;
536
537 my $children = delete $self->{children};
538 $self->{children} = [];
539
540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
544
545 $self->check_size;
546 $self->update;
402} 547}
403 548
404sub find_widget { 549sub find_widget {
405 my ($self, $x, $y) = @_; 550 my ($self, $x, $y) = @_;
406 551
… …
436 581
437 $class->SUPER::new (children => [$child], %arg) 582 $class->SUPER::new (children => [$child], %arg)
438} 583}
439 584
440sub add { 585sub add {
441 my ($self, $widget) = @_; 586 my ($self, $child) = @_;
442 587
443 $self->{children} = []; 588 $self->{children} = [];
444 589
445 $self->SUPER::add ($widget); 590 $self->SUPER::add ($child);
446} 591}
447 592
448sub remove { 593sub remove {
449 my ($self, $widget) = @_; 594 my ($self, $widget) = @_;
450 595
… …
470 615
471package CFClient::UI::Window; 616package CFClient::UI::Window;
472 617
473our @ISA = CFClient::UI::Bin::; 618our @ISA = CFClient::UI::Bin::;
474 619
475use SDL::OpenGL; 620use CFClient::OpenGL;
476 621
477sub new { 622sub new {
478 my ($class, %arg) = @_; 623 my ($class, %arg) = @_;
479 624
480 my $self = $class->SUPER::new (%arg); 625 my $self = $class->SUPER::new (%arg);
481} 626}
482 627
483sub update { 628sub update {
484 my ($self) = @_; 629 my ($self) = @_;
485 630
486 # we want to do this delayed... 631 $ROOT->on_refresh ($self => sub { $self->render_child });
487 $self->render_chld;
488 $self->SUPER::update; 632 $self->SUPER::update;
489}
490
491sub render_chld {
492 my ($self) = @_;
493
494 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
495 glClearColor 0, 0, 0, 1;
496 glClear GL_COLOR_BUFFER_BIT;
497 $self->child->draw;
498 };
499} 633}
500 634
501sub size_allocate { 635sub size_allocate {
502 my ($self, $w, $h) = @_; 636 my ($self, $w, $h) = @_;
503 637
504 $self->child->configure (0, 0, $w, $h); 638 $self->SUPER::size_allocate ($w, $h);
639 $self->update;
640}
505 641
642sub _render {
643 $_[0]{children}[0]->draw;
644}
645
646sub render_child {
647 my ($self) = @_;
648
649 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
650 glClearColor 0, 0, 0, 0;
651 glClear GL_COLOR_BUFFER_BIT;
652
506 $self->render_chld; 653 $self->_render;
654# glColorMask 1, 1, 1, 0;
655# glEnable GL_BLEND;
656# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
657# glRasterPos 0, 0;
658# glCopyPixels 0, 0, $self->{w}, $self->{h};
659# glDisable GL_BLEND;
660# glColorMask 1, 1, 1, 1;
661 };
507} 662}
508 663
509sub _draw { 664sub _draw {
510 my ($self) = @_; 665 my ($self) = @_;
511 666
512 my ($w, $h) = ($self->w, $self->h); 667 my ($w, $h) = ($self->w, $self->h);
513 668
514 my $tex = $self->{texture} 669 my $tex = $self->{texture}
515 or return; 670 or return;
671
672 glEnable GL_TEXTURE_2D;
673 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
674 glColor 0, 0, 0, 1;
675
676 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
677
678 glDisable GL_TEXTURE_2D;
679}
680
681#############################################################################
682
683package CFClient::UI::ViewPort;
684
685our @ISA = CFClient::UI::Window::;
686
687sub size_request {
688 my ($self) = @_;
689
690 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
691 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
692
693 @$self{qw(child_w child_h)}
694}
695
696sub size_allocate {
697 my ($self, $w, $h) = @_;
698
699 $self->update;
700}
701
702sub set_offset {
703 my ($self, $x, $y) = @_;
704
705 $self->{view_x} = int $x;
706 $self->{view_y} = int $y;
707
708 $self->update;
709}
710
711# hmm, this does not work for topleft of $self... but we should not ask for that
712sub coord2local {
713 my ($self, $x, $y) = @_;
714
715 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
716}
717
718sub coord2global {
719 my ($self, $x, $y) = @_;
720
721 $x = List::Util::min $self->{w}, $x - $self->{view_x};
722 $y = List::Util::min $self->{h}, $y - $self->{view_y};
723
724 $self->SUPER::coord2global ($x, $y)
725}
726
727sub find_widget {
728 my ($self, $x, $y) = @_;
729
730 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
731 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
732 ) {
733 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
734 } else {
735 $self->CFClient::UI::Base::find_widget ($x, $y)
736 }
737}
738
739sub _render {
740 my ($self) = @_;
741
742 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
743
744 $self->SUPER::_render;
745}
746
747#############################################################################
748
749package CFClient::UI::ScrolledWindow;
750
751our @ISA = CFClient::UI::HBox::;
752
753sub new {
754 my $class = shift;
755
756 my $self;
757
758 my $slider = new CFClient::UI::Slider
759 vertical => 1,
760 range => [0, 0, 1, 0.01], # HACK fix
761 connect_changed => sub {
762 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
763 },
764 ;
765
766 $self = $class->SUPER::new (
767 vp => (new CFClient::UI::ViewPort),
768 slider => $slider,
769 @_,
770 );
771
772 $self->{vp}->add ($self->{scrolled});
773 $self->add ($self->{vp});
774 $self->add ($self->{slider});
775
776 $self
777}
778
779#TODO# update range on size_allocate depeneing on child
780# update viewport offset on scroll
781
782#############################################################################
783
784package CFClient::UI::Frame;
785
786our @ISA = CFClient::UI::Bin::;
787
788use CFClient::OpenGL;
789
790sub new {
791 my $class = shift;
792
793 my $self = $class->SUPER::new (
794 bg => [1, 1, 1, 1],
795 border_bg => [1, 1, 1, 1],
796 border => 0.8,
797 @_
798 );
799
800 $self
801}
802
803sub _draw {
804 my ($self) = @_;
805
806 my ($w, $h) = ($self->{w}, $self->{h});
516 807
517 glEnable GL_BLEND; 808 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
519 glEnable GL_TEXTURE_2D; 810 glEnable GL_TEXTURE_2D;
520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
521 812
522 $tex->draw_quad (0, 0, $w, $h); 813# glBegin GL_QUADS;
814# glColor 0, 0, 0, 0;
815# glVertex 0 , 0;
816# glVertex 0 , $h;
817# glVertex $w, $h;
818# glVertex $w, 0;
819# glEnd;
523 820
821
822 $self->child->draw;
524 glDisable GL_BLEND; 823 glDisable GL_BLEND;
525 glDisable GL_TEXTURE_2D; 824 glDisable GL_TEXTURE_2D;
526} 825}
527 826
528############################################################################# 827#############################################################################
529 828
530package CFClient::UI::ViewPort;
531
532our @ISA = CFClient::UI::Window::;
533
534sub new { die }
535
536sub size_request {
537 my ($self) = @_;
538
539 @$self{qw(child_w child_h)} = $self->child->size_request;
540 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
541
542 @$self{qw(child_w child_h)}
543}
544
545sub _draw {
546 my ($self) = @_;
547
548 $self->{children}[1]->draw;
549}
550
551
552#############################################################################
553
554package CFClient::UI::Frame; 829package CFClient::UI::FancyFrame;
555 830
556our @ISA = CFClient::UI::Bin::; 831our @ISA = CFClient::UI::Bin::;
557 832
558use SDL::OpenGL; 833use CFClient::OpenGL;
559
560sub size_request {
561 my ($self) = @_;
562 my $chld = $self->child
563 or return (0, 0);
564
565 $chld->move (2, 2);
566
567 map { $_ + 4 } $chld->size_request;
568}
569
570sub size_allocate {
571 my ($self, $x, $y, $w, $h) = @_;
572
573 $self->child->configure (2, 2, $w - 4, $h - 4);
574}
575
576sub _draw {
577 my ($self) = @_;
578
579 my $chld = $self->child;
580
581 my ($w, $h) = $chld->size_request;
582
583 glBegin GL_QUADS;
584 glColor 0, 0, 0;
585 glVertex 0 , 0;
586 glVertex 0 , $h + 4;
587 glVertex $w + 4 , $h + 4;
588 glVertex $w + 4 , 0;
589 glEnd;
590
591 $chld->draw;
592}
593
594#############################################################################
595
596package CFClient::UI::FancyFrame;
597
598our @ISA = CFClient::UI::Bin::;
599
600use SDL::OpenGL;
601 834
602my @tex = 835my @tex =
603 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
604 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 837 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
605 838
606sub new { 839sub new {
607 my $class = shift; 840 my $class = shift;
608 841
609 # TODO: user_x, user_y, overwrite moveto? 842 # TODO: user_x, user_y, overwrite moveto?
610 843
611 $class->SUPER::new ( 844 my $self = $class->SUPER::new (
612 bg => [1, 1, 1, 1], 845 bg => [1, 1, 1, 1],
613 border_bg => [1, 1, 1, 1], 846 border_bg => [1, 1, 1, 1],
614 border => int $::FONTSIZE * 0.8, 847 border => 0.6,
848 can_events => 1,
615 @_ 849 @_
616 ) 850 );
851
852 $self->{title} &&= new CFClient::UI::Label
853 align => 0,
854 valign => 1,
855 text => $self->{title},
856 fontsize => $self->{border};
857
858 $self
859}
860
861sub border {
862 int $_[0]{border} * $::FONTSIZE
617} 863}
618 864
619sub size_request { 865sub size_request {
620 my ($self) = @_; 866 my ($self) = @_;
621 867
622 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
623
624 my ($w, $h) = $self->SUPER::size_request; 868 my ($w, $h) = $self->SUPER::size_request;
625 869
626 ( 870 (
627 $w + $self->{border} * 2, 871 $w + $self->border * 2,
628 $h + $self->{border} * 2, 872 $h + $self->border * 2,
629 ) 873 )
630} 874}
631 875
632sub size_allocate { 876sub size_allocate {
633 my ($self, $w, $h) = @_; 877 my ($self, $w, $h) = @_;
634 878
635 $h -= List::Util::max 0, $self->{border} * 2; 879 $h -= List::Util::max 0, $self->border * 2;
636 $w -= List::Util::max 0, $self->{border} * 2; 880 $w -= List::Util::max 0, $self->border * 2;
637 881
882 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
883 if $self->{title};
884
638 $self->child->configure ($self->{border}, $self->{border}, $w, $h); 885 $self->child->configure ($self->border, $self->border, $w, $h);
639} 886}
640 887
641sub button_down { 888sub button_down {
642 my ($self, $ev, $x, $y) = @_; 889 my ($self, $ev, $x, $y) = @_;
643 890
644 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 891 my ($w, $h) = @$self{qw(w h)};
645 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 892 my $border = $self->border;
646 893
894 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
895 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
896
897 if ($lr & $td) {
898 my ($wx, $wy) = ($self->{x}, $self->{y});
647 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 899 my ($ox, $oy) = ($ev->{x}, $ev->{y});
648 my ($bw, $bh) = ($self->{w}, $self->{h}); 900 my ($bw, $bh) = ($self->{w}, $self->{h});
901
902 my $mx = $x < $border;
903 my $my = $y < $border;
649 904
650 $self->{motion} = sub { 905 $self->{motion} = sub {
651 my ($ev, $x, $y) = @_; 906 my ($ev, $x, $y) = @_;
652 907
653 ($x, $y) = ($ev->motion_x, $ev->motion_y); 908 my $dx = $ev->{x} - $ox;
909 my $dy = $ev->{y} - $oy;
654 910
655 $self->{user_w} = $bw + $x - $ox; 911 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
656 $self->{user_h} = $bh + $y - $oy; 912 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
913 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
657 $self->check_size; 914 $self->check_size;
658 }; 915 };
659 916
660 } elsif ($x >= 0 && $x < $self->{w} 917 } elsif ($lr ^ $td) {
661 && $y >= 0 && $y < $self->{border}) {
662
663 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 918 my ($ox, $oy) = ($ev->{x}, $ev->{y});
664 my ($bx, $by) = ($self->{x}, $self->{y}); 919 my ($bx, $by) = ($self->{x}, $self->{y});
665 920
666 $self->{motion} = sub { 921 $self->{motion} = sub {
667 my ($ev, $x, $y) = @_; 922 my ($ev, $x, $y) = @_;
668 923
669 ($x, $y) = ($ev->motion_x, $ev->motion_y); 924 ($x, $y) = ($ev->{x}, $ev->{y});
670 925
671 $self->move ($bx + $x - $ox, $by + $y - $oy); 926 $self->move ($bx + $x - $ox, $by + $y - $oy);
672 $self->update; 927 $self->update;
673 }; 928 };
674 } 929 }
… …
695 glEnable GL_BLEND; 950 glEnable GL_BLEND;
696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 951 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
697 glEnable GL_TEXTURE_2D; 952 glEnable GL_TEXTURE_2D;
698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
699 954
955 my $border = $self->border;
956
700 glColor @{ $self->{border_bg} }; 957 glColor @{ $self->{border_bg} };
701 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 958 $tex[1]->draw_quad (0, 0, $w, $border);
702 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 959 $tex[3]->draw_quad (0, $border, $border, $ch);
703 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 960 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
704 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 961 $tex[4]->draw_quad (0, $h - $border, $w, $border);
705 962
963 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
706 my $bg = $tex[0]; 964 my $bg = $tex[0];
707 965
708 # TODO: repeat texture not scale 966 # TODO: repeat texture not scale
709 my $rep_x = $cw / $bg->{w}; 967 my $rep_x = $cw / $bg->{w};
710 my $rep_y = $ch / $bg->{h}; 968 my $rep_y = $ch / $bg->{h};
711 969
712 glColor @{ $self->{bg} }; 970 glColor @{ $self->{bg} };
713 971
714 $bg->{s} = $rep_x; 972 $bg->{s} = $rep_x;
715 $bg->{t} = $rep_y; 973 $bg->{t} = $rep_y;
716 $bg->{wrap_mode} = 1; 974 $bg->{wrap_mode} = 1;
717 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 975 $bg->draw_quad ($border, $border, $cw, $ch);
718 976
719 glDisable GL_TEXTURE_2D; 977 glDisable GL_TEXTURE_2D;
720 glDisable GL_BLEND; 978 glDisable GL_BLEND;
979 }
980
981 $self->{title}->draw if $self->{title};
721 982
722 $self->child->draw; 983 $self->child->draw;
723} 984}
724 985
725############################################################################# 986#############################################################################
… …
728 989
729our @ISA = CFClient::UI::Base::; 990our @ISA = CFClient::UI::Base::;
730 991
731use List::Util qw(max sum); 992use List::Util qw(max sum);
732 993
733use SDL::OpenGL; 994use CFClient::OpenGL;
734 995
735sub new { 996sub new {
736 my $class = shift; 997 my $class = shift;
737 998
738 $class->SUPER::new ( 999 $class->SUPER::new (
… …
745 my ($self, $x, $y, $child) = @_; 1006 my ($self, $x, $y, $child) = @_;
746 1007
747 $child->set_parent ($self); 1008 $child->set_parent ($self);
748 $self->{children}[$y][$x] = $child; 1009 $self->{children}[$y][$x] = $child;
749 1010
750 $self->{w} = $self->{h} = -1;
751
752 $child->check_size; 1011 $child->check_size;
1012}
1013
1014sub children {
1015 grep $_, map @$_, grep $_, @{ $_[0]{children} }
753} 1016}
754 1017
755# TODO: move to container class maybe? send childs a signal on removal? 1018# TODO: move to container class maybe? send childs a signal on removal?
756sub clear { 1019sub clear {
757 my ($self) = @_; 1020 my ($self) = @_;
758 1021
1022 my @children = $self->children;
759 delete $self->{children}; 1023 delete $self->{children};
1024
1025 for (@children) {
1026 delete $_->{parent};
1027 $_->hide;
1028 }
1029
760 $self->update; 1030 $self->update;
761} 1031}
762 1032
763sub get_wh { 1033sub get_wh {
764 my ($self) = @_; 1034 my ($self) = @_;
… …
770 or next; 1040 or next;
771 1041
772 for my $x (0 .. $#$row) { 1042 for my $x (0 .. $#$row) {
773 my $widget = $row->[$x] 1043 my $widget = $row->[$x]
774 or next; 1044 or next;
775 my ($w, $h) = $widget->size_request; 1045 my ($w, $h) = @$widget{qw(req_w req_h)};
776 1046
777 $w[$x] = max $w[$x], $w; 1047 $w[$x] = max $w[$x], $w;
778 $h[$y] = max $h[$y], $h; 1048 $h[$y] = max $h[$y], $h;
779 } 1049 }
780 } 1050 }
… …
885 1155
886 ($h, $w) = ($w, $h); 1156 ($h, $w) = ($w, $h);
887 1157
888 my $children = $self->{children}; 1158 my $children = $self->{children};
889 1159
890 my @h = map +($_->size_request)[0], @$children; 1160 my @h = map $_->{req_w}, @$children;
891 1161
892 my $req_h = List::Util::sum @h; 1162 my $req_h = List::Util::sum @h;
893 1163
894 if ($req_h > $h) { 1164 if ($req_h > $h) {
895 # ah well, not enough space 1165 # ah well, not enough space
… …
941} 1211}
942 1212
943sub size_allocate { 1213sub size_allocate {
944 my ($self, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
945 1215
1216 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1217
946 my $children = $self->{children}; 1218 my $children = $self->{children};
947 1219
948 my @h = map +($_->size_request)[1], @$children; 1220 my @h = map $_->{req_h}, @$children;
949 1221
950 my $req_h = List::Util::sum @h; 1222 my $req_h = List::Util::sum @h;
951 1223
952 if ($req_h > $h) { 1224 if ($req_h > $h) {
953 # ah well, not enough space 1225 # ah well, not enough space
… …
981 1253
982package CFClient::UI::Label; 1254package CFClient::UI::Label;
983 1255
984our @ISA = CFClient::UI::Base::; 1256our @ISA = CFClient::UI::Base::;
985 1257
986use SDL::OpenGL; 1258use CFClient::OpenGL;
987 1259
988sub new { 1260sub new {
989 my ($class, %arg) = @_; 1261 my ($class, %arg) = @_;
990 1262
991 my $self = $class->SUPER::new ( 1263 my $self = $class->SUPER::new (
992 fg => [1, 1, 1], 1264 fg => [1, 1, 1],
993 fontsize => $::FONTSIZE, 1265 #font => default_font
994 text => "", 1266 #text => initial text
1267 #markup => initial narkup
1268 layout => (new CFClient::Layout),
1269 fontsize => 1,
995 align => -1, 1270 align => -1,
996 valign => -1, 1271 valign => -1,
997 padding => 2, 1272 padding => 2,
998 layout => new CFClient::Layout, 1273 can_events => 0,
999 %arg 1274 %arg
1000 ); 1275 );
1001 1276
1002 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1277 if (exists $self->{template}) {
1278 my $layout = new CFClient::Layout;
1279 $layout->set_text (delete $self->{template});
1280 $self->{template} = $layout;
1281 }
1003 1282
1004 $self->set_text (delete $self->{text}) if exists $self->{text}; 1283 if (exists $self->{markup}) {
1005 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1284 $self->set_markup (delete $self->{markup});
1285 } else {
1286 $self->set_text (delete $self->{text});
1287 }
1006 1288
1007 $self 1289 $self
1008} 1290}
1009 1291
1010sub escape_text { 1292sub escape {
1011 local $_ = $_[1]; 1293 local $_ = $_[1];
1012 1294
1013 s/&/&amp;/g; 1295 s/&/&amp;/g;
1014 s/>/&gt;/g; 1296 s/>/&gt;/g;
1015 s/</&lt;/g; 1297 s/</&lt;/g;
1016 1298
1017 $_[1] 1299 $_[1]
1018} 1300}
1019 1301
1302sub update {
1303 my ($self) = @_;
1304
1305 delete $self->{texture};
1306 $self->SUPER::update;
1307}
1308
1020sub set_text { 1309sub set_text {
1021 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1022 1311
1312 return if $self->{text} eq "T$text";
1313 $self->{text} = "T$text";
1314
1315 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1023 $self->{layout}->set_text ($text); 1316 $self->{layout}->set_text ($text);
1024 1317
1025 delete $self->{texture};
1026 $self->update; 1318 $self->update;
1319 $self->check_size;
1027} 1320}
1028 1321
1029sub set_markup { 1322sub set_markup {
1030 my ($self, $markup) = @_; 1323 my ($self, $markup) = @_;
1031 1324
1325 return if $self->{text} eq "M$markup";
1326 $self->{text} = "M$markup";
1327
1328 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1329
1330 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1032 $self->{layout}->set_markup ($markup); 1331 $self->{layout}->set_markup ($markup);
1033 1332
1034 delete $self->{texture};
1035 $self->update; 1333 $self->update;
1334 $self->check_size;
1036} 1335}
1037 1336
1038sub size_request { 1337sub size_request {
1039 my ($self) = @_; 1338 my ($self) = @_;
1040 1339
1041 $self->{layout}->set_width; 1340 $self->{layout}->set_font ($self->{font}) if $self->{font};
1341 $self->{layout}->set_width ($self->{max_w} || -1);
1042 $self->{layout}->set_height ($self->{fontsize}); 1342 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1043 1343
1044 my ($w, $h) = $self->{layout}->size; 1344 my ($w, $h) = $self->{layout}->size;
1345
1346 if (exists $self->{template}) {
1347 $self->{template}->set_font ($self->{font}) if $self->{font};
1348 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1349
1350 my ($w2, $h2) = $self->{template}->size;
1351
1352 $w = List::Util::max $w, $w2;
1353 $h = List::Util::max $h, $h2;
1354 }
1045 1355
1046 ( 1356 (
1047 $w + $self->{padding} * 2, 1357 $w + $self->{padding} * 2,
1048 $h + $self->{padding} * 2, 1358 $h + $self->{padding} * 2,
1049 ) 1359 )
… …
1053 my ($self, $w, $h) = @_; 1363 my ($self, $w, $h) = @_;
1054 1364
1055 delete $self->{texture}; 1365 delete $self->{texture};
1056} 1366}
1057 1367
1058sub update { 1368sub set_fontsize {
1059 my ($self) = @_; 1369 my ($self, $fontsize) = @_;
1060 1370
1371 $self->{fontsize} = $fontsize;
1061 delete $self->{texture}; 1372 delete $self->{texture};
1373
1062 $self->SUPER::update; 1374 $self->update;
1375 $self->check_size;
1063} 1376}
1064 1377
1065sub _draw { 1378sub _draw {
1066 my ($self) = @_; 1379 my ($self) = @_;
1067 1380
1068 my $tex = $self->{texture} ||= do { 1381 my $tex = $self->{texture} ||= do {
1382 $self->{layout}->set_foreground (@{$self->{fg}});
1383 $self->{layout}->set_font ($self->{font}) if $self->{font};
1069 $self->{layout}->set_width ($self->{w}); 1384 $self->{layout}->set_width ($self->{w});
1070 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1385 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1386
1071 new_from_layout CFClient::Texture $self->{layout} 1387 my $tex = new_from_layout CFClient::Texture $self->{layout};
1388
1389 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1390 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1391 : ($self->{w} - $tex->{w}) * 0.5;
1392
1393 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1394 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1395 : ($self->{h} - $tex->{h}) * 0.5;
1396
1397 $tex
1072 }; 1398 };
1073 1399
1074 glEnable GL_BLEND;
1075 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1076 glEnable GL_TEXTURE_2D; 1400 glEnable GL_TEXTURE_2D;
1077 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1401 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1078 1402
1403 if ($tex->{format} == GL_ALPHA) {
1079 glColor @{$self->{fg}}; 1404 glColor @{$self->{fg}};
1080
1081 $self->{ox} = int (
1082 $self->{align} < 0 ? $self->{padding}
1083 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1084 : ($self->{w} - $tex->{w}) * 0.5
1085 );
1086
1087 $self->{oy} = int (
1088 $self->{valign} < 0 ? $self->{padding}
1089 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1090 : ($self->{h} - $tex->{h}) * 0.5
1091 );
1092
1093 $tex->draw_quad ($self->{ox}, $self->{oy}); 1405 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1406 } else {
1407 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1408 }
1094 1409
1095 glDisable GL_TEXTURE_2D; 1410 glDisable GL_TEXTURE_2D;
1096 glDisable GL_BLEND;
1097} 1411}
1098 1412
1099############################################################################# 1413#############################################################################
1100 1414
1101package CFClient::UI::EntryBase; 1415package CFClient::UI::EntryBase;
1102 1416
1103our @ISA = CFClient::UI::Label::; 1417our @ISA = CFClient::UI::Label::;
1104 1418
1105use SDL; 1419use CFClient::OpenGL;
1106use SDL::OpenGL;
1107 1420
1108sub new { 1421sub new {
1109 my $class = shift; 1422 my $class = shift;
1110 1423
1111 $class->SUPER::new ( 1424 $class->SUPER::new (
1112 fg => [1, 1, 1], 1425 fg => [1, 1, 1],
1113 bg => [0, 0, 0, 0.2], 1426 bg => [0, 0, 0, 0.2],
1114 active_bg => [1, 1, 1, 0.5], 1427 active_bg => [1, 1, 1, 0.5],
1115 active_fg => [0, 0, 0], 1428 active_fg => [0, 0, 0],
1116 can_hover => 1, 1429 can_hover => 1,
1117 can_focus => 1, 1430 can_focus => 1,
1118 valign => 0, 1431 valign => 0,
1432 can_events => 1,
1119 @_ 1433 @_
1120 ) 1434 )
1121} 1435}
1122 1436
1123sub _set_text { 1437sub _set_text {
… …
1125 1439
1126 delete $self->{cur_h}; 1440 delete $self->{cur_h};
1127 1441
1128 return if $self->{text} eq $text; 1442 return if $self->{text} eq $text;
1129 1443
1444 delete $self->{texture};
1445
1130 $self->{last_activity} = $::NOW; 1446 $self->{last_activity} = $::NOW;
1131 $self->{text} = $text; 1447 $self->{text} = $text;
1132 1448
1133 $text =~ s/./*/g if $self->{hidden}; 1449 $text =~ s/./*/g if $self->{hidden};
1134 $self->{layout}->set_text ("$text "); 1450 $self->{layout}->set_text ("$text ");
1135 1451
1136 $self->emit (changed => $self->{text}); 1452 $self->emit (changed => $self->{text});
1137} 1453}
1138 1454
1455sub set_text {
1456 my ($self, $text) = @_;
1457
1458 $self->{cursor} = length $text;
1459 $self->_set_text ($text);
1460 $self->check_size;
1461 $self->update;
1462}
1463
1139sub get_text { 1464sub get_text {
1140 $_[0]{text} 1465 $_[0]{text}
1141} 1466}
1142 1467
1143sub size_request { 1468sub size_request {
… …
1149} 1474}
1150 1475
1151sub size_allocate { 1476sub size_allocate {
1152 my ($self, $w, $h) = @_; 1477 my ($self, $w, $h) = @_;
1153 1478
1154 $self->_set_text ($self->{text}); 1479 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1155}
1156
1157sub set_text {
1158 my ($self, $text) = @_;
1159
1160 $self->{cursor} = length $text;
1161 $self->_set_text ($text);
1162 $self->update;
1163} 1480}
1164 1481
1165sub key_down { 1482sub key_down {
1166 my ($self, $ev) = @_; 1483 my ($self, $ev) = @_;
1167 1484
1168 my $mod = $ev->key_mod; 1485 my $mod = $ev->{mod};
1169 my $sym = $ev->key_sym; 1486 my $sym = $ev->{sym};
1170
1171 my $uni = $ev->key_unicode; 1487 my $uni = $ev->{unicode};
1172 1488
1173 my $text = $self->get_text; 1489 my $text = $self->get_text;
1174 1490
1175 if ($sym == SDLK_BACKSPACE) { 1491 if ($sym == 8) {
1176 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1492 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1177 } elsif ($sym == SDLK_DELETE) { 1493 } elsif ($sym == 127) {
1178 substr $text, $self->{cursor}, 1, ""; 1494 substr $text, $self->{cursor}, 1, "";
1179 } elsif ($sym == SDLK_LEFT) { 1495 } elsif ($sym == CFClient::SDLK_LEFT) {
1180 --$self->{cursor} if $self->{cursor}; 1496 --$self->{cursor} if $self->{cursor};
1181 } elsif ($sym == SDLK_RIGHT) { 1497 } elsif ($sym == CFClient::SDLK_RIGHT) {
1182 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1498 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1183 } elsif ($sym == SDLK_HOME) { 1499 } elsif ($sym == CFClient::SDLK_HOME) {
1184 $self->{cursor} = 0; 1500 $self->{cursor} = 0;
1185 } elsif ($sym == SDLK_END) { 1501 } elsif ($sym == CFClient::SDLK_END) {
1186 $self->{cursor} = length $text; 1502 $self->{cursor} = length $text;
1187 } elsif ($sym == SDLK_ESCAPE) { 1503 } elsif ($sym == 27) {
1188 $self->emit ('escape'); 1504 $self->emit ('escape');
1189 } elsif ($uni) { 1505 } elsif ($uni) {
1190 substr $text, $self->{cursor}++, 0, chr $uni; 1506 substr $text, $self->{cursor}++, 0, chr $uni;
1191 } 1507 }
1192 1508
… …
1267 1583
1268package CFClient::UI::Entry; 1584package CFClient::UI::Entry;
1269 1585
1270our @ISA = CFClient::UI::EntryBase::; 1586our @ISA = CFClient::UI::EntryBase::;
1271 1587
1272use SDL; 1588use CFClient::OpenGL;
1273use SDL::OpenGL;
1274 1589
1275sub key_down { 1590sub key_down {
1276 my ($self, $ev) = @_; 1591 my ($self, $ev) = @_;
1277 1592
1278 my $sym = $ev->key_sym; 1593 my $sym = $ev->{sym};
1279 1594
1280 if ($sym == SDLK_RETURN) { 1595 if ($sym == 13) {
1596 unshift @{$self->{history}},
1597 my $txt = $self->get_text;
1598 $self->{history_pointer} = -1;
1599 $self->{history_saveback} = '';
1281 $self->emit (activate => $self->get_text); 1600 $self->emit (activate => $txt);
1282 $self->update; 1601 $self->update;
1602
1603 } elsif ($sym == CFClient::SDLK_UP) {
1604 if ($self->{history_pointer} < 0) {
1605 $self->{history_saveback} = $self->get_text;
1606 }
1607 if (@{$self->{history} || []} > 0) {
1608 $self->{history_pointer}++;
1609 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1610 $self->{history_pointer} = @{$self->{history} || []} - 1;
1611 }
1612 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1613 }
1614
1615 } elsif ($sym == CFClient::SDLK_DOWN) {
1616 $self->{history_pointer}--;
1617 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1618
1619 if ($self->{history_pointer} >= 0) {
1620 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1621 } else {
1622 $self->set_text ($self->{history_saveback});
1623 }
1283 1624
1284 } else { 1625 } else {
1285 $self->SUPER::key_down ($ev); 1626 $self->SUPER::key_down ($ev);
1286 } 1627 }
1287 1628
… …
1291 1632
1292package CFClient::UI::Button; 1633package CFClient::UI::Button;
1293 1634
1294our @ISA = CFClient::UI::Label::; 1635our @ISA = CFClient::UI::Label::;
1295 1636
1296use SDL; 1637use CFClient::OpenGL;
1297use SDL::OpenGL;
1298 1638
1299my @tex = 1639my @tex =
1300 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1640 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1301 qw(b1_button_active.png); 1641 qw(b1_button_active.png);
1302 1642
1303sub new { 1643sub new {
1304 my $class = shift; 1644 my $class = shift;
1305 1645
1306 $class->SUPER::new ( 1646 $class->SUPER::new (
1307 padding => 4, 1647 padding => 4,
1308 fg => [1, 1, 1], 1648 fg => [1, 1, 1],
1309 bg => [1, 1, 1, 0.2], 1649 bg => [1, 1, 1, 0.2],
1310 active_fg => [0, 0, 1], 1650 active_fg => [0, 0, 1],
1311 can_hover => 1, 1651 can_hover => 1,
1312 align => 0, 1652 align => 0,
1313 valign => 0, 1653 valign => 0,
1654 can_events => 1,
1314 @_ 1655 @_
1315 ) 1656 )
1316} 1657}
1317 1658
1318sub button_up { 1659sub button_up {
… …
1352package CFClient::UI::CheckBox; 1693package CFClient::UI::CheckBox;
1353 1694
1354our @ISA = CFClient::UI::DrawBG::; 1695our @ISA = CFClient::UI::DrawBG::;
1355 1696
1356my @tex = 1697my @tex =
1357 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1698 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1358 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1699 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1359 1700
1360use SDL; 1701use CFClient::OpenGL;
1361use SDL::OpenGL;
1362 1702
1363sub new { 1703sub new {
1364 my $class = shift; 1704 my $class = shift;
1365 1705
1366 $class->SUPER::new ( 1706 $class->SUPER::new (
… …
1412 glDisable GL_BLEND; 1752 glDisable GL_BLEND;
1413} 1753}
1414 1754
1415############################################################################# 1755#############################################################################
1416 1756
1417package CFClient::UI::VGauge; 1757package CFClient::UI::Image;
1418 1758
1419our @ISA = CFClient::UI::Base::; 1759our @ISA = CFClient::UI::Base::;
1420 1760
1421use SDL::OpenGL; 1761use CFClient::OpenGL;
1762use Carp qw/confess/;
1422 1763
1423my %tex = ( 1764our %loaded_images;
1424 food => [
1425 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1426 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1427 ],
1428 grace => [
1429 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1430 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1431 ],
1432 hp => [
1433 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1434 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1435 ],
1436 mana => [
1437 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1438 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1439 ],
1440);
1441 1765
1442# eg. VGauge->new (gauge => 'food'), default gauge: food
1443sub new { 1766sub new {
1444 my $class = shift; 1767 my $class = shift;
1445 1768
1446 my $self = $class->SUPER::new (gauge => 'food', @_); 1769 my $self = $class->SUPER::new (can_events => 0, @_);
1770
1771 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1772
1773 $loaded_images{$self->{image}} ||=
1774 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1775
1776 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1777
1778 Scalar::Util::weaken $loaded_images{$self->{image}};
1779
1780 $self->{aspect} = $tex->{w} / $tex->{h};
1447 1781
1448 $self 1782 $self
1449} 1783}
1450 1784
1451sub size_request { 1785sub size_request {
1452 my ($self) = @_; 1786 my ($self) = @_;
1453 1787
1454 my $tex = $tex{$self->{gauge}}[0]; 1788 ($self->{tex}->{w}, $self->{tex}->{h})
1455
1456 @$tex{qw(w h)}
1457}
1458
1459sub set_max {
1460 my ($self, $max) = @_;
1461
1462 $self->{max_val} = $max;
1463}
1464
1465sub set_value {
1466 my ($self, $val, $max) = @_;
1467
1468 $self->set_max ($max)
1469 if defined $max;
1470
1471 $max = $self->{max_val};
1472 $self->{val} = $val;
1473
1474 $self->update;
1475} 1789}
1476 1790
1477sub _draw { 1791sub _draw {
1478 my ($self) = @_; 1792 my ($self) = @_;
1479 1793
1480 my $tex = $tex{$self->{gauge}}; 1794 my $tex = $self->{tex};
1481 1795
1482 my ($w, $h) = ($self->{w}, $self->{h}); 1796 my ($w, $h) = ($self->{w}, $self->{h});
1483 1797
1484 my $ycut = $self->{val} / ($self->{max_val} || 1); 1798 if ($self->{rot90}) {
1485 $ycut = 1 if $self->{val} > $self->{max_val}; 1799 glRotate 90, 0, 0, 1;
1800 glTranslate 0, -$self->{w}, 0;
1486 1801
1487 my $t1 = $tex->[0]; 1802 ($w, $h) = ($h, $w);
1488 my $t2 = $tex->[1]; 1803 }
1489 1804
1490 glEnable GL_BLEND; 1805 glEnable GL_BLEND;
1491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1806 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1492 glEnable GL_TEXTURE_2D; 1807 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1808 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1809
1810 $tex->draw_quad (0, 0, $w, $h);
1811
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D;
1814}
1815
1816#############################################################################
1817
1818package CFClient::UI::VGauge;
1819
1820our @ISA = CFClient::UI::Base::;
1821
1822use List::Util qw(min max);
1823
1824use CFClient::OpenGL;
1825
1826my %tex = (
1827 food => [
1828 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1829 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1830 ],
1831 grace => [
1832 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1833 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1834 ],
1835 hp => [
1836 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1837 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1838 ],
1839 mana => [
1840 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1841 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1842 ],
1843);
1844
1845# eg. VGauge->new (gauge => 'food'), default gauge: food
1846sub new {
1847 my $class = shift;
1848
1849 my $self = $class->SUPER::new (
1850 type => 'food',
1851 @_
1852 );
1853
1854 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1855
1856 $self
1857}
1858
1859sub size_request {
1860 my ($self) = @_;
1861
1862 #my $tex = $tex{$self->{type}}[0];
1863 #@$tex{qw(w h)}
1864 (0, 0)
1865}
1866
1867sub set_max {
1868 my ($self, $max) = @_;
1869
1870 return if $self->{max_val} == $max;
1871
1872 $self->{max_val} = $max;
1873 $self->update;
1874}
1875
1876sub set_value {
1877 my ($self, $val, $max) = @_;
1878
1879 $self->set_max ($max)
1880 if defined $max;
1881
1882 return if $self->{val} == $val;
1883
1884 $self->{val} = $val;
1885 $self->update;
1886}
1887
1888sub _draw {
1889 my ($self) = @_;
1890
1891 my $tex = $tex{$self->{type}};
1892 my ($t1, $t2, $t3) = @$tex;
1893
1894 my ($w, $h) = ($self->{w}, $self->{h});
1895
1896 if ($self->{vertical}) {
1897 glRotate 90, 0, 0, 1;
1898 glTranslate 0, -$self->{w}, 0;
1899
1900 ($w, $h) = ($h, $w);
1901 }
1902
1903 my $ycut = $self->{val} / ($self->{max_val} || 1);
1904
1905 my $ycut1 = max 0, min 1, $ycut;
1906 my $ycut2 = max 0, min 1, $ycut - 1;
1907
1495 my $h1 = $self->{h} - $ycut * $self->{h}; 1908 my $h1 = $self->{h} * (1 - $ycut1);
1496 my $h2 = $ycut * $self->{h}; 1909 my $h2 = $self->{h} * (1 - $ycut2);
1497 1910
1498 my $yp = 0; 1911 glEnable GL_BLEND;
1912 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1913 glEnable GL_TEXTURE_2D;
1914 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1499 1915
1500 glBindTexture GL_TEXTURE_2D, $t1->{name}; 1916 glBindTexture GL_TEXTURE_2D, $t1->{name};
1501 glBegin GL_QUADS; 1917 glBegin GL_QUADS;
1502 glTexCoord 0 , 0; glVertex 0 , $yp; 1918 glTexCoord 0 , 0; glVertex 0 , 0;
1503 glTexCoord 0 , $t1->{t} * (1 - $ycut); glVertex 0 , $yp + $h1; 1919 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1504 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1; 1920 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1505 glTexCoord $t1->{s}, 0; glVertex 0 + $w, $yp; 1921 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1506 glEnd; 1922 glEnd;
1507 1923
1508 $yp += $h1; 1924 my $ycut1 = List::Util::min 1, $ycut;
1509
1510 glBindTexture GL_TEXTURE_2D, $t2->{name}; 1925 glBindTexture GL_TEXTURE_2D, $t2->{name};
1511 glBegin GL_QUADS; 1926 glBegin GL_QUADS;
1512 glTexCoord 0 , $t2->{t} * (1 - $ycut); glVertex 0 , $yp; 1927 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1513 glTexCoord 0 , $t2->{t}; glVertex 0 , $yp + $h2; 1928 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1514 glTexCoord $t2->{s}, $t2->{t}; glVertex 0 + $w, $yp + $h2;
1515 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp; 1929 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1930 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1516 glEnd; 1931 glEnd;
1932
1933 if ($t3) {
1934 glBindTexture GL_TEXTURE_2D, $t3->{name};
1935 glBegin GL_QUADS;
1936 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1937 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1938 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1939 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1940 glEnd;
1941 }
1517 1942
1518 glDisable GL_BLEND; 1943 glDisable GL_BLEND;
1519 glDisable GL_TEXTURE_2D; 1944 glDisable GL_TEXTURE_2D;
1520} 1945}
1521 1946
1522############################################################################# 1947#############################################################################
1523 1948
1949package CFClient::UI::Gauge;
1950
1951our @ISA = CFClient::UI::VBox::;
1952
1953sub new {
1954 my ($class, %arg) = @_;
1955
1956 my $self = $class->SUPER::new (
1957 tooltip => $arg{type},
1958 can_hover => 1,
1959 can_events => 1,
1960 %arg,
1961 );
1962
1963 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1964 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1965 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1966
1967 $self
1968}
1969
1970sub set_fontsize {
1971 my ($self, $fsize) = @_;
1972
1973 $self->{value}->set_fontsize ($fsize);
1974 $self->{max} ->set_fontsize ($fsize);
1975}
1976
1977sub set_max {
1978 my ($self, $max) = @_;
1979
1980 $self->{gauge}->set_max ($max);
1981 $self->{max}->set_text ($max);
1982}
1983
1984sub set_value {
1985 my ($self, $val, $max) = @_;
1986
1987 $self->set_max ($max)
1988 if defined $max;
1989
1990 $self->{gauge}->set_value ($val, $max);
1991 $self->{value}->set_text ($val);
1992}
1993
1994#############################################################################
1995
1524package CFClient::UI::Slider; 1996package CFClient::UI::Slider;
1525 1997
1526use strict; 1998use strict;
1527 1999
1528use SDL::OpenGL; 2000use CFClient::OpenGL;
1529 2001
1530our @ISA = CFClient::UI::DrawBG::; 2002our @ISA = CFClient::UI::DrawBG::;
1531 2003
1532my @tex = 2004my @tex =
1533 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1543 # TODO: calculations are off 2015 # TODO: calculations are off
1544 my $self = $class->SUPER::new ( 2016 my $self = $class->SUPER::new (
1545 fg => [1, 1, 1], 2017 fg => [1, 1, 1],
1546 active_fg => [0, 0, 0], 2018 active_fg => [0, 0, 0],
1547 range => [0, 0, 100, 10], 2019 range => [0, 0, 100, 10],
1548 req_w => 40, 2020 req_w => $::WIDTH / 80,
1549 req_h => 13, 2021 req_h => $::WIDTH / 80,
1550 vertical => 0, 2022 vertical => 0,
1551 can_hover => 1, 2023 can_hover => 1,
1552 inner_pad => 5, 2024 inner_pad => 5,
1553 @_ 2025 @_
1554 ); 2026 );
… …
1658 2130
1659package CFClient::UI::TextView; 2131package CFClient::UI::TextView;
1660 2132
1661our @ISA = CFClient::UI::HBox::; 2133our @ISA = CFClient::UI::HBox::;
1662 2134
1663use SDL::OpenGL; 2135use CFClient::OpenGL;
1664 2136
1665sub new { 2137sub new {
1666 my $class = shift; 2138 my $class = shift;
1667 2139
1668 my $self = $class->SUPER::new ( 2140 my $self = $class->SUPER::new (
1669 req_w => $::WIDTH / 6, 2141 fontsize => 1,
1670 req_h => $::HEIGHT / 6, 2142 can_events => 0,
1671 fontsize => $::FONTSIZE, 2143 #font => default_font
1672 @_, 2144 @_,
1673 2145
1674 layout => (new CFClient::Layout), 2146 layout => (new CFClient::Layout),
1675 par => [], 2147 par => [],
1676 height => 0, 2148 height => 0,
1677 children => [ 2149 children => [
1678 (new CFClient::UI::Empty expand => 1), 2150 (new CFClient::UI::Empty expand => 1),
1679 (new CFClient::UI::Slider vertical => 1), 2151 (new CFClient::UI::Slider vertical => 1),
1680 ], 2152 ],
1681 ); 2153 );
1682 2154
1683 $self->{children}[1]->connect (changed => sub { 2155 $self->{children}[1]->connect (changed => sub { $self->update });
1684 $self->update;
1685 });
1686 2156
1687 $self 2157 $self
1688} 2158}
1689 2159
1690sub set_fontsize { 2160sub set_fontsize {
… …
1697sub text_height { 2167sub text_height {
1698 my ($self, $text) = @_; 2168 my ($self, $text) = @_;
1699 2169
1700 my $layout = $self->{layout}; 2170 my $layout = $self->{layout};
1701 2171
1702 $layout->set_height ($self->{fontsize}); 2172 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1703 $layout->set_width ($self->{w}); 2173 $layout->set_width ($self->{children}[0]{w});
1704 $layout->set_text ($text); 2174 $layout->set_text ($text);
1705 2175
1706 ($layout->size)[1] 2176 ($layout->size)[1]
1707} 2177}
1708 2178
… …
1711 2181
1712 $self->{need_reflow}++; 2182 $self->{need_reflow}++;
1713 $self->update; 2183 $self->update;
1714} 2184}
1715 2185
1716sub size_request {
1717 my ($self) = @_;
1718
1719 ($self->{req_w}, $self->{req_h})
1720}
1721
1722sub size_allocate { 2186sub size_allocate {
1723 my ($self, $w, $h) = @_; 2187 my ($self, $w, $h) = @_;
1724 2188
2189 $self->SUPER::size_allocate ($w, $h);
2190
2191 $self->{layout}->set_font ($self->{font}) if $self->{font};
1725 $self->{layout}->set_height ($self->{fontsize}); 2192 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1726 $self->{layout}->set_width ($self->{w}); 2193 $self->{layout}->set_width ($self->{children}[0]{w});
1727 2194
1728 $self->reflow; 2195 $self->reflow;
1729 $self->update;
1730} 2196}
1731 2197
1732sub add_paragraph { 2198sub add_paragraph {
1733 my ($self, $color, $text) = @_; 2199 my ($self, $color, $text) = @_;
1734 2200
… …
1765 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2231 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1766 2232
1767 delete $self->{texture}; 2233 delete $self->{texture};
1768 } 2234 }
1769 2235
1770 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2236 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1771 glClearColor 0, 0, 0, 1; 2237 glClearColor 0, 0, 0, 0;
1772 glClear GL_COLOR_BUFFER_BIT; 2238 glClear GL_COLOR_BUFFER_BIT;
1773 2239
1774 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1775 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1776 glEnable GL_TEXTURE_2D; 2242 glEnable GL_TEXTURE_2D;
… …
1783 2249
1784 my $y = 0; 2250 my $y = 0;
1785 2251
1786 my $layout = $self->{layout}; 2252 my $layout = $self->{layout};
1787 2253
2254 $layout->set_font ($self->{font}) if $self->{font};
2255
1788 for my $par (@{$self->{par}}) { 2256 for my $par (@{$self->{par}}) {
1789 my $h = $par->[0]; 2257 my $h = $par->[0];
1790 2258
1791 if ($y0 < $y + $h && $y < $y1) { 2259 if ($y0 < $y + $h && $y < $y1) {
1792 $layout->set_text ($par->[2]); 2260 $layout->set_text ($par->[2]);
… …
1806} 2274}
1807 2275
1808sub _draw { 2276sub _draw {
1809 my ($self) = @_; 2277 my ($self) = @_;
1810 2278
1811 if ($self->{texture}) { 2279 glEnable GL_BLEND;
2280 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1812 glEnable GL_TEXTURE_2D; 2281 glEnable GL_TEXTURE_2D;
1813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2283 glColor 1, 1, 1, 1;
1814 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2284 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1815 glDisable GL_TEXTURE_2D; 2285 glDisable GL_TEXTURE_2D;
1816 } 2286 glDisable GL_BLEND;
1817 2287
1818 $self->{children}[1]->draw; 2288 $self->{children}[1]->draw;
1819 2289
1820} 2290}
1821 2291
1822############################################################################# 2292#############################################################################
1823 2293
1824package CFClient::UI::MapWidget;
1825
1826use strict;
1827
1828use List::Util qw(min max);
1829
1830use SDL;
1831use SDL::OpenGL;
1832
1833our @ISA = CFClient::UI::Base::;
1834
1835sub new {
1836 my $class = shift;
1837
1838 $class->SUPER::new (
1839 z => -1,
1840 can_focus => 1,
1841 list => (glGenLists 1),
1842 @_
1843 )
1844}
1845
1846sub key_down {
1847 print "MAPKEYDOWN\n";
1848}
1849
1850sub key_up {
1851}
1852
1853sub button_down {
1854 my ($self, $ev, $x, $y) = @_;
1855
1856 $self->focus_in;
1857
1858 if ($ev->button == 2) {
1859 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1860 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1861
1862 $self->{motion} = sub {
1863 my ($ev, $x, $y) = @_;
1864
1865 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1866
1867 $::CFG->{map_shift_x} = $bw + $x - $ox;
1868 $::CFG->{map_shift_y} = $bh + $y - $oy;
1869
1870 $self->update;
1871 };
1872 }
1873}
1874
1875sub button_up {
1876 my ($self, $ev, $x, $y) = @_;
1877
1878 delete $self->{motion};
1879}
1880
1881sub mouse_motion {
1882 my ($self, $ev, $x, $y) = @_;
1883
1884 $self->{motion}->($ev, $x, $y) if $self->{motion};
1885}
1886
1887sub size_request {
1888 (
1889 1 + 32 * int $::WIDTH / 32,
1890 1 + 32 * int $::HEIGHT / 32,
1891 )
1892}
1893
1894sub update {
1895 my ($self) = @_;
1896
1897 $self->{need_update} = 1;
1898 $self->SUPER::update;
1899}
1900
1901sub draw {
1902 my ($self) = @_;
1903
1904 if (delete $self->{need_update}) {
1905 glNewList $self->{list}, GL_COMPILE;
1906
1907 if ($::MAP) {
1908 my $sw = int $::WIDTH / 32;
1909 my $sh = int $::HEIGHT / 32;
1910
1911 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1912 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1913
1914 glTranslate $sx0 - 32, $sy0 - 32, 0;
1915
1916 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1917
1918 if ($::CFG->{fow_enable}) {
1919 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war
1920 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
1921 glConvolutionFilter2D (
1922 GL_CONVOLUTION_2D,
1923 GL_ALPHA,
1924 3, 3,
1925 GL_ALPHA, GL_FLOAT,
1926 pack "f*",
1927 0.1, 0.1, 0.1,
1928 0.1, 0.2, 0.1,
1929 0.1, 0.1, 0.1,
1930 );
1931 glEnable GL_CONVOLUTION_2D;
1932 }
1933
1934 $self->{fow_texture} = new CFClient::Texture
1935 w => $w,
1936 h => $h,
1937 data => $data,
1938 internalformat => GL_ALPHA,
1939 format => GL_ALPHA;
1940
1941 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1942
1943 glEnable GL_BLEND;
1944 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1945 glEnable GL_TEXTURE_2D;
1946 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1947
1948 glColor +($::CFG->{fow_intensity}) x 3, 1;
1949 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1950
1951 glDisable GL_TEXTURE_2D;
1952 glDisable GL_BLEND;
1953 }
1954
1955 # HACK BEGIN
1956 {
1957 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1958 my ($w, $h) = (250, 250);
1959
1960 glEnable GL_BLEND;
1961 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1962 glEnable GL_TEXTURE_2D;
1963 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1964
1965 $self->{mapmap_texture} =
1966 new CFClient::Texture
1967 w => $w,
1968 h => $h,
1969 data => $::MAP->mapmap ($w, $h),
1970 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
1971
1972 $self->{mapmap_texture}->draw_quad (100, 100);
1973
1974 glDisable GL_TEXTURE_2D;
1975 glDisable GL_BLEND;
1976 }
1977 # HACK END
1978 }
1979
1980 glEndList;
1981 }
1982
1983 glPushMatrix;
1984 glCallList $self->{list};
1985 glPopMatrix;
1986
1987 if ($FOCUS != $self) {
1988 glColor 64/255, 64/255, 64/255;
1989 glLogicOp GL_AND;
1990 glEnable GL_COLOR_LOGIC_OP;
1991 glBegin GL_QUADS;
1992 glVertex 0, 0;
1993 glVertex 0, $::HEIGHT;
1994 glVertex $::WIDTH, $::HEIGHT;
1995 glVertex $::WIDTH, 0;
1996 glEnd;
1997 glDisable GL_COLOR_LOGIC_OP;
1998 }
1999}
2000
2001my %DIR = (
2002 SDLK_KP8, [1, "north"],
2003 SDLK_KP9, [2, "northeast"],
2004 SDLK_KP6, [3, "east"],
2005 SDLK_KP3, [4, "southeast"],
2006 SDLK_KP2, [5, "south"],
2007 SDLK_KP1, [6, "southwest"],
2008 SDLK_KP4, [7, "west"],
2009 SDLK_KP7, [8, "northwest"],
2010
2011 SDLK_UP, [1, "north"],
2012 SDLK_RIGHT, [3, "east"],
2013 SDLK_DOWN, [5, "south"],
2014 SDLK_LEFT, [7, "west"],
2015);
2016
2017sub key_down {
2018 my ($self, $ev) = @_;
2019
2020 my $mod = $ev->key_mod;
2021 my $sym = $ev->key_sym;
2022
2023 if ($sym == SDLK_KP5) {
2024 $::CONN->user_send ("stay fire");
2025 } elsif ($sym == SDLK_a) {
2026 $::CONN->user_send ("apply");
2027 } elsif ($sym == SDLK_QUOTE) {
2028 $self->emit ('activate_console');
2029 } elsif ($sym == SDLK_SLASH) {
2030 $self->emit ('activate_console' => '/');
2031 } elsif (exists $DIR{$sym}) {
2032 if ($mod & KMOD_SHIFT) {
2033 $self->{shft}++;
2034 $::CONN->user_send ("fire $DIR{$sym}[0]");
2035 } elsif ($mod & KMOD_CTRL) {
2036 $self->{ctrl}++;
2037 $::CONN->user_send ("run $DIR{$sym}[0]");
2038 } else {
2039 $::CONN->user_send ("$DIR{$sym}[1]");
2040 }
2041 }
2042}
2043
2044sub key_up {
2045 my ($self, $ev) = @_;
2046
2047 my $mod = $ev->key_mod;
2048 my $sym = $ev->key_sym;
2049
2050 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2051 $::CONN->user_send ("fire_stop");
2052 }
2053 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2054 $::CONN->user_send ("run_stop");
2055 }
2056}
2057
2058#############################################################################
2059
2060package CFClient::UI::Animator; 2294package CFClient::UI::Animator;
2061 2295
2062use SDL::OpenGL; 2296use CFClient::OpenGL;
2063 2297
2064our @ISA = CFClient::UI::Bin::; 2298our @ISA = CFClient::UI::Bin::;
2065 2299
2066sub moveto { 2300sub moveto {
2067 my ($self, $x, $y) = @_; 2301 my ($self, $x, $y) = @_;
… …
2105 2339
2106sub new { 2340sub new {
2107 my $class = shift; 2341 my $class = shift;
2108 2342
2109 my $self = $class->SUPER::new ( 2343 my $self = $class->SUPER::new (
2110 state => 0, 2344 state => 0,
2111 connect_activate => \&toggle_flopper, 2345 connect_activate => \&toggle_flopper,
2112 @_ 2346 @_
2113 ); 2347 );
2114 2348
2115 if ($self->{state}) { 2349 if ($self->{state}) {
… …
2136 $self->emit (changed => $self->{state}); 2370 $self->emit (changed => $self->{state});
2137} 2371}
2138 2372
2139############################################################################# 2373#############################################################################
2140 2374
2375package CFClient::UI::Tooltip;
2376
2377our @ISA = CFClient::UI::Bin::;
2378
2379use CFClient::OpenGL;
2380
2381sub new {
2382 my $class = shift;
2383
2384 $class->SUPER::new (
2385 @_,
2386 can_events => 0,
2387 )
2388}
2389
2390sub set_markup {
2391 my ($self, $text) = @_;
2392
2393 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2394 $self->{label}->set_markup ($text);
2395 $self->add ($self->{label});
2396}
2397
2398sub size_request {
2399 my ($self) = @_;
2400
2401 $self->child->set_max_size ($::WIDTH * 0.3);
2402
2403 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2404
2405 ($w + 4, $h + 4)
2406}
2407
2408sub size_allocate {
2409 my ($self, $w, $h) = @_;
2410
2411 $self->SUPER::size_allocate ($w - 4, $h - 4);
2412}
2413
2414sub _draw {
2415 my ($self) = @_;
2416
2417 glPushMatrix;
2418 glTranslate 0.375, 0.375;
2419
2420 my ($w, $h) = @$self{qw(w h)};
2421
2422 glColor 1, 0.8, 0.4;
2423 glBegin GL_QUADS;
2424 glVertex 0 , 0;
2425 glVertex 0 , $h;
2426 glVertex $w, $h;
2427 glVertex $w, 0;
2428 glEnd;
2429
2430 glColor 0, 0, 0;
2431 glBegin GL_LINE_LOOP;
2432 glVertex 0 , 0;
2433 glVertex 0 , $h;
2434 glVertex $w, $h;
2435 glVertex $w, 0;
2436 glEnd;
2437
2438 glPopMatrix;
2439
2440 glTranslate 2, 2;
2441 $self->SUPER::_draw;
2442}
2443
2444#############################################################################
2445
2446package CFClient::UI::Face;
2447
2448our @ISA = CFClient::UI::Base::;
2449
2450use CFClient::OpenGL;
2451
2452sub new {
2453 my $class = shift;
2454
2455 $class->SUPER::new (
2456 aspect => 1,
2457 @_,
2458 )
2459}
2460
2461sub size_request {
2462 (32, 8)
2463}
2464
2465sub _draw {
2466 my ($self) = @_;
2467
2468 return unless $::CONN;#d# manage and cache textures differently
2469 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2470
2471 # TODO animation
2472 if ($tex) {
2473 glEnable GL_BLEND;
2474 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2475 glEnable GL_TEXTURE_2D;
2476 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2477 glColor 1, 1, 1, 1;
2478 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2479 glDisable GL_TEXTURE_2D;
2480 glDisable GL_BLEND;
2481 }
2482}
2483
2484#############################################################################
2485
2486package CFClient::UI::InventoryItem;
2487
2488our @ISA = CFClient::UI::HBox::;
2489
2490sub new {
2491 my $class = shift;
2492
2493 my %args = @_;
2494
2495 my $item = delete $args{item};
2496
2497 my $desc = $item->{nrof} < 2
2498 ? $item->{name}
2499 : "$item->{nrof} $item->{name_pl}";
2500
2501
2502 my $self = $class->SUPER::new (
2503 can_hover => 1,
2504 can_events => 1,
2505 tooltip => (CFClient::UI::Label->escape ($desc)
2506 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2507 connect_button_down => sub {
2508 my ($self, $ev, $x, $y) = @_;
2509
2510 # todo: maybe put examine on 1? but should just be a tooltip :(
2511 if ($ev->{button} == 1) {
2512 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2513 } elsif ($ev->{button} == 2) {
2514 $::CONN->send ("apply $item->{tag}");
2515 } elsif ($ev->{button} == 3) {
2516 CFClient::UI::Menu->new (
2517 items => [
2518 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2519 [
2520 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2521 sub { $::CONN->send ("lock $item->{tag}") },
2522 ],
2523 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2524 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2525 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2526 ],
2527 )->popup ($ev);
2528 }
2529
2530 1
2531 },
2532 %args
2533 );
2534
2535 $self->add (new CFClient::UI::Face
2536 can_events => 0,
2537 face => $item->{face},
2538 anim => $item->{anim},
2539 animspeed => $item->{animspeed},
2540 );
2541
2542 $self->add (new CFClient::UI::Label
2543 can_events => 0,
2544 text => $desc,
2545 );
2546
2547 $self
2548}
2549
2550#############################################################################
2551
2552package CFClient::UI::Inventory;
2553
2554our @ISA = CFClient::UI::ScrolledWindow::;
2555
2556sub new {
2557 my $class = shift;
2558
2559 my $self = $class->SUPER::new (
2560 scrolled => (new CFClient::UI::VBox),
2561 @_,
2562 );
2563
2564 $self
2565}
2566
2567sub set_items {
2568 my ($self, $items) = @_;
2569
2570 $self->{scrolled}->clear;
2571 return unless $items;
2572
2573 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2574
2575 $self->{real_items} = \@items;
2576
2577 for my $item (@items) {
2578 my $desc = $item->{nrof} < 2
2579 ? $item->{name}
2580 : "$item->{nrof} $item->{name_pl}";
2581
2582 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2583 }
2584
2585# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2586}
2587
2588sub size_request {
2589 my ($self) = @_;
2590 ($self->{req_w}, $self->{req_h});
2591}
2592
2593#############################################################################
2594
2595package CFClient::UI::Menu;
2596
2597our @ISA = CFClient::UI::FancyFrame::;
2598
2599use CFClient::OpenGL;
2600
2601sub new {
2602 my $class = shift;
2603
2604 my $self = $class->SUPER::new (
2605 items => [],
2606 z => 100,
2607 @_,
2608 );
2609
2610 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2611
2612 for my $item (@{ $self->{items} }) {
2613 my ($widget, $cb) = @$item;
2614
2615 # handle various types of items, only text for now
2616 if (!ref $widget) {
2617 $widget = new CFClient::UI::Label
2618 can_hover => 1,
2619 can_events => 1,
2620 text => $widget;
2621 }
2622
2623 $self->{item}{$widget} = $item;
2624
2625 $self->{vbox}->add ($widget);
2626 }
2627
2628 $self
2629}
2630
2631# popup given the event (must be a mouse button down event currently)
2632sub popup {
2633 my ($self, $ev) = @_;
2634
2635 $self->emit ("popdown");
2636
2637 # maybe save $GRAB? must be careful about events...
2638 $GRAB = $self;
2639 $self->{button} = $ev->{button};
2640
2641 $self->show;
2642 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2643}
2644
2645sub mouse_motion {
2646 my ($self, $ev, $x, $y) = @_;
2647
2648 # TODO: should use vbox->find_widget or so
2649 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2650 $self->{hover} = $self->{item}{$HOVER};
2651}
2652
2653sub button_up {
2654 my ($self, $ev, $x, $y) = @_;
2655
2656 if ($ev->{button} == $self->{button}) {
2657 undef $GRAB;
2658 $self->hide;
2659
2660 $self->emit ("popdown");
2661 $self->{hover}[1]->() if $self->{hover};
2662 }
2663}
2664
2665#############################################################################
2666
2667package CFClient::UI::Statusbox;
2668
2669our @ISA = CFClient::UI::VBox::;
2670
2671sub reorder {
2672 my ($self) = @_;
2673 my $NOW = time;
2674
2675 while (my ($k, $v) = each %{ $self->{item} }) {
2676 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2677 }
2678
2679 my @widgets;
2680 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} };
2681 my $count = 10 + 1;
2682 for my $item (@items) {
2683 last unless --$count;
2684
2685 push @widgets, $item->{label} ||= do {
2686 # TODO: doesn't handle markup well (read as: at all)
2687 my $short = delete $item->{text};
2688 for ($short) {
2689 s/^\s+//;
2690 s/\012.*//s;
2691 my $len = int 30 / $item->{fontsize};
2692 substr $_, $len, length, "…" if $len < length;
2693 }
2694
2695 new CFClient::UI::Label
2696 markup => $short,
2697 tooltip => delete $item->{tooltip},
2698 fontsize => delete $item->{fontsize},
2699 color => delete $item->{color},
2700 can_events => 1,
2701 can_hover => 1,
2702 };
2703 }
2704
2705 $self->clear;
2706 $self->SUPER::add (@widgets);
2707}
2708
2709sub add {
2710 my ($self, $text, %arg) = @_;
2711
2712 my $item = {
2713 time => time,
2714 text => $text,
2715 timeout => 60,
2716 tooltip => $text,
2717 fontsize => 0.8,
2718 color => [0.8, 0.8, 0.8, 0.8],
2719 %arg,
2720 };
2721
2722 $item->{timeout} += time;
2723 $item->{group} ||= $item+0;
2724
2725 $item = $self->{item}{$item->{group}} ||= $item;
2726
2727 $self->reorder;
2728}
2729
2730#############################################################################
2731
2141package CFClient::UI::Root; 2732package CFClient::UI::Root;
2142 2733
2143our @ISA = CFClient::UI::Container::; 2734our @ISA = CFClient::UI::Container::;
2144 2735
2145use SDL::OpenGL; 2736use CFClient::OpenGL;
2146 2737
2147sub check_size { 2738sub new {
2148 my ($self) = @_; 2739 my $class = shift;
2149 2740
2150 $self->configure (0, 0, $::WITH, $::HEIGHT); 2741 $class->SUPER::new (
2151} 2742 @_,
2152 2743 )
2153sub size_request {
2154 ($::WIDTH, $::HEIGHT)
2155} 2744}
2156 2745
2157sub configure { 2746sub configure {
2158 my ($self, $x, $y, $w, $h) = @_; 2747 my ($self, $x, $y, $w, $h) = @_;
2159 2748
2160 $self->SUPER::configure ($x, $y, $w, $h); 2749 $self->{w} = $w;
2161 2750 $self->{h} = $h;
2162 $_->configure ($_->{x}, $_->{y}, $_->size_request)
2163 for @{$self->{children}};
2164} 2751}
2165 2752
2166sub _topleft { 2753sub check_size {
2754 my ($self) = @_;
2755
2756 $self->size_allocate ($self->{w}, $self->{h})
2757 if $self->{w};
2758}
2759
2760sub size_request {
2761 my ($self) = @_;
2762
2763 ($self->{w}, $self->{h})
2764}
2765
2766sub size_allocate {
2767 my ($self, $w, $h) = @_;
2768
2769 my $old_w = $self->{old_w};
2770 my $old_h = $self->{old_h};
2771
2772 if ($old_w && $old_h) {
2773 for my $child ($self->children) {
2774 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2775 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2776 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2777 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2778 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2779 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2780 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2781 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2782 }
2783 }
2784
2785 for my $child ($self->children) {
2786 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2787
2788 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2789 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2790 $child->configure ($X, $Y, $W, $H);
2791 }
2792
2793 $self->{old_w} = $w;
2794 $self->{old_h} = $h;
2795}
2796
2797sub coord2local {
2167 my ($self, $x, $y) = @_; 2798 my ($self, $x, $y) = @_;
2168 2799
2169 ($x, $y) 2800 ($x, $y)
2170} 2801}
2171 2802
2803sub coord2global {
2804 my ($self, $x, $y) = @_;
2805
2806 ($x, $y)
2807}
2808
2172sub update { 2809sub update {
2173 my ($self) = @_; 2810 my ($self) = @_;
2174 2811
2175 $self->check_size; 2812 $self->check_size;
2176 ::refresh (); 2813 $::WANT_REFRESH++;
2177} 2814}
2178 2815
2179sub add { 2816sub add {
2180 my ($self, $child) = @_; 2817 my ($self, $child) = @_;
2181 2818
2819 # integerise window positions
2820 $child->{x} = int $child->{x};
2821 $child->{y} = int $child->{y};
2822
2182 $self->SUPER::add ($child); 2823 $self->SUPER::add ($child);
2183} 2824}
2184 2825
2185sub on_refresh { 2826sub on_refresh {
2186 my ($self, $id, $cb) = @_; 2827 my ($self, $id, $cb) = @_;
2187 2828
2188 $self->{refresh_hook}{$id} = $cb; 2829 $self->{refresh_hook}{$id} = $cb;
2189} 2830}
2190 2831
2191sub draw { 2832sub draw {
2192 my ($self) = @_; 2833 my ($self) = @_;
2193 2834
2835 if ($self->{check_size}) {
2836 my @queue = ([], []);
2837
2838 for (;;) {
2839 if ($self->{check_size}) {
2840 # heuristic: check containers last
2841 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2842 for values %{delete $self->{check_size}}
2843 }
2844
2845 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2846
2847 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2848 ? @$widget{qw(user_w user_h)}
2849 : $widget->size_request;
2850
2851 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2852 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2853
2854 $widget->{req_w} = $w;
2855 $widget->{req_h} = $h;
2856
2857 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2858
2859 $widget->{parent}->check_size
2860 if $widget->{parent};
2861 }
2862 }
2863 }
2864
2865 while ($self->{size_alloc}) {
2866 for (values %{delete $self->{size_alloc}}) {
2867 my ($widget, $w, $h) = @$_;
2868
2869 $w = 0 if $w < 0;
2870 $h = 0 if $h < 0;
2871
2872 $widget->{w} = $w;
2873 $widget->{h} = $h;
2874 $widget->size_allocate ($w, $h);
2875 $widget->emit (size_allocate => $w, $h);
2876 }
2877 }
2878
2194 while (my $rcb = delete $self->{refresh_hook}) { 2879 while ($self->{refresh_hook}) {
2195 $_->() for values %$rcb; 2880 $_->()
2881 for values %{delete $self->{refresh_hook}};
2196 } 2882 }
2197 2883
2198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 2884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 2885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2200 glClear GL_COLOR_BUFFER_BIT; 2886 glClear GL_COLOR_BUFFER_BIT;
… …
2211############################################################################# 2897#############################################################################
2212 2898
2213package CFClient::UI; 2899package CFClient::UI;
2214 2900
2215$ROOT = new CFClient::UI::Root; 2901$ROOT = new CFClient::UI::Root;
2902$TOOLTIP = new CFClient::UI::Tooltip;
2216 2903
22171 29041
2218 2905

Diff Legend

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