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.120 by elmex, Sun Apr 16 17:43:17 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
225 glPopMatrix; 349 glPopMatrix;
226 350
227 if ($self == $HOVER && $self->{can_hover}) { 351 if ($self == $HOVER && $self->{can_hover}) {
228 my ($x, $y) = @$self{qw(x y)}; 352 my ($x, $y) = @$self{qw(x y)};
229 353
230 glColor 0, 0, 1, 0.2; 354 glColor 1, 0.8, 0.5, 0.2;
231 glEnable GL_BLEND; 355 glEnable GL_BLEND;
232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
233 glBegin GL_QUADS; 357 glBegin GL_QUADS;
234 glVertex $x , $y; 358 glVertex $x , $y;
235 glVertex $x + $self->{w}, $y; 359 glVertex $x + $self->{w}, $y;
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
260 my ($self, $parent) = @_; 400 my ($self, $parent) = @_;
261 401
262 Scalar::Util::weaken ($self->{parent} = $parent); 402 Scalar::Util::weaken ($self->{parent} = $parent);
263} 403}
264 404
405sub check_size {
406 my ($self) = @_;
407
408 $self->{parent}
409 or return 1;
410
411 my ($w, $h) = $self->{user_w} && $self->{user_h}
412 ? @$self{qw(user_w user_h)}
413 : $self->size_request;
414
415 if ($w != $self->{req_w} || $h != $self->{req_h}) {
416 $self->{req_w} = $w;
417 $self->{req_h} = $h;
418
419 $self->{parent}->check_size
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
428 }
429}
430
265sub update { 431sub update {
266 my ($self) = @_; 432 my ($self) = @_;
267 433
268 $self->{parent}->update 434 $self->{parent}->update
269 if $self->{parent}; 435 if $self->{parent};
270} 436}
271 437
272sub connect { 438sub connect {
273 my ($self, $signal, $cb) = @_; 439 my ($self, $signal, $cb) = @_;
274 440
275 push @{ $self->{cb}{$signal} }, $cb; 441 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 442}
277 443
278sub emit { 444sub emit {
279 my ($self, $signal, @args) = @_; 445 my ($self, $signal, @args) = @_;
280 446
281 $_->($self, @args) 447 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282 for @{$self->{cb}{$signal} || []};
283} 448}
284 449
285sub DESTROY { 450sub DESTROY {
286 my ($self) = @_; 451 my ($self) = @_;
287 452
293package CFClient::UI::DrawBG; 458package CFClient::UI::DrawBG;
294 459
295our @ISA = CFClient::UI::Base::; 460our @ISA = CFClient::UI::Base::;
296 461
297use strict; 462use strict;
298use SDL::OpenGL; 463use CFClient::OpenGL;
299 464
300sub new { 465sub new {
301 my $class = shift; 466 my $class = shift;
302 467
303 # range [value, low, high, page] 468 # range [value, low, high, page]
332 497
333package CFClient::UI::Empty; 498package CFClient::UI::Empty;
334 499
335our @ISA = CFClient::UI::Base::; 500our @ISA = CFClient::UI::Base::;
336 501
502sub new {
503 my ($class, %arg) = @_;
504 $class->SUPER::new (can_events => 0, %arg);
505}
506
337sub size_request { 507sub size_request {
338 (0, 0) 508 (0, 0)
339} 509}
340 510
341sub draw { } 511sub draw { }
349sub new { 519sub new {
350 my ($class, %arg) = @_; 520 my ($class, %arg) = @_;
351 521
352 my $children = delete $arg{children} || []; 522 my $children = delete $arg{children} || [];
353 523
354 my $self = $class->SUPER::new (children => [], %arg); 524 my $self = $class->SUPER::new (
525 children => [],
526 can_events => 0,
527 %arg,
528 );
355 $self->add ($_) for @$children; 529 $self->add ($_) for @$children;
356 530
357 $self 531 $self
358} 532}
359 533
360sub add { 534sub add {
361 my ($self, $child) = @_; 535 my ($self, @widgets) = @_;
362 536
363 $child->set_parent ($self); 537 $_->set_parent ($self)
538 for @widgets;
364 539
365 use sort 'stable'; 540 use sort 'stable';
366 541
367 $self->{children} = [ 542 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 543 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 544 @{$self->{children}}, @widgets
370 ]; 545 ];
371 546
372 $self->{w} = $self->{h} = -1; 547 $_->check_size
548 for @widgets;
549
373 $self->update; 550 $self->update;
374} 551}
375 552
553sub children {
554 @{ $_[0]{children} }
555}
556
376sub remove { 557sub remove {
377 my ($self, $widget) = @_; 558 my ($self, $child) = @_;
378 559
560 delete $child->{parent};
561 $child->hide;
562
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 563 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
380 564
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 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;
382} 582}
383 583
384sub find_widget { 584sub find_widget {
385 my ($self, $x, $y) = @_; 585 my ($self, $x, $y) = @_;
386 586
416 616
417 $class->SUPER::new (children => [$child], %arg) 617 $class->SUPER::new (children => [$child], %arg)
418} 618}
419 619
420sub add { 620sub add {
421 my ($self, $widget) = @_; 621 my ($self, $child) = @_;
422 622
423 $self->{children} = []; 623 $self->{children} = [];
424 624
425 $self->SUPER::add ($widget); 625 $self->SUPER::add ($child);
426} 626}
427 627
428sub remove { 628sub remove {
429 my ($self, $widget) = @_; 629 my ($self, $widget) = @_;
430 630
439sub size_request { 639sub size_request {
440 $_[0]{children}[0]->size_request 640 $_[0]{children}[0]->size_request
441} 641}
442 642
443sub size_allocate { 643sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 644 my ($self, $w, $h) = @_;
445 645
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 646 $self->{children}[0]->configure (0, 0, $w, $h);
449} 647}
450 648
451############################################################################# 649#############################################################################
452 650
453package CFClient::UI::Window; 651package CFClient::UI::Window;
454 652
455our @ISA = CFClient::UI::Bin::; 653our @ISA = CFClient::UI::Bin::;
456 654
457use SDL::OpenGL; 655use CFClient::OpenGL;
458 656
459sub new { 657sub new {
460 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
461 659
462 my $self = $class->SUPER::new (%arg); 660 my $self = $class->SUPER::new (%arg);
463} 661}
464 662
465sub update { 663sub update {
466 my ($self) = @_; 664 my ($self) = @_;
467 665
468 # we want to do this delayed... 666 $ROOT->on_refresh ($self => sub { $self->render_child });
469 $self->render_chld;
470 $self->SUPER::update; 667 $self->SUPER::update;
471} 668}
472 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
473sub render_chld { 681sub render_child {
474 my ($self) = @_; 682 my ($self) = @_;
475 683
476 $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 {
477 glClearColor 0, 0, 0, 1; 685 glClearColor 0, 0, 0, 0;
478 glClear GL_COLOR_BUFFER_BIT; 686 glClear GL_COLOR_BUFFER_BIT;
479 $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;
480 }; 696 };
481}
482
483sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_;
485
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h);
489
490 $self->render_chld;
491} 697}
492 698
493sub _draw { 699sub _draw {
494 my ($self) = @_; 700 my ($self) = @_;
495 701
496 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
497 703
498 my $tex = $self->{texture} 704 my $tex = $self->{texture}
499 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});
500 836
501 glEnable GL_BLEND; 837 glEnable GL_BLEND;
502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 838 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
503 glEnable GL_TEXTURE_2D; 839 glEnable GL_TEXTURE_2D;
504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
505 841
506 $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;
507 849
850
851 $self->child->draw;
508 glDisable GL_BLEND; 852 glDisable GL_BLEND;
509 glDisable GL_TEXTURE_2D; 853 glDisable GL_TEXTURE_2D;
510} 854}
511 855
512############################################################################# 856#############################################################################
513 857
514package CFClient::UI::Frame; 858package CFClient::UI::FancyFrame;
515 859
516our @ISA = CFClient::UI::Bin::; 860our @ISA = CFClient::UI::Bin::;
517 861
518use SDL::OpenGL; 862use CFClient::OpenGL;
519
520sub size_request {
521 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524
525 $chld->move (2, 2);
526
527 map { $_ + 4 } $chld->size_request;
528}
529
530sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_;
532
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536}
537
538sub _draw {
539 my ($self) = @_;
540
541 my $chld = $self->child;
542
543 my ($w, $h) = $chld->size_request;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554}
555
556#############################################################################
557
558package CFClient::UI::FancyFrame;
559
560our @ISA = CFClient::UI::Bin::;
561
562use SDL::OpenGL;
563 863
564my @tex = 864my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
566 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);
567 867
568sub new { 868sub new {
569 my $class = shift; 869 my $class = shift;
570 870
571 # TODO: user_x, user_y, overwrite moveto? 871 # TODO: user_x, user_y, overwrite moveto?
572 872
573 $class->SUPER::new ( 873 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 874 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 875 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 876 border => 0.6,
877 can_events => 1,
577 @_ 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,
578 ) 902 )
579} 903}
580 904
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 905sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 906 my ($self, $w, $h) = @_;
596 907
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 908 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 909 $w -= List::Util::max 0, $self->border * 2;
601 910
911 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
912 if $self->{title};
913
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 914 $self->child->configure ($self->border, $self->border, $w, $h);
603} 915}
604 916
605sub button_down { 917sub button_down {
606 my ($self, $ev, $x, $y) = @_; 918 my ($self, $ev, $x, $y) = @_;
607 919
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 920 my ($w, $h) = @$self{qw(w h)};
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 921 my $border = $self->border;
610 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});
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 928 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 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;
613 933
614 $self->{motion} = sub { 934 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 935 my ($ev, $x, $y) = @_;
616 936
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 937 my $dx = $ev->{x} - $ox;
938 my $dy = $ev->{y} - $oy;
618 939
619 $self->{user_w} = $bw + $x - $ox; 940 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
620 $self->{user_h} = $bh + $y - $oy; 941 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
621 $self->update; 942 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
943 $self->check_size;
622 }; 944 };
623 945
624 } elsif ($x >= 0 && $x < $self->{w} 946 } elsif ($lr ^ $td) {
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 947 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 948 my ($bx, $by) = ($self->{x}, $self->{y});
629 949
630 $self->{motion} = sub { 950 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 951 my ($ev, $x, $y) = @_;
632 952
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 953 ($x, $y) = ($ev->{x}, $ev->{y});
634 954
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 955 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 956 $self->update;
637 }; 957 };
638 } 958 }
659 glEnable GL_BLEND; 979 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 983
984 my $border = $self->border;
985
664 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 987 $tex[1]->draw_quad (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 988 $tex[3]->draw_quad (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 989 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 990 $tex[4]->draw_quad (0, $h - $border, $w, $border);
669 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
670 my $bg = $tex[0]; 993 my $bg = $tex[0];
671 994
672 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
674 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
675 998
676 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
677 1000
678 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1004 $bg->draw_quad ($border, $border, $cw, $ch);
682 1005
683 glDisable GL_TEXTURE_2D; 1006 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 1007 glDisable GL_BLEND;
1008 }
1009
1010 $self->{title}->draw if $self->{title};
685 1011
686 $self->child->draw; 1012 $self->child->draw;
687} 1013}
688 1014
689############################################################################# 1015#############################################################################
692 1018
693our @ISA = CFClient::UI::Base::; 1019our @ISA = CFClient::UI::Base::;
694 1020
695use List::Util qw(max sum); 1021use List::Util qw(max sum);
696 1022
697use SDL::OpenGL; 1023use CFClient::OpenGL;
698 1024
699sub new { 1025sub new {
700 my $class = shift; 1026 my $class = shift;
701 1027
702 $class->SUPER::new ( 1028 $class->SUPER::new (
709 my ($self, $x, $y, $child) = @_; 1035 my ($self, $x, $y, $child) = @_;
710 1036
711 $child->set_parent ($self); 1037 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 1038 $self->{children}[$y][$x] = $child;
713 1039
714 $self->{w} = $self->{h} = -1; 1040 $child->check_size;
715 $self->update; 1041}
1042
1043sub children {
1044 grep $_, map @$_, grep $_, @{ $_[0]{children} }
716} 1045}
717 1046
718# 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?
719sub clear { 1048sub clear {
720 my ($self) = @_; 1049 my ($self) = @_;
721 1050
1051 my @children = $self->children;
722 delete $self->{children}; 1052 delete $self->{children};
1053
1054 for (@children) {
1055 delete $_->{parent};
1056 $_->hide;
1057 }
1058
723 $self->update; 1059 $self->update;
724} 1060}
725 1061
726sub get_wh { 1062sub get_wh {
727 my ($self) = @_; 1063 my ($self) = @_;
733 or next; 1069 or next;
734 1070
735 for my $x (0 .. $#$row) { 1071 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 1072 my $widget = $row->[$x]
737 or next; 1073 or next;
738 my ($w, $h) = $widget->size_request; 1074 my ($w, $h) = @$widget{qw(req_w req_h)};
739 1075
740 $w[$x] = max $w[$x], $w; 1076 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 1077 $h[$y] = max $h[$y], $h;
742 } 1078 }
743 } 1079 }
755 (sum @$hs), 1091 (sum @$hs),
756 ) 1092 )
757} 1093}
758 1094
759sub size_allocate { 1095sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 1096 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 1097
764 my ($ws, $hs) = $self->get_wh; 1098 my ($ws, $hs) = $self->get_wh;
765 1099
766 my $req_w = sum @$ws; 1100 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 1101 my $req_h = sum @$hs;
789 1123
790 for my $c (0 .. $#$row) { 1124 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 1125 my $col_w = $ws->[$c];
792 1126
793 if (my $widget = $row->[$c]) { 1127 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 1128 $widget->configure ($x, $y, $col_w, $row_h);
795 } 1129 }
796 1130
797 $x += $col_w; 1131 $x += $col_w;
798 } 1132 }
799 1133
844 (List::Util::max map $_->[1], @alloc), 1178 (List::Util::max map $_->[1], @alloc),
845 ) 1179 )
846} 1180}
847 1181
848sub size_allocate { 1182sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 1183 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 1184
853 ($h, $w) = ($w, $h); 1185 ($h, $w) = ($w, $h);
854 1186
855 my $children = $self->{children}; 1187 my $children = $self->{children};
856 1188
857 my @h = map +($_->size_request)[0], @$children; 1189 my @h = map $_->{req_w}, @$children;
858 1190
859 my $req_h = List::Util::sum @h; 1191 my $req_h = List::Util::sum @h;
860 1192
861 if ($req_h > $h) { 1193 if ($req_h > $h) {
862 # ah well, not enough space 1194 # ah well, not enough space
878 1210
879 my $y = 0; 1211 my $y = 0;
880 for (0 .. $#$children) { 1212 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1213 my $child = $children->[$_];
882 my $h = $h[$_]; 1214 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1215 $child->configure ($y, 0, $h, $w);
884 1216
885 $y += $h; 1217 $y += $h;
886 } 1218 }
1219
1220 1
887} 1221}
888 1222
889############################################################################# 1223#############################################################################
890 1224
891package CFClient::UI::VBox; 1225package CFClient::UI::VBox;
904 (List::Util::sum map $_->[1], @alloc), 1238 (List::Util::sum map $_->[1], @alloc),
905 ) 1239 )
906} 1240}
907 1241
908sub size_allocate { 1242sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1243 my ($self, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912 1244
913 my $children = $self->{children}; 1245 my $children = $self->{children};
914 1246
915 my @h = map +($_->size_request)[1], @$children; 1247 my @h = map $_->{req_h}, @$children;
916 1248
917 my $req_h = List::Util::sum @h; 1249 my $req_h = List::Util::sum @h;
918 1250
919 if ($req_h > $h) { 1251 if ($req_h > $h) {
920 # ah well, not enough space 1252 # ah well, not enough space
934 1266
935 my $y = 0; 1267 my $y = 0;
936 for (0 .. $#$children) { 1268 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1269 my $child = $children->[$_];
938 my $h = $h[$_]; 1270 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1271 $child->configure (0, $y, $w, $h);
940 1272
941 $y += $h; 1273 $y += $h;
942 } 1274 }
1275
1276 1
943} 1277}
944 1278
945############################################################################# 1279#############################################################################
946 1280
947package CFClient::UI::Label; 1281package CFClient::UI::Label;
948 1282
949our @ISA = CFClient::UI::Base::; 1283our @ISA = CFClient::UI::Base::;
950 1284
951use SDL::OpenGL; 1285use CFClient::OpenGL;
952 1286
953sub new { 1287sub new {
954 my ($class, %arg) = @_; 1288 my ($class, %arg) = @_;
955 1289
956 my $self = $class->SUPER::new ( 1290 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1291 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1292 #font => default_font
1293 fontsize => 1,
959 text => "", 1294 text => "",
960 align => -1, 1295 align => -1,
961 valign => -1, 1296 valign => -1,
962 padding => 2, 1297 padding => 2,
963 layout => new CFClient::Layout, 1298 layout => new CFClient::Layout,
1299 can_events => 0,
964 %arg 1300 %arg
965 ); 1301 );
966 1302
967 $self->set_text ($self->{text}); 1303 if (exists $self->{template}) {
1304 my $layout = new CFClient::Layout;
1305 $layout->set_text (delete $self->{template});
1306 $self->{template} = $layout;
1307 }
1308
1309 $self->set_text (delete $self->{text}) if exists $self->{text};
1310 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
968 1311
969 $self 1312 $self
970} 1313}
971 1314
972sub escape_text { 1315sub escape {
973 local $_ = $_[1]; 1316 local $_ = $_[1];
974 1317
975 s/&/&amp;/g; 1318 s/&/&amp;/g;
976 s/>/&gt;/g; 1319 s/>/&gt;/g;
977 s/</&lt;/g; 1320 s/</&lt;/g;
978 1321
979 $_[1] 1322 $_[1]
980} 1323}
981 1324
1325sub update {
1326 my ($self) = @_;
1327
1328 delete $self->{texture};
1329 $self->SUPER::update;
1330}
1331
982sub set_text { 1332sub set_text {
983 my ($self, $text) = @_; 1333 my ($self, $text) = @_;
984 1334
1335 return if $self->{text} eq "T$text";
985 $self->{text} = $text; 1336 $self->{text} = "T$text";
1337
986 $self->{layout}->set_markup ($text); 1338 $self->{layout}->set_text ($text);
987 1339
988 delete $self->{texture}; 1340 delete $self->{texture};
989# $self->{w} = $self->{h} = -1;
990 $self->update; 1341 $self->update;
1342 $self->check_size;
991} 1343}
992 1344
993sub get_text { 1345sub set_markup {
994 my ($self, $text) = @_; 1346 my ($self, $markup) = @_;
995 1347
996 $self->{text} 1348 return if $self->{text} eq "M$markup";
1349 $self->{text} = "M$markup";
1350
1351 $self->{layout}->set_markup ($markup);
1352
1353 delete $self->{texture};
1354 $self->update;
1355 $self->check_size;
997} 1356}
998 1357
999sub size_request { 1358sub size_request {
1000 my ($self) = @_; 1359 my ($self) = @_;
1001 1360
1002 $self->{layout}->set_width; 1361 $self->{layout}->set_font ($self->{font}) if $self->{font};
1362 $self->{layout}->set_width ($self->{max_w} || -1);
1003 $self->{layout}->set_height ($self->{fontsize}); 1363 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1364
1004 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 }
1005 1376
1006 ( 1377 (
1007 $w + $self->{padding} * 2, 1378 $w + $self->{padding} * 2,
1008 $h + $self->{padding} * 2, 1379 $h + $self->{padding} * 2,
1009 ) 1380 )
1010} 1381}
1011 1382
1012sub size_allocate { 1383sub size_allocate {
1013 my ($self, $x, $y, $w, $h) = @_; 1384 my ($self, $w, $h) = @_;
1014
1015 $self->_size_allocate ($x, $y, $w, $h) or return;
1016 1385
1017 delete $self->{texture}; 1386 delete $self->{texture};
1018} 1387}
1019 1388
1020sub update { 1389sub set_fontsize {
1021 my ($self) = @_; 1390 my ($self, $fontsize) = @_;
1022 1391
1392 $self->{fontsize} = $fontsize;
1023 delete $self->{texture}; 1393 delete $self->{texture};
1394
1024 $self->SUPER::update; 1395 $self->update;
1396 $self->check_size;
1025} 1397}
1026 1398
1027sub _draw { 1399sub _draw {
1028 my ($self) = @_; 1400 my ($self) = @_;
1029 1401
1030 my $tex = $self->{texture} ||= do { 1402 my $tex = $self->{texture} ||= do {
1403 $self->{layout}->set_font ($self->{font}) if $self->{font};
1031 $self->{layout}->set_width ($self->{w}); 1404 $self->{layout}->set_width ($self->{w});
1032 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1405 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1033 new_from_layout CFClient::Texture $self->{layout} 1406 new_from_layout CFClient::Texture $self->{layout}
1034 }; 1407 };
1035 1408
1036 glEnable GL_BLEND; 1409 glEnable GL_BLEND;
1037 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1038 glEnable GL_TEXTURE_2D; 1411 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1040 1413
1041 glColor @{$self->{fg}}; 1414 glColor @{$self->{fg}};
1042 1415
1043 my $x = 1416 $self->{ox} = int (
1044 $self->{align} < 0 ? $self->{padding} 1417 $self->{align} < 0 ? $self->{padding}
1045 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1046 : ($self->{w} - $tex->{w}) * 0.5; 1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1047 1421
1048 my $y = 1422 $self->{oy} = int (
1049 $self->{valign} < 0 ? $self->{padding} 1423 $self->{valign} < 0 ? $self->{padding}
1050 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1051 : ($self->{h} - $tex->{h}) * 0.5; 1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1052 1427
1053 $tex->draw_quad (int $x, int $y); 1428 $tex->draw_quad ($self->{ox}, $self->{oy});
1054 1429
1055 glDisable GL_TEXTURE_2D; 1430 glDisable GL_TEXTURE_2D;
1056 glDisable GL_BLEND; 1431 glDisable GL_BLEND;
1057} 1432}
1058 1433
1059############################################################################# 1434#############################################################################
1060 1435
1061package CFClient::UI::Entry; 1436package CFClient::UI::EntryBase;
1062 1437
1063our @ISA = CFClient::UI::Label::; 1438our @ISA = CFClient::UI::Label::;
1064 1439
1065use SDL; 1440use CFClient::OpenGL;
1066use SDL::OpenGL;
1067 1441
1068sub new { 1442sub new {
1069 my $class = shift; 1443 my $class = shift;
1070 1444
1071 $class->SUPER::new ( 1445 $class->SUPER::new (
1072 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1073 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1074 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1075 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1076 can_hover => 1, 1450 can_hover => 1,
1077 can_focus => 1, 1451 can_focus => 1,
1078 valign => 0, 1452 valign => 0,
1453 can_events => 1,
1079 @_ 1454 @_
1080 ) 1455 )
1081} 1456}
1082 1457
1083sub _set_text { 1458sub _set_text {
1084 my ($self, $text) = @_; 1459 my ($self, $text) = @_;
1085 1460
1086 my $old_text = $self->{text}; 1461 delete $self->{cur_h};
1462
1463 return if $self->{text} eq $text;
1464
1465 delete $self->{texture};
1087 1466
1088 $self->{last_activity} = $::NOW; 1467 $self->{last_activity} = $::NOW;
1089
1090 $self->{text} = $text; 1468 $self->{text} = $text;
1091 $self->{layout}->set_width ($self->{w});
1092 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1093 1469
1094 $text =~ s/./*/g if $self->{hidden}; 1470 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text ");
1095 1472
1096 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1473 $self->emit (changed => $self->{text});
1474}
1097 1475
1098 $text = substr $text, 0, $self->{cursor}; 1476sub get_text {
1099 utf8::encode $text; 1477 $_[0]{text}
1100
1101 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1102
1103 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1104 if $old_text ne $self->{text};
1105} 1478}
1106 1479
1107sub size_request { 1480sub size_request {
1108 my ($self) = @_; 1481 my ($self) = @_;
1109 1482
1111 1484
1112 ($w + 1, $h) # add 1 for cursor 1485 ($w + 1, $h) # add 1 for cursor
1113} 1486}
1114 1487
1115sub size_allocate { 1488sub size_allocate {
1116 my ($self, $x, $y, $w, $h) = @_; 1489 my ($self, $w, $h) = @_;
1117 1490
1118 $self->SUPER::size_allocate ($x, $y, $w, $h); 1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1119
1120 $self->_set_text ($self->{text});
1121} 1492}
1122 1493
1123sub set_text { 1494sub set_text {
1124 my ($self, $text) = @_; 1495 my ($self, $text) = @_;
1125 1496
1129} 1500}
1130 1501
1131sub key_down { 1502sub key_down {
1132 my ($self, $ev) = @_; 1503 my ($self, $ev) = @_;
1133 1504
1134 my $mod = $ev->key_mod; 1505 my $mod = $ev->{mod};
1135 my $sym = $ev->key_sym; 1506 my $sym = $ev->{sym};
1136
1137 my $uni = $ev->key_unicode; 1507 my $uni = $ev->{unicode};
1138 1508
1139 my $text = $self->get_text; 1509 my $text = $self->get_text;
1140 1510
1141 if ($sym == SDLK_BACKSPACE) { 1511 if ($sym == 8) {
1142 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1143 } elsif ($sym == SDLK_DELETE) { 1513 } elsif ($sym == 127) {
1144 substr $text, $self->{cursor}, 1, ""; 1514 substr $text, $self->{cursor}, 1, "";
1145 } elsif ($sym == SDLK_LEFT) { 1515 } elsif ($sym == CFClient::SDLK_LEFT) {
1146 --$self->{cursor} if $self->{cursor}; 1516 --$self->{cursor} if $self->{cursor};
1147 } elsif ($sym == SDLK_RIGHT) { 1517 } elsif ($sym == CFClient::SDLK_RIGHT) {
1148 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1518 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1149 } elsif ($sym == SDLK_HOME) { 1519 } elsif ($sym == CFClient::SDLK_HOME) {
1150 $self->{cursor} = 0; 1520 $self->{cursor} = 0;
1151 } elsif ($sym == SDLK_END) { 1521 } elsif ($sym == CFClient::SDLK_END) {
1152 $self->{cursor} = length $text; 1522 $self->{cursor} = length $text;
1153 } elsif ($sym == SDLK_ESCAPE) { 1523 } elsif ($sym == 27) {
1154 $self->emit ('escape'); 1524 $self->emit ('escape');
1155 } elsif ($uni) { 1525 } elsif ($uni) {
1156 substr $text, $self->{cursor}++, 0, chr $uni; 1526 substr $text, $self->{cursor}++, 0, chr $uni;
1157 } 1527 }
1158 1528
1213 1583
1214 $self->SUPER::_draw; 1584 $self->SUPER::_draw;
1215 1585
1216 #TODO: force update every cursor change :( 1586 #TODO: force update every cursor change :(
1217 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1587 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1588
1589 unless (exists $self->{cur_h}) {
1590 my $text = substr $self->{text}, 0, $self->{cursor};
1591 utf8::encode $text;
1592
1593 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1594 }
1595
1218 glColor @{$self->{fg}}; 1596 glColor @{$self->{fg}};
1219 glBegin GL_LINES; 1597 glBegin GL_LINES;
1220 glVertex $self->{cur_x}, $self->{cur_y};
1221 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1598 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1599 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1222 glEnd; 1600 glEnd;
1223 } 1601 }
1224} 1602}
1225 1603
1226package CFClient::UI::LineEntry; 1604package CFClient::UI::Entry;
1227 1605
1228our @ISA = CFClient::UI::Entry::; 1606our @ISA = CFClient::UI::EntryBase::;
1229 1607
1230use SDL; 1608use CFClient::OpenGL;
1231use SDL::OpenGL;
1232 1609
1233sub key_down { 1610sub key_down {
1234 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1235 1612
1236 my $sym = $ev->key_sym; 1613 my $sym = $ev->{sym};
1237 1614
1238 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} = '';
1239 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1240 $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 }
1241 1644
1242 } else { 1645 } else {
1243 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1244 } 1647 }
1245 1648
1249 1652
1250package CFClient::UI::Button; 1653package CFClient::UI::Button;
1251 1654
1252our @ISA = CFClient::UI::Label::; 1655our @ISA = CFClient::UI::Label::;
1253 1656
1254use SDL; 1657use CFClient::OpenGL;
1255use SDL::OpenGL;
1256 1658
1257my @tex = 1659my @tex =
1258 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1660 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1259 qw(b1_button_active.png); 1661 qw(b1_button_active.png);
1260 1662
1261sub new { 1663sub new {
1262 my $class = shift; 1664 my $class = shift;
1263 1665
1264 $class->SUPER::new ( 1666 $class->SUPER::new (
1265 padding => 4, 1667 padding => 4,
1266 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1267 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1268 active_fg => [1, 1, 0], 1670 active_fg => [0, 0, 1],
1269 can_hover => 1, 1671 can_hover => 1,
1672 align => 0,
1673 valign => 0,
1674 can_events => 1,
1270 @_ 1675 @_
1271 ) 1676 )
1272} 1677}
1273 1678
1274sub button_up { 1679sub button_up {
1308package CFClient::UI::CheckBox; 1713package CFClient::UI::CheckBox;
1309 1714
1310our @ISA = CFClient::UI::DrawBG::; 1715our @ISA = CFClient::UI::DrawBG::;
1311 1716
1312my @tex = 1717my @tex =
1313 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1719 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1315 1720
1316use SDL; 1721use CFClient::OpenGL;
1317use SDL::OpenGL;
1318 1722
1319sub new { 1723sub new {
1320 my $class = shift; 1724 my $class = shift;
1321 1725
1322 $class->SUPER::new ( 1726 $class->SUPER::new (
1333 my ($self) = @_; 1737 my ($self) = @_;
1334 1738
1335 ($self->{padding} * 2 + 6) x 2 1739 ($self->{padding} * 2 + 6) x 2
1336} 1740}
1337 1741
1338sub size_allocate {
1339 my ($self, $x, $y, $w, $h) = @_;
1340
1341 $self->_size_allocate ($x, $y, $w, $h);
1342}
1343
1344sub button_down { 1742sub button_down {
1345 my ($self, $ev, $x, $y) = @_; 1743 my ($self, $ev, $x, $y) = @_;
1346 1744
1347 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1348 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1374 glDisable GL_BLEND; 1772 glDisable GL_BLEND;
1375} 1773}
1376 1774
1377############################################################################# 1775#############################################################################
1378 1776
1777package CFClient::UI::Image;
1778
1779our @ISA = CFClient::UI::Base::;
1780
1781use CFClient::OpenGL;
1782use Carp qw/confess/;
1783
1784our %loaded_images;
1785
1786sub new {
1787 my $class = shift;
1788
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};
1801
1802 $self
1803}
1804
1805sub size_request {
1806 my ($self) = @_;
1807
1808 ($self->{tex}->{w}, $self->{tex}->{h})
1809}
1810
1811sub _draw {
1812 my ($self) = @_;
1813
1814 my $tex = $self->{tex};
1815
1816 my ($w, $h) = ($self->{w}, $self->{h});
1817
1818 if ($self->{rot90}) {
1819 glRotate 90, 0, 0, 1;
1820 glTranslate 0, -$self->{w}, 0;
1821
1822 ($w, $h) = ($h, $w);
1823 }
1824
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829
1830 $tex->draw_quad (0, 0, $w, $h);
1831
1832 glDisable GL_BLEND;
1833 glDisable GL_TEXTURE_2D;
1834}
1835
1836#############################################################################
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
1379package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
1380 2017
1381use strict; 2018use strict;
1382 2019
1383use SDL::OpenGL; 2020use CFClient::OpenGL;
1384 2021
1385our @ISA = CFClient::UI::DrawBG::; 2022our @ISA = CFClient::UI::DrawBG::;
1386 2023
1387my @tex = 2024my @tex =
1388 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1398 # TODO: calculations are off 2035 # TODO: calculations are off
1399 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1400 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1401 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1402 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1403 req_w => 40, 2040 req_w => $::WIDTH / 80,
1404 req_h => 13, 2041 req_h => $::WIDTH / 80,
1405 vertical => 0, 2042 vertical => 0,
1406 can_hover => 1, 2043 can_hover => 1,
1407 inner_pad => 5, 2044 inner_pad => 5,
1408 @_ 2045 @_
1409 ); 2046 );
1513 2150
1514package CFClient::UI::TextView; 2151package CFClient::UI::TextView;
1515 2152
1516our @ISA = CFClient::UI::HBox::; 2153our @ISA = CFClient::UI::HBox::;
1517 2154
1518use SDL::OpenGL; 2155use CFClient::OpenGL;
1519 2156
1520sub new { 2157sub new {
1521 my $class = shift; 2158 my $class = shift;
1522 2159
1523 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1524 req_w => $::WIDTH / 6, 2161 fontsize => 1,
1525 req_h => $::HEIGHT / 6, 2162 can_events => 0,
1526 fontsize => $::FONTSIZE, 2163 #font => default_font
1527 @_, 2164 @_,
1528 2165
1529 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1530 par => [], 2167 par => [],
1531 height => 0, 2168 height => 0,
1532 children => [ 2169 children => [
1533 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1534 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1535 ], 2172 ],
1536 ); 2173 );
1537 2174
1538 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1539 $self->update;
1540 });
1541 2176
1542 $self 2177 $self
1543} 2178}
1544 2179
1545sub set_fontsize { 2180sub set_fontsize {
1552sub text_height { 2187sub text_height {
1553 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1554 2189
1555 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1556 2191
1557 $layout->set_height ($self->{fontsize}); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1558 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1559 $layout->set_text ($text); 2194 $layout->set_text ($text);
1560 2195
1561 ($layout->size)[1] 2196 ($layout->size)[1]
1562} 2197}
1563 2198
1566 2201
1567 $self->{need_reflow}++; 2202 $self->{need_reflow}++;
1568 $self->update; 2203 $self->update;
1569} 2204}
1570 2205
1571sub size_request {
1572 my ($self) = @_;
1573
1574 ($self->{req_w}, $self->{req_h})
1575}
1576
1577sub size_allocate { 2206sub size_allocate {
1578 my ($self, $x, $y, $w, $h) = @_; 2207 my ($self, $w, $h) = @_;
1579 2208
1580 $self->SUPER::size_allocate ($x, $y, $w, $h); 2209 $self->SUPER::size_allocate ($w, $h);
1581 2210
2211 $self->{layout}->set_font ($self->{font}) if $self->{font};
1582 $self->{layout}->set_height ($self->{fontsize}); 2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1583 $self->{layout}->set_width ($self->{w}); 2213 $self->{layout}->set_width ($self->{children}[0]{w});
1584 2214
1585 $self->reflow; 2215 $self->reflow;
1586} 2216}
1587 2217
1588sub add_paragraph { 2218sub add_paragraph {
1621 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1622 2252
1623 delete $self->{texture}; 2253 delete $self->{texture};
1624 } 2254 }
1625 2255
1626 $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 {
1627 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
1628 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
1629 2259
1630 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
1631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1632 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
1639 2269
1640 my $y = 0; 2270 my $y = 0;
1641 2271
1642 my $layout = $self->{layout}; 2272 my $layout = $self->{layout};
1643 2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275
1644 for my $par (@{$self->{par}}) { 2276 for my $par (@{$self->{par}}) {
1645 my $h = $par->[0]; 2277 my $h = $par->[0];
1646 2278
1647 if ($y0 < $y + $h && $y < $y1) { 2279 if ($y0 < $y + $h && $y < $y1) {
1648 $layout->set_text ($par->[2]); 2280 $layout->set_text ($par->[2]);
1662} 2294}
1663 2295
1664sub _draw { 2296sub _draw {
1665 my ($self) = @_; 2297 my ($self) = @_;
1666 2298
1667 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1668 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
1669 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;
1670 $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});
1671 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
1672 } 2306 glDisable GL_BLEND;
1673 2307
1674 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
1675 2309
1676} 2310}
1677 2311
1678############################################################################# 2312#############################################################################
1679 2313
1680package CFClient::UI::MapWidget;
1681
1682use strict;
1683
1684use List::Util qw(min max);
1685
1686use SDL;
1687use SDL::OpenGL;
1688
1689our @ISA = CFClient::UI::Base::;
1690
1691sub new {
1692 my $class = shift;
1693
1694 $class->SUPER::new (
1695 z => -1,
1696 can_focus => 1,
1697 list => (glGenLists 1),
1698 @_
1699 )
1700}
1701
1702sub key_down {
1703 print "MAPKEYDOWN\n";
1704}
1705
1706sub key_up {
1707}
1708
1709sub button_down {
1710 my ($self, $ev, $x, $y) = @_;
1711
1712 $self->focus_in;
1713
1714 if ($ev->button == 2) {
1715 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1716 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1717
1718 $self->{motion} = sub {
1719 my ($ev, $x, $y) = @_;
1720
1721 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1722
1723 $::CFG->{map_shift_x} = $bw + $x - $ox;
1724 $::CFG->{map_shift_y} = $bh + $y - $oy;
1725
1726 $self->update;
1727 };
1728 }
1729}
1730
1731sub button_up {
1732 my ($self, $ev, $x, $y) = @_;
1733
1734 delete $self->{motion};
1735}
1736
1737sub mouse_motion {
1738 my ($self, $ev, $x, $y) = @_;
1739
1740 $self->{motion}->($ev, $x, $y) if $self->{motion};
1741}
1742
1743sub size_request {
1744 (
1745 1 + 32 * int $::WIDTH / 32,
1746 1 + 32 * int $::HEIGHT / 32,
1747 )
1748}
1749
1750sub update {
1751 my ($self) = @_;
1752
1753 $self->{need_update} = 1;
1754 $self->SUPER::update;
1755}
1756
1757sub draw {
1758 my ($self) = @_;
1759
1760 if (delete $self->{need_update}) {
1761 glNewList $self->{list}, GL_COMPILE;
1762
1763 if ($::MAP) {
1764 my $sw = int $::WIDTH / 32;
1765 my $sh = int $::HEIGHT / 32;
1766
1767 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1768 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1769
1770 glTranslate $sx0 - 32, $sy0 - 32, 0;
1771
1772 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1773
1774 if ($::CFG->{fow_enable}) {
1775 if ($::CFG->{fow_smooth}) { # smooth fog of war
1776 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1777 glConvolutionFilter2D
1778 GL_CONVOLUTION_2D,
1779 GL_ALPHA,
1780 3, 3,
1781 GL_ALPHA, GL_FLOAT,
1782 pack "f*",
1783 0.1, 0.1, 0.1,
1784 0.1, 0.2, 0.1,
1785 0.1, 0.1, 0.1,
1786 ;
1787 glEnable GL_CONVOLUTION_2D;
1788 }
1789
1790 $self->{fow_texture} = new CFClient::Texture
1791 w => $w,
1792 h => $h,
1793 data => $data,
1794 internalformat => GL_ALPHA,
1795 format => GL_ALPHA;
1796
1797 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1798
1799 glEnable GL_BLEND;
1800 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1801 glEnable GL_TEXTURE_2D;
1802 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1803
1804 glColor +($::CFG->{fow_intensity}) x 3, 1;
1805 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1806
1807 glDisable GL_TEXTURE_2D;
1808 glDisable GL_BLEND;
1809 }
1810
1811 # HACK BEGIN
1812 {
1813 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1814 my ($w, $h) = (250, 250);
1815
1816 glEnable GL_BLEND;
1817 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1818 glEnable GL_TEXTURE_2D;
1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1820
1821 $self->{mapmap_texture} =
1822 new CFClient::Texture
1823 w => $w,
1824 h => $h,
1825 data => $::MAP->mapmap ($w, $h),
1826 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1827
1828 $self->{mapmap_texture}->draw_quad (100, 100);
1829
1830 glDisable GL_TEXTURE_2D;
1831 glDisable GL_BLEND;
1832 }
1833 # HACK END
1834 }
1835
1836 glEndList;
1837 }
1838
1839 glPushMatrix;
1840 glCallList $self->{list};
1841 glPopMatrix;
1842
1843 if ($FOCUS != $self) {
1844 glColor 64/255, 64/255, 64/255;
1845 glLogicOp GL_AND;
1846 glEnable GL_COLOR_LOGIC_OP;
1847 glBegin GL_QUADS;
1848 glVertex 0, 0;
1849 glVertex 0, $::HEIGHT;
1850 glVertex $::WIDTH, $::HEIGHT;
1851 glVertex $::WIDTH, 0;
1852 glEnd;
1853 glDisable GL_COLOR_LOGIC_OP;
1854 }
1855}
1856
1857my %DIR = (
1858 SDLK_KP8, [1, "north"],
1859 SDLK_KP9, [2, "northeast"],
1860 SDLK_KP6, [3, "east"],
1861 SDLK_KP3, [4, "southeast"],
1862 SDLK_KP2, [5, "south"],
1863 SDLK_KP1, [6, "southwest"],
1864 SDLK_KP4, [7, "west"],
1865 SDLK_KP7, [8, "northwest"],
1866
1867 SDLK_UP, [1, "north"],
1868 SDLK_RIGHT, [3, "east"],
1869 SDLK_DOWN, [5, "south"],
1870 SDLK_LEFT, [7, "west"],
1871);
1872
1873sub key_down {
1874 my ($self, $ev) = @_;
1875
1876 my $mod = $ev->key_mod;
1877 my $sym = $ev->key_sym;
1878
1879 if ($sym == SDLK_KP5) {
1880 $::CONN->user_send ("command stay fire");
1881 } elsif ($sym == SDLK_a) {
1882 $::CONN->user_send ("command apply");
1883 } elsif ($sym == SDLK_QUOTE) {
1884 $self->emit ('activate_console');
1885 } elsif ($sym == SDLK_SLASH) {
1886 $self->emit ('activate_console' => '/');
1887 } elsif (exists $DIR{$sym}) {
1888 if ($mod & KMOD_SHIFT) {
1889 $self->{shft}++;
1890 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1891 } elsif ($mod & KMOD_CTRL) {
1892 $self->{ctrl}++;
1893 $::CONN->user_send ("command run $DIR{$sym}[0]");
1894 } else {
1895 $::CONN->user_send ("command $DIR{$sym}[1]");
1896 }
1897 }
1898}
1899
1900sub key_up {
1901 my ($self, $ev) = @_;
1902
1903 my $mod = $ev->key_mod;
1904 my $sym = $ev->key_sym;
1905
1906 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1907 $::CONN->user_send ("command fire_stop");
1908 }
1909 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1910 $::CONN->user_send ("command run_stop");
1911 }
1912}
1913
1914#############################################################################
1915
1916package CFClient::UI::Animator; 2314package CFClient::UI::Animator;
1917 2315
1918use SDL::OpenGL; 2316use CFClient::OpenGL;
1919 2317
1920our @ISA = CFClient::UI::Bin::; 2318our @ISA = CFClient::UI::Bin::;
1921 2319
1922sub moveto { 2320sub moveto {
1923 my ($self, $x, $y) = @_; 2321 my ($self, $x, $y) = @_;
1961 2359
1962sub new { 2360sub new {
1963 my $class = shift; 2361 my $class = shift;
1964 2362
1965 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1966 state => 0, 2364 state => 0,
1967 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
1968 @_ 2366 @_
1969 ); 2367 );
1970 2368
1971 if ($self->{state}) { 2369 if ($self->{state}) {
1992 $self->emit (changed => $self->{state}); 2390 $self->emit (changed => $self->{state});
1993} 2391}
1994 2392
1995############################################################################# 2393#############################################################################
1996 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
1997package CFClient::UI::Root; 2683package CFClient::UI::Root;
1998 2684
1999our @ISA = CFClient::UI::Container::; 2685our @ISA = CFClient::UI::Container::;
2000 2686
2001use SDL::OpenGL; 2687use CFClient::OpenGL;
2688
2689sub check_size {
2690 my ($self) = @_;
2691
2692 $self->configure (0, 0, $self->{w}, $self->{h});
2693}
2002 2694
2003sub size_request { 2695sub size_request {
2004 ($::WIDTH, $::HEIGHT) 2696 my ($self) = @_;
2697
2698 ($self->{w}, $self->{h})
2005} 2699}
2006 2700
2007sub 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 {
2008 my ($self, $x, $y, $w, $h) = @_; 2725 my ($self, $x, $y, $w, $h) = @_;
2009 2726
2010 $self->_size_allocate ($x, $y, $w, $h); 2727 $self->SUPER::configure ($x, $y, $w, $h);
2011 2728
2012 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2729 for my $child ($self->children) {
2013 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 }
2014} 2736}
2015 2737
2016sub _topleft { 2738sub _topleft {
2017 my ($self, $x, $y) = @_; 2739 my ($self, $x, $y) = @_;
2018 2740
2020} 2742}
2021 2743
2022sub update { 2744sub update {
2023 my ($self) = @_; 2745 my ($self) = @_;
2024 2746
2025 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2747 $self->check_size;
2026 ::refresh (); 2748 ::refresh ();
2027} 2749}
2028 2750
2029sub add { 2751sub add {
2030 my ($self, $widget) = @_; 2752 my ($self, $child) = @_;
2031 2753
2754 # integerize window positions
2755 $child->{x} = int $child->{x};
2756 $child->{y} = int $child->{y};
2757
2032 $self->SUPER::add ($widget); 2758 $self->SUPER::add ($child);
2033
2034 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2035} 2759}
2036 2760
2037sub on_refresh { 2761sub on_refresh {
2038 my ($self, $id, $cb) = @_; 2762 my ($self, $id, $cb) = @_;
2039 2763
2063############################################################################# 2787#############################################################################
2064 2788
2065package CFClient::UI; 2789package CFClient::UI;
2066 2790
2067$ROOT = new CFClient::UI::Root; 2791$ROOT = new CFClient::UI::Root;
2792$TOOLTIP = new CFClient::UI::Tooltip;
2068 2793
20691 27941
2070 2795

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines