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.116 by root, Sat Apr 15 21:16:50 2006 UTC vs.
Revision 1.184 by root, Wed May 3 19:56:05 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} = $x; 194 $self->{x} = int $x;
118 $self->{y} = $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 $_->check_size;
261}
262
263sub set_max_size {
146 my ($self, $x, $y, $w, $h) = @_; 264 my ($self, $w, $h) = @_;
147 265
148 $self->_size_allocate ($x, $y, $w, $h); 266 delete $self->{max_w}; $self->{max_w} = $w if $w;
267 delete $self->{max_h}; $self->{max_h} = $h if $h;
149} 268}
150 269
151# return top left coordinates 270# return top left coordinates
152sub _topleft { 271sub _topleft {
153 my ($self, $x, $y) = @_; 272 my ($self, $x, $y) = @_;
154 273
274 $self->{parent}
275 or Carp::confess "no parent widget in _topleft\n";#d#
276
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 277 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156} 278}
157 279
158# translate global coordinates to local coordinate system 280# translate global coordinates to local coordinate system
159sub coord2local { 281sub coord2local {
… …
176 298
177 return if $FOCUS == $self; 299 return if $FOCUS == $self;
178 return unless $self->{can_focus}; 300 return unless $self->{can_focus};
179 301
180 my $focus = $FOCUS; $FOCUS = $self; 302 my $focus = $FOCUS; $FOCUS = $self;
303
304 $self->emit (focus_in => $focus);
305
181 $focus->update if $focus; 306 $focus->update if $focus;
182 $FOCUS->update; 307 $FOCUS->update;
183} 308}
184 309
185sub focus_out { 310sub focus_out {
186 my ($self) = @_; 311 my ($self) = @_;
187 312
188 return unless $FOCUS == $self; 313 return unless $FOCUS == $self;
189 314
190 my $focus = $FOCUS; undef $FOCUS; 315 my $focus = $FOCUS; undef $FOCUS;
316
317 $self->emit (focus_out => $focus);
318
191 $focus->update if $focus; #? 319 $focus->update if $focus; #?
192} 320}
193 321
194sub mouse_motion { } 322sub mouse_motion { }
195sub button_up { } 323sub button_up { }
… …
219 glPopMatrix; 347 glPopMatrix;
220 348
221 if ($self == $HOVER && $self->{can_hover}) { 349 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)}; 350 my ($x, $y) = @$self{qw(x y)};
223 351
224 glColor 0, 0, 1, 0.2; 352 glColor 1, 0.8, 0.5, 0.2;
225 glEnable GL_BLEND; 353 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 354 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
227 glBegin GL_QUADS; 355 glBegin GL_QUADS;
228 glVertex $x , $y; 356 glVertex $x , $y;
229 glVertex $x + $self->{w}, $y; 357 glVertex $x + $self->{w}, $y;
230 glVertex $x + $self->{w}, $y + $self->{h}; 358 glVertex $x + $self->{w}, $y + $self->{h};
231 glVertex $x , $y + $self->{h}; 359 glVertex $x , $y + $self->{h};
232 glEnd; 360 glEnd;
233 glDisable GL_BLEND; 361 glDisable GL_BLEND;
234 } 362 }
363
364 if ($ENV{PCLIENT_DEBUG}) {
365 glPushMatrix;
366 glColor 1, 1, 0, 1;
367 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
368 glBegin GL_LINE_LOOP;
369 glVertex 0 , 0;
370 glVertex $self->{w}, 0;
371 glVertex $self->{w}, $self->{h};
372 glVertex 0 , $self->{h};
373 glEnd;
374 glPopMatrix;
375 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
376 }
235} 377}
236 378
237sub _draw { 379sub _draw {
238 my ($self) = @_; 380 my ($self) = @_;
239 381
240 warn "no draw defined for $self\n"; 382 warn "no draw defined for $self\n";
241} 383}
242 384
243sub find_widget { 385sub find_widget {
244 my ($self, $x, $y) = @_; 386 my ($self, $x, $y) = @_;
387
388 return () unless $self->{can_events};
245 389
246 return $self 390 return $self
247 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 391 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
248 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 392 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
249 393
… …
254 my ($self, $parent) = @_; 398 my ($self, $parent) = @_;
255 399
256 Scalar::Util::weaken ($self->{parent} = $parent); 400 Scalar::Util::weaken ($self->{parent} = $parent);
257} 401}
258 402
403sub check_size {
404 my ($self) = @_;
405
406 $self->{parent}
407 or return 1;
408
409 my ($w, $h) = $self->{user_w} && $self->{user_h}
410 ? @$self{qw(user_w user_h)}
411 : $self->size_request;
412
413 if ($w != $self->{req_w} || $h != $self->{req_h}) {
414 $self->{req_w} = $w;
415 $self->{req_h} = $h;
416
417 $self->{parent}->check_size
418 or $self->size_allocate (
419 (List::Util::max $self->{w}, $w),
420 (List::Util::max $self->{h}, $h),
421 );
422
423 1
424 } else {
425 0
426 }
427}
428
259sub update { 429sub update {
260 my ($self) = @_; 430 my ($self) = @_;
261 431
262 $self->{parent}->update 432 $self->{parent}->update
263 if $self->{parent}; 433 if $self->{parent};
264} 434}
265 435
266sub connect { 436sub connect {
267 my ($self, $signal, $cb) = @_; 437 my ($self, $signal, $cb) = @_;
268 438
269 push @{ $self->{cb}{$signal} }, $cb; 439 push @{ $self->{signal_cb}{$signal} }, $cb;
270} 440}
271 441
272sub emit { 442sub emit {
273 my ($self, $signal, @args) = @_; 443 my ($self, $signal, @args) = @_;
274 444
275 $_->($self, @args) 445 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
276 for @{$self->{cb}{$signal} || []};
277} 446}
278 447
279sub DESTROY { 448sub DESTROY {
280 my ($self) = @_; 449 my ($self) = @_;
281 450
… …
287package CFClient::UI::DrawBG; 456package CFClient::UI::DrawBG;
288 457
289our @ISA = CFClient::UI::Base::; 458our @ISA = CFClient::UI::Base::;
290 459
291use strict; 460use strict;
292use SDL::OpenGL; 461use CFClient::OpenGL;
293 462
294sub new { 463sub new {
295 my $class = shift; 464 my $class = shift;
296 465
297 # range [value, low, high, page] 466 # range [value, low, high, page]
… …
326 495
327package CFClient::UI::Empty; 496package CFClient::UI::Empty;
328 497
329our @ISA = CFClient::UI::Base::; 498our @ISA = CFClient::UI::Base::;
330 499
500sub new {
501 my ($class, %arg) = @_;
502 $class->SUPER::new (can_events => 0, %arg);
503}
504
331sub size_request { 505sub size_request {
332 (0, 0) 506 (0, 0)
333} 507}
334 508
335sub draw { } 509sub draw { }
… …
343sub new { 517sub new {
344 my ($class, %arg) = @_; 518 my ($class, %arg) = @_;
345 519
346 my $children = delete $arg{children} || []; 520 my $children = delete $arg{children} || [];
347 521
348 my $self = $class->SUPER::new (children => [], %arg); 522 my $self = $class->SUPER::new (
523 children => [],
524 can_events => 0,
525 %arg,
526 );
349 $self->add ($_) for @$children; 527 $self->add ($_) for @$children;
350 528
351 $self 529 $self
352} 530}
353 531
… …
361 $self->{children} = [ 539 $self->{children} = [
362 sort { $a->{z} <=> $b->{z} } 540 sort { $a->{z} <=> $b->{z} }
363 @{$self->{children}}, $child 541 @{$self->{children}}, $child
364 ]; 542 ];
365 543
366 $self->{w} = $self->{h} = -1; 544 $child->check_size;
367 $self->update; 545 $self->update;
368} 546}
369 547
548sub children {
549 @{ $_[0]{children} }
550}
551
370sub remove { 552sub remove {
371 my ($self, $widget) = @_; 553 my ($self, $child) = @_;
372 554
555 delete $child->{parent};
556 $child->hide;
557
373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 558 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
374 559
375 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 560 $self->check_size;
561 $self->update;
562}
563
564sub clear {
565 my ($self) = @_;
566
567 my $children = delete $self->{children};
568 $self->{children} = [];
569
570 for (@$children) {
571 delete $_->{parent};
572 $_->hide;
573 }
574
575 $self->check_size;
576 $self->update;
376} 577}
377 578
378sub find_widget { 579sub find_widget {
379 my ($self, $x, $y) = @_; 580 my ($self, $x, $y) = @_;
380 581
… …
410 611
411 $class->SUPER::new (children => [$child], %arg) 612 $class->SUPER::new (children => [$child], %arg)
412} 613}
413 614
414sub add { 615sub add {
415 my ($self, $widget) = @_; 616 my ($self, $child) = @_;
416 617
417 $self->{children} = []; 618 $self->{children} = [];
418 619
419 $self->SUPER::add ($widget); 620 $self->SUPER::add ($child);
420} 621}
421 622
422sub remove { 623sub remove {
423 my ($self, $widget) = @_; 624 my ($self, $widget) = @_;
424 625
… …
433sub size_request { 634sub size_request {
434 $_[0]{children}[0]->size_request 635 $_[0]{children}[0]->size_request
435} 636}
436 637
437sub size_allocate { 638sub size_allocate {
438 my ($self, $x, $y, $w, $h) = @_; 639 my ($self, $w, $h) = @_;
439 640
440 $self->_size_allocate ($x, $y, $w, $h) or return;
441
442 $self->{children}[0]->size_allocate (0, 0, $w, $h); 641 $self->{children}[0]->configure (0, 0, $w, $h);
443} 642}
444 643
445############################################################################# 644#############################################################################
446 645
447package CFClient::UI::Window; 646package CFClient::UI::Window;
448 647
449our @ISA = CFClient::UI::Bin::; 648our @ISA = CFClient::UI::Bin::;
450 649
451use SDL::OpenGL; 650use CFClient::OpenGL;
452 651
453sub new { 652sub new {
454 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
455 654
456 my $self = $class->SUPER::new (%arg); 655 my $self = $class->SUPER::new (%arg);
457} 656}
458 657
459sub update { 658sub update {
460 my ($self) = @_; 659 my ($self) = @_;
461 660
462 # we want to do this delayed... 661 $ROOT->on_refresh ($self => sub { $self->render_child });
463 $self->render_chld;
464 $self->SUPER::update; 662 $self->SUPER::update;
465} 663}
466 664
665sub size_allocate {
666 my ($self, $w, $h) = @_;
667
668 $self->SUPER::size_allocate ($w, $h);
669 $self->update;
670}
671
672sub _render {
673 $_[0]{children}[0]->draw;
674}
675
467sub render_chld { 676sub render_child {
468 my ($self) = @_; 677 my ($self) = @_;
469 678
470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 679 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
471 glClearColor 0, 0, 0, 1; 680 glClearColor 0, 0, 0, 0;
472 glClear GL_COLOR_BUFFER_BIT; 681 glClear GL_COLOR_BUFFER_BIT;
473 $self->child->draw; 682
683 $self->_render;
684# glColorMask 1, 1, 1, 0;
685# glEnable GL_BLEND;
686# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
687# glRasterPos 0, 0;
688# glCopyPixels 0, 0, $self->{w}, $self->{h};
689# glDisable GL_BLEND;
690# glColorMask 1, 1, 1, 1;
474 }; 691 };
475}
476
477sub size_allocate {
478 my ($self, $x, $y, $w, $h) = @_;
479
480 $self->_size_allocate ($x, $y, $w, $h) or return;
481
482 $self->child->size_allocate (0, 0, $w, $h);
483
484 $self->render_chld;
485} 692}
486 693
487sub _draw { 694sub _draw {
488 my ($self) = @_; 695 my ($self) = @_;
489 696
490 my ($w, $h) = ($self->w, $self->h); 697 my ($w, $h) = ($self->w, $self->h);
491 698
492 my $tex = $self->{texture} 699 my $tex = $self->{texture}
493 or return; 700 or return;
701
702 glEnable GL_BLEND;
703 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
704 glEnable GL_TEXTURE_2D;
705 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
706 glColor 0, 0, 0, 1;
707
708 $tex->draw_quad (0, 0, $w, $h);
709
710 glDisable GL_BLEND;
711 glDisable GL_TEXTURE_2D;
712}
713
714#############################################################################
715
716package CFClient::UI::ViewPort;
717
718our @ISA = CFClient::UI::Window::;
719
720sub size_request {
721 my ($self) = @_;
722
723 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
724 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
725
726 @$self{qw(child_w child_h)}
727}
728
729sub size_allocate {
730 my ($self, $w, $h) = @_;
731
732 $self->update;
733}
734
735sub set_offset {
736 my ($self, $x, $y) = @_;
737
738 $self->{view_x} = int $x;
739 $self->{view_y} = int $y;
740
741 $self->update;
742}
743
744# hmm, this does not work for topleft of $self... but we should not aks for that
745sub _topleft {
746 my ($self, $x, $y) = @_;
747
748 $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
749}
750
751sub find_widget {
752 my ($self, $x, $y) = @_;
753
754 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
755 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
756 ) {
757 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
758 } else {
759 $self->CFClient::UI::Base::find_widget ($x, $y)
760 }
761}
762
763sub _render {
764 my ($self) = @_;
765
766 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
767
768 $self->SUPER::_render;
769}
770
771#############################################################################
772
773package CFClient::UI::ScrolledWindow;
774
775our @ISA = CFClient::UI::HBox::;
776
777sub new {
778 my $class = shift;
779
780 my $self;
781
782 my $slider = new CFClient::UI::Slider
783 vertical => 1,
784 range => [0, 0, 1, 0.01], # HACK fix
785 connect_changed => sub {
786 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
787 },
788 ;
789
790 $self = $class->SUPER::new (
791 vp => (new CFClient::UI::ViewPort),
792 slider => $slider,
793 @_,
794 );
795
796 $self->{vp}->add ($self->{scrolled});
797 $self->add ($self->{vp});
798 $self->add ($self->{slider});
799
800 $self
801}
802
803#TODO# update range on size_allocate depeneing on child
804# update viewport offset on scroll
805
806#############################################################################
807
808package CFClient::UI::Frame;
809
810our @ISA = CFClient::UI::Bin::;
811
812use CFClient::OpenGL;
813
814sub new {
815 my $class = shift;
816
817 my $self = $class->SUPER::new (
818 bg => [1, 1, 1, 1],
819 border_bg => [1, 1, 1, 1],
820 border => 0.8,
821 @_
822 );
823
824 $self
825}
826
827sub _draw {
828 my ($self) = @_;
829
830 my ($w, $h) = ($self->{w}, $self->{h});
494 831
495 glEnable GL_BLEND; 832 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 833 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
497 glEnable GL_TEXTURE_2D; 834 glEnable GL_TEXTURE_2D;
498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 835 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
499 836
500 $tex->draw_quad (0, 0, $w, $h); 837# glBegin GL_QUADS;
838# glColor 0, 0, 0, 0;
839# glVertex 0 , 0;
840# glVertex 0 , $h;
841# glVertex $w, $h;
842# glVertex $w, 0;
843# glEnd;
501 844
845
846 $self->child->draw;
502 glDisable GL_BLEND; 847 glDisable GL_BLEND;
503 glDisable GL_TEXTURE_2D; 848 glDisable GL_TEXTURE_2D;
504} 849}
505 850
506############################################################################# 851#############################################################################
507 852
508package CFClient::UI::Frame; 853package CFClient::UI::FancyFrame;
509 854
510our @ISA = CFClient::UI::Bin::; 855our @ISA = CFClient::UI::Bin::;
511 856
512use SDL::OpenGL; 857use CFClient::OpenGL;
513
514sub size_request {
515 my ($self) = @_;
516 my $chld = $self->child
517 or return (0, 0);
518
519 $chld->move (2, 2);
520
521 map { $_ + 4 } $chld->size_request;
522}
523
524sub size_allocate {
525 my ($self, $x, $y, $w, $h) = @_;
526
527 $self->_size_allocate ($x, $y, $w, $h) or return;
528
529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
530}
531
532sub _draw {
533 my ($self) = @_;
534
535 my $chld = $self->child;
536
537 my ($w, $h) = $chld->size_request;
538
539 glBegin GL_QUADS;
540 glColor 0, 0, 0;
541 glVertex 0 , 0;
542 glVertex 0 , $h + 4;
543 glVertex $w + 4 , $h + 4;
544 glVertex $w + 4 , 0;
545 glEnd;
546
547 $chld->draw;
548}
549
550#############################################################################
551
552package CFClient::UI::FancyFrame;
553
554our @ISA = CFClient::UI::Bin::;
555
556use SDL::OpenGL;
557 858
558my @tex = 859my @tex =
559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 860 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 861 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
561 862
562sub new { 863sub new {
563 my $class = shift; 864 my $class = shift;
564 865
565 # TODO: user_x, user_y, overwrite moveto? 866 # TODO: user_x, user_y, overwrite moveto?
566 867
567 $class->SUPER::new ( 868 my $self = $class->SUPER::new (
568 bg => [1, 1, 1, 1], 869 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1], 870 border_bg => [1, 1, 1, 1],
570 border => $::FONTSIZE * 0.8, 871 border => 0.6,
872 can_events => 1,
571 @_ 873 @_
874 );
875
876 $self->{title} &&= new CFClient::UI::Label
877 align => 0,
878 valign => 1,
879 text => $self->{title},
880 fontsize => $self->{border};
881
882 $self
883}
884
885sub border {
886 int $_[0]{border} * $::FONTSIZE
887}
888
889sub size_request {
890 my ($self) = @_;
891
892 my ($w, $h) = $self->SUPER::size_request;
893
894 (
895 $w + $self->border * 2,
896 $h + $self->border * 2,
572 ) 897 )
573} 898}
574 899
575sub size_request {
576 my ($self) = @_;
577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
580 my ($w, $h) = $self->SUPER::size_request;
581
582 (
583 $w + $self->{border} * 2,
584 $h + $self->{border} * 2,
585 )
586}
587
588sub size_allocate { 900sub size_allocate {
589 my ($self, $x, $y, $w, $h) = @_; 901 my ($self, $w, $h) = @_;
590 902
591 $self->_size_allocate ($x, $y, $w, $h) or return;
592
593 $h -= List::Util::max 0, $self->{border} * 2; 903 $h -= List::Util::max 0, $self->border * 2;
594 $w -= List::Util::max 0, $self->{border} * 2; 904 $w -= List::Util::max 0, $self->border * 2;
595 905
906 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
907 if $self->{title};
908
596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 909 $self->child->configure ($self->border, $self->border, $w, $h);
597} 910}
598 911
599sub button_down { 912sub button_down {
600 my ($self, $ev, $x, $y) = @_; 913 my ($self, $ev, $x, $y) = @_;
601 914
602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 915 my ($w, $h) = @$self{qw(w h)};
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 916 my $border = $self->border;
604 917
918 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
919 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
920
921 if ($lr & $td) {
922 my ($wx, $wy) = ($self->{x}, $self->{y});
605 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 923 my ($ox, $oy) = ($ev->{x}, $ev->{y});
606 my ($bw, $bh) = ($self->{w}, $self->{h}); 924 my ($bw, $bh) = ($self->{w}, $self->{h});
925
926 my $mx = $x < $border;
927 my $my = $y < $border;
607 928
608 $self->{motion} = sub { 929 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_; 930 my ($ev, $x, $y) = @_;
610 931
611 ($x, $y) = ($ev->motion_x, $ev->motion_y); 932 my $dx = $ev->{x} - $ox;
933 my $dy = $ev->{y} - $oy;
612 934
613 $self->{user_w} = $bw + $x - $ox; 935 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
614 $self->{user_h} = $bh + $y - $oy; 936 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
615 $self->update; 937 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
938 $self->check_size;
616 }; 939 };
617 940
618 } elsif ($x >= 0 && $x < $self->{w} 941 } elsif ($lr ^ $td) {
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 942 my ($ox, $oy) = ($ev->{x}, $ev->{y});
622 my ($bx, $by) = ($self->{x}, $self->{y}); 943 my ($bx, $by) = ($self->{x}, $self->{y});
623 944
624 $self->{motion} = sub { 945 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_; 946 my ($ev, $x, $y) = @_;
626 947
627 ($x, $y) = ($ev->motion_x, $ev->motion_y); 948 ($x, $y) = ($ev->{x}, $ev->{y});
628 949
629 $self->move ($bx + $x - $ox, $by + $y - $oy); 950 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update; 951 $self->update;
631 }; 952 };
632 } 953 }
… …
653 glEnable GL_BLEND; 974 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 975 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
655 glEnable GL_TEXTURE_2D; 976 glEnable GL_TEXTURE_2D;
656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
657 978
979 my $border = $self->border;
980
658 glColor @{ $self->{border_bg} }; 981 glColor @{ $self->{border_bg} };
659 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 982 $tex[1]->draw_quad (0, 0, $w, $border);
660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 983 $tex[3]->draw_quad (0, $border, $border, $ch);
661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 984 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 985 $tex[4]->draw_quad (0, $h - $border, $w, $border);
663 986
987 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
664 my $bg = $tex[0]; 988 my $bg = $tex[0];
665 989
666 # TODO: repeat texture not scale 990 # TODO: repeat texture not scale
667 my $rep_x = $cw / $bg->{w}; 991 my $rep_x = $cw / $bg->{w};
668 my $rep_y = $ch / $bg->{h}; 992 my $rep_y = $ch / $bg->{h};
669 993
670 glColor @{ $self->{bg} }; 994 glColor @{ $self->{bg} };
671 995
672 $bg->{s} = $rep_x; 996 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y; 997 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1; 998 $bg->{wrap_mode} = 1;
675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 999 $bg->draw_quad ($border, $border, $cw, $ch);
676 1000
677 glDisable GL_TEXTURE_2D; 1001 glDisable GL_TEXTURE_2D;
678 glDisable GL_BLEND; 1002 glDisable GL_BLEND;
1003 }
1004
1005 $self->{title}->draw if $self->{title};
679 1006
680 $self->child->draw; 1007 $self->child->draw;
681} 1008}
682 1009
683############################################################################# 1010#############################################################################
… …
686 1013
687our @ISA = CFClient::UI::Base::; 1014our @ISA = CFClient::UI::Base::;
688 1015
689use List::Util qw(max sum); 1016use List::Util qw(max sum);
690 1017
691use SDL::OpenGL; 1018use CFClient::OpenGL;
692 1019
693sub new { 1020sub new {
694 my $class = shift; 1021 my $class = shift;
695 1022
696 $class->SUPER::new ( 1023 $class->SUPER::new (
… …
703 my ($self, $x, $y, $child) = @_; 1030 my ($self, $x, $y, $child) = @_;
704 1031
705 $child->set_parent ($self); 1032 $child->set_parent ($self);
706 $self->{children}[$y][$x] = $child; 1033 $self->{children}[$y][$x] = $child;
707 1034
708 $self->{w} = $self->{h} = -1; 1035 $child->check_size;
709 $self->update; 1036}
1037
1038sub children {
1039 grep $_, map @$_, grep $_, @{ $_[0]{children} }
710} 1040}
711 1041
712# TODO: move to container class maybe? send childs a signal on removal? 1042# TODO: move to container class maybe? send childs a signal on removal?
713sub clear { 1043sub clear {
714 my ($self) = @_; 1044 my ($self) = @_;
715 1045
1046 my @children = $self->children;
716 delete $self->{children}; 1047 delete $self->{children};
1048
1049 for (@children) {
1050 delete $_->{parent};
1051 $_->hide;
1052 }
1053
717 $self->update; 1054 $self->update;
718} 1055}
719 1056
720sub get_wh { 1057sub get_wh {
721 my ($self) = @_; 1058 my ($self) = @_;
… …
727 or next; 1064 or next;
728 1065
729 for my $x (0 .. $#$row) { 1066 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x] 1067 my $widget = $row->[$x]
731 or next; 1068 or next;
732 my ($w, $h) = $widget->size_request; 1069 my ($w, $h) = @$widget{qw(req_w req_h)};
733 1070
734 $w[$x] = max $w[$x], $w; 1071 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h; 1072 $h[$y] = max $h[$y], $h;
736 } 1073 }
737 } 1074 }
… …
749 (sum @$hs), 1086 (sum @$hs),
750 ) 1087 )
751} 1088}
752 1089
753sub size_allocate { 1090sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_; 1091 my ($self, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757 1092
758 my ($ws, $hs) = $self->get_wh; 1093 my ($ws, $hs) = $self->get_wh;
759 1094
760 my $req_w = sum @$ws; 1095 my $req_w = sum @$ws;
761 my $req_h = sum @$hs; 1096 my $req_h = sum @$hs;
… …
783 1118
784 for my $c (0 .. $#$row) { 1119 for my $c (0 .. $#$row) {
785 my $col_w = $ws->[$c]; 1120 my $col_w = $ws->[$c];
786 1121
787 if (my $widget = $row->[$c]) { 1122 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h); 1123 $widget->configure ($x, $y, $col_w, $row_h);
789 } 1124 }
790 1125
791 $x += $col_w; 1126 $x += $col_w;
792 } 1127 }
793 1128
… …
838 (List::Util::max map $_->[1], @alloc), 1173 (List::Util::max map $_->[1], @alloc),
839 ) 1174 )
840} 1175}
841 1176
842sub size_allocate { 1177sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_; 1178 my ($self, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846 1179
847 ($h, $w) = ($w, $h); 1180 ($h, $w) = ($w, $h);
848 1181
849 my $children = $self->{children}; 1182 my $children = $self->{children};
850 1183
851 my @h = map +($_->size_request)[0], @$children; 1184 my @h = map $_->{req_w}, @$children;
852 1185
853 my $req_h = List::Util::sum @h; 1186 my $req_h = List::Util::sum @h;
854 1187
855 if ($req_h > $h) { 1188 if ($req_h > $h) {
856 # ah well, not enough space 1189 # ah well, not enough space
… …
872 1205
873 my $y = 0; 1206 my $y = 0;
874 for (0 .. $#$children) { 1207 for (0 .. $#$children) {
875 my $child = $children->[$_]; 1208 my $child = $children->[$_];
876 my $h = $h[$_]; 1209 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w); 1210 $child->configure ($y, 0, $h, $w);
878 1211
879 $y += $h; 1212 $y += $h;
880 } 1213 }
1214
1215 1
881} 1216}
882 1217
883############################################################################# 1218#############################################################################
884 1219
885package CFClient::UI::VBox; 1220package CFClient::UI::VBox;
… …
898 (List::Util::sum map $_->[1], @alloc), 1233 (List::Util::sum map $_->[1], @alloc),
899 ) 1234 )
900} 1235}
901 1236
902sub size_allocate { 1237sub size_allocate {
903 my ($self, $x, $y, $w, $h) = @_; 1238 my ($self, $w, $h) = @_;
904
905 $self->_size_allocate ($x, $y, $w, $h);
906 1239
907 my $children = $self->{children}; 1240 my $children = $self->{children};
908 1241
909 my @h = map +($_->size_request)[1], @$children; 1242 my @h = map $_->{req_h}, @$children;
910 1243
911 my $req_h = List::Util::sum @h; 1244 my $req_h = List::Util::sum @h;
912 1245
913 if ($req_h > $h) { 1246 if ($req_h > $h) {
914 # ah well, not enough space 1247 # ah well, not enough space
… …
928 1261
929 my $y = 0; 1262 my $y = 0;
930 for (0 .. $#$children) { 1263 for (0 .. $#$children) {
931 my $child = $children->[$_]; 1264 my $child = $children->[$_];
932 my $h = $h[$_]; 1265 my $h = $h[$_];
933 $child->size_allocate (0, $y, $w, $h); 1266 $child->configure (0, $y, $w, $h);
934 1267
935 $y += $h; 1268 $y += $h;
936 } 1269 }
1270
1271 1
937} 1272}
938 1273
939############################################################################# 1274#############################################################################
940 1275
941package CFClient::UI::Label; 1276package CFClient::UI::Label;
942 1277
943our @ISA = CFClient::UI::Base::; 1278our @ISA = CFClient::UI::Base::;
944 1279
945use SDL::OpenGL; 1280use CFClient::OpenGL;
946 1281
947sub new { 1282sub new {
948 my ($class, %arg) = @_; 1283 my ($class, %arg) = @_;
949 1284
950 my $self = $class->SUPER::new ( 1285 my $self = $class->SUPER::new (
951 fg => [1, 1, 1], 1286 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE, 1287 #font => default_font
1288 fontsize => 1,
953 text => "", 1289 text => "",
954 align => -1, 1290 align => -1,
955 valign => -1, 1291 valign => -1,
956 padding => 2, 1292 padding => 2,
957 layout => new CFClient::Layout, 1293 layout => new CFClient::Layout,
1294 can_events => 0,
958 %arg 1295 %arg
959 ); 1296 );
960 1297
961 $self->set_text ($self->{text}); 1298 if (exists $self->{template}) {
1299 my $layout = new CFClient::Layout;
1300 $layout->set_text (delete $self->{template});
1301 $self->{template} = $layout;
1302 }
1303
1304 $self->set_text (delete $self->{text}) if exists $self->{text};
1305 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
962 1306
963 $self 1307 $self
964} 1308}
965 1309
966sub escape_text { 1310sub escape {
967 local $_ = $_[1]; 1311 local $_ = $_[1];
968 1312
969 s/&/&amp;/g; 1313 s/&/&amp;/g;
970 s/>/&gt;/g; 1314 s/>/&gt;/g;
971 s/</&lt;/g; 1315 s/</&lt;/g;
972 1316
973 $_[1] 1317 $_[1]
974} 1318}
975 1319
1320sub update {
1321 my ($self) = @_;
1322
1323 delete $self->{texture};
1324 $self->SUPER::update;
1325}
1326
1327sub reconfigure {
1328 my ($self) = @_;
1329
1330 delete $self->{texture};
1331}
1332
976sub set_text { 1333sub set_text {
977 my ($self, $text) = @_; 1334 my ($self, $text) = @_;
978 1335
1336 return if $self->{text} eq "T$text";
979 $self->{text} = $text; 1337 $self->{text} = "T$text";
1338
980 $self->{layout}->set_markup ($text); 1339 $self->{layout}->set_text ($text);
981 1340
982 delete $self->{texture}; 1341 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
984 $self->update; 1342 $self->update;
1343 $self->check_size;
985} 1344}
986 1345
987sub get_text { 1346sub set_markup {
988 my ($self, $text) = @_; 1347 my ($self, $markup) = @_;
989 1348
990 $self->{text} 1349 return if $self->{text} eq "M$markup";
1350 $self->{text} = "M$markup";
1351
1352 $self->{layout}->set_markup ($markup);
1353
1354 delete $self->{texture};
1355 $self->update;
1356 $self->check_size;
991} 1357}
992 1358
993sub size_request { 1359sub size_request {
994 my ($self) = @_; 1360 my ($self) = @_;
995 1361
996 $self->{layout}->set_width; 1362 $self->{layout}->set_font ($self->{font}) if $self->{font};
1363 $self->{layout}->set_width ($self->{max_w} || -1);
997 $self->{layout}->set_height ($self->{fontsize}); 1364 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1365
998 my ($w, $h) = $self->{layout}->size; 1366 my ($w, $h) = $self->{layout}->size;
1367
1368 if (exists $self->{template}) {
1369 $self->{template}->set_font ($self->{font}) if $self->{font};
1370 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1371
1372 my ($w2, $h2) = $self->{template}->size;
1373
1374 $w = List::Util::max $w, $w2;
1375 $h = List::Util::max $h, $h2;
1376 }
999 1377
1000 ( 1378 (
1001 $w + $self->{padding} * 2, 1379 $w + $self->{padding} * 2,
1002 $h + $self->{padding} * 2, 1380 $h + $self->{padding} * 2,
1003 ) 1381 )
1004} 1382}
1005 1383
1006sub size_allocate { 1384sub size_allocate {
1007 my ($self, $x, $y, $w, $h) = @_; 1385 my ($self, $w, $h) = @_;
1008
1009 $self->_size_allocate ($x, $y, $w, $h) or return;
1010 1386
1011 delete $self->{texture}; 1387 delete $self->{texture};
1012} 1388}
1013 1389
1014sub update { 1390sub set_fontsize {
1015 my ($self) = @_; 1391 my ($self, $fontsize) = @_;
1016 1392
1393 $self->{fontsize} = $fontsize;
1017 delete $self->{texture}; 1394 delete $self->{texture};
1395 $self->check_size;
1018 $self->SUPER::update; 1396 $self->update;
1019} 1397}
1020 1398
1021sub _draw { 1399sub _draw {
1022 my ($self) = @_; 1400 my ($self) = @_;
1023 1401
1024 my $tex = $self->{texture} ||= do { 1402 my $tex = $self->{texture} ||= do {
1403 $self->{layout}->set_font ($self->{font}) if $self->{font};
1025 $self->{layout}->set_width ($self->{w}); 1404 $self->{layout}->set_width ($self->{w});
1026 $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);
1027 new_from_layout CFClient::Texture $self->{layout} 1406 new_from_layout CFClient::Texture $self->{layout}
1028 }; 1407 };
1029 1408
1030 glEnable GL_BLEND; 1409 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1410 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032 glEnable GL_TEXTURE_2D; 1411 glEnable GL_TEXTURE_2D;
1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1034 1413
1035 glColor @{$self->{fg}}; 1414 glColor @{$self->{fg}};
1036 1415
1037 my $x = 1416 $self->{ox} = int (
1038 $self->{align} < 0 ? $self->{padding} 1417 $self->{align} < 0 ? $self->{padding}
1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1418 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1040 : ($self->{w} - $tex->{w}) * 0.5; 1419 : ($self->{w} - $tex->{w}) * 0.5
1420 );
1041 1421
1042 my $y = 1422 $self->{oy} = int (
1043 $self->{valign} < 0 ? $self->{padding} 1423 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1424 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5; 1425 : ($self->{h} - $tex->{h}) * 0.5
1426 );
1046 1427
1047 $tex->draw_quad (int $x, int $y); 1428 $tex->draw_quad ($self->{ox}, $self->{oy});
1048 1429
1049 glDisable GL_TEXTURE_2D; 1430 glDisable GL_TEXTURE_2D;
1050 glDisable GL_BLEND; 1431 glDisable GL_BLEND;
1051} 1432}
1052 1433
1053############################################################################# 1434#############################################################################
1054 1435
1055package CFClient::UI::Entry; 1436package CFClient::UI::EntryBase;
1056 1437
1057our @ISA = CFClient::UI::Label::; 1438our @ISA = CFClient::UI::Label::;
1058 1439
1059use SDL; 1440use CFClient::OpenGL;
1060use SDL::OpenGL;
1061 1441
1062sub new { 1442sub new {
1063 my $class = shift; 1443 my $class = shift;
1064 1444
1065 $class->SUPER::new ( 1445 $class->SUPER::new (
1066 fg => [1, 1, 1], 1446 fg => [1, 1, 1],
1067 bg => [0, 0, 0, 0.2], 1447 bg => [0, 0, 0, 0.2],
1068 active_bg => [1, 1, 1, 0.5], 1448 active_bg => [1, 1, 1, 0.5],
1069 active_fg => [0, 0, 0], 1449 active_fg => [0, 0, 0],
1070 can_hover => 1, 1450 can_hover => 1,
1071 can_focus => 1, 1451 can_focus => 1,
1072 valign => 0, 1452 valign => 0,
1453 can_events => 1,
1073 @_ 1454 @_
1074 ) 1455 )
1075} 1456}
1076 1457
1077sub _set_text { 1458sub _set_text {
1078 my ($self, $text) = @_; 1459 my ($self, $text) = @_;
1079 1460
1080 my $old_text = $self->{text}; 1461 delete $self->{cur_h};
1462
1463 return if $self->{text} eq $text;
1464
1465 delete $self->{texture};
1081 1466
1082 $self->{last_activity} = $::NOW; 1467 $self->{last_activity} = $::NOW;
1083
1084 $self->{text} = $text; 1468 $self->{text} = $text;
1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1087 1469
1088 $text =~ s/./*/g if $self->{hidden}; 1470 $text =~ s/./*/g if $self->{hidden};
1471 $self->{layout}->set_text ("$text ");
1089 1472
1090 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1473 $self->emit (changed => $self->{text});
1474}
1091 1475
1092 $text = substr $text, 0, $self->{cursor}; 1476sub get_text {
1093 utf8::encode $text; 1477 $_[0]{text}
1094
1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
1099} 1478}
1100 1479
1101sub size_request { 1480sub size_request {
1102 my ($self) = @_; 1481 my ($self) = @_;
1103 1482
… …
1105 1484
1106 ($w + 1, $h) # add 1 for cursor 1485 ($w + 1, $h) # add 1 for cursor
1107} 1486}
1108 1487
1109sub size_allocate { 1488sub size_allocate {
1110 my ($self, $x, $y, $w, $h) = @_; 1489 my ($self, $w, $h) = @_;
1111 1490
1112 $self->SUPER::size_allocate ($x, $y, $w, $h); 1491 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1113
1114 $self->_set_text ($self->{text});
1115} 1492}
1116 1493
1117sub set_text { 1494sub set_text {
1118 my ($self, $text) = @_; 1495 my ($self, $text) = @_;
1119 1496
… …
1123} 1500}
1124 1501
1125sub key_down { 1502sub key_down {
1126 my ($self, $ev) = @_; 1503 my ($self, $ev) = @_;
1127 1504
1128 my $mod = $ev->key_mod; 1505 my $mod = $ev->{mod};
1129 my $sym = $ev->key_sym; 1506 my $sym = $ev->{sym};
1130
1131 my $uni = $ev->key_unicode; 1507 my $uni = $ev->{unicode};
1132 1508
1133 my $text = $self->get_text; 1509 my $text = $self->get_text;
1134 1510
1135 if ($sym == SDLK_BACKSPACE) { 1511 if ($sym == 8) {
1136 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1512 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1137 } elsif ($sym == SDLK_DELETE) { 1513 } elsif ($sym == 127) {
1138 substr $text, $self->{cursor}, 1, ""; 1514 substr $text, $self->{cursor}, 1, "";
1139 } elsif ($sym == SDLK_LEFT) { 1515 } elsif ($sym == CFClient::SDLK_LEFT) {
1140 --$self->{cursor} if $self->{cursor}; 1516 --$self->{cursor} if $self->{cursor};
1141 } elsif ($sym == SDLK_RIGHT) { 1517 } elsif ($sym == CFClient::SDLK_RIGHT) {
1142 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1518 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1143 } elsif ($sym == SDLK_HOME) { 1519 } elsif ($sym == CFClient::SDLK_HOME) {
1144 $self->{cursor} = 0; 1520 $self->{cursor} = 0;
1145 } elsif ($sym == SDLK_END) { 1521 } elsif ($sym == CFClient::SDLK_END) {
1146 $self->{cursor} = length $text; 1522 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) { 1523 } elsif ($sym == 27) {
1148 $self->emit ('escape'); 1524 $self->emit ('escape');
1149 } elsif ($uni) { 1525 } elsif ($uni) {
1150 substr $text, $self->{cursor}++, 0, chr $uni; 1526 substr $text, $self->{cursor}++, 0, chr $uni;
1151 } 1527 }
1152 1528
… …
1207 1583
1208 $self->SUPER::_draw; 1584 $self->SUPER::_draw;
1209 1585
1210 #TODO: force update every cursor change :( 1586 #TODO: force update every cursor change :(
1211 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
1212 glColor @{$self->{fg}}; 1596 glColor @{$self->{fg}};
1213 glBegin GL_LINES; 1597 glBegin GL_LINES;
1214 glVertex $self->{cur_x}, $self->{cur_y};
1215 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};
1216 glEnd; 1600 glEnd;
1217 } 1601 }
1218} 1602}
1219 1603
1220package CFClient::UI::LineEntry; 1604package CFClient::UI::Entry;
1221 1605
1222our @ISA = CFClient::UI::Entry::; 1606our @ISA = CFClient::UI::EntryBase::;
1223 1607
1224use SDL; 1608use CFClient::OpenGL;
1225use SDL::OpenGL;
1226 1609
1227sub key_down { 1610sub key_down {
1228 my ($self, $ev) = @_; 1611 my ($self, $ev) = @_;
1229 1612
1230 my $sym = $ev->key_sym; 1613 my $sym = $ev->{sym};
1231 1614
1232 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} = '';
1233 $self->emit (activate => $self->get_text); 1620 $self->emit (activate => $txt);
1234 $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 }
1235 1644
1236 } else { 1645 } else {
1237 $self->SUPER::key_down ($ev); 1646 $self->SUPER::key_down ($ev);
1238 } 1647 }
1239 1648
… …
1243 1652
1244package CFClient::UI::Button; 1653package CFClient::UI::Button;
1245 1654
1246our @ISA = CFClient::UI::Label::; 1655our @ISA = CFClient::UI::Label::;
1247 1656
1248use SDL; 1657use CFClient::OpenGL;
1249use SDL::OpenGL;
1250 1658
1251my @tex = 1659my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1660 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1253 qw(b1_button_active.png); 1661 qw(b1_button_active.png);
1254 1662
1255sub new { 1663sub new {
1256 my $class = shift; 1664 my $class = shift;
1257 1665
1258 $class->SUPER::new ( 1666 $class->SUPER::new (
1259 padding => 4, 1667 padding => 4,
1260 fg => [1, 1, 1], 1668 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2], 1669 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0], 1670 active_fg => [0, 0, 1],
1263 can_hover => 1, 1671 can_hover => 1,
1672 align => 0,
1673 valign => 0,
1674 can_events => 1,
1264 @_ 1675 @_
1265 ) 1676 )
1266} 1677}
1267 1678
1268sub button_up { 1679sub button_up {
… …
1276 1687
1277sub _draw { 1688sub _draw {
1278 my ($self) = @_; 1689 my ($self) = @_;
1279 1690
1280 local $self->{fg} = $self->{fg}; 1691 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1282
1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286 1692
1287 if ($GRAB == $self) { 1693 if ($GRAB == $self) {
1288 $self->{fg} = $self->{active_fg}; 1694 $self->{fg} = $self->{active_fg};
1289 } 1695 }
1290 1696
1291 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1697 glEnable GL_BLEND;
1698 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1699 glEnable GL_TEXTURE_2D;
1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1701 glColor 0, 0, 0, 1;
1293 1702
1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1703 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1295 1704
1296 glDisable GL_TEXTURE_2D; 1705 glDisable GL_TEXTURE_2D;
1297 glDisable GL_BLEND; 1706 glDisable GL_BLEND;
1298 1707
1299 $self->SUPER::_draw; 1708 $self->SUPER::_draw;
… …
1304package CFClient::UI::CheckBox; 1713package CFClient::UI::CheckBox;
1305 1714
1306our @ISA = CFClient::UI::DrawBG::; 1715our @ISA = CFClient::UI::DrawBG::;
1307 1716
1308my @tex = 1717my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1719 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311 1720
1312use SDL; 1721use CFClient::OpenGL;
1313use SDL::OpenGL;
1314 1722
1315sub new { 1723sub new {
1316 my $class = shift; 1724 my $class = shift;
1317 1725
1318 $class->SUPER::new ( 1726 $class->SUPER::new (
… …
1329 my ($self) = @_; 1737 my ($self) = @_;
1330 1738
1331 ($self->{padding} * 2 + 6) x 2 1739 ($self->{padding} * 2 + 6) x 2
1332} 1740}
1333 1741
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down { 1742sub button_down {
1341 my ($self, $ev, $x, $y) = @_; 1743 my ($self, $ev, $x, $y) = @_;
1342 1744
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1745 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1746 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1370 glDisable GL_BLEND; 1772 glDisable GL_BLEND;
1371} 1773}
1372 1774
1373############################################################################# 1775#############################################################################
1374 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
1375package CFClient::UI::Slider; 2016package CFClient::UI::Slider;
1376 2017
1377use strict; 2018use strict;
1378 2019
1379use SDL::OpenGL; 2020use CFClient::OpenGL;
1380 2021
1381our @ISA = CFClient::UI::DrawBG::; 2022our @ISA = CFClient::UI::DrawBG::;
1382 2023
1383my @tex = 2024my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1394 # TODO: calculations are off 2035 # TODO: calculations are off
1395 my $self = $class->SUPER::new ( 2036 my $self = $class->SUPER::new (
1396 fg => [1, 1, 1], 2037 fg => [1, 1, 1],
1397 active_fg => [0, 0, 0], 2038 active_fg => [0, 0, 0],
1398 range => [0, 0, 100, 10], 2039 range => [0, 0, 100, 10],
1399 req_w => 40, 2040 req_w => $::WIDTH / 80,
1400 req_h => 13, 2041 req_h => $::WIDTH / 80,
1401 vertical => 0, 2042 vertical => 0,
1402 can_hover => 1, 2043 can_hover => 1,
1403 inner_pad => 5, 2044 inner_pad => 5,
1404 @_ 2045 @_
1405 ); 2046 );
… …
1509 2150
1510package CFClient::UI::TextView; 2151package CFClient::UI::TextView;
1511 2152
1512our @ISA = CFClient::UI::HBox::; 2153our @ISA = CFClient::UI::HBox::;
1513 2154
1514use SDL::OpenGL; 2155use CFClient::OpenGL;
1515 2156
1516sub new { 2157sub new {
1517 my $class = shift; 2158 my $class = shift;
1518 2159
1519 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6, 2161 fontsize => 1,
1521 req_h => $::HEIGHT / 6, 2162 can_events => 0,
1522 fontsize => $::FONTSIZE, 2163 #font => default_font
1523 @_, 2164 @_,
1524 2165
1525 layout => (new CFClient::Layout), 2166 layout => (new CFClient::Layout),
1526 par => [], 2167 par => [],
1527 height => 0, 2168 height => 0,
1528 children => [ 2169 children => [
1529 (new CFClient::UI::Empty expand => 1), 2170 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1), 2171 (new CFClient::UI::Slider vertical => 1),
1531 ], 2172 ],
1532 ); 2173 );
1533 2174
1534 $self->{children}[1]->connect (changed => sub { 2175 $self->{children}[1]->connect (changed => sub { $self->update });
1535 $self->update;
1536 });
1537 2176
1538 $self 2177 $self
1539} 2178}
1540 2179
1541sub set_fontsize { 2180sub set_fontsize {
… …
1548sub text_height { 2187sub text_height {
1549 my ($self, $text) = @_; 2188 my ($self, $text) = @_;
1550 2189
1551 my $layout = $self->{layout}; 2190 my $layout = $self->{layout};
1552 2191
1553 $layout->set_height ($self->{fontsize}); 2192 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1554 $layout->set_width ($self->{w}); 2193 $layout->set_width ($self->{children}[0]{w});
1555 $layout->set_text ($text); 2194 $layout->set_text ($text);
1556 2195
1557 ($layout->size)[1] 2196 ($layout->size)[1]
1558} 2197}
1559 2198
… …
1562 2201
1563 $self->{need_reflow}++; 2202 $self->{need_reflow}++;
1564 $self->update; 2203 $self->update;
1565} 2204}
1566 2205
1567sub size_request {
1568 my ($self) = @_;
1569
1570 ($self->{req_w}, $self->{req_h})
1571}
1572
1573sub size_allocate { 2206sub size_allocate {
1574 my ($self, $x, $y, $w, $h) = @_; 2207 my ($self, $w, $h) = @_;
1575 2208
1576 $self->SUPER::size_allocate ($x, $y, $w, $h); 2209 $self->SUPER::size_allocate ($w, $h);
1577 2210
2211 $self->{layout}->set_font ($self->{font}) if $self->{font};
1578 $self->{layout}->set_height ($self->{fontsize}); 2212 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1579 $self->{layout}->set_width ($self->{w}); 2213 $self->{layout}->set_width ($self->{children}[0]{w});
1580 2214
1581 $self->reflow; 2215 $self->reflow;
1582} 2216}
1583 2217
1584sub add_paragraph { 2218sub add_paragraph {
… …
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2251 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1618 2252
1619 delete $self->{texture}; 2253 delete $self->{texture};
1620 } 2254 }
1621 2255
1622 $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 {
1623 glClearColor 0, 0, 0, 1; 2257 glClearColor 0, 0, 0, 0;
1624 glClear GL_COLOR_BUFFER_BIT; 2258 glClear GL_COLOR_BUFFER_BIT;
1625 2259
1626 glEnable GL_BLEND; 2260 glEnable GL_BLEND;
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D; 2262 glEnable GL_TEXTURE_2D;
… …
1635 2269
1636 my $y = 0; 2270 my $y = 0;
1637 2271
1638 my $layout = $self->{layout}; 2272 my $layout = $self->{layout};
1639 2273
2274 $layout->set_font ($self->{font}) if $self->{font};
2275
1640 for my $par (@{$self->{par}}) { 2276 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0]; 2277 my $h = $par->[0];
1642 2278
1643 if ($y0 < $y + $h && $y < $y1) { 2279 if ($y0 < $y + $h && $y < $y1) {
1644 $layout->set_text ($par->[2]); 2280 $layout->set_text ($par->[2]);
… …
1658} 2294}
1659 2295
1660sub _draw { 2296sub _draw {
1661 my ($self) = @_; 2297 my ($self) = @_;
1662 2298
1663 if ($self->{texture}) { 2299 glEnable GL_BLEND;
2300 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1664 glEnable GL_TEXTURE_2D; 2301 glEnable GL_TEXTURE_2D;
1665 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;
1666 $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});
1667 glDisable GL_TEXTURE_2D; 2305 glDisable GL_TEXTURE_2D;
1668 } 2306 glDisable GL_BLEND;
1669 2307
1670 $self->{children}[1]->draw; 2308 $self->{children}[1]->draw;
1671 2309
1672} 2310}
1673 2311
1674############################################################################# 2312#############################################################################
1675 2313
1676package CFClient::UI::MapWidget;
1677
1678use strict;
1679
1680use List::Util qw(min max);
1681
1682use SDL;
1683use SDL::OpenGL;
1684
1685our @ISA = CFClient::UI::Base::;
1686
1687sub new {
1688 my $class = shift;
1689
1690 $class->SUPER::new (
1691 z => -1,
1692 can_focus => 1,
1693 list => (glGenLists 1),
1694 @_
1695 )
1696}
1697
1698sub key_down {
1699 print "MAPKEYDOWN\n";
1700}
1701
1702sub key_up {
1703}
1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1737}
1738
1739sub size_request {
1740 (
1741 1 + 32 * int $::WIDTH / 32,
1742 1 + 32 * int $::HEIGHT / 32,
1743 )
1744}
1745
1746sub update {
1747 my ($self) = @_;
1748
1749 $self->{need_update} = 1;
1750 $self->SUPER::update;
1751}
1752
1753sub draw {
1754 my ($self) = @_;
1755
1756 if (delete $self->{need_update}) {
1757 glNewList $self->{list}, GL_COMPILE;
1758
1759 if ($::MAP) {
1760 my $sw = int $::WIDTH / 32;
1761 my $sh = int $::HEIGHT / 32;
1762
1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1765
1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 my $tex = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 CFClient::Texture->new (
1818 w => $w,
1819 h => $h,
1820 data => $::MAP->mapmap ($w, $h),
1821 type => GL_UNSIGNED_INT_8_8_8_8_REV
1822 )->draw_quad (100, 100);
1823
1824 glDisable GL_TEXTURE_2D;
1825 glDisable GL_BLEND;
1826 }
1827 # HACK END
1828 }
1829
1830 glEndList;
1831 }
1832
1833 glPushMatrix;
1834 glCallList $self->{list};
1835 glPopMatrix;
1836
1837 if ($FOCUS != $self) {
1838 glColor 64/255, 64/255, 64/255;
1839 glLogicOp GL_AND;
1840 glEnable GL_COLOR_LOGIC_OP;
1841 glBegin GL_QUADS;
1842 glVertex 0, 0;
1843 glVertex 0, $::HEIGHT;
1844 glVertex $::WIDTH, $::HEIGHT;
1845 glVertex $::WIDTH, 0;
1846 glEnd;
1847 glDisable GL_COLOR_LOGIC_OP;
1848 }
1849}
1850
1851my %DIR = (
1852 SDLK_KP8, [1, "north"],
1853 SDLK_KP9, [2, "northeast"],
1854 SDLK_KP6, [3, "east"],
1855 SDLK_KP3, [4, "southeast"],
1856 SDLK_KP2, [5, "south"],
1857 SDLK_KP1, [6, "southwest"],
1858 SDLK_KP4, [7, "west"],
1859 SDLK_KP7, [8, "northwest"],
1860
1861 SDLK_UP, [1, "north"],
1862 SDLK_RIGHT, [3, "east"],
1863 SDLK_DOWN, [5, "south"],
1864 SDLK_LEFT, [7, "west"],
1865);
1866
1867sub key_down {
1868 my ($self, $ev) = @_;
1869
1870 my $mod = $ev->key_mod;
1871 my $sym = $ev->key_sym;
1872
1873 if ($sym == SDLK_KP5) {
1874 $::CONN->user_send ("command stay fire");
1875 } elsif ($sym == SDLK_a) {
1876 $::CONN->user_send ("command apply");
1877 } elsif ($sym == SDLK_QUOTE) {
1878 $self->emit ('activate_console');
1879 } elsif ($sym == SDLK_SLASH) {
1880 $self->emit ('activate_console' => '/');
1881 } elsif (exists $DIR{$sym}) {
1882 if ($mod & KMOD_SHIFT) {
1883 $self->{shft}++;
1884 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1885 } elsif ($mod & KMOD_CTRL) {
1886 $self->{ctrl}++;
1887 $::CONN->user_send ("command run $DIR{$sym}[0]");
1888 } else {
1889 $::CONN->user_send ("command $DIR{$sym}[1]");
1890 }
1891 }
1892}
1893
1894sub key_up {
1895 my ($self, $ev) = @_;
1896
1897 my $mod = $ev->key_mod;
1898 my $sym = $ev->key_sym;
1899
1900 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1901 $::CONN->user_send ("command fire_stop");
1902 }
1903 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1904 $::CONN->user_send ("command run_stop");
1905 }
1906}
1907
1908#############################################################################
1909
1910package CFClient::UI::Animator; 2314package CFClient::UI::Animator;
1911 2315
1912use SDL::OpenGL; 2316use CFClient::OpenGL;
1913 2317
1914our @ISA = CFClient::UI::Bin::; 2318our @ISA = CFClient::UI::Bin::;
1915 2319
1916sub moveto { 2320sub moveto {
1917 my ($self, $x, $y) = @_; 2321 my ($self, $x, $y) = @_;
… …
1955 2359
1956sub new { 2360sub new {
1957 my $class = shift; 2361 my $class = shift;
1958 2362
1959 my $self = $class->SUPER::new ( 2363 my $self = $class->SUPER::new (
1960 state => 0, 2364 state => 0,
1961 connect_activate => \&toggle_flopper, 2365 connect_activate => \&toggle_flopper,
1962 @_ 2366 @_
1963 ); 2367 );
1964 2368
1965 if ($self->{state}) { 2369 if ($self->{state}) {
… …
1986 $self->emit (changed => $self->{state}); 2390 $self->emit (changed => $self->{state});
1987} 2391}
1988 2392
1989############################################################################# 2393#############################################################################
1990 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 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2489
2490 # TODO animation
2491 if ($tex) {
2492 glEnable GL_BLEND;
2493 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2494 glEnable GL_TEXTURE_2D;
2495 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2496 glColor 1, 1, 1, 1;
2497 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2498 glDisable GL_TEXTURE_2D;
2499 glDisable GL_BLEND;
2500 }
2501}
2502
2503#############################################################################
2504
2505package CFClient::UI::Menu;
2506
2507our @ISA = CFClient::UI::FancyFrame::;
2508
2509use CFClient::OpenGL;
2510
2511sub new {
2512 my $class = shift;
2513
2514 my $self = $class->SUPER::new (
2515 items => [],
2516 z => 100,
2517 @_,
2518 );
2519
2520 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2521
2522 for my $item (@{ $self->{items} }) {
2523 my ($widget, $cb) = @$item;
2524
2525 # handle various types of items, only text for now
2526 if (!ref $widget) {
2527 $widget = new CFClient::UI::Label
2528 can_hover => 1,
2529 can_events => 1,
2530 text => $widget;
2531 }
2532
2533 $self->{item}{$widget} = $item;
2534
2535 $self->{vbox}->add ($widget);
2536 }
2537
2538 $self
2539}
2540
2541# popup given the event (must be a mouse button down event currently)
2542sub popup {
2543 my ($self, $ev) = @_;
2544
2545 $self->emit ("popdown");
2546
2547 # maybe save $GRAB? must be careful about events...
2548 $GRAB = $self;
2549 $self->{button} = $ev->{button};
2550
2551 $self->show;
2552 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2553}
2554
2555sub mouse_motion {
2556 my ($self, $ev, $x, $y) = @_;
2557
2558 # TODO: should use vbox->find_widget or so
2559 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2560 $self->{hover} = $self->{item}{$HOVER};
2561}
2562
2563sub button_up {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 if ($ev->{button} == $self->{button}) {
2567 undef $GRAB;
2568 $self->hide;
2569
2570 $self->emit ("popdown");
2571 $self->{hover}[1]->() if $self->{hover};
2572 }
2573}
2574
2575#############################################################################
2576
1991package CFClient::UI::Root; 2577package CFClient::UI::Root;
1992 2578
1993our @ISA = CFClient::UI::Container::; 2579our @ISA = CFClient::UI::Container::;
1994 2580
1995use SDL::OpenGL; 2581use CFClient::OpenGL;
2582
2583sub check_size {
2584 my ($self) = @_;
2585
2586 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2587}
1996 2588
1997sub size_request { 2589sub size_request {
1998 ($::WIDTH, $::HEIGHT) 2590 ($::WIDTH, $::HEIGHT)
1999} 2591}
2000 2592
2001sub size_allocate { 2593sub configure {
2002 my ($self, $x, $y, $w, $h) = @_; 2594 my ($self, $x, $y, $w, $h) = @_;
2003 2595
2004 $self->_size_allocate ($x, $y, $w, $h); 2596 $self->SUPER::configure ($x, $y, $w, $h);
2005 2597
2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2007 for @{$self->{children}}; 2598 for my $child (@{$self->{children}}) {
2599 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2600
2601 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2602 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2603 $child->configure ($X, $Y, $W,$H);
2604 }
2008} 2605}
2009 2606
2010sub _topleft { 2607sub _topleft {
2011 my ($self, $x, $y) = @_; 2608 my ($self, $x, $y) = @_;
2012 2609
… …
2014} 2611}
2015 2612
2016sub update { 2613sub update {
2017 my ($self) = @_; 2614 my ($self) = @_;
2018 2615
2019 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2616 $self->check_size;
2020 ::refresh (); 2617 ::refresh ();
2021} 2618}
2022 2619
2023sub add { 2620sub add {
2024 my ($self, $widget) = @_; 2621 my ($self, $child) = @_;
2025 2622
2623 # integerize window positions
2624 $child->{x} = int $child->{x};
2625 $child->{y} = int $child->{y};
2626
2026 $self->SUPER::add ($widget); 2627 $self->SUPER::add ($child);
2027
2028 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2029} 2628}
2030 2629
2031sub on_refresh { 2630sub on_refresh {
2032 my ($self, $id, $cb) = @_; 2631 my ($self, $id, $cb) = @_;
2033 2632
… …
2054 $self->_draw; 2653 $self->_draw;
2055} 2654}
2056 2655
2057############################################################################# 2656#############################################################################
2058 2657
2658package CFClient::UI::InventoryItem;
2659
2660our @ISA = CFClient::UI::HBox::;
2661
2662sub new {
2663 my $class = shift;
2664
2665 my %args = @_;
2666
2667 my $item = $args{item};
2668
2669 my $desc = $item->{nrof} < 2
2670 ? $item->{name}
2671 : "$item->{nrof} $item->{name_pl}";
2672
2673
2674 my $self = $class->SUPER::new (
2675 can_hover => 1,
2676 can_events => 1,
2677 tooltip => (CFClient::UI::Label->escape ($desc)
2678 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2679 connect_button_down => sub {
2680 my ($self, $ev, $x, $y) = @_;
2681
2682 # todo: maybe put examine on 1? but should just be a tooltip :(
2683 if ($ev->{button} == 1) {
2684 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2685 } elsif ($ev->{button} == 2) {
2686 $::CONN->send ("apply $item->{tag}");
2687 } elsif ($ev->{button} == 3) {
2688 CFClient::UI::Menu->new (
2689 items => [
2690 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2691 [
2692 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2693 sub { $::CONN->send ("lock $item->{tag}") },
2694 ],
2695 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2696 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2697 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2698 ],
2699 )->popup ($ev);
2700 }
2701
2702 1
2703 },
2704 %args
2705 );
2706 $self->add(new CFClient::UI::Face
2707 can_events => 0,
2708 face => $item->{face},
2709 anim => $item->{anim},
2710 animspeed => $item->{animspeed});
2711 $self->add(new CFClient::UI::Label
2712 can_events => 0,
2713 text => $desc);
2714
2715 $self
2716}
2717
2718#############################################################################
2719
2720package CFClient::UI::Inventory;
2721
2722our @ISA = CFClient::UI::ScrolledWindow::;
2723
2724sub new {
2725 my $class = shift;
2726
2727 my $self = $class->SUPER::new (
2728 scrolled => (new CFClient::UI::VBox),
2729 @_,
2730 );
2731
2732 $self
2733}
2734
2735sub set_items {
2736 my ($self, $items) = @_;
2737
2738 $self->{scrolled}->clear;
2739 return unless $items;
2740
2741 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2742
2743 $self->{real_items} = \@items;
2744
2745 for my $item (@items) {
2746 my $desc = $item->{nrof} < 2
2747 ? $item->{name}
2748 : "$item->{nrof} $item->{name_pl}";
2749
2750 $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760
2761#############################################################################
2762
2059package CFClient::UI; 2763package CFClient::UI;
2060 2764
2061$ROOT = new CFClient::UI::Root; 2765$ROOT = new CFClient::UI::Root;
2766$TOOLTIP = new CFClient::UI::Tooltip;
2062 2767
20631 27681
2064 2769

Diff Legend

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