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.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.171 by root, Mon Apr 24 11:54:26 2006 UTC

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

Diff Legend

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