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

Diff Legend

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