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.126 by root, Mon Apr 17 20:59:20 2006 UTC vs.
Revision 1.186 by root, Mon May 8 20:39:34 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->{parent}
409 or return 1;
269 410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
270 if ($w != $self->{req_w} || $h != $self->{req_h}) { 415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
271 $self->{req_w} = $w; 416 $self->{req_w} = $w;
272 $self->{req_h} = $h; 417 $self->{req_h} = $h;
273 418
274 $self->{parent}->check_size 419 $self->{parent}->check_size
275 if $self->{parent}; 420 or $self->size_allocate (
421 (List::Util::max $self->{w}, $w),
422 (List::Util::max $self->{h}, $h),
423 );
424
425 1
426 } else {
427 0
276 } 428 }
277} 429}
278 430
279sub update { 431sub update {
280 my ($self) = @_; 432 my ($self) = @_;
… …
284} 436}
285 437
286sub connect { 438sub connect {
287 my ($self, $signal, $cb) = @_; 439 my ($self, $signal, $cb) = @_;
288 440
289 push @{ $self->{cb}{$signal} }, $cb; 441 push @{ $self->{signal_cb}{$signal} }, $cb;
290} 442}
291 443
292sub emit { 444sub emit {
293 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
294 446
295 $_->($self, @args) 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
296 for @{$self->{cb}{$signal} || []};
297} 448}
298 449
299sub DESTROY { 450sub DESTROY {
300 my ($self) = @_; 451 my ($self) = @_;
301 452
… …
307package CFClient::UI::DrawBG; 458package CFClient::UI::DrawBG;
308 459
309our @ISA = CFClient::UI::Base::; 460our @ISA = CFClient::UI::Base::;
310 461
311use strict; 462use strict;
312use SDL::OpenGL; 463use CFClient::OpenGL;
313 464
314sub new { 465sub new {
315 my $class = shift; 466 my $class = shift;
316 467
317 # range [value, low, high, page] 468 # range [value, low, high, page]
… …
346 497
347package CFClient::UI::Empty; 498package CFClient::UI::Empty;
348 499
349our @ISA = CFClient::UI::Base::; 500our @ISA = CFClient::UI::Base::;
350 501
502sub new {
503 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg);
505}
506
351sub size_request { 507sub size_request {
352 (0, 0) 508 (0, 0)
353} 509}
354 510
355sub draw { } 511sub draw { }
… …
363sub new { 519sub new {
364 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
365 521
366 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
367 523
368 my $self = $class->SUPER::new (children => [], %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
369 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
370 530
371 $self 531 $self
372} 532}
373 533
… …
381 $self->{children} = [ 541 $self->{children} = [
382 sort { $a->{z} <=> $b->{z} } 542 sort { $a->{z} <=> $b->{z} }
383 @{$self->{children}}, $child 543 @{$self->{children}}, $child
384 ]; 544 ];
385 545
386 $self->{w} = $self->{h} = -1;
387
388 $child->check_size; 546 $child->check_size;
547 $self->update;
548}
549
550sub children {
551 @{ $_[0]{children} }
389} 552}
390 553
391sub remove { 554sub remove {
392 my ($self, $widget) = @_; 555 my ($self, $child) = @_;
393 556
557 delete $child->{parent};
558 $child->hide;
559
394 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 560 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
395 561
396 $self->check_size; 562 $self->check_size;
563 $self->update;
564}
565
566sub clear {
567 my ($self) = @_;
568
569 my $children = delete $self->{children};
570 $self->{children} = [];
571
572 for (@$children) {
573 delete $_->{parent};
574 $_->hide;
575 }
576
577 $self->check_size;
578 $self->update;
397} 579}
398 580
399sub find_widget { 581sub find_widget {
400 my ($self, $x, $y) = @_; 582 my ($self, $x, $y) = @_;
401 583
… …
431 613
432 $class->SUPER::new (children => [$child], %arg) 614 $class->SUPER::new (children => [$child], %arg)
433} 615}
434 616
435sub add { 617sub add {
436 my ($self, $widget) = @_; 618 my ($self, $child) = @_;
437 619
438 $self->{children} = []; 620 $self->{children} = [];
439 621
440 $self->SUPER::add ($widget); 622 $self->SUPER::add ($child);
441} 623}
442 624
443sub remove { 625sub remove {
444 my ($self, $widget) = @_; 626 my ($self, $widget) = @_;
445 627
… …
454sub size_request { 636sub size_request {
455 $_[0]{children}[0]->size_request 637 $_[0]{children}[0]->size_request
456} 638}
457 639
458sub size_allocate { 640sub size_allocate {
459 my ($self, $x, $y, $w, $h) = @_; 641 my ($self, $w, $h) = @_;
460 642
461 $self->_size_allocate ($x, $y, $w, $h) or return;
462
463 $self->{children}[0]->size_allocate (0, 0, $w, $h); 643 $self->{children}[0]->configure (0, 0, $w, $h);
464} 644}
465 645
466############################################################################# 646#############################################################################
467 647
468package CFClient::UI::Window; 648package CFClient::UI::Window;
469 649
470our @ISA = CFClient::UI::Bin::; 650our @ISA = CFClient::UI::Bin::;
471 651
472use SDL::OpenGL; 652use CFClient::OpenGL;
473 653
474sub new { 654sub new {
475 my ($class, %arg) = @_; 655 my ($class, %arg) = @_;
476 656
477 my $self = $class->SUPER::new (%arg); 657 my $self = $class->SUPER::new (%arg);
478} 658}
479 659
480sub update { 660sub update {
481 my ($self) = @_; 661 my ($self) = @_;
482 662
483 # we want to do this delayed... 663 $ROOT->on_refresh ($self => sub { $self->render_child });
484 $self->render_chld;
485 $self->SUPER::update; 664 $self->SUPER::update;
486} 665}
487 666
667sub size_allocate {
668 my ($self, $w, $h) = @_;
669
670 $self->SUPER::size_allocate ($w, $h);
671 $self->update;
672}
673
674sub _render {
675 $_[0]{children}[0]->draw;
676}
677
488sub render_chld { 678sub render_child {
489 my ($self) = @_; 679 my ($self) = @_;
490 680
491 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 681 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
492 glClearColor 0, 0, 0, 1; 682 glClearColor 0, 0, 0, 0;
493 glClear GL_COLOR_BUFFER_BIT; 683 glClear GL_COLOR_BUFFER_BIT;
494 $self->child->draw; 684
685 $self->_render;
686# glColorMask 1, 1, 1, 0;
687# glEnable GL_BLEND;
688# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
689# glRasterPos 0, 0;
690# glCopyPixels 0, 0, $self->{w}, $self->{h};
691# glDisable GL_BLEND;
692# glColorMask 1, 1, 1, 1;
495 }; 693 };
496}
497
498sub size_allocate {
499 my ($self, $x, $y, $w, $h) = @_;
500
501 $self->_size_allocate ($x, $y, $w, $h) or return;
502
503 $self->child->size_allocate (0, 0, $w, $h);
504
505 $self->render_chld;
506} 694}
507 695
508sub _draw { 696sub _draw {
509 my ($self) = @_; 697 my ($self) = @_;
510 698
511 my ($w, $h) = ($self->w, $self->h); 699 my ($w, $h) = ($self->w, $self->h);
512 700
513 my $tex = $self->{texture} 701 my $tex = $self->{texture}
514 or return; 702 or return;
703
704 glEnable GL_BLEND;
705 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
708 glColor 0, 0, 0, 1;
709
710 $tex->draw_quad (0, 0, $w, $h);
711
712 glDisable GL_BLEND;
713 glDisable GL_TEXTURE_2D;
714}
715
716#############################################################################
717
718package CFClient::UI::ViewPort;
719
720our @ISA = CFClient::UI::Window::;
721
722sub size_request {
723 my ($self) = @_;
724
725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
727
728 @$self{qw(child_w child_h)}
729}
730
731sub size_allocate {
732 my ($self, $w, $h) = @_;
733
734 $self->update;
735}
736
737sub set_offset {
738 my ($self, $x, $y) = @_;
739
740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not aks for that
747sub _topleft {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
751}
752
753sub find_widget {
754 my ($self, $x, $y) = @_;
755
756 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
757 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
758 ) {
759 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
760 } else {
761 $self->CFClient::UI::Base::find_widget ($x, $y)
762 }
763}
764
765sub _render {
766 my ($self) = @_;
767
768 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
769
770 $self->SUPER::_render;
771}
772
773#############################################################################
774
775package CFClient::UI::ScrolledWindow;
776
777our @ISA = CFClient::UI::HBox::;
778
779sub new {
780 my $class = shift;
781
782 my $self;
783
784 my $slider = new CFClient::UI::Slider
785 vertical => 1,
786 range => [0, 0, 1, 0.01], # HACK fix
787 connect_changed => sub {
788 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
789 },
790 ;
791
792 $self = $class->SUPER::new (
793 vp => (new CFClient::UI::ViewPort),
794 slider => $slider,
795 @_,
796 );
797
798 $self->{vp}->add ($self->{scrolled});
799 $self->add ($self->{vp});
800 $self->add ($self->{slider});
801
802 $self
803}
804
805#TODO# update range on size_allocate depeneing on child
806# update viewport offset on scroll
807
808#############################################################################
809
810package CFClient::UI::Frame;
811
812our @ISA = CFClient::UI::Bin::;
813
814use CFClient::OpenGL;
815
816sub new {
817 my $class = shift;
818
819 my $self = $class->SUPER::new (
820 bg => [1, 1, 1, 1],
821 border_bg => [1, 1, 1, 1],
822 border => 0.8,
823 @_
824 );
825
826 $self
827}
828
829sub _draw {
830 my ($self) = @_;
831
832 my ($w, $h) = ($self->{w}, $self->{h});
515 833
516 glEnable GL_BLEND; 834 glEnable GL_BLEND;
517 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 835 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
518 glEnable GL_TEXTURE_2D; 836 glEnable GL_TEXTURE_2D;
519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
520 838
521 $tex->draw_quad (0, 0, $w, $h); 839# glBegin GL_QUADS;
840# glColor 0, 0, 0, 0;
841# glVertex 0 , 0;
842# glVertex 0 , $h;
843# glVertex $w, $h;
844# glVertex $w, 0;
845# glEnd;
522 846
847
848 $self->child->draw;
523 glDisable GL_BLEND; 849 glDisable GL_BLEND;
524 glDisable GL_TEXTURE_2D; 850 glDisable GL_TEXTURE_2D;
525} 851}
526 852
527############################################################################# 853#############################################################################
528 854
529package CFClient::UI::ViewPort;
530
531our @ISA = CFClient::UI::Window::;
532
533sub new { die }
534
535sub size_request {
536 my ($self) = @_;
537
538 @$self{qw(child_w child_h)} = $self->child->size_request;
539 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
540
541 @$self{qw(child_w child_h)}
542}
543
544sub size_allocate {
545 my ($self, $x, $y, $w, $h) = @_;
546
547 $self->_size_allocate ($x, $y, $w, $h) or return;
548}
549
550sub _draw {
551 my ($self) = @_;
552
553 $self->{children}[1]->draw;
554}
555
556
557#############################################################################
558
559package CFClient::UI::Frame; 855package CFClient::UI::FancyFrame;
560 856
561our @ISA = CFClient::UI::Bin::; 857our @ISA = CFClient::UI::Bin::;
562 858
563use SDL::OpenGL; 859use CFClient::OpenGL;
564
565sub size_request {
566 my ($self) = @_;
567 my $chld = $self->child
568 or return (0, 0);
569
570 $chld->move (2, 2);
571
572 map { $_ + 4 } $chld->size_request;
573}
574
575sub size_allocate {
576 my ($self, $x, $y, $w, $h) = @_;
577
578 $self->_size_allocate ($x, $y, $w, $h) or return;
579
580 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
581}
582
583sub _draw {
584 my ($self) = @_;
585
586 my $chld = $self->child;
587
588 my ($w, $h) = $chld->size_request;
589
590 glBegin GL_QUADS;
591 glColor 0, 0, 0;
592 glVertex 0 , 0;
593 glVertex 0 , $h + 4;
594 glVertex $w + 4 , $h + 4;
595 glVertex $w + 4 , 0;
596 glEnd;
597
598 $chld->draw;
599}
600
601#############################################################################
602
603package CFClient::UI::FancyFrame;
604
605our @ISA = CFClient::UI::Bin::;
606
607use SDL::OpenGL;
608 860
609my @tex = 861my @tex =
610 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 862 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
611 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 863 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
612 864
613sub new { 865sub new {
614 my $class = shift; 866 my $class = shift;
615 867
616 # TODO: user_x, user_y, overwrite moveto? 868 # TODO: user_x, user_y, overwrite moveto?
617 869
618 $class->SUPER::new ( 870 my $self = $class->SUPER::new (
619 bg => [1, 1, 1, 1], 871 bg => [1, 1, 1, 1],
620 border_bg => [1, 1, 1, 1], 872 border_bg => [1, 1, 1, 1],
621 border => int $::FONTSIZE * 0.8, 873 border => 0.6,
874 can_events => 1,
622 @_ 875 @_
876 );
877
878 $self->{title} &&= new CFClient::UI::Label
879 align => 0,
880 valign => 1,
881 text => $self->{title},
882 fontsize => $self->{border};
883
884 $self
885}
886
887sub border {
888 int $_[0]{border} * $::FONTSIZE
889}
890
891sub size_request {
892 my ($self) = @_;
893
894 my ($w, $h) = $self->SUPER::size_request;
895
896 (
897 $w + $self->border * 2,
898 $h + $self->border * 2,
623 ) 899 )
624} 900}
625 901
626sub size_request {
627 my ($self) = @_;
628
629 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
630
631 my ($w, $h) = $self->SUPER::size_request;
632
633 (
634 $w + $self->{border} * 2,
635 $h + $self->{border} * 2,
636 )
637}
638
639sub size_allocate { 902sub size_allocate {
640 my ($self, $x, $y, $w, $h) = @_; 903 my ($self, $w, $h) = @_;
641 904
642 $self->_size_allocate ($x, $y, $w, $h) or return;
643
644 $h -= List::Util::max 0, $self->{border} * 2; 905 $h -= List::Util::max 0, $self->border * 2;
645 $w -= List::Util::max 0, $self->{border} * 2; 906 $w -= List::Util::max 0, $self->border * 2;
646 907
908 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
909 if $self->{title};
910
647 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 911 $self->child->configure ($self->border, $self->border, $w, $h);
648} 912}
649 913
650sub button_down { 914sub button_down {
651 my ($self, $ev, $x, $y) = @_; 915 my ($self, $ev, $x, $y) = @_;
652 916
653 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 917 my ($w, $h) = @$self{qw(w h)};
654 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 918 my $border = $self->border;
655 919
920 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
921 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
922
923 if ($lr & $td) {
924 my ($wx, $wy) = ($self->{x}, $self->{y});
656 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 925 my ($ox, $oy) = ($ev->{x}, $ev->{y});
657 my ($bw, $bh) = ($self->{w}, $self->{h}); 926 my ($bw, $bh) = ($self->{w}, $self->{h});
927
928 my $mx = $x < $border;
929 my $my = $y < $border;
658 930
659 $self->{motion} = sub { 931 $self->{motion} = sub {
660 my ($ev, $x, $y) = @_; 932 my ($ev, $x, $y) = @_;
661 933
662 ($x, $y) = ($ev->motion_x, $ev->motion_y); 934 my $dx = $ev->{x} - $ox;
935 my $dy = $ev->{y} - $oy;
663 936
664 $self->{user_w} = $bw + $x - $ox; 937 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
665 $self->{user_h} = $bh + $y - $oy; 938 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
666 $self->update; 939 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
940 $self->check_size;
667 }; 941 };
668 942
669 } elsif ($x >= 0 && $x < $self->{w} 943 } elsif ($lr ^ $td) {
670 && $y >= 0 && $y < $self->{border}) {
671
672 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 944 my ($ox, $oy) = ($ev->{x}, $ev->{y});
673 my ($bx, $by) = ($self->{x}, $self->{y}); 945 my ($bx, $by) = ($self->{x}, $self->{y});
674 946
675 $self->{motion} = sub { 947 $self->{motion} = sub {
676 my ($ev, $x, $y) = @_; 948 my ($ev, $x, $y) = @_;
677 949
678 ($x, $y) = ($ev->motion_x, $ev->motion_y); 950 ($x, $y) = ($ev->{x}, $ev->{y});
679 951
680 $self->move ($bx + $x - $ox, $by + $y - $oy); 952 $self->move ($bx + $x - $ox, $by + $y - $oy);
681 $self->update; 953 $self->update;
682 }; 954 };
683 } 955 }
… …
704 glEnable GL_BLEND; 976 glEnable GL_BLEND;
705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 977 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
706 glEnable GL_TEXTURE_2D; 978 glEnable GL_TEXTURE_2D;
707 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 979 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
708 980
981 my $border = $self->border;
982
709 glColor @{ $self->{border_bg} }; 983 glColor @{ $self->{border_bg} };
710 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 984 $tex[1]->draw_quad (0, 0, $w, $border);
711 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 985 $tex[3]->draw_quad (0, $border, $border, $ch);
712 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 986 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
713 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 987 $tex[4]->draw_quad (0, $h - $border, $w, $border);
714 988
989 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
715 my $bg = $tex[0]; 990 my $bg = $tex[0];
716 991
717 # TODO: repeat texture not scale 992 # TODO: repeat texture not scale
718 my $rep_x = $cw / $bg->{w}; 993 my $rep_x = $cw / $bg->{w};
719 my $rep_y = $ch / $bg->{h}; 994 my $rep_y = $ch / $bg->{h};
720 995
721 glColor @{ $self->{bg} }; 996 glColor @{ $self->{bg} };
722 997
723 $bg->{s} = $rep_x; 998 $bg->{s} = $rep_x;
724 $bg->{t} = $rep_y; 999 $bg->{t} = $rep_y;
725 $bg->{wrap_mode} = 1; 1000 $bg->{wrap_mode} = 1;
726 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1001 $bg->draw_quad ($border, $border, $cw, $ch);
727 1002
728 glDisable GL_TEXTURE_2D; 1003 glDisable GL_TEXTURE_2D;
729 glDisable GL_BLEND; 1004 glDisable GL_BLEND;
1005 }
1006
1007 $self->{title}->draw if $self->{title};
730 1008
731 $self->child->draw; 1009 $self->child->draw;
732} 1010}
733 1011
734############################################################################# 1012#############################################################################
… …
737 1015
738our @ISA = CFClient::UI::Base::; 1016our @ISA = CFClient::UI::Base::;
739 1017
740use List::Util qw(max sum); 1018use List::Util qw(max sum);
741 1019
742use SDL::OpenGL; 1020use CFClient::OpenGL;
743 1021
744sub new { 1022sub new {
745 my $class = shift; 1023 my $class = shift;
746 1024
747 $class->SUPER::new ( 1025 $class->SUPER::new (
… …
754 my ($self, $x, $y, $child) = @_; 1032 my ($self, $x, $y, $child) = @_;
755 1033
756 $child->set_parent ($self); 1034 $child->set_parent ($self);
757 $self->{children}[$y][$x] = $child; 1035 $self->{children}[$y][$x] = $child;
758 1036
759 $self->{w} = $self->{h} = -1;
760
761 $child->check_size; 1037 $child->check_size;
1038}
1039
1040sub children {
1041 grep $_, map @$_, grep $_, @{ $_[0]{children} }
762} 1042}
763 1043
764# TODO: move to container class maybe? send childs a signal on removal? 1044# TODO: move to container class maybe? send childs a signal on removal?
765sub clear { 1045sub clear {
766 my ($self) = @_; 1046 my ($self) = @_;
767 1047
1048 my @children = $self->children;
768 delete $self->{children}; 1049 delete $self->{children};
1050
1051 for (@children) {
1052 delete $_->{parent};
1053 $_->hide;
1054 }
1055
769 $self->update; 1056 $self->update;
770} 1057}
771 1058
772sub get_wh { 1059sub get_wh {
773 my ($self) = @_; 1060 my ($self) = @_;
… …
779 or next; 1066 or next;
780 1067
781 for my $x (0 .. $#$row) { 1068 for my $x (0 .. $#$row) {
782 my $widget = $row->[$x] 1069 my $widget = $row->[$x]
783 or next; 1070 or next;
784 my ($w, $h) = $widget->size_request; 1071 my ($w, $h) = @$widget{qw(req_w req_h)};
785 1072
786 $w[$x] = max $w[$x], $w; 1073 $w[$x] = max $w[$x], $w;
787 $h[$y] = max $h[$y], $h; 1074 $h[$y] = max $h[$y], $h;
788 } 1075 }
789 } 1076 }
… …
801 (sum @$hs), 1088 (sum @$hs),
802 ) 1089 )
803} 1090}
804 1091
805sub size_allocate { 1092sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_; 1093 my ($self, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h) or return;
809 1094
810 my ($ws, $hs) = $self->get_wh; 1095 my ($ws, $hs) = $self->get_wh;
811 1096
812 my $req_w = sum @$ws; 1097 my $req_w = sum @$ws;
813 my $req_h = sum @$hs; 1098 my $req_h = sum @$hs;
… …
835 1120
836 for my $c (0 .. $#$row) { 1121 for my $c (0 .. $#$row) {
837 my $col_w = $ws->[$c]; 1122 my $col_w = $ws->[$c];
838 1123
839 if (my $widget = $row->[$c]) { 1124 if (my $widget = $row->[$c]) {
840 $widget->size_allocate ($x, $y, $col_w, $row_h); 1125 $widget->configure ($x, $y, $col_w, $row_h);
841 } 1126 }
842 1127
843 $x += $col_w; 1128 $x += $col_w;
844 } 1129 }
845 1130
… …
890 (List::Util::max map $_->[1], @alloc), 1175 (List::Util::max map $_->[1], @alloc),
891 ) 1176 )
892} 1177}
893 1178
894sub size_allocate { 1179sub size_allocate {
895 my ($self, $x, $y, $w, $h) = @_; 1180 my ($self, $w, $h) = @_;
896
897 $self->_size_allocate ($x, $y, $w, $h) or return;
898 1181
899 ($h, $w) = ($w, $h); 1182 ($h, $w) = ($w, $h);
900 1183
901 my $children = $self->{children}; 1184 my $children = $self->{children};
902 1185
903 my @h = map +($_->size_request)[0], @$children; 1186 my @h = map $_->{req_w}, @$children;
904 1187
905 my $req_h = List::Util::sum @h; 1188 my $req_h = List::Util::sum @h;
906 1189
907 if ($req_h > $h) { 1190 if ($req_h > $h) {
908 # ah well, not enough space 1191 # ah well, not enough space
… …
924 1207
925 my $y = 0; 1208 my $y = 0;
926 for (0 .. $#$children) { 1209 for (0 .. $#$children) {
927 my $child = $children->[$_]; 1210 my $child = $children->[$_];
928 my $h = $h[$_]; 1211 my $h = $h[$_];
929 $child->size_allocate ($y, 0, $h, $w); 1212 $child->configure ($y, 0, $h, $w);
930 1213
931 $y += $h; 1214 $y += $h;
932 } 1215 }
933 1216
934 1 1217 1
… …
952 (List::Util::sum map $_->[1], @alloc), 1235 (List::Util::sum map $_->[1], @alloc),
953 ) 1236 )
954} 1237}
955 1238
956sub size_allocate { 1239sub size_allocate {
957 my ($self, $x, $y, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
958
959 $self->_size_allocate ($x, $y, $w, $h) or return;
960 1241
961 my $children = $self->{children}; 1242 my $children = $self->{children};
962 1243
963 my @h = map +($_->size_request)[1], @$children; 1244 my @h = map $_->{req_h}, @$children;
964 1245
965 my $req_h = List::Util::sum @h; 1246 my $req_h = List::Util::sum @h;
966 1247
967 if ($req_h > $h) { 1248 if ($req_h > $h) {
968 # ah well, not enough space 1249 # ah well, not enough space
… …
982 1263
983 my $y = 0; 1264 my $y = 0;
984 for (0 .. $#$children) { 1265 for (0 .. $#$children) {
985 my $child = $children->[$_]; 1266 my $child = $children->[$_];
986 my $h = $h[$_]; 1267 my $h = $h[$_];
987 $child->size_allocate (0, $y, $w, $h); 1268 $child->configure (0, $y, $w, $h);
988 1269
989 $y += $h; 1270 $y += $h;
990 } 1271 }
991 1272
992 1 1273 1
… …
996 1277
997package CFClient::UI::Label; 1278package CFClient::UI::Label;
998 1279
999our @ISA = CFClient::UI::Base::; 1280our @ISA = CFClient::UI::Base::;
1000 1281
1001use SDL::OpenGL; 1282use CFClient::OpenGL;
1002 1283
1003sub new { 1284sub new {
1004 my ($class, %arg) = @_; 1285 my ($class, %arg) = @_;
1005 1286
1006 my $self = $class->SUPER::new ( 1287 my $self = $class->SUPER::new (
1007 fg => [1, 1, 1], 1288 fg => [1, 1, 1],
1008 fontsize => $::FONTSIZE, 1289 #font => default_font
1290 fontsize => 1,
1009 text => "", 1291 text => "",
1010 align => -1, 1292 align => -1,
1011 valign => -1, 1293 valign => -1,
1012 padding => 2, 1294 padding => 2,
1013 layout => new CFClient::Layout, 1295 layout => new CFClient::Layout,
1296 can_events => 0,
1014 %arg 1297 %arg
1015 ); 1298 );
1016 1299
1017 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1300 if (exists $self->{template}) {
1301 my $layout = new CFClient::Layout;
1302 $layout->set_text (delete $self->{template});
1303 $self->{template} = $layout;
1304 }
1018 1305
1019 $self->set_text (delete $self->{text}) if exists $self->{text}; 1306 $self->set_text (delete $self->{text}) if exists $self->{text};
1020 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1307 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
1021 1308
1022 $self 1309 $self
1023} 1310}
1024 1311
1025sub escape_text { 1312sub escape {
1026 local $_ = $_[1]; 1313 local $_ = $_[1];
1027 1314
1028 s/&/&amp;/g; 1315 s/&/&amp;/g;
1029 s/>/&gt;/g; 1316 s/>/&gt;/g;
1030 s/</&lt;/g; 1317 s/</&lt;/g;
1031 1318
1032 $_[1] 1319 $_[1]
1033} 1320}
1034 1321
1322sub update {
1323 my ($self) = @_;
1324
1325 delete $self->{texture};
1326 $self->SUPER::update;
1327}
1328
1035sub set_text { 1329sub set_text {
1036 my ($self, $text) = @_; 1330 my ($self, $text) = @_;
1037 1331
1332 return if $self->{text} eq "T$text";
1333 $self->{text} = "T$text";
1334
1038 $self->{layout}->set_text ($text); 1335 $self->{layout}->set_text ($text);
1039 1336
1040 delete $self->{texture}; 1337 delete $self->{texture};
1041 $self->update; 1338 $self->update;
1339 $self->check_size;
1042} 1340}
1043 1341
1044sub set_markup { 1342sub set_markup {
1045 my ($self, $markup) = @_; 1343 my ($self, $markup) = @_;
1046 1344
1345 return if $self->{text} eq "M$markup";
1346 $self->{text} = "M$markup";
1347
1047 $self->{layout}->set_markup ($markup); 1348 $self->{layout}->set_markup ($markup);
1048 1349
1049 delete $self->{texture}; 1350 delete $self->{texture};
1050 $self->update; 1351 $self->update;
1352 $self->check_size;
1051} 1353}
1052 1354
1053sub size_request { 1355sub size_request {
1054 my ($self) = @_; 1356 my ($self) = @_;
1055 1357
1056 $self->{layout}->set_width; 1358 $self->{layout}->set_font ($self->{font}) if $self->{font};
1359 $self->{layout}->set_width ($self->{max_w} || -1);
1057 $self->{layout}->set_height ($self->{fontsize}); 1360 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1058 1361
1059 my ($w, $h) = $self->{layout}->size; 1362 my ($w, $h) = $self->{layout}->size;
1363
1364 if (exists $self->{template}) {
1365 $self->{template}->set_font ($self->{font}) if $self->{font};
1366 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1367
1368 my ($w2, $h2) = $self->{template}->size;
1369
1370 $w = List::Util::max $w, $w2;
1371 $h = List::Util::max $h, $h2;
1372 }
1060 1373
1061 ( 1374 (
1062 $w + $self->{padding} * 2, 1375 $w + $self->{padding} * 2,
1063 $h + $self->{padding} * 2, 1376 $h + $self->{padding} * 2,
1064 ) 1377 )
1065} 1378}
1066 1379
1067sub size_allocate { 1380sub size_allocate {
1068 my ($self, $x, $y, $w, $h) = @_; 1381 my ($self, $w, $h) = @_;
1069
1070 $self->_size_allocate ($x, $y, $w, $h) or return;
1071 1382
1072 delete $self->{texture}; 1383 delete $self->{texture};
1073} 1384}
1074 1385
1075sub update { 1386sub set_fontsize {
1076 my ($self) = @_; 1387 my ($self, $fontsize) = @_;
1077 1388
1389 $self->{fontsize} = $fontsize;
1078 delete $self->{texture}; 1390 delete $self->{texture};
1391
1079 $self->SUPER::update; 1392 $self->update;
1393 $self->check_size;
1080} 1394}
1081 1395
1082sub _draw { 1396sub _draw {
1083 my ($self) = @_; 1397 my ($self) = @_;
1084 1398
1085 my $tex = $self->{texture} ||= do { 1399 my $tex = $self->{texture} ||= do {
1400 $self->{layout}->set_font ($self->{font}) if $self->{font};
1086 $self->{layout}->set_width ($self->{w}); 1401 $self->{layout}->set_width ($self->{w});
1087 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1402 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1088 new_from_layout CFClient::Texture $self->{layout} 1403 new_from_layout CFClient::Texture $self->{layout}
1089 }; 1404 };
1090 1405
1091 glEnable GL_BLEND; 1406 glEnable GL_BLEND;
1092 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
… …
1117 1432
1118package CFClient::UI::EntryBase; 1433package CFClient::UI::EntryBase;
1119 1434
1120our @ISA = CFClient::UI::Label::; 1435our @ISA = CFClient::UI::Label::;
1121 1436
1122use SDL; 1437use CFClient::OpenGL;
1123use SDL::OpenGL;
1124 1438
1125sub new { 1439sub new {
1126 my $class = shift; 1440 my $class = shift;
1127 1441
1128 $class->SUPER::new ( 1442 $class->SUPER::new (
1129 fg => [1, 1, 1], 1443 fg => [1, 1, 1],
1130 bg => [0, 0, 0, 0.2], 1444 bg => [0, 0, 0, 0.2],
1131 active_bg => [1, 1, 1, 0.5], 1445 active_bg => [1, 1, 1, 0.5],
1132 active_fg => [0, 0, 0], 1446 active_fg => [0, 0, 0],
1133 can_hover => 1, 1447 can_hover => 1,
1134 can_focus => 1, 1448 can_focus => 1,
1135 valign => 0, 1449 valign => 0,
1450 can_events => 1,
1136 @_ 1451 @_
1137 ) 1452 )
1138} 1453}
1139 1454
1140sub _set_text { 1455sub _set_text {
… …
1142 1457
1143 delete $self->{cur_h}; 1458 delete $self->{cur_h};
1144 1459
1145 return if $self->{text} eq $text; 1460 return if $self->{text} eq $text;
1146 1461
1462 delete $self->{texture};
1463
1147 $self->{last_activity} = $::NOW; 1464 $self->{last_activity} = $::NOW;
1148 $self->{text} = $text; 1465 $self->{text} = $text;
1149 1466
1150 $text =~ s/./*/g if $self->{hidden}; 1467 $text =~ s/./*/g if $self->{hidden};
1151 $self->{layout}->set_text ("$text "); 1468 $self->{layout}->set_text ("$text ");
… …
1164 1481
1165 ($w + 1, $h) # add 1 for cursor 1482 ($w + 1, $h) # add 1 for cursor
1166} 1483}
1167 1484
1168sub size_allocate { 1485sub size_allocate {
1169 my ($self, $x, $y, $w, $h) = @_; 1486 my ($self, $w, $h) = @_;
1170 1487
1171 $self->SUPER::size_allocate ($x, $y, $w, $h) or return; 1488 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1172
1173 $self->_set_text ($self->{text});
1174} 1489}
1175 1490
1176sub set_text { 1491sub set_text {
1177 my ($self, $text) = @_; 1492 my ($self, $text) = @_;
1178 1493
… …
1182} 1497}
1183 1498
1184sub key_down { 1499sub key_down {
1185 my ($self, $ev) = @_; 1500 my ($self, $ev) = @_;
1186 1501
1187 my $mod = $ev->key_mod; 1502 my $mod = $ev->{mod};
1188 my $sym = $ev->key_sym; 1503 my $sym = $ev->{sym};
1189
1190 my $uni = $ev->key_unicode; 1504 my $uni = $ev->{unicode};
1191 1505
1192 my $text = $self->get_text; 1506 my $text = $self->get_text;
1193 1507
1194 if ($sym == SDLK_BACKSPACE) { 1508 if ($sym == 8) {
1195 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1509 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1196 } elsif ($sym == SDLK_DELETE) { 1510 } elsif ($sym == 127) {
1197 substr $text, $self->{cursor}, 1, ""; 1511 substr $text, $self->{cursor}, 1, "";
1198 } elsif ($sym == SDLK_LEFT) { 1512 } elsif ($sym == CFClient::SDLK_LEFT) {
1199 --$self->{cursor} if $self->{cursor}; 1513 --$self->{cursor} if $self->{cursor};
1200 } elsif ($sym == SDLK_RIGHT) { 1514 } elsif ($sym == CFClient::SDLK_RIGHT) {
1201 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1515 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1202 } elsif ($sym == SDLK_HOME) { 1516 } elsif ($sym == CFClient::SDLK_HOME) {
1203 $self->{cursor} = 0; 1517 $self->{cursor} = 0;
1204 } elsif ($sym == SDLK_END) { 1518 } elsif ($sym == CFClient::SDLK_END) {
1205 $self->{cursor} = length $text; 1519 $self->{cursor} = length $text;
1206 } elsif ($sym == SDLK_ESCAPE) { 1520 } elsif ($sym == 27) {
1207 $self->emit ('escape'); 1521 $self->emit ('escape');
1208 } elsif ($uni) { 1522 } elsif ($uni) {
1209 substr $text, $self->{cursor}++, 0, chr $uni; 1523 substr $text, $self->{cursor}++, 0, chr $uni;
1210 } 1524 }
1211 1525
… …
1286 1600
1287package CFClient::UI::Entry; 1601package CFClient::UI::Entry;
1288 1602
1289our @ISA = CFClient::UI::EntryBase::; 1603our @ISA = CFClient::UI::EntryBase::;
1290 1604
1291use SDL; 1605use CFClient::OpenGL;
1292use SDL::OpenGL;
1293 1606
1294sub key_down { 1607sub key_down {
1295 my ($self, $ev) = @_; 1608 my ($self, $ev) = @_;
1296 1609
1297 my $sym = $ev->key_sym; 1610 my $sym = $ev->{sym};
1298 1611
1299 if ($sym == SDLK_RETURN) { 1612 if ($sym == 13) {
1613 unshift @{$self->{history}},
1614 my $txt = $self->get_text;
1615 $self->{history_pointer} = -1;
1616 $self->{history_saveback} = '';
1300 $self->emit (activate => $self->get_text); 1617 $self->emit (activate => $txt);
1301 $self->update; 1618 $self->update;
1619
1620 } elsif ($sym == CFClient::SDLK_UP) {
1621 if ($self->{history_pointer} < 0) {
1622 $self->{history_saveback} = $self->get_text;
1623 }
1624 if (@{$self->{history} || []} > 0) {
1625 $self->{history_pointer}++;
1626 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1627 $self->{history_pointer} = @{$self->{history} || []} - 1;
1628 }
1629 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1630 }
1631
1632 } elsif ($sym == CFClient::SDLK_DOWN) {
1633 $self->{history_pointer}--;
1634 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1635
1636 if ($self->{history_pointer} >= 0) {
1637 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1638 } else {
1639 $self->set_text ($self->{history_saveback});
1640 }
1302 1641
1303 } else { 1642 } else {
1304 $self->SUPER::key_down ($ev); 1643 $self->SUPER::key_down ($ev);
1305 } 1644 }
1306 1645
… …
1310 1649
1311package CFClient::UI::Button; 1650package CFClient::UI::Button;
1312 1651
1313our @ISA = CFClient::UI::Label::; 1652our @ISA = CFClient::UI::Label::;
1314 1653
1315use SDL; 1654use CFClient::OpenGL;
1316use SDL::OpenGL;
1317 1655
1318my @tex = 1656my @tex =
1319 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1657 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1320 qw(b1_button_active.png); 1658 qw(b1_button_active.png);
1321 1659
1322sub new { 1660sub new {
1323 my $class = shift; 1661 my $class = shift;
1324 1662
1325 $class->SUPER::new ( 1663 $class->SUPER::new (
1326 padding => 4, 1664 padding => 4,
1327 fg => [1, 1, 1], 1665 fg => [1, 1, 1],
1328 bg => [1, 1, 1, 0.2], 1666 bg => [1, 1, 1, 0.2],
1329 active_fg => [0, 0, 1], 1667 active_fg => [0, 0, 1],
1330 can_hover => 1, 1668 can_hover => 1,
1331 align => 0, 1669 align => 0,
1332 valign => 0, 1670 valign => 0,
1671 can_events => 1,
1333 @_ 1672 @_
1334 ) 1673 )
1335} 1674}
1336 1675
1337sub button_up { 1676sub button_up {
… …
1371package CFClient::UI::CheckBox; 1710package CFClient::UI::CheckBox;
1372 1711
1373our @ISA = CFClient::UI::DrawBG::; 1712our @ISA = CFClient::UI::DrawBG::;
1374 1713
1375my @tex = 1714my @tex =
1376 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1715 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1377 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1716 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1378 1717
1379use SDL; 1718use CFClient::OpenGL;
1380use SDL::OpenGL;
1381 1719
1382sub new { 1720sub new {
1383 my $class = shift; 1721 my $class = shift;
1384 1722
1385 $class->SUPER::new ( 1723 $class->SUPER::new (
… …
1396 my ($self) = @_; 1734 my ($self) = @_;
1397 1735
1398 ($self->{padding} * 2 + 6) x 2 1736 ($self->{padding} * 2 + 6) x 2
1399} 1737}
1400 1738
1401sub size_allocate {
1402 my ($self, $x, $y, $w, $h) = @_;
1403
1404 $self->_size_allocate ($x, $y, $w, $h) or return;
1405}
1406
1407sub button_down { 1739sub button_down {
1408 my ($self, $ev, $x, $y) = @_; 1740 my ($self, $ev, $x, $y) = @_;
1409 1741
1410 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1742 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1411 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1743 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1437 glDisable GL_BLEND; 1769 glDisable GL_BLEND;
1438} 1770}
1439 1771
1440############################################################################# 1772#############################################################################
1441 1773
1442package CFClient::UI::VGauge; 1774package CFClient::UI::Image;
1443 1775
1444our @ISA = CFClient::UI::Base::; 1776our @ISA = CFClient::UI::Base::;
1445 1777
1446use SDL::OpenGL; 1778use CFClient::OpenGL;
1779use Carp qw/confess/;
1447 1780
1448my %tex = ( 1781our %loaded_images;
1449 food => [
1450 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1451 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1452 ],
1453 grace => [
1454 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1455 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
1456 ],
1457 hp => [
1458 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1459 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1460 ],
1461 mana => [
1462 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1463 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
1464 ],
1465);
1466 1782
1467# eg. VGauge->new (gauge => 'food'), default gauge: food
1468sub new { 1783sub new {
1469 my $class = shift; 1784 my $class = shift;
1470 1785
1471 my $self = $class->SUPER::new (gauge => 'food', @_); 1786 my $self = $class->SUPER::new (can_events => 0, @_);
1787
1788 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1789
1790 $loaded_images{$self->{image}} ||=
1791 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1792
1793 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1794
1795 Scalar::Util::weaken $loaded_images{$self->{image}};
1796
1797 $self->{aspect} = $tex->{w} / $tex->{h};
1472 1798
1473 $self 1799 $self
1474} 1800}
1475 1801
1476sub size_request { 1802sub size_request {
1477 my ($self) = @_; 1803 my ($self) = @_;
1478 1804
1479 (30, 100) 1805 ($self->{tex}->{w}, $self->{tex}->{h})
1480}
1481
1482sub set_max {
1483 my ($self, $max) = @_;
1484 $self->{max_val} = $max;
1485}
1486
1487sub set_value {
1488 my ($self, $val, $max) = @_;
1489
1490 $self->set_max ($max)
1491 if defined $max;
1492
1493 $max = $self->{max_val};
1494 $self->{val} = $val;
1495
1496 $self->update;
1497} 1806}
1498 1807
1499sub _draw { 1808sub _draw {
1500 my ($self) = @_; 1809 my ($self) = @_;
1501 1810
1502 my $tex = $tex{$self->{gauge}}; 1811 my $tex = $self->{tex};
1503 1812
1504 my ($w, $h) = ($self->{w}, $self->{h}); 1813 my ($w, $h) = ($self->{w}, $self->{h});
1505 1814
1506 my $ycut = $self->{val} / ($self->{max_val} || 1); 1815 if ($self->{rot90}) {
1507 $ycut = 1 if $self->{val} > $self->{max_val}; 1816 glRotate 90, 0, 0, 1;
1817 glTranslate 0, -$self->{w}, 0;
1508 1818
1509 my $t1 = $tex->[0]; 1819 ($w, $h) = ($h, $w);
1510 my $t2 = $tex->[1]; 1820 }
1511 1821
1512 glEnable GL_BLEND; 1822 glEnable GL_BLEND;
1513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1823 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1514 glEnable GL_TEXTURE_2D; 1824 glEnable GL_TEXTURE_2D;
1515 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1516 1826
1517 my $h1 = $self->{h} - $ycut * $self->{h}; 1827 $tex->draw_quad (0, 0, $w, $h);
1518 my $h2 = $ycut * $self->{h};
1519
1520 my $yp = 0;
1521
1522 glBindTexture (GL_TEXTURE_2D, $t1->{name});
1523 glBegin (GL_QUADS);
1524 glTexCoord (0, 0); glVertex (0 , $yp);
1525 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp + $h1);
1526 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
1527 glTexCoord (1, 0); glVertex (0 + $w, $yp);
1528 glEnd ();
1529
1530 $yp += $h1;
1531
1532 glBindTexture (GL_TEXTURE_2D, $t2->{name});
1533 glBegin (GL_QUADS);
1534 glTexCoord (0, (1 - $ycut)); glVertex (0 , $yp);
1535 glTexCoord (0, 1); glVertex (0 , $yp + $h2);
1536 glTexCoord (1, 1); glVertex (0 + $w, $yp + $h2);
1537 glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
1538 glEnd ();
1539 1828
1540 glDisable GL_BLEND; 1829 glDisable GL_BLEND;
1541 glDisable GL_TEXTURE_2D; 1830 glDisable GL_TEXTURE_2D;
1542} 1831}
1543 1832
1544############################################################################# 1833#############################################################################
1545 1834
1835package CFClient::UI::VGauge;
1836
1837our @ISA = CFClient::UI::Base::;
1838
1839use List::Util qw(min max);
1840
1841use CFClient::OpenGL;
1842
1843my %tex = (
1844 food => [
1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1846 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1847 ],
1848 grace => [
1849 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1850 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1851 ],
1852 hp => [
1853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1854 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1855 ],
1856 mana => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1858 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1859 ],
1860);
1861
1862# eg. VGauge->new (gauge => 'food'), default gauge: food
1863sub new {
1864 my $class = shift;
1865
1866 my $self = $class->SUPER::new (
1867 type => 'food',
1868 @_
1869 );
1870
1871 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1872
1873 $self
1874}
1875
1876sub size_request {
1877 my ($self) = @_;
1878
1879 #my $tex = $tex{$self->{type}}[0];
1880 #@$tex{qw(w h)}
1881 (0, 0)
1882}
1883
1884sub set_max {
1885 my ($self, $max) = @_;
1886
1887 return if $self->{max_val} == $max;
1888
1889 $self->{max_val} = $max;
1890 $self->update;
1891}
1892
1893sub set_value {
1894 my ($self, $val, $max) = @_;
1895
1896 $self->set_max ($max)
1897 if defined $max;
1898
1899 return if $self->{val} == $val;
1900
1901 $self->{val} = $val;
1902 $self->update;
1903}
1904
1905sub _draw {
1906 my ($self) = @_;
1907
1908 my $tex = $tex{$self->{type}};
1909 my ($t1, $t2, $t3) = @$tex;
1910
1911 my ($w, $h) = ($self->{w}, $self->{h});
1912
1913 if ($self->{vertical}) {
1914 glRotate 90, 0, 0, 1;
1915 glTranslate 0, -$self->{w}, 0;
1916
1917 ($w, $h) = ($h, $w);
1918 }
1919
1920 my $ycut = $self->{val} / ($self->{max_val} || 1);
1921
1922 my $ycut1 = max 0, min 1, $ycut;
1923 my $ycut2 = max 0, min 1, $ycut - 1;
1924
1925 my $h1 = $self->{h} * (1 - $ycut1);
1926 my $h2 = $self->{h} * (1 - $ycut2);
1927
1928 glEnable GL_BLEND;
1929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1930 glEnable GL_TEXTURE_2D;
1931 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1932
1933 glBindTexture GL_TEXTURE_2D, $t1->{name};
1934 glBegin GL_QUADS;
1935 glTexCoord 0 , 0; glVertex 0 , 0;
1936 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1937 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1938 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1939 glEnd;
1940
1941 my $ycut1 = List::Util::min 1, $ycut;
1942 glBindTexture GL_TEXTURE_2D, $t2->{name};
1943 glBegin GL_QUADS;
1944 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1945 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1946 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1947 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1948 glEnd;
1949
1950 if ($t3) {
1951 glBindTexture GL_TEXTURE_2D, $t3->{name};
1952 glBegin GL_QUADS;
1953 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1954 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1955 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1956 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1957 glEnd;
1958 }
1959
1960 glDisable GL_BLEND;
1961 glDisable GL_TEXTURE_2D;
1962}
1963
1964#############################################################################
1965
1966package CFClient::UI::Gauge;
1967
1968our @ISA = CFClient::UI::VBox::;
1969
1970sub new {
1971 my ($class, %arg) = @_;
1972
1973 my $self = $class->SUPER::new (
1974 tooltip => $arg{type},
1975 can_hover => 1,
1976 can_events => 1,
1977 %arg,
1978 );
1979
1980 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1981 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1982 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1983
1984 $self
1985}
1986
1987sub set_fontsize {
1988 my ($self, $fsize) = @_;
1989
1990 $self->{value}->set_fontsize ($fsize);
1991 $self->{max} ->set_fontsize ($fsize);
1992}
1993
1994sub set_max {
1995 my ($self, $max) = @_;
1996
1997 $self->{gauge}->set_max ($max);
1998 $self->{max}->set_text ($max);
1999}
2000
2001sub set_value {
2002 my ($self, $val, $max) = @_;
2003
2004 $self->set_max ($max)
2005 if defined $max;
2006
2007 $self->{gauge}->set_value ($val, $max);
2008 $self->{value}->set_text ($val);
2009}
2010
2011#############################################################################
2012
1546package CFClient::UI::Slider; 2013package CFClient::UI::Slider;
1547 2014
1548use strict; 2015use strict;
1549 2016
1550use SDL::OpenGL; 2017use CFClient::OpenGL;
1551 2018
1552our @ISA = CFClient::UI::DrawBG::; 2019our @ISA = CFClient::UI::DrawBG::;
1553 2020
1554my @tex = 2021my @tex =
1555 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2022 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1565 # TODO: calculations are off 2032 # TODO: calculations are off
1566 my $self = $class->SUPER::new ( 2033 my $self = $class->SUPER::new (
1567 fg => [1, 1, 1], 2034 fg => [1, 1, 1],
1568 active_fg => [0, 0, 0], 2035 active_fg => [0, 0, 0],
1569 range => [0, 0, 100, 10], 2036 range => [0, 0, 100, 10],
1570 req_w => 40, 2037 req_w => $::WIDTH / 80,
1571 req_h => 13, 2038 req_h => $::WIDTH / 80,
1572 vertical => 0, 2039 vertical => 0,
1573 can_hover => 1, 2040 can_hover => 1,
1574 inner_pad => 5, 2041 inner_pad => 5,
1575 @_ 2042 @_
1576 ); 2043 );
… …
1680 2147
1681package CFClient::UI::TextView; 2148package CFClient::UI::TextView;
1682 2149
1683our @ISA = CFClient::UI::HBox::; 2150our @ISA = CFClient::UI::HBox::;
1684 2151
1685use SDL::OpenGL; 2152use CFClient::OpenGL;
1686 2153
1687sub new { 2154sub new {
1688 my $class = shift; 2155 my $class = shift;
1689 2156
1690 my $self = $class->SUPER::new ( 2157 my $self = $class->SUPER::new (
1691 req_w => $::WIDTH / 6, 2158 fontsize => 1,
1692 req_h => $::HEIGHT / 6, 2159 can_events => 0,
1693 fontsize => $::FONTSIZE, 2160 #font => default_font
1694 @_, 2161 @_,
1695 2162
1696 layout => (new CFClient::Layout), 2163 layout => (new CFClient::Layout),
1697 par => [], 2164 par => [],
1698 height => 0, 2165 height => 0,
1699 children => [ 2166 children => [
1700 (new CFClient::UI::Empty expand => 1), 2167 (new CFClient::UI::Empty expand => 1),
1701 (new CFClient::UI::Slider vertical => 1), 2168 (new CFClient::UI::Slider vertical => 1),
1702 ], 2169 ],
1703 ); 2170 );
1704 2171
1705 $self->{children}[1]->connect (changed => sub { 2172 $self->{children}[1]->connect (changed => sub { $self->update });
1706 $self->update;
1707 });
1708 2173
1709 $self 2174 $self
1710} 2175}
1711 2176
1712sub set_fontsize { 2177sub set_fontsize {
… …
1719sub text_height { 2184sub text_height {
1720 my ($self, $text) = @_; 2185 my ($self, $text) = @_;
1721 2186
1722 my $layout = $self->{layout}; 2187 my $layout = $self->{layout};
1723 2188
1724 $layout->set_height ($self->{fontsize}); 2189 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1725 $layout->set_width ($self->{w}); 2190 $layout->set_width ($self->{children}[0]{w});
1726 $layout->set_text ($text); 2191 $layout->set_text ($text);
1727 2192
1728 ($layout->size)[1] 2193 ($layout->size)[1]
1729} 2194}
1730 2195
… …
1733 2198
1734 $self->{need_reflow}++; 2199 $self->{need_reflow}++;
1735 $self->update; 2200 $self->update;
1736} 2201}
1737 2202
1738sub size_request {
1739 my ($self) = @_;
1740
1741 ($self->{req_w}, $self->{req_h})
1742}
1743
1744sub size_allocate { 2203sub size_allocate {
1745 my ($self, $x, $y, $w, $h) = @_; 2204 my ($self, $w, $h) = @_;
1746 2205
1747 $self->SUPER::size_allocate ($x, $y, $w, $h) or return; 2206 $self->SUPER::size_allocate ($w, $h);
1748 2207
2208 $self->{layout}->set_font ($self->{font}) if $self->{font};
1749 $self->{layout}->set_height ($self->{fontsize}); 2209 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1750 $self->{layout}->set_width ($self->{w}); 2210 $self->{layout}->set_width ($self->{children}[0]{w});
1751 2211
1752 $self->reflow; 2212 $self->reflow;
1753 $self->update;
1754} 2213}
1755 2214
1756sub add_paragraph { 2215sub add_paragraph {
1757 my ($self, $color, $text) = @_; 2216 my ($self, $color, $text) = @_;
1758 2217
… …
1789 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2248 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1790 2249
1791 delete $self->{texture}; 2250 delete $self->{texture};
1792 } 2251 }
1793 2252
1794 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2253 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1795 glClearColor 0, 0, 0, 1; 2254 glClearColor 0, 0, 0, 0;
1796 glClear GL_COLOR_BUFFER_BIT; 2255 glClear GL_COLOR_BUFFER_BIT;
1797 2256
1798 glEnable GL_BLEND; 2257 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2258 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D; 2259 glEnable GL_TEXTURE_2D;
… …
1807 2266
1808 my $y = 0; 2267 my $y = 0;
1809 2268
1810 my $layout = $self->{layout}; 2269 my $layout = $self->{layout};
1811 2270
2271 $layout->set_font ($self->{font}) if $self->{font};
2272
1812 for my $par (@{$self->{par}}) { 2273 for my $par (@{$self->{par}}) {
1813 my $h = $par->[0]; 2274 my $h = $par->[0];
1814 2275
1815 if ($y0 < $y + $h && $y < $y1) { 2276 if ($y0 < $y + $h && $y < $y1) {
1816 $layout->set_text ($par->[2]); 2277 $layout->set_text ($par->[2]);
… …
1830} 2291}
1831 2292
1832sub _draw { 2293sub _draw {
1833 my ($self) = @_; 2294 my ($self) = @_;
1834 2295
1835 if ($self->{texture}) { 2296 glEnable GL_BLEND;
2297 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1836 glEnable GL_TEXTURE_2D; 2298 glEnable GL_TEXTURE_2D;
1837 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2299 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2300 glColor 1, 1, 1, 1;
1838 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2301 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1839 glDisable GL_TEXTURE_2D; 2302 glDisable GL_TEXTURE_2D;
1840 } 2303 glDisable GL_BLEND;
1841 2304
1842 $self->{children}[1]->draw; 2305 $self->{children}[1]->draw;
1843 2306
1844} 2307}
1845 2308
1846############################################################################# 2309#############################################################################
1847 2310
1848package CFClient::UI::MapWidget;
1849
1850use strict;
1851
1852use List::Util qw(min max);
1853
1854use SDL;
1855use SDL::OpenGL;
1856
1857our @ISA = CFClient::UI::Base::;
1858
1859sub new {
1860 my $class = shift;
1861
1862 $class->SUPER::new (
1863 z => -1,
1864 can_focus => 1,
1865 list => (glGenLists 1),
1866 @_
1867 )
1868}
1869
1870sub key_down {
1871 print "MAPKEYDOWN\n";
1872}
1873
1874sub key_up {
1875}
1876
1877sub button_down {
1878 my ($self, $ev, $x, $y) = @_;
1879
1880 $self->focus_in;
1881
1882 if ($ev->button == 2) {
1883 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1884 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1885
1886 $self->{motion} = sub {
1887 my ($ev, $x, $y) = @_;
1888
1889 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1890
1891 $::CFG->{map_shift_x} = $bw + $x - $ox;
1892 $::CFG->{map_shift_y} = $bh + $y - $oy;
1893
1894 $self->update;
1895 };
1896 }
1897}
1898
1899sub button_up {
1900 my ($self, $ev, $x, $y) = @_;
1901
1902 delete $self->{motion};
1903}
1904
1905sub mouse_motion {
1906 my ($self, $ev, $x, $y) = @_;
1907
1908 $self->{motion}->($ev, $x, $y) if $self->{motion};
1909}
1910
1911sub size_request {
1912 (
1913 1 + 32 * int $::WIDTH / 32,
1914 1 + 32 * int $::HEIGHT / 32,
1915 )
1916}
1917
1918sub update {
1919 my ($self) = @_;
1920
1921 $self->{need_update} = 1;
1922 $self->SUPER::update;
1923}
1924
1925sub draw {
1926 my ($self) = @_;
1927
1928 if (delete $self->{need_update}) {
1929 glNewList $self->{list}, GL_COMPILE;
1930
1931 if ($::MAP) {
1932 my $sw = int $::WIDTH / 32;
1933 my $sh = int $::HEIGHT / 32;
1934
1935 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1936 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1937
1938 glTranslate $sx0 - 32, $sy0 - 32, 0;
1939
1940 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1941
1942 if ($::CFG->{fow_enable}) {
1943 if ($::CFG->{fow_smooth}) { # smooth fog of war
1944 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1945 glConvolutionFilter2D
1946 GL_CONVOLUTION_2D,
1947 GL_ALPHA,
1948 3, 3,
1949 GL_ALPHA, GL_FLOAT,
1950 pack "f*",
1951 0.1, 0.1, 0.1,
1952 0.1, 0.2, 0.1,
1953 0.1, 0.1, 0.1,
1954 ;
1955 glEnable GL_CONVOLUTION_2D;
1956 }
1957
1958 $self->{fow_texture} = new CFClient::Texture
1959 w => $w,
1960 h => $h,
1961 data => $data,
1962 internalformat => GL_ALPHA,
1963 format => GL_ALPHA;
1964
1965 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1966
1967 glEnable GL_BLEND;
1968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1969 glEnable GL_TEXTURE_2D;
1970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1971
1972 glColor +($::CFG->{fow_intensity}) x 3, 1;
1973 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1974
1975 glDisable GL_TEXTURE_2D;
1976 glDisable GL_BLEND;
1977 }
1978
1979 # HACK BEGIN
1980 {
1981 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1982 my ($w, $h) = (250, 250);
1983
1984 glEnable GL_BLEND;
1985 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1986 glEnable GL_TEXTURE_2D;
1987 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1988
1989 $self->{mapmap_texture} =
1990 new CFClient::Texture
1991 w => $w,
1992 h => $h,
1993 data => $::MAP->mapmap ($w, $h),
1994 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1995
1996 $self->{mapmap_texture}->draw_quad (100, 100);
1997
1998 glDisable GL_TEXTURE_2D;
1999 glDisable GL_BLEND;
2000 }
2001 # HACK END
2002 }
2003
2004 glEndList;
2005 }
2006
2007 glPushMatrix;
2008 glCallList $self->{list};
2009 glPopMatrix;
2010
2011 if ($FOCUS != $self) {
2012 glColor 64/255, 64/255, 64/255;
2013 glLogicOp GL_AND;
2014 glEnable GL_COLOR_LOGIC_OP;
2015 glBegin GL_QUADS;
2016 glVertex 0, 0;
2017 glVertex 0, $::HEIGHT;
2018 glVertex $::WIDTH, $::HEIGHT;
2019 glVertex $::WIDTH, 0;
2020 glEnd;
2021 glDisable GL_COLOR_LOGIC_OP;
2022 }
2023}
2024
2025my %DIR = (
2026 SDLK_KP8, [1, "north"],
2027 SDLK_KP9, [2, "northeast"],
2028 SDLK_KP6, [3, "east"],
2029 SDLK_KP3, [4, "southeast"],
2030 SDLK_KP2, [5, "south"],
2031 SDLK_KP1, [6, "southwest"],
2032 SDLK_KP4, [7, "west"],
2033 SDLK_KP7, [8, "northwest"],
2034
2035 SDLK_UP, [1, "north"],
2036 SDLK_RIGHT, [3, "east"],
2037 SDLK_DOWN, [5, "south"],
2038 SDLK_LEFT, [7, "west"],
2039);
2040
2041sub key_down {
2042 my ($self, $ev) = @_;
2043
2044 my $mod = $ev->key_mod;
2045 my $sym = $ev->key_sym;
2046
2047 if ($sym == SDLK_KP5) {
2048 $::CONN->user_send ("stay fire");
2049 } elsif ($sym == SDLK_a) {
2050 $::CONN->user_send ("apply");
2051 } elsif ($sym == SDLK_QUOTE) {
2052 $self->emit ('activate_console');
2053 } elsif ($sym == SDLK_SLASH) {
2054 $self->emit ('activate_console' => '/');
2055 } elsif (exists $DIR{$sym}) {
2056 if ($mod & KMOD_SHIFT) {
2057 $self->{shft}++;
2058 $::CONN->user_send ("fire $DIR{$sym}[0]");
2059 } elsif ($mod & KMOD_CTRL) {
2060 $self->{ctrl}++;
2061 $::CONN->user_send ("run $DIR{$sym}[0]");
2062 } else {
2063 $::CONN->user_send ("$DIR{$sym}[1]");
2064 }
2065 }
2066}
2067
2068sub key_up {
2069 my ($self, $ev) = @_;
2070
2071 my $mod = $ev->key_mod;
2072 my $sym = $ev->key_sym;
2073
2074 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
2075 $::CONN->user_send ("fire_stop");
2076 }
2077 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
2078 $::CONN->user_send ("run_stop");
2079 }
2080}
2081
2082#############################################################################
2083
2084package CFClient::UI::Animator; 2311package CFClient::UI::Animator;
2085 2312
2086use SDL::OpenGL; 2313use CFClient::OpenGL;
2087 2314
2088our @ISA = CFClient::UI::Bin::; 2315our @ISA = CFClient::UI::Bin::;
2089 2316
2090sub moveto { 2317sub moveto {
2091 my ($self, $x, $y) = @_; 2318 my ($self, $x, $y) = @_;
… …
2129 2356
2130sub new { 2357sub new {
2131 my $class = shift; 2358 my $class = shift;
2132 2359
2133 my $self = $class->SUPER::new ( 2360 my $self = $class->SUPER::new (
2134 state => 0, 2361 state => 0,
2135 connect_activate => \&toggle_flopper, 2362 connect_activate => \&toggle_flopper,
2136 @_ 2363 @_
2137 ); 2364 );
2138 2365
2139 if ($self->{state}) { 2366 if ($self->{state}) {
… …
2160 $self->emit (changed => $self->{state}); 2387 $self->emit (changed => $self->{state});
2161} 2388}
2162 2389
2163############################################################################# 2390#############################################################################
2164 2391
2392package CFClient::UI::Tooltip;
2393
2394our @ISA = CFClient::UI::Bin::;
2395
2396use CFClient::OpenGL;
2397
2398sub new {
2399 my $class = shift;
2400
2401 $class->SUPER::new (
2402 @_,
2403 can_events => 0,
2404 )
2405}
2406
2407sub set_markup {
2408 my ($self, $text) = @_;
2409
2410 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2411 $self->{label}->set_markup ($text);
2412 $self->add ($self->{label});
2413}
2414
2415sub size_request {
2416 my ($self) = @_;
2417
2418 $self->child->set_max_size ($::WIDTH * 0.3);
2419
2420 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2421
2422 ($w + 4, $h + 4)
2423}
2424
2425sub size_allocate {
2426 my ($self, $w, $h) = @_;
2427
2428 $self->SUPER::size_allocate ($w - 4, $h - 4);
2429}
2430
2431sub _draw {
2432 my ($self) = @_;
2433
2434 glPushMatrix;
2435 glTranslate 0.375, 0.375;
2436
2437 my ($w, $h) = @$self{qw(w h)};
2438
2439 glColor 1, 0.8, 0.4;
2440 glBegin GL_QUADS;
2441 glVertex 0 , 0;
2442 glVertex 0 , $h;
2443 glVertex $w, $h;
2444 glVertex $w, 0;
2445 glEnd;
2446
2447 glColor 0, 0, 0;
2448 glBegin GL_LINE_LOOP;
2449 glVertex 0 , 0;
2450 glVertex 0 , $h;
2451 glVertex $w, $h;
2452 glVertex $w, 0;
2453 glEnd;
2454
2455 glPopMatrix;
2456
2457 glTranslate 2, 2;
2458 $self->SUPER::_draw;
2459}
2460
2461#############################################################################
2462
2463package CFClient::UI::Face;
2464
2465our @ISA = CFClient::UI::Base::;
2466
2467use CFClient::OpenGL;
2468
2469sub new {
2470 my $class = shift;
2471
2472 $class->SUPER::new (
2473 aspect => 1,
2474 @_,
2475 )
2476}
2477
2478sub size_request {
2479 (32, 8)
2480}
2481
2482sub _draw {
2483 my ($self) = @_;
2484
2485 return unless $::CONN;#d# manage and cache textures differently
2486 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2487
2488 # TODO animation
2489 if ($tex) {
2490 glEnable GL_BLEND;
2491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2492 glEnable GL_TEXTURE_2D;
2493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2494 glColor 1, 1, 1, 1;
2495 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2496 glDisable GL_TEXTURE_2D;
2497 glDisable GL_BLEND;
2498 }
2499}
2500
2501#############################################################################
2502
2503package CFClient::UI::InventoryItem;
2504
2505our @ISA = CFClient::UI::HBox::;
2506
2507sub new {
2508 my $class = shift;
2509
2510 my %args = @_;
2511
2512 my $item = $args{item};
2513
2514 my $desc = $item->{nrof} < 2
2515 ? $item->{name}
2516 : "$item->{nrof} $item->{name_pl}";
2517
2518
2519 my $self = $class->SUPER::new (
2520 can_hover => 1,
2521 can_events => 1,
2522 tooltip => (CFClient::UI::Label->escape ($desc)
2523 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2524 connect_button_down => sub {
2525 my ($self, $ev, $x, $y) = @_;
2526
2527 # todo: maybe put examine on 1? but should just be a tooltip :(
2528 if ($ev->{button} == 1) {
2529 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2530 } elsif ($ev->{button} == 2) {
2531 $::CONN->send ("apply $item->{tag}");
2532 } elsif ($ev->{button} == 3) {
2533 CFClient::UI::Menu->new (
2534 items => [
2535 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2536 [
2537 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2538 sub { $::CONN->send ("lock $item->{tag}") },
2539 ],
2540 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2541 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2542 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2543 ],
2544 )->popup ($ev);
2545 }
2546
2547 1
2548 },
2549 %args
2550 );
2551 $self->add(new CFClient::UI::Face
2552 can_events => 0,
2553 face => $item->{face},
2554 anim => $item->{anim},
2555 animspeed => $item->{animspeed});
2556 $self->add(new CFClient::UI::Label
2557 can_events => 0,
2558 text => $desc);
2559
2560 $self
2561}
2562
2563#############################################################################
2564
2565package CFClient::UI::Inventory;
2566
2567our @ISA = CFClient::UI::ScrolledWindow::;
2568
2569sub new {
2570 my $class = shift;
2571
2572 my $self = $class->SUPER::new (
2573 scrolled => (new CFClient::UI::VBox),
2574 @_,
2575 );
2576
2577 $self
2578}
2579
2580sub set_items {
2581 my ($self, $items) = @_;
2582
2583 $self->{scrolled}->clear;
2584 return unless $items;
2585
2586 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2587
2588 $self->{real_items} = \@items;
2589
2590 for my $item (@items) {
2591 my $desc = $item->{nrof} < 2
2592 ? $item->{name}
2593 : "$item->{nrof} $item->{name_pl}";
2594
2595 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2596 }
2597
2598# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2599}
2600
2601sub size_request {
2602 my ($self) = @_;
2603 ($self->{req_w}, $self->{req_h});
2604}
2605
2606#############################################################################
2607
2608package CFClient::UI::Menu;
2609
2610our @ISA = CFClient::UI::FancyFrame::;
2611
2612use CFClient::OpenGL;
2613
2614sub new {
2615 my $class = shift;
2616
2617 my $self = $class->SUPER::new (
2618 items => [],
2619 z => 100,
2620 @_,
2621 );
2622
2623 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2624
2625 for my $item (@{ $self->{items} }) {
2626 my ($widget, $cb) = @$item;
2627
2628 # handle various types of items, only text for now
2629 if (!ref $widget) {
2630 $widget = new CFClient::UI::Label
2631 can_hover => 1,
2632 can_events => 1,
2633 text => $widget;
2634 }
2635
2636 $self->{item}{$widget} = $item;
2637
2638 $self->{vbox}->add ($widget);
2639 }
2640
2641 $self
2642}
2643
2644# popup given the event (must be a mouse button down event currently)
2645sub popup {
2646 my ($self, $ev) = @_;
2647
2648 $self->emit ("popdown");
2649
2650 # maybe save $GRAB? must be careful about events...
2651 $GRAB = $self;
2652 $self->{button} = $ev->{button};
2653
2654 $self->show;
2655 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2656}
2657
2658sub mouse_motion {
2659 my ($self, $ev, $x, $y) = @_;
2660
2661 # TODO: should use vbox->find_widget or so
2662 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2663 $self->{hover} = $self->{item}{$HOVER};
2664}
2665
2666sub button_up {
2667 my ($self, $ev, $x, $y) = @_;
2668
2669 if ($ev->{button} == $self->{button}) {
2670 undef $GRAB;
2671 $self->hide;
2672
2673 $self->emit ("popdown");
2674 $self->{hover}[1]->() if $self->{hover};
2675 }
2676}
2677
2678#############################################################################
2679
2165package CFClient::UI::Root; 2680package CFClient::UI::Root;
2166 2681
2167our @ISA = CFClient::UI::Container::; 2682our @ISA = CFClient::UI::Container::;
2168 2683
2169use SDL::OpenGL; 2684use CFClient::OpenGL;
2170 2685
2171sub check_size { 2686sub check_size {
2172 my ($self) = @_; 2687 my ($self) = @_;
2173 2688
2174 $self->size_allocate (0, 0, $::WITH, $::HEIGHT); 2689 $self->configure (0, 0, $self->{w}, $self->{h});
2175} 2690}
2176 2691
2177sub size_request { 2692sub size_request {
2178 ($::WIDTH, $::HEIGHT) 2693 my ($self) = @_;
2694
2695 ($self->{w}, $self->{h})
2179} 2696}
2180 2697
2181sub size_allocate { 2698sub size_allocate {
2699 my ($self, $w, $h) = @_;
2700
2701 my $old_w = $self->{old_w};
2702 my $old_h = $self->{old_h};
2703
2704 if ($old_w && $old_h) {
2705 for my $child ($self->children) {
2706 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2707 $child->{w} = int 0.5 + $child->{req_w} * $w / $old_w;
2708 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2709 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2710 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2711 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2712 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2713 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2714 }
2715 }
2716
2717 $self->{old_w} = $w;
2718 $self->{old_h} = $h;
2719}
2720
2721sub configure {
2182 my ($self, $x, $y, $w, $h) = @_; 2722 my ($self, $x, $y, $w, $h) = @_;
2183 2723
2184 $self->_size_allocate ($x, $y, $w, $h); 2724 $self->SUPER::configure ($x, $y, $w, $h);
2185 2725
2186 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2726 for my $child ($self->children) {
2187 for @{$self->{children}}; 2727 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2728
2729 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2730 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2731 $child->configure ($X, $Y, $W, $H);
2732 }
2188} 2733}
2189 2734
2190sub _topleft { 2735sub _topleft {
2191 my ($self, $x, $y) = @_; 2736 my ($self, $x, $y) = @_;
2192 2737
… …
2199 $self->check_size; 2744 $self->check_size;
2200 ::refresh (); 2745 ::refresh ();
2201} 2746}
2202 2747
2203sub add { 2748sub add {
2204 my ($self, $widget) = @_; 2749 my ($self, $child) = @_;
2205 2750
2751 # integerize window positions
2752 $child->{x} = int $child->{x};
2753 $child->{y} = int $child->{y};
2754
2206 $self->SUPER::add ($widget); 2755 $self->SUPER::add ($child);
2207
2208 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2209} 2756}
2210 2757
2211sub on_refresh { 2758sub on_refresh {
2212 my ($self, $id, $cb) = @_; 2759 my ($self, $id, $cb) = @_;
2213 2760
… …
2237############################################################################# 2784#############################################################################
2238 2785
2239package CFClient::UI; 2786package CFClient::UI;
2240 2787
2241$ROOT = new CFClient::UI::Root; 2788$ROOT = new CFClient::UI::Root;
2789$TOOLTIP = new CFClient::UI::Tooltip;
2242 2790
22431 27911
2244 2792

Diff Legend

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