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.125 by root, Mon Apr 17 20:52:15 2006 UTC vs.
Revision 1.189 by root, Mon May 8 22:17:24 2006 UTC

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

Diff Legend

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