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.121 by root, Mon Apr 17 19:21:00 2006 UTC vs.
Revision 1.172 by root, Tue Apr 25 09:52:04 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 $TOOLTIP->move ($widget->coord2global ($widget->{w}, 0));
30 $TOOLTIP->show;
31 }
32
33 return;
34 }
35 }
36 }
37
38 $TOOLTIP->hide;
39 delete $TOOLTIP->{owner};
40}
14 41
15# class methods for events 42# class methods for events
16sub feed_sdl_key_down_event { 43sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 44 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
45 if $FOCUS;
18} 46}
19 47
20sub feed_sdl_key_up_event { 48sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 49 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
50 if $FOCUS;
22} 51}
23 52
24sub feed_sdl_button_down_event { 53sub feed_sdl_button_down_event {
25 my ($ev) = @_; 54 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 55 my ($x, $y) = ($ev->{x}, $ev->{y});
27 56
28 if (!$BUTTON_STATE) { 57 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 58 my $widget = $ROOT->find_widget ($x, $y);
30 59
31 $GRAB = $widget; 60 $GRAB = $widget;
32 $GRAB->update if $GRAB; 61 $GRAB->update if $GRAB;
33 }
34 62
63 check_tooltip;
64 }
65
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 66 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 67
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 68 if ($GRAB) {
69 ($x, $y) = $GRAB->coord2local ($x, $y);
70 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
71 }
38} 72}
39 73
40sub feed_sdl_button_up_event { 74sub feed_sdl_button_up_event {
41 my ($ev) = @_; 75 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 76 my ($x, $y) = ($ev->{x}, $ev->{y});
43 77
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 78 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 79
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 80 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 81
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 82 if ($GRAB) {
83 ($x, $y) = $GRAB->coord2local ($x, $y);
84 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
85 }
49 86
50 if (!$BUTTON_STATE) { 87 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 88 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 89 $grab->update if $grab;
53 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
91
92 check_tooltip;
54 } 93 }
55} 94}
56 95
57sub feed_sdl_motion_event { 96sub feed_sdl_motion_event {
58 my ($ev) = @_; 97 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 98 my ($x, $y) = ($ev->{x}, $ev->{y});
60 99
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 100 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 101
63 if ($widget != $HOVER) { 102 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 103 my $hover = $HOVER; $HOVER = $widget;
65 104
66 $hover->update if $hover && $hover->{can_hover}; 105 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 106 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 107
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 108 check_tooltip;
109 }
110
111 if ($HOVER) {
112 ($x, $y) = $HOVER->coord2local ($x, $y);
113 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
114 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
87 131
88package CFClient::UI::Base; 132package CFClient::UI::Base;
89 133
90use strict; 134use strict;
91 135
92use SDL::OpenGL; 136use CFClient::OpenGL;
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
101 w => -1, 145 can_events => 1,
102 h => -1,
103 @_ 146 @_
104 }, $class; 147 }, $class;
105 148
106 for (keys %$self) { 149 for (keys %$self) {
107 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
110 } 153 }
111 154
112 $self 155 $self
113} 156}
114 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
181}
182
115sub move { 183sub move {
116 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
117 $self->{x} = int $x; 186 $self->{x} = int $x;
118 $self->{y} = int $y; 187 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
120}
121 189
122sub needs_redraw { 190 $self->update;
123 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
124} 200}
125 201
126sub size_request { 202sub size_request {
127 require Carp; 203 require Carp;
128 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
129} 205}
130 206
131sub _size_allocate { 207sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
133 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 223 $self->{x} = $x;
135 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
136 227
137 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
138
139 $self->{w} = $w; 229 $self->{w} = $w;
140 $self->{h} = $h; 230 $self->{h} = $h;
141 231
232 $self->size_allocate ($w, $h);
233 $self->update;
142 1 234 }
143} 235}
144 236
145sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub children {
242}
243
244sub set_max_size {
146 my ($self, $x, $y, $w, $h) = @_; 245 my ($self, $w, $h) = @_;
147 246
148 $self->_size_allocate ($x, $y, $w, $h); 247 delete $self->{max_w}; $self->{max_w} = $w if $w;
248 delete $self->{max_h}; $self->{max_h} = $h if $h;
149} 249}
150 250
151# return top left coordinates 251# return top left coordinates
152sub _topleft { 252sub _topleft {
153 my ($self, $x, $y) = @_; 253 my ($self, $x, $y) = @_;
254
255 $self->{parent}
256 or Carp::confess "no parent widget in _topleft\n";#d#
154 257
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 258 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156} 259}
157 260
158# translate global coordinates to local coordinate system 261# translate global coordinates to local coordinate system
225 glPopMatrix; 328 glPopMatrix;
226 329
227 if ($self == $HOVER && $self->{can_hover}) { 330 if ($self == $HOVER && $self->{can_hover}) {
228 my ($x, $y) = @$self{qw(x y)}; 331 my ($x, $y) = @$self{qw(x y)};
229 332
230 glColor 0, 0, 1, 0.2; 333 glColor 1, 0.8, 0.5, 0.2;
231 glEnable GL_BLEND; 334 glEnable GL_BLEND;
232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 335 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
233 glBegin GL_QUADS; 336 glBegin GL_QUADS;
234 glVertex $x , $y; 337 glVertex $x , $y;
235 glVertex $x + $self->{w}, $y; 338 glVertex $x + $self->{w}, $y;
236 glVertex $x + $self->{w}, $y + $self->{h}; 339 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 340 glVertex $x , $y + $self->{h};
238 glEnd; 341 glEnd;
239 glDisable GL_BLEND; 342 glDisable GL_BLEND;
240 } 343 }
344
345 if ($ENV{PCLIENT_DEBUG}) {
346 glPushMatrix;
347 glColor 1, 1, 0, 1;
348 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
349 glBegin GL_LINE_LOOP;
350 glVertex 0 , 0;
351 glVertex $self->{w}, 0;
352 glVertex $self->{w}, $self->{h};
353 glVertex 0 , $self->{h};
354 glEnd;
355 glPopMatrix;
356 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
357 }
241} 358}
242 359
243sub _draw { 360sub _draw {
244 my ($self) = @_; 361 my ($self) = @_;
245 362
246 warn "no draw defined for $self\n"; 363 warn "no draw defined for $self\n";
247} 364}
248 365
249sub find_widget { 366sub find_widget {
250 my ($self, $x, $y) = @_; 367 my ($self, $x, $y) = @_;
368
369 return () unless $self->{can_events};
251 370
252 return $self 371 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 372 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 373 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 374
260 my ($self, $parent) = @_; 379 my ($self, $parent) = @_;
261 380
262 Scalar::Util::weaken ($self->{parent} = $parent); 381 Scalar::Util::weaken ($self->{parent} = $parent);
263} 382}
264 383
384sub check_size {
385 my ($self) = @_;
386
387 $self->{parent}
388 or return 1;
389
390 my ($w, $h) = $self->{user_w} && $self->{user_h}
391 ? @$self{qw(user_w user_h)}
392 : $self->size_request;
393
394 if ($w != $self->{req_w} || $h != $self->{req_h}) {
395 $self->{req_w} = $w;
396 $self->{req_h} = $h;
397
398 $self->{parent}->check_size
399 or $self->size_allocate (
400 (List::Util::max $self->{w}, $w),
401 (List::Util::max $self->{h}, $h),
402 );
403
404 1
405 } else {
406 0
407 }
408}
409
265sub update { 410sub update {
266 my ($self) = @_; 411 my ($self) = @_;
267 412
268 $self->{parent}->update 413 $self->{parent}->update
269 if $self->{parent}; 414 if $self->{parent};
270} 415}
271 416
272sub connect { 417sub connect {
273 my ($self, $signal, $cb) = @_; 418 my ($self, $signal, $cb) = @_;
274 419
275 push @{ $self->{cb}{$signal} }, $cb; 420 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 421}
277 422
278sub emit { 423sub emit {
279 my ($self, $signal, @args) = @_; 424 my ($self, $signal, @args) = @_;
280 425
281 $_->($self, @args) 426 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282 for @{$self->{cb}{$signal} || []};
283} 427}
284 428
285sub DESTROY { 429sub DESTROY {
286 my ($self) = @_; 430 my ($self) = @_;
287 431
293package CFClient::UI::DrawBG; 437package CFClient::UI::DrawBG;
294 438
295our @ISA = CFClient::UI::Base::; 439our @ISA = CFClient::UI::Base::;
296 440
297use strict; 441use strict;
298use SDL::OpenGL; 442use CFClient::OpenGL;
299 443
300sub new { 444sub new {
301 my $class = shift; 445 my $class = shift;
302 446
303 # range [value, low, high, page] 447 # range [value, low, high, page]
332 476
333package CFClient::UI::Empty; 477package CFClient::UI::Empty;
334 478
335our @ISA = CFClient::UI::Base::; 479our @ISA = CFClient::UI::Base::;
336 480
481sub new {
482 my ($class, %arg) = @_;
483 $class->SUPER::new (can_events => 0, %arg);
484}
485
337sub size_request { 486sub size_request {
338 (0, 0) 487 (0, 0)
339} 488}
340 489
341sub draw { } 490sub draw { }
349sub new { 498sub new {
350 my ($class, %arg) = @_; 499 my ($class, %arg) = @_;
351 500
352 my $children = delete $arg{children} || []; 501 my $children = delete $arg{children} || [];
353 502
354 my $self = $class->SUPER::new (children => [], %arg); 503 my $self = $class->SUPER::new (
504 children => [],
505 can_events => 0,
506 %arg,
507 );
355 $self->add ($_) for @$children; 508 $self->add ($_) for @$children;
356 509
357 $self 510 $self
358} 511}
359 512
367 $self->{children} = [ 520 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 521 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 522 @{$self->{children}}, $child
370 ]; 523 ];
371 524
372 $self->{w} = $self->{h} = -1; 525 $child->check_size;
526}
527
528sub children {
529 @{ $_[0]{children} }
530}
531
532sub remove {
533 my ($self, $child) = @_;
534
535 delete $child->{parent};
536 $child->hide;
537
538 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
539
540 $self->check_size;
373 $self->update; 541 $self->update;
374} 542}
375 543
376sub remove { 544sub clear {
377 my ($self, $widget) = @_; 545 my ($self) = @_;
378 546
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 547 my $children = delete $self->{children};
548 $self->{children} = [];
380 549
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 550 for (@$children) {
551 delete $_->{parent};
552 $_->hide;
553 }
382} 554}
383 555
384sub find_widget { 556sub find_widget {
385 my ($self, $x, $y) = @_; 557 my ($self, $x, $y) = @_;
386 558
416 588
417 $class->SUPER::new (children => [$child], %arg) 589 $class->SUPER::new (children => [$child], %arg)
418} 590}
419 591
420sub add { 592sub add {
421 my ($self, $widget) = @_; 593 my ($self, $child) = @_;
422 594
423 $self->{children} = []; 595 $self->{children} = [];
424 596
425 $self->SUPER::add ($widget); 597 $self->SUPER::add ($child);
426} 598}
427 599
428sub remove { 600sub remove {
429 my ($self, $widget) = @_; 601 my ($self, $widget) = @_;
430 602
439sub size_request { 611sub size_request {
440 $_[0]{children}[0]->size_request 612 $_[0]{children}[0]->size_request
441} 613}
442 614
443sub size_allocate { 615sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 616 my ($self, $w, $h) = @_;
445 617
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 618 $self->{children}[0]->configure (0, 0, $w, $h);
449} 619}
450 620
451############################################################################# 621#############################################################################
452 622
453package CFClient::UI::Window; 623package CFClient::UI::Window;
454 624
455our @ISA = CFClient::UI::Bin::; 625our @ISA = CFClient::UI::Bin::;
456 626
457use SDL::OpenGL; 627use CFClient::OpenGL;
458 628
459sub new { 629sub new {
460 my ($class, %arg) = @_; 630 my ($class, %arg) = @_;
461 631
462 my $self = $class->SUPER::new (%arg); 632 my $self = $class->SUPER::new (%arg);
479 $self->child->draw; 649 $self->child->draw;
480 }; 650 };
481} 651}
482 652
483sub size_allocate { 653sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_; 654 my ($self, $w, $h) = @_;
485 655
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h); 656 $self->child->configure (0, 0, $w, $h);
489 657
490 $self->render_chld; 658 $self->render_chld;
491} 659}
492 660
493sub _draw { 661sub _draw {
509 glDisable GL_TEXTURE_2D; 677 glDisable GL_TEXTURE_2D;
510} 678}
511 679
512############################################################################# 680#############################################################################
513 681
682package CFClient::UI::ViewPort;
683
684our @ISA = CFClient::UI::Window::;
685
686sub new { die }
687
688sub size_request {
689 my ($self) = @_;
690
691 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
692 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
693
694 @$self{qw(child_w child_h)}
695}
696
697sub _draw {
698 my ($self) = @_;
699
700 $self->{children}[1]->draw;
701}
702
703
704#############################################################################
705
514package CFClient::UI::Frame; 706package CFClient::UI::Frame;
515 707
516our @ISA = CFClient::UI::Bin::; 708our @ISA = CFClient::UI::Bin::;
517 709
518use SDL::OpenGL; 710use 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
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 711
568sub new { 712sub new {
569 my $class = shift; 713 my $class = shift;
570 714
571 # TODO: user_x, user_y, overwrite moveto?
572
573 $class->SUPER::new ( 715 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 716 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 717 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 718 border => 0.8,
577 @_ 719 @_
720 );
721
722 $self
723}
724
725sub _draw {
726 my ($self) = @_;
727
728 my ($w, $h) = ($self->{w}, $self->{h});
729
730 glEnable GL_BLEND;
731 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
732 glEnable GL_TEXTURE_2D;
733 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
734
735# glBegin GL_QUADS;
736# glColor 0, 0, 0, 0;
737# glVertex 0 , 0;
738# glVertex 0 , $h;
739# glVertex $w, $h;
740# glVertex $w, 0;
741# glEnd;
742
743
744 $self->child->draw;
745 glDisable GL_BLEND;
746 glDisable GL_TEXTURE_2D;
747}
748
749#############################################################################
750
751package CFClient::UI::FancyFrame;
752
753our @ISA = CFClient::UI::Bin::;
754
755use CFClient::OpenGL;
756
757my @tex =
758 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
759 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
760
761sub new {
762 my $class = shift;
763
764 # TODO: user_x, user_y, overwrite moveto?
765
766 my $self = $class->SUPER::new (
767 bg => [1, 1, 1, 1],
768 border_bg => [1, 1, 1, 1],
769 border => 0.8,
770 can_events => 1,
771 @_
772 );
773
774 $self->{title} &&= new CFClient::UI::Label
775 align => 0,
776 valign => 1,
777 text => $self->{title},
778 fontsize => 1;
779
780 $self
781}
782
783sub border {
784 int $_[0]{border} * $::FONTSIZE
785}
786
787sub size_request {
788 my ($self) = @_;
789
790 my ($w, $h) = $self->SUPER::size_request;
791
792 (
793 $w + $self->border * 2,
794 $h + $self->border * 2,
578 ) 795 )
579} 796}
580 797
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 { 798sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 799 my ($self, $w, $h) = @_;
596 800
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 801 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 802 $w -= List::Util::max 0, $self->border * 2;
601 803
804 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
805 if $self->{title};
806
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 807 $self->child->configure ($self->border, $self->border, $w, $h);
603} 808}
604 809
605sub button_down { 810sub button_down {
606 my ($self, $ev, $x, $y) = @_; 811 my ($self, $ev, $x, $y) = @_;
607 812
813 my $border = $self->border;
814
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 815 if ($x < $self->{w} && $x >= $self->{w} - $border
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 816 && $y < $self->{h} && $y >= $self->{h} - $border) {
610 817
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 818 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 819 my ($bw, $bh) = ($self->{w}, $self->{h});
613 820
614 $self->{motion} = sub { 821 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 822 my ($ev, $x, $y) = @_;
616 823
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 824 ($x, $y) = ($ev->{x}, $ev->{y});
618 825
619 $self->{user_w} = $bw + $x - $ox; 826 $self->{user_w} = $bw + $x - $ox;
620 $self->{user_h} = $bh + $y - $oy; 827 $self->{user_h} = $bh + $y - $oy;
621 $self->update; 828 $self->check_size;
622 }; 829 };
623 830
624 } elsif ($x >= 0 && $x < $self->{w} 831 } elsif ($x >= 0 && $x < $self->{w}
625 && $y >= 0 && $y < $self->{border}) { 832 && $y >= 0 && $y < $border) {
626 833
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 834 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 835 my ($bx, $by) = ($self->{x}, $self->{y});
629 836
630 $self->{motion} = sub { 837 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 838 my ($ev, $x, $y) = @_;
632 839
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 840 ($x, $y) = ($ev->{x}, $ev->{y});
634 841
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 842 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 843 $self->update;
637 }; 844 };
638 } 845 }
659 glEnable GL_BLEND; 866 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 867 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 868 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 869 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 870
871 my $border = $self->border;
872
664 glColor @{ $self->{border_bg} }; 873 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 874 $tex[1]->draw_quad (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 875 $tex[3]->draw_quad (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 876 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 877 $tex[4]->draw_quad (0, $h - $border, $w, $border);
669 878
670 my $bg = $tex[0]; 879 my $bg = $tex[0];
671 880
672 # TODO: repeat texture not scale 881 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 882 my $rep_x = $cw / $bg->{w};
676 glColor @{ $self->{bg} }; 885 glColor @{ $self->{bg} };
677 886
678 $bg->{s} = $rep_x; 887 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 888 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 889 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 890 $bg->draw_quad ($border, $border, $cw, $ch);
682 891
683 glDisable GL_TEXTURE_2D; 892 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 893 glDisable GL_BLEND;
685 894
895 $self->{title}->draw if $self->{title};
686 $self->child->draw; 896 $self->child->draw;
687} 897}
688 898
689############################################################################# 899#############################################################################
690 900
692 902
693our @ISA = CFClient::UI::Base::; 903our @ISA = CFClient::UI::Base::;
694 904
695use List::Util qw(max sum); 905use List::Util qw(max sum);
696 906
697use SDL::OpenGL; 907use CFClient::OpenGL;
698 908
699sub new { 909sub new {
700 my $class = shift; 910 my $class = shift;
701 911
702 $class->SUPER::new ( 912 $class->SUPER::new (
709 my ($self, $x, $y, $child) = @_; 919 my ($self, $x, $y, $child) = @_;
710 920
711 $child->set_parent ($self); 921 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 922 $self->{children}[$y][$x] = $child;
713 923
714 $self->{w} = $self->{h} = -1; 924 $child->check_size;
715 $self->update; 925}
926
927sub children {
928 grep $_, map @$_, grep $_, @{ $_[0]{children} }
716} 929}
717 930
718# TODO: move to container class maybe? send childs a signal on removal? 931# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 932sub clear {
720 my ($self) = @_; 933 my ($self) = @_;
721 934
935 my @children = $self->children;
722 delete $self->{children}; 936 delete $self->{children};
937
938 for (@children) {
939 delete $_->{parent};
940 $_->hide;
941 }
942
723 $self->update; 943 $self->update;
724} 944}
725 945
726sub get_wh { 946sub get_wh {
727 my ($self) = @_; 947 my ($self) = @_;
733 or next; 953 or next;
734 954
735 for my $x (0 .. $#$row) { 955 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 956 my $widget = $row->[$x]
737 or next; 957 or next;
738 my ($w, $h) = $widget->size_request; 958 my ($w, $h) = @$widget{qw(req_w req_h)};
739 959
740 $w[$x] = max $w[$x], $w; 960 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 961 $h[$y] = max $h[$y], $h;
742 } 962 }
743 } 963 }
755 (sum @$hs), 975 (sum @$hs),
756 ) 976 )
757} 977}
758 978
759sub size_allocate { 979sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 980 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 981
764 my ($ws, $hs) = $self->get_wh; 982 my ($ws, $hs) = $self->get_wh;
765 983
766 my $req_w = sum @$ws; 984 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 985 my $req_h = sum @$hs;
789 1007
790 for my $c (0 .. $#$row) { 1008 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 1009 my $col_w = $ws->[$c];
792 1010
793 if (my $widget = $row->[$c]) { 1011 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 1012 $widget->configure ($x, $y, $col_w, $row_h);
795 } 1013 }
796 1014
797 $x += $col_w; 1015 $x += $col_w;
798 } 1016 }
799 1017
844 (List::Util::max map $_->[1], @alloc), 1062 (List::Util::max map $_->[1], @alloc),
845 ) 1063 )
846} 1064}
847 1065
848sub size_allocate { 1066sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 1067 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 1068
853 ($h, $w) = ($w, $h); 1069 ($h, $w) = ($w, $h);
854 1070
855 my $children = $self->{children}; 1071 my $children = $self->{children};
856 1072
857 my @h = map +($_->size_request)[0], @$children; 1073 my @h = map $_->{req_w}, @$children;
858 1074
859 my $req_h = List::Util::sum @h; 1075 my $req_h = List::Util::sum @h;
860 1076
861 if ($req_h > $h) { 1077 if ($req_h > $h) {
862 # ah well, not enough space 1078 # ah well, not enough space
878 1094
879 my $y = 0; 1095 my $y = 0;
880 for (0 .. $#$children) { 1096 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1097 my $child = $children->[$_];
882 my $h = $h[$_]; 1098 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1099 $child->configure ($y, 0, $h, $w);
884 1100
885 $y += $h; 1101 $y += $h;
886 } 1102 }
1103
1104 1
887} 1105}
888 1106
889############################################################################# 1107#############################################################################
890 1108
891package CFClient::UI::VBox; 1109package CFClient::UI::VBox;
904 (List::Util::sum map $_->[1], @alloc), 1122 (List::Util::sum map $_->[1], @alloc),
905 ) 1123 )
906} 1124}
907 1125
908sub size_allocate { 1126sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1127 my ($self, $w, $h) = @_;
910
911 $self->_size_allocate ($x, $y, $w, $h);
912 1128
913 my $children = $self->{children}; 1129 my $children = $self->{children};
914 1130
915 my @h = map +($_->size_request)[1], @$children; 1131 my @h = map $_->{req_h}, @$children;
916 1132
917 my $req_h = List::Util::sum @h; 1133 my $req_h = List::Util::sum @h;
918 1134
919 if ($req_h > $h) { 1135 if ($req_h > $h) {
920 # ah well, not enough space 1136 # ah well, not enough space
934 1150
935 my $y = 0; 1151 my $y = 0;
936 for (0 .. $#$children) { 1152 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1153 my $child = $children->[$_];
938 my $h = $h[$_]; 1154 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1155 $child->configure (0, $y, $w, $h);
940 1156
941 $y += $h; 1157 $y += $h;
942 } 1158 }
1159
1160 1
943} 1161}
944 1162
945############################################################################# 1163#############################################################################
946 1164
947package CFClient::UI::Label; 1165package CFClient::UI::Label;
948 1166
949our @ISA = CFClient::UI::Base::; 1167our @ISA = CFClient::UI::Base::;
950 1168
951use SDL::OpenGL; 1169use CFClient::OpenGL;
952 1170
953sub new { 1171sub new {
954 my ($class, %arg) = @_; 1172 my ($class, %arg) = @_;
955 1173
956 my $self = $class->SUPER::new ( 1174 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1175 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1176 #font => default_font
1177 fontsize => 1,
959 text => "", 1178 text => "",
960 align => -1, 1179 align => -1,
961 valign => -1, 1180 valign => -1,
962 padding => 2, 1181 padding => 2,
963 layout => new CFClient::Layout, 1182 layout => new CFClient::Layout,
1183 can_events => 0,
964 %arg 1184 %arg
965 ); 1185 );
966 1186
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1187 if (exists $self->{template}) {
1188 my $layout = new CFClient::Layout;
1189 $layout->set_text (delete $self->{template});
1190 $self->{template} = $layout;
1191 }
968 1192
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1193 $self->set_text (delete $self->{text}) if exists $self->{text};
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1194 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
971 1195
972 $self 1196 $self
973} 1197}
974 1198
975sub escape_text { 1199sub escape {
976 local $_ = $_[1]; 1200 local $_ = $_[1];
977 1201
978 s/&/&amp;/g; 1202 s/&/&amp;/g;
979 s/>/&gt;/g; 1203 s/>/&gt;/g;
980 s/</&lt;/g; 1204 s/</&lt;/g;
986 my ($self, $text) = @_; 1210 my ($self, $text) = @_;
987 1211
988 $self->{layout}->set_text ($text); 1212 $self->{layout}->set_text ($text);
989 1213
990 delete $self->{texture}; 1214 delete $self->{texture};
1215 $self->check_size;
991 $self->update; 1216 $self->update;
992} 1217}
993 1218
994sub set_markup { 1219sub set_markup {
995 my ($self, $markup) = @_; 1220 my ($self, $markup) = @_;
996 1221
997 $self->{layout}->set_markup ($markup); 1222 $self->{layout}->set_markup ($markup);
998 1223
999 delete $self->{texture}; 1224 delete $self->{texture};
1225 $self->check_size;
1000 $self->update; 1226 $self->update;
1001} 1227}
1002 1228
1003sub size_request { 1229sub size_request {
1004 my ($self) = @_; 1230 my ($self) = @_;
1005 1231
1006 $self->{layout}->set_width; 1232 $self->{layout}->set_font ($self->{font}) if $self->{font};
1233 $self->{layout}->set_width ($self->{max_w} || -1);
1007 $self->{layout}->set_height ($self->{fontsize}); 1234 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008 1235
1009 my ($w, $h) = $self->{layout}->size; 1236 my ($w, $h) = $self->{layout}->size;
1237
1238 if (exists $self->{template}) {
1239 $self->{template}->set_font ($self->{font}) if $self->{font};
1240 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1241
1242 my ($w2, $h2) = $self->{template}->size;
1243
1244 $w = List::Util::max $w, $w2;
1245 $h = List::Util::max $h, $h2;
1246 }
1010 1247
1011 ( 1248 (
1012 $w + $self->{padding} * 2, 1249 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2, 1250 $h + $self->{padding} * 2,
1014 ) 1251 )
1015} 1252}
1016 1253
1017sub size_allocate { 1254sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1255 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1256
1022 delete $self->{texture}; 1257 delete $self->{texture};
1023} 1258}
1024 1259
1025sub update { 1260sub set_fontsize {
1026 my ($self) = @_; 1261 my ($self, $fontsize) = @_;
1027 1262
1263 $self->{fontsize} = $fontsize;
1028 delete $self->{texture}; 1264 delete $self->{texture};
1265 $self->check_size;
1029 $self->SUPER::update; 1266 $self->update;
1030} 1267}
1031 1268
1032sub _draw { 1269sub _draw {
1033 my ($self) = @_; 1270 my ($self) = @_;
1034 1271
1035 my $tex = $self->{texture} ||= do { 1272 my $tex = $self->{texture} ||= do {
1273 $self->{layout}->set_font ($self->{font}) if $self->{font};
1036 $self->{layout}->set_width ($self->{w}); 1274 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1275 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
1038 new_from_layout CFClient::Texture $self->{layout} 1276 new_from_layout CFClient::Texture $self->{layout}
1039 }; 1277 };
1040 1278
1041 glEnable GL_BLEND; 1279 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1280 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1043 glEnable GL_TEXTURE_2D; 1281 glEnable GL_TEXTURE_2D;
1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1045 1283
1046 glColor @{$self->{fg}}; 1284 glColor @{$self->{fg}};
1047 1285
1048 my $x = 1286 $self->{ox} = int (
1049 $self->{align} < 0 ? $self->{padding} 1287 $self->{align} < 0 ? $self->{padding}
1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1288 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1051 : ($self->{w} - $tex->{w}) * 0.5; 1289 : ($self->{w} - $tex->{w}) * 0.5
1290 );
1052 1291
1053 my $y = 1292 $self->{oy} = int (
1054 $self->{valign} < 0 ? $self->{padding} 1293 $self->{valign} < 0 ? $self->{padding}
1055 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1294 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1056 : ($self->{h} - $tex->{h}) * 0.5; 1295 : ($self->{h} - $tex->{h}) * 0.5
1296 );
1057 1297
1058 $tex->draw_quad (int $x, int $y); 1298 $tex->draw_quad ($self->{ox}, $self->{oy});
1059 1299
1060 glDisable GL_TEXTURE_2D; 1300 glDisable GL_TEXTURE_2D;
1061 glDisable GL_BLEND; 1301 glDisable GL_BLEND;
1062} 1302}
1063 1303
1065 1305
1066package CFClient::UI::EntryBase; 1306package CFClient::UI::EntryBase;
1067 1307
1068our @ISA = CFClient::UI::Label::; 1308our @ISA = CFClient::UI::Label::;
1069 1309
1070use SDL; 1310use CFClient::OpenGL;
1071use SDL::OpenGL;
1072 1311
1073sub new { 1312sub new {
1074 my $class = shift; 1313 my $class = shift;
1075 1314
1076 $class->SUPER::new ( 1315 $class->SUPER::new (
1077 fg => [1, 1, 1], 1316 fg => [1, 1, 1],
1078 bg => [0, 0, 0, 0.2], 1317 bg => [0, 0, 0, 0.2],
1079 active_bg => [1, 1, 1, 0.5], 1318 active_bg => [1, 1, 1, 0.5],
1080 active_fg => [0, 0, 0], 1319 active_fg => [0, 0, 0],
1081 can_hover => 1, 1320 can_hover => 1,
1082 can_focus => 1, 1321 can_focus => 1,
1083 valign => 0, 1322 valign => 0,
1323 can_events => 1,
1084 @_ 1324 @_
1085 ) 1325 )
1086} 1326}
1087 1327
1088sub _set_text { 1328sub _set_text {
1090 1330
1091 delete $self->{cur_h}; 1331 delete $self->{cur_h};
1092 1332
1093 return if $self->{text} eq $text; 1333 return if $self->{text} eq $text;
1094 1334
1335 delete $self->{texture};
1336
1095 $self->{last_activity} = $::NOW; 1337 $self->{last_activity} = $::NOW;
1096 $self->{text} = $text; 1338 $self->{text} = $text;
1097 1339
1098 $text =~ s/./*/g if $self->{hidden}; 1340 $text =~ s/./*/g if $self->{hidden};
1099 $self->{layout}->set_text ("$text "); 1341 $self->{layout}->set_text ("$text ");
1112 1354
1113 ($w + 1, $h) # add 1 for cursor 1355 ($w + 1, $h) # add 1 for cursor
1114} 1356}
1115 1357
1116sub size_allocate { 1358sub size_allocate {
1117 my ($self, $x, $y, $w, $h) = @_; 1359 my ($self, $w, $h) = @_;
1118 1360
1119 $self->SUPER::size_allocate ($x, $y, $w, $h); 1361 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1120
1121 $self->_set_text ($self->{text});
1122} 1362}
1123 1363
1124sub set_text { 1364sub set_text {
1125 my ($self, $text) = @_; 1365 my ($self, $text) = @_;
1126 1366
1130} 1370}
1131 1371
1132sub key_down { 1372sub key_down {
1133 my ($self, $ev) = @_; 1373 my ($self, $ev) = @_;
1134 1374
1135 my $mod = $ev->key_mod; 1375 my $mod = $ev->{mod};
1136 my $sym = $ev->key_sym; 1376 my $sym = $ev->{sym};
1137
1138 my $uni = $ev->key_unicode; 1377 my $uni = $ev->{unicode};
1139 1378
1140 my $text = $self->get_text; 1379 my $text = $self->get_text;
1141 1380
1142 if ($sym == SDLK_BACKSPACE) { 1381 if ($sym == 8) {
1143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1382 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1144 } elsif ($sym == SDLK_DELETE) { 1383 } elsif ($sym == 127) {
1145 substr $text, $self->{cursor}, 1, ""; 1384 substr $text, $self->{cursor}, 1, "";
1146 } elsif ($sym == SDLK_LEFT) { 1385 } elsif ($sym == CFClient::SDLK_LEFT) {
1147 --$self->{cursor} if $self->{cursor}; 1386 --$self->{cursor} if $self->{cursor};
1148 } elsif ($sym == SDLK_RIGHT) { 1387 } elsif ($sym == CFClient::SDLK_RIGHT) {
1149 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1388 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1150 } elsif ($sym == SDLK_HOME) { 1389 } elsif ($sym == CFClient::SDLK_HOME) {
1151 $self->{cursor} = 0; 1390 $self->{cursor} = 0;
1152 } elsif ($sym == SDLK_END) { 1391 } elsif ($sym == CFClient::SDLK_END) {
1153 $self->{cursor} = length $text; 1392 $self->{cursor} = length $text;
1154 } elsif ($sym == SDLK_ESCAPE) { 1393 } elsif ($sym == 27) {
1155 $self->emit ('escape'); 1394 $self->emit ('escape');
1156 } elsif ($uni) { 1395 } elsif ($uni) {
1157 substr $text, $self->{cursor}++, 0, chr $uni; 1396 substr $text, $self->{cursor}++, 0, chr $uni;
1158 } 1397 }
1159 1398
1224 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1463 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1225 } 1464 }
1226 1465
1227 glColor @{$self->{fg}}; 1466 glColor @{$self->{fg}};
1228 glBegin GL_LINES; 1467 glBegin GL_LINES;
1229 glVertex $self->{cur_x}, $self->{cur_y};
1230 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1468 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1469 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1231 glEnd; 1470 glEnd;
1232 } 1471 }
1233} 1472}
1234 1473
1235package CFClient::UI::Entry; 1474package CFClient::UI::Entry;
1236 1475
1237our @ISA = CFClient::UI::EntryBase::; 1476our @ISA = CFClient::UI::EntryBase::;
1238 1477
1239use SDL; 1478use CFClient::OpenGL;
1240use SDL::OpenGL;
1241 1479
1242sub key_down { 1480sub key_down {
1243 my ($self, $ev) = @_; 1481 my ($self, $ev) = @_;
1244 1482
1245 my $sym = $ev->key_sym; 1483 my $sym = $ev->{sym};
1246 1484
1247 if ($sym == SDLK_RETURN) { 1485 if ($sym == 13) {
1486 unshift @{$self->{history}},
1487 my $txt = $self->get_text;
1488 $self->{history_pointer} = -1;
1489 $self->{history_saveback} = '';
1248 $self->emit (activate => $self->get_text); 1490 $self->emit (activate => $txt);
1249 $self->update; 1491 $self->update;
1492
1493 } elsif ($sym == CFClient::SDLK_UP) {
1494 if ($self->{history_pointer} < 0) {
1495 $self->{history_saveback} = $self->get_text;
1496 }
1497 if (@{$self->{history} || []} > 0) {
1498 $self->{history_pointer}++;
1499 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1500 $self->{history_pointer} = @{$self->{history} || []} - 1;
1501 }
1502 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1503 }
1504
1505 } elsif ($sym == CFClient::SDLK_DOWN) {
1506 $self->{history_pointer}--;
1507 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1508
1509 if ($self->{history_pointer} >= 0) {
1510 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1511 } else {
1512 $self->set_text ($self->{history_saveback});
1513 }
1250 1514
1251 } else { 1515 } else {
1252 $self->SUPER::key_down ($ev); 1516 $self->SUPER::key_down ($ev);
1253 } 1517 }
1254 1518
1258 1522
1259package CFClient::UI::Button; 1523package CFClient::UI::Button;
1260 1524
1261our @ISA = CFClient::UI::Label::; 1525our @ISA = CFClient::UI::Label::;
1262 1526
1263use SDL; 1527use CFClient::OpenGL;
1264use SDL::OpenGL;
1265 1528
1266my @tex = 1529my @tex =
1267 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1530 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1268 qw(b1_button_active.png); 1531 qw(b1_button_active.png);
1269 1532
1270sub new { 1533sub new {
1271 my $class = shift; 1534 my $class = shift;
1272 1535
1273 $class->SUPER::new ( 1536 $class->SUPER::new (
1274 padding => 4, 1537 padding => 4,
1275 fg => [1, 1, 1], 1538 fg => [1, 1, 1],
1276 bg => [1, 1, 1, 0.2], 1539 bg => [1, 1, 1, 0.2],
1277 active_fg => [1, 1, 0], 1540 active_fg => [0, 0, 1],
1278 can_hover => 1, 1541 can_hover => 1,
1542 align => 0,
1543 valign => 0,
1544 can_events => 1,
1279 @_ 1545 @_
1280 ) 1546 )
1281} 1547}
1282 1548
1283sub button_up { 1549sub button_up {
1317package CFClient::UI::CheckBox; 1583package CFClient::UI::CheckBox;
1318 1584
1319our @ISA = CFClient::UI::DrawBG::; 1585our @ISA = CFClient::UI::DrawBG::;
1320 1586
1321my @tex = 1587my @tex =
1322 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1588 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1323 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1589 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1324 1590
1325use SDL; 1591use CFClient::OpenGL;
1326use SDL::OpenGL;
1327 1592
1328sub new { 1593sub new {
1329 my $class = shift; 1594 my $class = shift;
1330 1595
1331 $class->SUPER::new ( 1596 $class->SUPER::new (
1342 my ($self) = @_; 1607 my ($self) = @_;
1343 1608
1344 ($self->{padding} * 2 + 6) x 2 1609 ($self->{padding} * 2 + 6) x 2
1345} 1610}
1346 1611
1347sub size_allocate {
1348 my ($self, $x, $y, $w, $h) = @_;
1349
1350 $self->_size_allocate ($x, $y, $w, $h);
1351}
1352
1353sub button_down { 1612sub button_down {
1354 my ($self, $ev, $x, $y) = @_; 1613 my ($self, $ev, $x, $y) = @_;
1355 1614
1356 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1615 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1357 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1616 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1383 glDisable GL_BLEND; 1642 glDisable GL_BLEND;
1384} 1643}
1385 1644
1386############################################################################# 1645#############################################################################
1387 1646
1647package CFClient::UI::Image;
1648
1649our @ISA = CFClient::UI::Base::;
1650
1651use CFClient::OpenGL;
1652use Carp qw/confess/;
1653
1654our %loaded_images;
1655
1656sub new {
1657 my $class = shift;
1658
1659 my $self = $class->SUPER::new (can_events => 0, @_);
1660
1661 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1662
1663 $loaded_images{$self->{image}} ||=
1664 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1665
1666 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1667
1668 Scalar::Util::weaken $loaded_images{$self->{image}};
1669
1670 $self->{aspect} = $tex->{w} / $tex->{h};
1671
1672 $self
1673}
1674
1675sub size_request {
1676 my ($self) = @_;
1677
1678 ($self->{tex}->{w}, $self->{tex}->{h})
1679}
1680
1681sub _draw {
1682 my ($self) = @_;
1683
1684 my $tex = $self->{tex};
1685
1686 my ($w, $h) = ($self->{w}, $self->{h});
1687
1688 if ($self->{rot90}) {
1689 glRotate 90, 0, 0, 1;
1690 glTranslate 0, -$self->{w}, 0;
1691
1692 ($w, $h) = ($h, $w);
1693 }
1694
1695 glEnable GL_BLEND;
1696 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1697 glEnable GL_TEXTURE_2D;
1698 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1699
1700 $tex->draw_quad (0, 0, $w, $h);
1701
1702 glDisable GL_BLEND;
1703 glDisable GL_TEXTURE_2D;
1704}
1705
1706#############################################################################
1707
1708package CFClient::UI::VGauge;
1709
1710our @ISA = CFClient::UI::Base::;
1711
1712use List::Util qw(min max);
1713
1714use CFClient::OpenGL;
1715
1716my %tex = (
1717 food => [
1718 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1719 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1720 ],
1721 grace => [
1722 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1723 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1724 ],
1725 hp => [
1726 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1727 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1728 ],
1729 mana => [
1730 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1731 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1732 ],
1733);
1734
1735# eg. VGauge->new (gauge => 'food'), default gauge: food
1736sub new {
1737 my $class = shift;
1738
1739 my $self = $class->SUPER::new (
1740 type => 'food',
1741 @_
1742 );
1743
1744 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1745
1746 $self
1747}
1748
1749sub size_request {
1750 my ($self) = @_;
1751
1752 #my $tex = $tex{$self->{type}}[0];
1753 #@$tex{qw(w h)}
1754 (0, 0)
1755}
1756
1757sub set_max {
1758 my ($self, $max) = @_;
1759
1760 $self->{max_val} = $max;
1761}
1762
1763sub set_value {
1764 my ($self, $val, $max) = @_;
1765
1766 $self->set_max ($max)
1767 if defined $max;
1768
1769 $max = $self->{max_val};
1770 $self->{val} = $val;
1771
1772 $self->update;
1773}
1774
1775sub _draw {
1776 my ($self) = @_;
1777
1778 my $tex = $tex{$self->{type}};
1779 my ($t1, $t2, $t3) = @$tex;
1780
1781 my ($w, $h) = ($self->{w}, $self->{h});
1782
1783 if ($self->{vertical}) {
1784 glRotate 90, 0, 0, 1;
1785 glTranslate 0, -$self->{w}, 0;
1786
1787 ($w, $h) = ($h, $w);
1788 }
1789
1790 my $ycut = $self->{val} / ($self->{max_val} || 1);
1791
1792 my $ycut1 = max 0, min 1, $ycut;
1793 my $ycut2 = max 0, min 1, $ycut - 1;
1794
1795 my $h1 = $self->{h} * (1 - $ycut1);
1796 my $h2 = $self->{h} * (1 - $ycut2);
1797
1798 glEnable GL_BLEND;
1799 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1800 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802
1803 glBindTexture GL_TEXTURE_2D, $t1->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , 0; glVertex 0 , 0;
1806 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1807 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1808 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1809 glEnd;
1810
1811 my $ycut1 = List::Util::min 1, $ycut;
1812 glBindTexture GL_TEXTURE_2D, $t2->{name};
1813 glBegin GL_QUADS;
1814 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1815 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1816 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1817 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1818 glEnd;
1819
1820 if ($t3) {
1821 glBindTexture GL_TEXTURE_2D, $t3->{name};
1822 glBegin GL_QUADS;
1823 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1824 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1825 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1826 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1827 glEnd;
1828 }
1829
1830 glDisable GL_BLEND;
1831 glDisable GL_TEXTURE_2D;
1832}
1833
1834#############################################################################
1835
1836package CFClient::UI::Gauge;
1837
1838our @ISA = CFClient::UI::VBox::;
1839
1840sub new {
1841 my ($class, %arg) = @_;
1842
1843 my $self = $class->SUPER::new (
1844 tooltip => $arg{type},
1845 can_hover => 1,
1846 can_events => 1,
1847 %arg,
1848 );
1849
1850 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1851 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1852 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1853
1854 $self
1855}
1856
1857sub set_fontsize {
1858 my ($self, $fsize) = @_;
1859
1860 $self->{value}->set_fontsize ($fsize);
1861 $self->{max} ->set_fontsize ($fsize);
1862}
1863
1864sub set_value {
1865 my ($self, $val, $max) = @_;
1866
1867 $self->set_max ($max)
1868 if defined $max;
1869
1870 $self->{gauge}->set_value ($val, $max);
1871 $self->{value}->set_text ($val);
1872}
1873
1874sub set_max {
1875 my ($self, $max) = @_;
1876
1877 $self->{gauge}->set_max ($max);
1878 $self->{max}->set_text ($max);
1879}
1880
1881#############################################################################
1882
1388package CFClient::UI::Slider; 1883package CFClient::UI::Slider;
1389 1884
1390use strict; 1885use strict;
1391 1886
1392use SDL::OpenGL; 1887use CFClient::OpenGL;
1393 1888
1394our @ISA = CFClient::UI::DrawBG::; 1889our @ISA = CFClient::UI::DrawBG::;
1395 1890
1396my @tex = 1891my @tex =
1397 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1892 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1407 # TODO: calculations are off 1902 # TODO: calculations are off
1408 my $self = $class->SUPER::new ( 1903 my $self = $class->SUPER::new (
1409 fg => [1, 1, 1], 1904 fg => [1, 1, 1],
1410 active_fg => [0, 0, 0], 1905 active_fg => [0, 0, 0],
1411 range => [0, 0, 100, 10], 1906 range => [0, 0, 100, 10],
1412 req_w => 40, 1907 req_w => 20,
1413 req_h => 13, 1908 req_h => 20,
1414 vertical => 0, 1909 vertical => 0,
1415 can_hover => 1, 1910 can_hover => 1,
1416 inner_pad => 5, 1911 inner_pad => 5,
1417 @_ 1912 @_
1418 ); 1913 );
1522 2017
1523package CFClient::UI::TextView; 2018package CFClient::UI::TextView;
1524 2019
1525our @ISA = CFClient::UI::HBox::; 2020our @ISA = CFClient::UI::HBox::;
1526 2021
1527use SDL::OpenGL; 2022use CFClient::OpenGL;
1528 2023
1529sub new { 2024sub new {
1530 my $class = shift; 2025 my $class = shift;
1531 2026
1532 my $self = $class->SUPER::new ( 2027 my $self = $class->SUPER::new (
1533 req_w => $::WIDTH / 6, 2028 fontsize => 1,
1534 req_h => $::HEIGHT / 6, 2029 can_events => 0,
1535 fontsize => $::FONTSIZE, 2030 #font => default_font
1536 @_, 2031 @_,
1537 2032
1538 layout => (new CFClient::Layout), 2033 layout => (new CFClient::Layout),
1539 par => [], 2034 par => [],
1540 height => 0, 2035 height => 0,
1541 children => [ 2036 children => [
1542 (new CFClient::UI::Empty expand => 1), 2037 (new CFClient::UI::Empty expand => 1),
1543 (new CFClient::UI::Slider vertical => 1), 2038 (new CFClient::UI::Slider vertical => 1),
1544 ], 2039 ],
1545 ); 2040 );
1546 2041
1561sub text_height { 2056sub text_height {
1562 my ($self, $text) = @_; 2057 my ($self, $text) = @_;
1563 2058
1564 my $layout = $self->{layout}; 2059 my $layout = $self->{layout};
1565 2060
1566 $layout->set_height ($self->{fontsize}); 2061 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1567 $layout->set_width ($self->{w}); 2062 $layout->set_width ($self->{w});
1568 $layout->set_text ($text); 2063 $layout->set_text ($text);
1569 2064
1570 ($layout->size)[1] 2065 ($layout->size)[1]
1571} 2066}
1575 2070
1576 $self->{need_reflow}++; 2071 $self->{need_reflow}++;
1577 $self->update; 2072 $self->update;
1578} 2073}
1579 2074
1580sub size_request {
1581 my ($self) = @_;
1582
1583 ($self->{req_w}, $self->{req_h})
1584}
1585
1586sub size_allocate { 2075sub size_allocate {
1587 my ($self, $x, $y, $w, $h) = @_; 2076 my ($self, $w, $h) = @_;
1588 2077
1589 $self->SUPER::size_allocate ($x, $y, $w, $h); 2078 $self->SUPER::size_allocate ($w, $h);
1590 2079
2080 $self->{layout}->set_font ($self->{font}) if $self->{font};
1591 $self->{layout}->set_height ($self->{fontsize}); 2081 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 $self->{layout}->set_width ($self->{w}); 2082 $self->{layout}->set_width ($self->{children}[0]{w});
1593 2083
1594 $self->reflow; 2084 $self->reflow;
1595} 2085}
1596 2086
1597sub add_paragraph { 2087sub add_paragraph {
1648 2138
1649 my $y = 0; 2139 my $y = 0;
1650 2140
1651 my $layout = $self->{layout}; 2141 my $layout = $self->{layout};
1652 2142
2143 $layout->set_font ($self->{font}) if $self->{font};
2144
1653 for my $par (@{$self->{par}}) { 2145 for my $par (@{$self->{par}}) {
1654 my $h = $par->[0]; 2146 my $h = $par->[0];
1655 2147
1656 if ($y0 < $y + $h && $y < $y1) { 2148 if ($y0 < $y + $h && $y < $y1) {
1657 $layout->set_text ($par->[2]); 2149 $layout->set_text ($par->[2]);
1674 my ($self) = @_; 2166 my ($self) = @_;
1675 2167
1676 if ($self->{texture}) { 2168 if ($self->{texture}) {
1677 glEnable GL_TEXTURE_2D; 2169 glEnable GL_TEXTURE_2D;
1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2170 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2171 glColor 1, 1, 1, 1;
1679 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2172 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1680 glDisable GL_TEXTURE_2D; 2173 glDisable GL_TEXTURE_2D;
1681 } 2174 }
1682 2175
1683 $self->{children}[1]->draw; 2176 $self->{children}[1]->draw;
1684 2177
1685} 2178}
1686 2179
1687############################################################################# 2180#############################################################################
1688 2181
1689package CFClient::UI::MapWidget;
1690
1691use strict;
1692
1693use List::Util qw(min max);
1694
1695use SDL;
1696use SDL::OpenGL;
1697
1698our @ISA = CFClient::UI::Base::;
1699
1700sub new {
1701 my $class = shift;
1702
1703 $class->SUPER::new (
1704 z => -1,
1705 can_focus => 1,
1706 list => (glGenLists 1),
1707 @_
1708 )
1709}
1710
1711sub key_down {
1712 print "MAPKEYDOWN\n";
1713}
1714
1715sub key_up {
1716}
1717
1718sub button_down {
1719 my ($self, $ev, $x, $y) = @_;
1720
1721 $self->focus_in;
1722
1723 if ($ev->button == 2) {
1724 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1725 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1726
1727 $self->{motion} = sub {
1728 my ($ev, $x, $y) = @_;
1729
1730 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1731
1732 $::CFG->{map_shift_x} = $bw + $x - $ox;
1733 $::CFG->{map_shift_y} = $bh + $y - $oy;
1734
1735 $self->update;
1736 };
1737 }
1738}
1739
1740sub button_up {
1741 my ($self, $ev, $x, $y) = @_;
1742
1743 delete $self->{motion};
1744}
1745
1746sub mouse_motion {
1747 my ($self, $ev, $x, $y) = @_;
1748
1749 $self->{motion}->($ev, $x, $y) if $self->{motion};
1750}
1751
1752sub size_request {
1753 (
1754 1 + 32 * int $::WIDTH / 32,
1755 1 + 32 * int $::HEIGHT / 32,
1756 )
1757}
1758
1759sub update {
1760 my ($self) = @_;
1761
1762 $self->{need_update} = 1;
1763 $self->SUPER::update;
1764}
1765
1766sub draw {
1767 my ($self) = @_;
1768
1769 if (delete $self->{need_update}) {
1770 glNewList $self->{list}, GL_COMPILE;
1771
1772 if ($::MAP) {
1773 my $sw = int $::WIDTH / 32;
1774 my $sh = int $::HEIGHT / 32;
1775
1776 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1777 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1778
1779 glTranslate $sx0 - 32, $sy0 - 32, 0;
1780
1781 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1782
1783 if ($::CFG->{fow_enable}) {
1784 if ($::CFG->{fow_smooth}) { # smooth fog of war
1785 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1786 glConvolutionFilter2D
1787 GL_CONVOLUTION_2D,
1788 GL_ALPHA,
1789 3, 3,
1790 GL_ALPHA, GL_FLOAT,
1791 pack "f*",
1792 0.1, 0.1, 0.1,
1793 0.1, 0.2, 0.1,
1794 0.1, 0.1, 0.1,
1795 ;
1796 glEnable GL_CONVOLUTION_2D;
1797 }
1798
1799 $self->{fow_texture} = new CFClient::Texture
1800 w => $w,
1801 h => $h,
1802 data => $data,
1803 internalformat => GL_ALPHA,
1804 format => GL_ALPHA;
1805
1806 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1807
1808 glEnable GL_BLEND;
1809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1810 glEnable GL_TEXTURE_2D;
1811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1812
1813 glColor +($::CFG->{fow_intensity}) x 3, 1;
1814 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1815
1816 glDisable GL_TEXTURE_2D;
1817 glDisable GL_BLEND;
1818 }
1819
1820 # HACK BEGIN
1821 {
1822 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1823 my ($w, $h) = (250, 250);
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 $self->{mapmap_texture} =
1831 new CFClient::Texture
1832 w => $w,
1833 h => $h,
1834 data => $::MAP->mapmap ($w, $h),
1835 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1836
1837 $self->{mapmap_texture}->draw_quad (100, 100);
1838
1839 glDisable GL_TEXTURE_2D;
1840 glDisable GL_BLEND;
1841 }
1842 # HACK END
1843 }
1844
1845 glEndList;
1846 }
1847
1848 glPushMatrix;
1849 glCallList $self->{list};
1850 glPopMatrix;
1851
1852 if ($FOCUS != $self) {
1853 glColor 64/255, 64/255, 64/255;
1854 glLogicOp GL_AND;
1855 glEnable GL_COLOR_LOGIC_OP;
1856 glBegin GL_QUADS;
1857 glVertex 0, 0;
1858 glVertex 0, $::HEIGHT;
1859 glVertex $::WIDTH, $::HEIGHT;
1860 glVertex $::WIDTH, 0;
1861 glEnd;
1862 glDisable GL_COLOR_LOGIC_OP;
1863 }
1864}
1865
1866my %DIR = (
1867 SDLK_KP8, [1, "north"],
1868 SDLK_KP9, [2, "northeast"],
1869 SDLK_KP6, [3, "east"],
1870 SDLK_KP3, [4, "southeast"],
1871 SDLK_KP2, [5, "south"],
1872 SDLK_KP1, [6, "southwest"],
1873 SDLK_KP4, [7, "west"],
1874 SDLK_KP7, [8, "northwest"],
1875
1876 SDLK_UP, [1, "north"],
1877 SDLK_RIGHT, [3, "east"],
1878 SDLK_DOWN, [5, "south"],
1879 SDLK_LEFT, [7, "west"],
1880);
1881
1882sub key_down {
1883 my ($self, $ev) = @_;
1884
1885 my $mod = $ev->key_mod;
1886 my $sym = $ev->key_sym;
1887
1888 if ($sym == SDLK_KP5) {
1889 $::CONN->user_send ("command stay fire");
1890 } elsif ($sym == SDLK_a) {
1891 $::CONN->user_send ("command apply");
1892 } elsif ($sym == SDLK_QUOTE) {
1893 $self->emit ('activate_console');
1894 } elsif ($sym == SDLK_SLASH) {
1895 $self->emit ('activate_console' => '/');
1896 } elsif (exists $DIR{$sym}) {
1897 if ($mod & KMOD_SHIFT) {
1898 $self->{shft}++;
1899 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1900 } elsif ($mod & KMOD_CTRL) {
1901 $self->{ctrl}++;
1902 $::CONN->user_send ("command run $DIR{$sym}[0]");
1903 } else {
1904 $::CONN->user_send ("command $DIR{$sym}[1]");
1905 }
1906 }
1907}
1908
1909sub key_up {
1910 my ($self, $ev) = @_;
1911
1912 my $mod = $ev->key_mod;
1913 my $sym = $ev->key_sym;
1914
1915 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1916 $::CONN->user_send ("command fire_stop");
1917 }
1918 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1919 $::CONN->user_send ("command run_stop");
1920 }
1921}
1922
1923#############################################################################
1924
1925package CFClient::UI::Animator; 2182package CFClient::UI::Animator;
1926 2183
1927use SDL::OpenGL; 2184use CFClient::OpenGL;
1928 2185
1929our @ISA = CFClient::UI::Bin::; 2186our @ISA = CFClient::UI::Bin::;
1930 2187
1931sub moveto { 2188sub moveto {
1932 my ($self, $x, $y) = @_; 2189 my ($self, $x, $y) = @_;
1970 2227
1971sub new { 2228sub new {
1972 my $class = shift; 2229 my $class = shift;
1973 2230
1974 my $self = $class->SUPER::new ( 2231 my $self = $class->SUPER::new (
1975 state => 0, 2232 state => 0,
1976 connect_activate => \&toggle_flopper, 2233 connect_activate => \&toggle_flopper,
1977 @_ 2234 @_
1978 ); 2235 );
1979 2236
1980 if ($self->{state}) { 2237 if ($self->{state}) {
2001 $self->emit (changed => $self->{state}); 2258 $self->emit (changed => $self->{state});
2002} 2259}
2003 2260
2004############################################################################# 2261#############################################################################
2005 2262
2263package CFClient::UI::Tooltip;
2264
2265our @ISA = CFClient::UI::Bin::;
2266
2267use CFClient::OpenGL;
2268
2269sub new {
2270 my $class = shift;
2271
2272 $class->SUPER::new (
2273 @_,
2274 can_events => 0,
2275 )
2276}
2277
2278sub set_markup {
2279 my ($self, $text) = @_;
2280
2281 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2282 $self->{label}->set_markup ($text);
2283 $self->add ($self->{label});
2284}
2285
2286sub size_request {
2287 my ($self) = @_;
2288
2289 $self->child->set_max_size ($::WIDTH * 0.3);
2290
2291 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2292
2293 ($w + 4, $h + 4)
2294}
2295
2296sub size_allocate {
2297 my ($self, $w, $h) = @_;
2298
2299 $self->SUPER::size_allocate ($w - 4, $h - 4);
2300}
2301
2302sub _draw {
2303 my ($self) = @_;
2304
2305 glPushMatrix;
2306 glTranslate 0.375, 0.375;
2307
2308 my ($w, $h) = @$self{qw(w h)};
2309
2310 glColor 1, 0.8, 0.4;
2311 glBegin GL_QUADS;
2312 glVertex 0 , 0;
2313 glVertex 0 , $h;
2314 glVertex $w, $h;
2315 glVertex $w, 0;
2316 glEnd;
2317
2318 glColor 0, 0, 0;
2319 glBegin GL_LINE_LOOP;
2320 glVertex 0 , 0;
2321 glVertex 0 , $h;
2322 glVertex $w, $h;
2323 glVertex $w, 0;
2324 glEnd;
2325
2326 glPopMatrix;
2327
2328 glTranslate 2, 2;
2329 $self->SUPER::_draw;
2330}
2331
2332#############################################################################
2333
2334package CFClient::UI::Face;
2335
2336our @ISA = CFClient::UI::Base::;
2337
2338use CFClient::OpenGL;
2339
2340sub new {
2341 my $class = shift;
2342
2343 $class->SUPER::new (
2344 aspect => 1,
2345 @_,
2346 )
2347}
2348
2349sub size_request {
2350 (32, 8)
2351}
2352
2353sub draw {
2354 my ($self) = @_;
2355
2356 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2357
2358 if ($tex) {
2359 glEnable GL_BLEND;
2360 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2361 glEnable GL_TEXTURE_2D;
2362 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2363 glColor 1, 1, 1, 1;
2364 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2365 glDisable GL_TEXTURE_2D;
2366 glDisable GL_BLEND;
2367 }
2368}
2369
2370#############################################################################
2371
2006package CFClient::UI::Root; 2372package CFClient::UI::Root;
2007 2373
2008our @ISA = CFClient::UI::Container::; 2374our @ISA = CFClient::UI::Container::;
2009 2375
2010use SDL::OpenGL; 2376use CFClient::OpenGL;
2377
2378sub check_size {
2379 my ($self) = @_;
2380
2381 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2382}
2011 2383
2012sub size_request { 2384sub size_request {
2013 ($::WIDTH, $::HEIGHT) 2385 ($::WIDTH, $::HEIGHT)
2014} 2386}
2015 2387
2016sub size_allocate { 2388sub configure {
2017 my ($self, $x, $y, $w, $h) = @_; 2389 my ($self, $x, $y, $w, $h) = @_;
2018 2390
2019 $self->_size_allocate ($x, $y, $w, $h); 2391 $self->SUPER::configure ($x, $y, $w, $h);
2020 2392
2021 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
2022 for @{$self->{children}}; 2393 for my $child (@{$self->{children}}) {
2394 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2395
2396 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2397 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2398 $child->configure ($X, $Y, $W,$H);
2399 }
2023} 2400}
2024 2401
2025sub _topleft { 2402sub _topleft {
2026 my ($self, $x, $y) = @_; 2403 my ($self, $x, $y) = @_;
2027 2404
2029} 2406}
2030 2407
2031sub update { 2408sub update {
2032 my ($self) = @_; 2409 my ($self) = @_;
2033 2410
2034 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2411 $self->check_size;
2035 ::refresh (); 2412 ::refresh ();
2036} 2413}
2037 2414
2038sub add { 2415sub add {
2039 my ($self, $widget) = @_; 2416 my ($self, $child) = @_;
2040 2417
2418 # integerize window positions
2419 $child->{x} = int $child->{x};
2420 $child->{y} = int $child->{y};
2421
2041 $self->SUPER::add ($widget); 2422 $self->SUPER::add ($child);
2042
2043 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2044} 2423}
2045 2424
2046sub on_refresh { 2425sub on_refresh {
2047 my ($self, $id, $cb) = @_; 2426 my ($self, $id, $cb) = @_;
2048 2427
2072############################################################################# 2451#############################################################################
2073 2452
2074package CFClient::UI; 2453package CFClient::UI;
2075 2454
2076$ROOT = new CFClient::UI::Root; 2455$ROOT = new CFClient::UI::Root;
2456$TOOLTIP = new CFClient::UI::Tooltip;
2077 2457
20781 24581
2079 2459

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines