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

Diff Legend

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