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.105 by root, Fri Apr 14 14:55:28 2006 UTC vs.
Revision 1.167 by elmex, Mon Apr 24 08:44:23 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 (
498 children => [],
499 can_events => 0,
500 %arg,
501 );
325 $self->add ($_) for @$children; 502 $self->add ($_) for @$children;
326 503
327 $self 504 $self
328} 505}
329 506
330sub add { 507sub add {
331 my ($self, $chld) = @_; 508 my ($self, $child) = @_;
332 509
333 $chld->set_parent ($self); 510 $child->set_parent ($self);
511
512 use sort 'stable';
334 513
335 $self->{children} = [ 514 $self->{children} = [
336 sort { $a->{z} <=> $b->{z} } 515 sort { $a->{z} <=> $b->{z} }
337 @{$self->{children}}, $chld 516 @{$self->{children}}, $child
338 ]; 517 ];
339 518
340 $self->{w} = $self->{h} = -1; 519 $child->check_size;
520}
521
522sub remove {
523 my ($self, $child) = @_;
524
525 delete $child->{parent};
526 $child->hide;
527
528 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
529
530 $self->check_size;
341 $self->update; 531 $self->update;
342} 532}
343 533
344sub remove { 534sub clear {
345 my ($self, $widget) = @_; 535 my ($self) = @_;
346 536
347 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 537 my $children = delete $self->{children};
538 $self->{children} = [];
348 539
349 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 540 for (@$children) {
541 delete $_->{parent};
542 $_->hide;
543 }
350} 544}
351 545
352sub find_widget { 546sub find_widget {
353 my ($self, $x, $y) = @_; 547 my ($self, $x, $y) = @_;
354 548
… …
384 578
385 $class->SUPER::new (children => [$child], %arg) 579 $class->SUPER::new (children => [$child], %arg)
386} 580}
387 581
388sub add { 582sub add {
389 my ($self, $widget) = @_; 583 my ($self, $child) = @_;
390 584
391 $self->{children} = []; 585 $self->{children} = [];
392 586
393 $self->SUPER::add ($widget); 587 $self->SUPER::add ($child);
394} 588}
395 589
396sub remove { 590sub remove {
397 my ($self, $widget) = @_; 591 my ($self, $widget) = @_;
398 592
… …
407sub size_request { 601sub size_request {
408 $_[0]{children}[0]->size_request 602 $_[0]{children}[0]->size_request
409} 603}
410 604
411sub size_allocate { 605sub size_allocate {
412 my ($self, $x, $y, $w, $h) = @_; 606 my ($self, $w, $h) = @_;
413 607
414 $self->_size_allocate ($x, $y, $w, $h) or return;
415
416 $self->{children}[0]->size_allocate (0, 0, $w, $h); 608 $self->{children}[0]->configure (0, 0, $w, $h);
417} 609}
418 610
419############################################################################# 611#############################################################################
420 612
421package CFClient::UI::Window; 613package CFClient::UI::Window;
422 614
423our @ISA = CFClient::UI::Bin::; 615our @ISA = CFClient::UI::Bin::;
424 616
425use SDL::OpenGL; 617use CFClient::OpenGL;
426 618
427sub new { 619sub new {
428 my ($class, %arg) = @_; 620 my ($class, %arg) = @_;
429 621
430 my $self = $class->SUPER::new (%arg); 622 my $self = $class->SUPER::new (%arg);
… …
447 $self->child->draw; 639 $self->child->draw;
448 }; 640 };
449} 641}
450 642
451sub size_allocate { 643sub size_allocate {
452 my ($self, $x, $y, $w, $h) = @_; 644 my ($self, $w, $h) = @_;
453 645
454 $self->_size_allocate ($x, $y, $w, $h) or return;
455
456 $self->child->size_allocate (0, 0, $w, $h); 646 $self->child->configure (0, 0, $w, $h);
457 647
458 $self->render_chld; 648 $self->render_chld;
459} 649}
460 650
461sub _draw { 651sub _draw {
… …
477 glDisable GL_TEXTURE_2D; 667 glDisable GL_TEXTURE_2D;
478} 668}
479 669
480############################################################################# 670#############################################################################
481 671
672package CFClient::UI::ViewPort;
673
674our @ISA = CFClient::UI::Window::;
675
676sub new { die }
677
678sub size_request {
679 my ($self) = @_;
680
681 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
682 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
683
684 @$self{qw(child_w child_h)}
685}
686
687sub _draw {
688 my ($self) = @_;
689
690 $self->{children}[1]->draw;
691}
692
693
694#############################################################################
695
482package CFClient::UI::Frame; 696package CFClient::UI::Frame;
483 697
484our @ISA = CFClient::UI::Bin::; 698our @ISA = CFClient::UI::Bin::;
485 699
486use SDL::OpenGL; 700use 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 701
536sub new { 702sub new {
537 my $class = shift; 703 my $class = shift;
538 704
539 # TODO: user_x, user_y, overwrite moveto?
540
541 $class->SUPER::new ( 705 my $self = $class->SUPER::new (
542 bg => [1, 1, 1, 1], 706 bg => [1, 1, 1, 1],
543 border_bg => [1, 1, 1, 1], 707 border_bg => [1, 1, 1, 1],
544 border => $::FONTSIZE * 0.8, 708 border => 0.8,
545 @_ 709 @_
710 );
711
712 $self
713}
714
715sub _draw {
716 my ($self) = @_;
717
718 my ($w, $h) = ($self->{w}, $self->{h});
719
720 glEnable GL_BLEND;
721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
722 glEnable GL_TEXTURE_2D;
723 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
724
725# glBegin GL_QUADS;
726# glColor 0, 0, 0, 0;
727# glVertex 0 , 0;
728# glVertex 0 , $h;
729# glVertex $w, $h;
730# glVertex $w, 0;
731# glEnd;
732
733
734 $self->child->draw;
735 glDisable GL_BLEND;
736 glDisable GL_TEXTURE_2D;
737}
738
739#############################################################################
740
741package CFClient::UI::FancyFrame;
742
743our @ISA = CFClient::UI::Bin::;
744
745use CFClient::OpenGL;
746
747my @tex =
748 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
749 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
750
751sub new {
752 my $class = shift;
753
754 # TODO: user_x, user_y, overwrite moveto?
755
756 my $self = $class->SUPER::new (
757 bg => [1, 1, 1, 1],
758 border_bg => [1, 1, 1, 1],
759 border => 0.8,
760 can_events => 1,
761 @_
762 );
763
764 $self->{title} &&= new CFClient::UI::Label
765 align => 0,
766 valign => 1,
767 text => $self->{title},
768 fontsize => 1;
769
770 $self
771}
772
773sub border {
774 int $_[0]{border} * $::FONTSIZE
775}
776
777sub size_request {
778 my ($self) = @_;
779
780 my ($w, $h) = $self->SUPER::size_request;
781
782 (
783 $w + $self->border * 2,
784 $h + $self->border * 2,
546 ) 785 )
547} 786}
548 787
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 { 788sub size_allocate {
563 my ($self, $x, $y, $w, $h) = @_; 789 my ($self, $w, $h) = @_;
564 790
565 $self->_size_allocate ($x, $y, $w, $h) or return;
566
567 $h -= List::Util::max 0, $self->{border} * 2; 791 $h -= List::Util::max 0, $self->border * 2;
568 $w -= List::Util::max 0, $self->{border} * 2; 792 $w -= List::Util::max 0, $self->border * 2;
569 793
794 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
795 if $self->{title};
796
570 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 797 $self->child->configure ($self->border, $self->border, $w, $h);
571} 798}
572 799
573sub button_down { 800sub button_down {
574 my ($self, $ev, $x, $y) = @_; 801 my ($self, $ev, $x, $y) = @_;
575 802
803 my $border = $self->border;
804
576 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 805 if ($x < $self->{w} && $x >= $self->{w} - $border
577 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 806 && $y < $self->{h} && $y >= $self->{h} - $border) {
578 807
579 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 808 my ($ox, $oy) = ($ev->{x}, $ev->{y});
580 my ($bw, $bh) = ($self->{w}, $self->{h}); 809 my ($bw, $bh) = ($self->{w}, $self->{h});
581 810
582 $self->{motion} = sub { 811 $self->{motion} = sub {
583 my ($ev, $x, $y) = @_; 812 my ($ev, $x, $y) = @_;
584 813
585 ($x, $y) = ($ev->motion_x, $ev->motion_y); 814 ($x, $y) = ($ev->{x}, $ev->{y});
586 815
587 $self->{user_w} = $bw + $x - $ox; 816 $self->{user_w} = $bw + $x - $ox;
588 $self->{user_h} = $bh + $y - $oy; 817 $self->{user_h} = $bh + $y - $oy;
589 $self->update; 818 $self->check_size;
590 }; 819 };
591 820
592 } elsif ($x >= 0 && $x < $self->{w} 821 } elsif ($x >= 0 && $x < $self->{w}
593 && $y >= 0 && $y < $self->{border}) { 822 && $y >= 0 && $y < $border) {
594 823
595 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 824 my ($ox, $oy) = ($ev->{x}, $ev->{y});
596 my ($bx, $by) = ($self->{x}, $self->{y}); 825 my ($bx, $by) = ($self->{x}, $self->{y});
597 826
598 $self->{motion} = sub { 827 $self->{motion} = sub {
599 my ($ev, $x, $y) = @_; 828 my ($ev, $x, $y) = @_;
600 829
601 ($x, $y) = ($ev->motion_x, $ev->motion_y); 830 ($x, $y) = ($ev->{x}, $ev->{y});
602 831
603 $self->move ($bx + $x - $ox, $by + $y - $oy); 832 $self->move ($bx + $x - $ox, $by + $y - $oy);
604 $self->update; 833 $self->update;
605 }; 834 };
606 } 835 }
… …
627 glEnable GL_BLEND; 856 glEnable GL_BLEND;
628 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 857 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
629 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
630 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
631 860
861 my $border = $self->border;
862
632 glColor @{ $self->{border_bg} }; 863 glColor @{ $self->{border_bg} };
633 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 864 $tex[1]->draw_quad (0, 0, $w, $border);
634 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 865 $tex[3]->draw_quad (0, $border, $border, $ch);
635 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 866 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
636 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 867 $tex[4]->draw_quad (0, $h - $border, $w, $border);
637 868
638 my $bg = $tex[0]; 869 my $bg = $tex[0];
639 870
640 # TODO: repeat texture not scale 871 # TODO: repeat texture not scale
641 my $rep_x = $cw / $bg->{w}; 872 my $rep_x = $cw / $bg->{w};
… …
644 glColor @{ $self->{bg} }; 875 glColor @{ $self->{bg} };
645 876
646 $bg->{s} = $rep_x; 877 $bg->{s} = $rep_x;
647 $bg->{t} = $rep_y; 878 $bg->{t} = $rep_y;
648 $bg->{wrap_mode} = 1; 879 $bg->{wrap_mode} = 1;
649 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 880 $bg->draw_quad ($border, $border, $cw, $ch);
650 881
651 glDisable GL_TEXTURE_2D; 882 glDisable GL_TEXTURE_2D;
652 glDisable GL_BLEND; 883 glDisable GL_BLEND;
653 884
885 $self->{title}->draw if $self->{title};
654 $self->child->draw; 886 $self->child->draw;
655} 887}
656 888
657############################################################################# 889#############################################################################
658 890
… …
660 892
661our @ISA = CFClient::UI::Base::; 893our @ISA = CFClient::UI::Base::;
662 894
663use List::Util qw(max sum); 895use List::Util qw(max sum);
664 896
665use SDL::OpenGL; 897use CFClient::OpenGL;
666 898
667sub new { 899sub new {
668 my $class = shift; 900 my $class = shift;
669 901
670 $class->SUPER::new ( 902 $class->SUPER::new (
… …
672 @_ 904 @_
673 ) 905 )
674} 906}
675 907
676sub add { 908sub add {
677 my ($self, $x, $y, $chld) = @_; 909 my ($self, $x, $y, $child) = @_;
678 910
911 $child->set_parent ($self);
679 $self->{children}[$y][$x] = $chld; 912 $self->{children}[$y][$x] = $child;
680 $chld->set_parent ($self);
681 913
682 $self->{w} = $self->{h} = -1; 914 $child->check_size;
915}
916
917# TODO: move to container class maybe? send childs a signal on removal?
918sub clear {
919 my ($self) = @_;
920
921 my $children = delete $self->{children};
922
923 for (grep $_, map @$_, grep $_, @$children) {
924 delete $_->{parent};
925 $_->hide;
926 }
927
683 $self->update; 928 $self->update;
684} 929}
685 930
686sub get_wh { 931sub get_wh {
687 my ($self) = @_; 932 my ($self) = @_;
… …
693 or next; 938 or next;
694 939
695 for my $x (0 .. $#$row) { 940 for my $x (0 .. $#$row) {
696 my $widget = $row->[$x] 941 my $widget = $row->[$x]
697 or next; 942 or next;
698 my ($w, $h) = $widget->size_request; 943 my ($w, $h) = @$widget{qw(req_w req_h)};
699 944
700 $w[$x] = max $w[$x], $w; 945 $w[$x] = max $w[$x], $w;
701 $h[$y] = max $h[$y], $h; 946 $h[$y] = max $h[$y], $h;
702 } 947 }
703 } 948 }
… …
715 (sum @$hs), 960 (sum @$hs),
716 ) 961 )
717} 962}
718 963
719sub size_allocate { 964sub size_allocate {
720 my ($self, $x, $y, $w, $h) = @_; 965 my ($self, $w, $h) = @_;
721
722 $self->_size_allocate ($x, $y, $w, $h) or return;
723 966
724 my ($ws, $hs) = $self->get_wh; 967 my ($ws, $hs) = $self->get_wh;
725 968
726 my $req_w = sum @$ws; 969 my $req_w = sum @$ws;
727 my $req_h = sum @$hs; 970 my $req_h = sum @$hs;
… …
732 my $col_expand = (sum @col_expand) || 1; 975 my $col_expand = (sum @col_expand) || 1;
733 976
734 # linearly scale sizes 977 # linearly scale sizes
735 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 978 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
736 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 979 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
980
981 CFClient::UI::harmonize $ws;
982 CFClient::UI::harmonize $hs;
737 983
738 my $y; 984 my $y;
739 985
740 for my $r (0 .. $#{$self->{children}}) { 986 for my $r (0 .. $#{$self->{children}}) {
741 my $row = $self->{children}[$r] 987 my $row = $self->{children}[$r]
… …
746 992
747 for my $c (0 .. $#$row) { 993 for my $c (0 .. $#$row) {
748 my $col_w = $ws->[$c]; 994 my $col_w = $ws->[$c];
749 995
750 if (my $widget = $row->[$c]) { 996 if (my $widget = $row->[$c]) {
751 $widget->size_allocate ($x, $y, $col_w, $row_h); 997 $widget->configure ($x, $y, $col_w, $row_h);
752 } 998 }
753 999
754 $x += $col_w; 1000 $x += $col_w;
755 } 1001 }
756 1002
… …
801 (List::Util::max map $_->[1], @alloc), 1047 (List::Util::max map $_->[1], @alloc),
802 ) 1048 )
803} 1049}
804 1050
805sub size_allocate { 1051sub size_allocate {
806 my ($self, $x, $y, $w, $h) = @_; 1052 my ($self, $w, $h) = @_;
807
808 $self->_size_allocate ($x, $y, $w, $h);
809 1053
810 ($h, $w) = ($w, $h); 1054 ($h, $w) = ($w, $h);
811 1055
812 my $children = $self->{children}; 1056 my $children = $self->{children};
813 1057
814 my @h = map +($_->size_request)[0], @$children; 1058 my @h = map $_->{req_w}, @$children;
815 1059
816 my $req_h = List::Util::sum @h; 1060 my $req_h = List::Util::sum @h;
817 1061
818 if ($req_h > $h) { 1062 if ($req_h > $h) {
819 # ah well, not enough space 1063 # ah well, not enough space
… …
829 $alloc_h += ($h - $req_h) * $child->{expand} / $exp; 1073 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
830 $h[$_] = $alloc_h; 1074 $h[$_] = $alloc_h;
831 } 1075 }
832 } 1076 }
833 1077
1078 CFClient::UI::harmonize \@h;
1079
834 my $y = 0; 1080 my $y = 0;
835 for (0 .. $#$children) { 1081 for (0 .. $#$children) {
836 my $child = $children->[$_]; 1082 my $child = $children->[$_];
837 my $h = int $h[$_]; 1083 my $h = $h[$_];
838 $child->size_allocate ($y, 0, $h, $w); 1084 $child->configure ($y, 0, $h, $w);
839 1085
840 $y += $h; 1086 $y += $h;
841 } 1087 }
1088
1089 1
842} 1090}
843 1091
844############################################################################# 1092#############################################################################
845 1093
846package CFClient::UI::VBox; 1094package CFClient::UI::VBox;
… …
859 (List::Util::sum map $_->[1], @alloc), 1107 (List::Util::sum map $_->[1], @alloc),
860 ) 1108 )
861} 1109}
862 1110
863sub size_allocate { 1111sub size_allocate {
864 my ($self, $x, $y, $w, $h) = @_; 1112 my ($self, $w, $h) = @_;
865
866 $self->_size_allocate ($x, $y, $w, $h);
867 1113
868 my $children = $self->{children}; 1114 my $children = $self->{children};
869 1115
870 my @h = map +($_->size_request)[1], @$children; 1116 my @h = map $_->{req_h}, @$children;
871 1117
872 my $req_h = List::Util::sum @h; 1118 my $req_h = List::Util::sum @h;
873 1119
874 if ($req_h > $h) { 1120 if ($req_h > $h) {
875 # ah well, not enough space 1121 # ah well, not enough space
… …
883 1129
884 $h[$_] += ($h - $req_h) * $child->{expand} / $exp; 1130 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
885 } 1131 }
886 } 1132 }
887 1133
1134 CFClient::UI::harmonize \@h;
1135
888 my $y = 0; 1136 my $y = 0;
889 for (0 .. $#$children) { 1137 for (0 .. $#$children) {
890 my $child = $children->[$_]; 1138 my $child = $children->[$_];
891 my $h = int $h[$_]; 1139 my $h = $h[$_];
892 $child->size_allocate (0, $y, $w, $h); 1140 $child->configure (0, $y, $w, $h);
893 1141
894 $y += $h; 1142 $y += $h;
895 } 1143 }
1144
1145 1
896} 1146}
897 1147
898############################################################################# 1148#############################################################################
899 1149
900package CFClient::UI::Label; 1150package CFClient::UI::Label;
901 1151
902our @ISA = CFClient::UI::Base::; 1152our @ISA = CFClient::UI::Base::;
903 1153
904use SDL::OpenGL; 1154use CFClient::OpenGL;
905 1155
906sub new { 1156sub new {
907 my ($class, %arg) = @_; 1157 my ($class, %arg) = @_;
908 1158
909 my $self = $class->SUPER::new ( 1159 my $self = $class->SUPER::new (
910 fg => [1, 1, 1], 1160 fg => [1, 1, 1],
911 fontsize => $::FONTSIZE, 1161 #font => default_font
1162 fontsize => 1,
912 text => "", 1163 text => "",
913 align => -1, 1164 align => -1,
1165 valign => -1,
914 padding => 2, 1166 padding => 2,
915 layout => new CFClient::Layout, 1167 layout => new CFClient::Layout,
1168 can_events => 0,
916 %arg 1169 %arg
917 ); 1170 );
918 1171
919 $self->set_text ($self->{text}); 1172 if (exists $self->{template}) {
1173 my $layout = new CFClient::Layout;
1174 $layout->set_text (delete $self->{template});
1175 $self->{template} = $layout;
1176 }
1177
1178 $self->set_text (delete $self->{text}) if exists $self->{text};
1179 $self->set_markup (delete $self->{markup}) if exists $self->{markup};
920 1180
921 $self 1181 $self
922} 1182}
923 1183
924sub escape_text { 1184sub escape {
925 local $_ = $_[1]; 1185 local $_ = $_[1];
926 1186
927 s/&/&amp;/g; 1187 s/&/&amp;/g;
928 s/>/&gt;/g; 1188 s/>/&gt;/g;
929 s/</&lt;/g; 1189 s/</&lt;/g;
… …
932} 1192}
933 1193
934sub set_text { 1194sub set_text {
935 my ($self, $text) = @_; 1195 my ($self, $text) = @_;
936 1196
937 $self->{text} = $text;
938 $self->{layout}->set_markup ($text); 1197 $self->{layout}->set_text ($text);
939 1198
940 delete $self->{texture}; 1199 delete $self->{texture};
941# $self->{w} = $self->{h} = -1; 1200 $self->check_size;
942 $self->update; 1201 $self->update;
943} 1202}
944 1203
945sub get_text { 1204sub set_markup {
946 my ($self, $text) = @_; 1205 my ($self, $markup) = @_;
947 1206
948 $self->{text} 1207 $self->{layout}->set_markup ($markup);
1208
1209 delete $self->{texture};
1210 $self->check_size;
1211 $self->update;
949} 1212}
950 1213
951sub size_request { 1214sub size_request {
952 my ($self) = @_; 1215 my ($self) = @_;
953 1216
954 $self->{layout}->set_width; 1217 $self->{layout}->set_font ($self->{font}) if $self->{font};
1218 $self->{layout}->set_width ($self->{max_w} || -1);
955 $self->{layout}->set_height ($self->{fontsize}); 1219 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1220
956 my ($w, $h) = $self->{layout}->size; 1221 my ($w, $h) = $self->{layout}->size;
1222
1223 if (exists $self->{template}) {
1224 $self->{template}->set_font ($self->{font}) if $self->{font};
1225 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1226
1227 my ($w2, $h2) = $self->{template}->size;
1228
1229 $w = List::Util::max $w, $w2;
1230 $h = List::Util::max $h, $h2;
1231 }
957 1232
958 ( 1233 (
959 $w + $self->{padding} * 2, 1234 $w + $self->{padding} * 2,
960 $h + $self->{padding} * 2, 1235 $h + $self->{padding} * 2,
961 ) 1236 )
962} 1237}
963 1238
964sub size_allocate { 1239sub size_allocate {
965 my ($self, $x, $y, $w, $h) = @_; 1240 my ($self, $w, $h) = @_;
966
967 $self->_size_allocate ($x, $y, $w, $h) or return;
968 1241
969 delete $self->{texture}; 1242 delete $self->{texture};
970} 1243}
971 1244
972sub update { 1245sub set_fontsize {
973 my ($self) = @_; 1246 my ($self, $fontsize) = @_;
974 1247
1248 $self->{fontsize} = $fontsize;
975 delete $self->{texture}; 1249 delete $self->{texture};
1250 $self->check_size;
976 $self->SUPER::update; 1251 $self->update;
977} 1252}
978 1253
979sub _draw { 1254sub _draw {
980 my ($self) = @_; 1255 my ($self) = @_;
981 1256
982 my $tex = $self->{texture} ||= do { 1257 my $tex = $self->{texture} ||= do {
1258 $self->{layout}->set_font ($self->{font}) if $self->{font};
983 $self->{layout}->set_width ($self->{w}); 1259 $self->{layout}->set_width ($self->{w});
984 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1260 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
985 new_from_layout CFClient::Texture $self->{layout} 1261 new_from_layout CFClient::Texture $self->{layout}
986 }; 1262 };
987 1263
988 glEnable GL_BLEND; 1264 glEnable GL_BLEND;
989 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1265 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
990 glEnable GL_TEXTURE_2D; 1266 glEnable GL_TEXTURE_2D;
991 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1267 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
992 1268
993 glColor @{$self->{fg}}; 1269 glColor @{$self->{fg}};
994 1270
995 my $x = 1271 $self->{ox} = int (
996 $self->{align} < 0 ? $self->{padding} 1272 $self->{align} < 0 ? $self->{padding}
997 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1273 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
998 : ($self->{w} - $tex->{w}) * 0.5; 1274 : ($self->{w} - $tex->{w}) * 0.5
1275 );
999 1276
1000 $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5); 1277 $self->{oy} = int (
1278 $self->{valign} < 0 ? $self->{padding}
1279 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1280 : ($self->{h} - $tex->{h}) * 0.5
1281 );
1282
1283 $tex->draw_quad ($self->{ox}, $self->{oy});
1001 1284
1002 glDisable GL_TEXTURE_2D; 1285 glDisable GL_TEXTURE_2D;
1003 glDisable GL_BLEND; 1286 glDisable GL_BLEND;
1004} 1287}
1005 1288
1006############################################################################# 1289#############################################################################
1007 1290
1008package CFClient::UI::Entry; 1291package CFClient::UI::EntryBase;
1009 1292
1010our @ISA = CFClient::UI::Label::; 1293our @ISA = CFClient::UI::Label::;
1011 1294
1012use SDL; 1295use CFClient::OpenGL;
1013use SDL::OpenGL;
1014 1296
1015sub new { 1297sub new {
1016 my $class = shift; 1298 my $class = shift;
1017 1299
1018 $class->SUPER::new ( 1300 $class->SUPER::new (
1019 fg => [1, 1, 1], 1301 fg => [1, 1, 1],
1020 bg => [0, 0, 0, 0.2], 1302 bg => [0, 0, 0, 0.2],
1021 active_bg => [1, 1, 1, 0.5], 1303 active_bg => [1, 1, 1, 0.5],
1022 active_fg => [0, 0, 0], 1304 active_fg => [0, 0, 0],
1023 can_hover => 1, 1305 can_hover => 1,
1024 can_focus => 1, 1306 can_focus => 1,
1307 valign => 0,
1308 can_events => 1,
1025 @_ 1309 @_
1026 ) 1310 )
1027} 1311}
1028 1312
1029sub _set_text { 1313sub _set_text {
1030 my ($self, $text) = @_; 1314 my ($self, $text) = @_;
1031 1315
1032 my $old_text = $self->{text}; 1316 delete $self->{cur_h};
1317
1318 return if $self->{text} eq $text;
1319
1320 delete $self->{texture};
1033 1321
1034 $self->{last_activity} = $::NOW; 1322 $self->{last_activity} = $::NOW;
1035
1036 $self->{text} = $text; 1323 $self->{text} = $text;
1037 $self->{layout}->set_width ($self->{w});
1038 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1039 1324
1040 $text =~ s/./*/g if $self->{hidden}; 1325 $text =~ s/./*/g if $self->{hidden};
1326 $self->{layout}->set_text ("$text ");
1041 1327
1042 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1328 $self->emit (changed => $self->{text});
1329}
1043 1330
1044 $text = substr $text, 0, $self->{cursor}; 1331sub get_text {
1045 utf8::encode $text; 1332 $_[0]{text}
1046
1047 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1048
1049 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1050 if $old_text ne $self->{text};
1051} 1333}
1052 1334
1053sub size_request { 1335sub size_request {
1054 my ($self) = @_; 1336 my ($self) = @_;
1055 1337
… …
1057 1339
1058 ($w + 1, $h) # add 1 for cursor 1340 ($w + 1, $h) # add 1 for cursor
1059} 1341}
1060 1342
1061sub size_allocate { 1343sub size_allocate {
1062 my ($self, $x, $y, $w, $h) = @_; 1344 my ($self, $w, $h) = @_;
1063 1345
1064 $self->SUPER::size_allocate ($x, $y, $w, $h); 1346 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1065
1066 $self->_set_text ($self->{text});
1067} 1347}
1068 1348
1069sub set_text { 1349sub set_text {
1070 my ($self, $text) = @_; 1350 my ($self, $text) = @_;
1071 1351
… …
1075} 1355}
1076 1356
1077sub key_down { 1357sub key_down {
1078 my ($self, $ev) = @_; 1358 my ($self, $ev) = @_;
1079 1359
1080 my $mod = $ev->key_mod; 1360 my $mod = $ev->{mod};
1081 my $sym = $ev->key_sym; 1361 my $sym = $ev->{sym};
1082
1083 my $uni = $ev->key_unicode; 1362 my $uni = $ev->{unicode};
1084 1363
1085 my $text = $self->get_text; 1364 my $text = $self->get_text;
1086 1365
1087 if ($sym == SDLK_BACKSPACE) { 1366 if ($sym == 8) {
1088 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1367 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1089 } elsif ($sym == SDLK_DELETE) { 1368 } elsif ($sym == 127) {
1090 substr $text, $self->{cursor}, 1, ""; 1369 substr $text, $self->{cursor}, 1, "";
1091 } elsif ($sym == SDLK_LEFT) { 1370 } elsif ($sym == CFClient::SDLK_LEFT) {
1092 --$self->{cursor} if $self->{cursor}; 1371 --$self->{cursor} if $self->{cursor};
1093 } elsif ($sym == SDLK_RIGHT) { 1372 } elsif ($sym == CFClient::SDLK_RIGHT) {
1094 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1373 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1095 } elsif ($sym == SDLK_HOME) { 1374 } elsif ($sym == CFClient::SDLK_HOME) {
1096 $self->{cursor} = 0; 1375 $self->{cursor} = 0;
1097 } elsif ($sym == SDLK_END) { 1376 } elsif ($sym == CFClient::SDLK_END) {
1098 $self->{cursor} = length $text; 1377 $self->{cursor} = length $text;
1099 } elsif ($sym == SDLK_ESCAPE) { 1378 } elsif ($sym == 27) {
1100 $self->emit ('escape'); 1379 $self->emit ('escape');
1101 } elsif ($uni) { 1380 } elsif ($uni) {
1102 substr $text, $self->{cursor}++, 0, chr $uni; 1381 substr $text, $self->{cursor}++, 0, chr $uni;
1103 } 1382 }
1104 1383
… …
1159 1438
1160 $self->SUPER::_draw; 1439 $self->SUPER::_draw;
1161 1440
1162 #TODO: force update every cursor change :( 1441 #TODO: force update every cursor change :(
1163 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1442 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1443
1444 unless (exists $self->{cur_h}) {
1445 my $text = substr $self->{text}, 0, $self->{cursor};
1446 utf8::encode $text;
1447
1448 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1449 }
1450
1164 glColor @{$self->{fg}}; 1451 glColor @{$self->{fg}};
1165 glBegin GL_LINES; 1452 glBegin GL_LINES;
1166 glVertex $self->{cur_x}, $self->{cur_y};
1167 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1453 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1454 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1168 glEnd; 1455 glEnd;
1169 } 1456 }
1170} 1457}
1171 1458
1172package CFClient::UI::LineEntry; 1459package CFClient::UI::Entry;
1173 1460
1174our @ISA = CFClient::UI::Entry::; 1461our @ISA = CFClient::UI::EntryBase::;
1175 1462
1176use SDL; 1463use CFClient::OpenGL;
1177use SDL::OpenGL;
1178 1464
1179sub key_down { 1465sub key_down {
1180 my ($self, $ev) = @_; 1466 my ($self, $ev) = @_;
1181 1467
1182 my $sym = $ev->key_sym; 1468 my $sym = $ev->{sym};
1183 1469
1184 if ($sym == SDLK_RETURN) { 1470 if ($sym == 13) {
1471 unshift @{$self->{history}},
1472 my $txt = $self->get_text;
1473 $self->{history_pointer} = -1;
1185 $self->emit (activate => $self->get_text); 1474 $self->emit (activate => $txt);
1186 $self->update; 1475 $self->update;
1476
1477 } elsif ($sym == CFClient::SDLK_UP) {
1478 if ($self->{history_pointer} < 0) {
1479 $self->{history_saveback} = $self->get_text;
1480 }
1481 $self->{history_pointer}++;
1482 if ($self->{history_pointer} >= @{$self->{history}}) {
1483 $self->{history_pointer} = @{$self->{history}} - 1;
1484 }
1485 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1486
1487 } elsif ($sym == CFClient::SDLK_DOWN) {
1488 $self->{history_pointer}--;
1489 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1490
1491 if ($self->{history_pointer} >= 0) {
1492 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1493 } else {
1494 $self->set_text ($self->{history_saveback});
1495 }
1187 1496
1188 } else { 1497 } else {
1189 $self->SUPER::key_down ($ev); 1498 $self->SUPER::key_down ($ev);
1190 } 1499 }
1191 1500
… …
1195 1504
1196package CFClient::UI::Button; 1505package CFClient::UI::Button;
1197 1506
1198our @ISA = CFClient::UI::Label::; 1507our @ISA = CFClient::UI::Label::;
1199 1508
1200use SDL; 1509use CFClient::OpenGL;
1201use SDL::OpenGL;
1202 1510
1203my @tex = 1511my @tex =
1204 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1512 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1205 qw(b1_button_active.png); 1513 qw(b1_button_active.png);
1206 1514
1207sub new { 1515sub new {
1208 my $class = shift; 1516 my $class = shift;
1209 1517
1210 $class->SUPER::new ( 1518 $class->SUPER::new (
1211 padding => 4, 1519 padding => 4,
1212 fg => [1, 1, 1], 1520 fg => [1, 1, 1],
1213 bg => [1, 1, 1, 0.2], 1521 bg => [1, 1, 1, 0.2],
1214 active_fg => [1, 1, 0], 1522 active_fg => [0, 0, 1],
1215 can_hover => 1, 1523 can_hover => 1,
1524 align => 0,
1525 valign => 0,
1526 can_events => 1,
1216 @_ 1527 @_
1217 ) 1528 )
1218} 1529}
1219 1530
1220sub button_up { 1531sub button_up {
… …
1228 1539
1229sub _draw { 1540sub _draw {
1230 my ($self) = @_; 1541 my ($self) = @_;
1231 1542
1232 local $self->{fg} = $self->{fg}; 1543 local $self->{fg} = $self->{fg};
1233 my $tex = $tex[0];
1234
1235 glEnable GL_BLEND;
1236 glEnable GL_TEXTURE_2D;
1237 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1238 1544
1239 if ($GRAB == $self) { 1545 if ($GRAB == $self) {
1240 $self->{fg} = $self->{active_fg}; 1546 $self->{fg} = $self->{active_fg};
1241 } 1547 }
1242 1548
1243 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1549 glEnable GL_BLEND;
1550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1551 glEnable GL_TEXTURE_2D;
1244 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1553 glColor 0, 0, 0, 1;
1245 1554
1246 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1555 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1247 1556
1248 glDisable GL_TEXTURE_2D; 1557 glDisable GL_TEXTURE_2D;
1249 glDisable GL_BLEND; 1558 glDisable GL_BLEND;
1250 1559
1251 $self->SUPER::_draw; 1560 $self->SUPER::_draw;
… …
1256package CFClient::UI::CheckBox; 1565package CFClient::UI::CheckBox;
1257 1566
1258our @ISA = CFClient::UI::DrawBG::; 1567our @ISA = CFClient::UI::DrawBG::;
1259 1568
1260my @tex = 1569my @tex =
1261 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1570 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1262 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1571 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1263 1572
1264use SDL; 1573use CFClient::OpenGL;
1265use SDL::OpenGL;
1266 1574
1267sub new { 1575sub new {
1268 my $class = shift; 1576 my $class = shift;
1269 1577
1270 $class->SUPER::new ( 1578 $class->SUPER::new (
… …
1281 my ($self) = @_; 1589 my ($self) = @_;
1282 1590
1283 ($self->{padding} * 2 + 6) x 2 1591 ($self->{padding} * 2 + 6) x 2
1284} 1592}
1285 1593
1286sub size_allocate {
1287 my ($self, $x, $y, $w, $h) = @_;
1288
1289 $self->_size_allocate ($x, $y, $w, $h);
1290}
1291
1292sub button_down { 1594sub button_down {
1293 my ($self, $ev, $x, $y) = @_; 1595 my ($self, $ev, $x, $y) = @_;
1294 1596
1295 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1597 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1296 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1598 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1322 glDisable GL_BLEND; 1624 glDisable GL_BLEND;
1323} 1625}
1324 1626
1325############################################################################# 1627#############################################################################
1326 1628
1629package CFClient::UI::Image;
1630
1631our @ISA = CFClient::UI::Base::;
1632
1633use CFClient::OpenGL;
1634use Carp qw/confess/;
1635
1636our %loaded_images;
1637
1638sub new {
1639 my $class = shift;
1640
1641 my $self = $class->SUPER::new (can_events => 0, @_);
1642
1643 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1644
1645 $loaded_images{$self->{image}} ||=
1646 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1647
1648 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1649
1650 Scalar::Util::weaken $loaded_images{$self->{image}};
1651
1652 $self->{aspect} = $tex->{w} / $tex->{h};
1653
1654 $self
1655}
1656
1657sub size_request {
1658 my ($self) = @_;
1659
1660 ($self->{tex}->{w}, $self->{tex}->{h})
1661}
1662
1663sub _draw {
1664 my ($self) = @_;
1665
1666 my $tex = $self->{tex};
1667
1668 my ($w, $h) = ($self->{w}, $self->{h});
1669
1670 if ($self->{rot90}) {
1671 glRotate 90, 0, 0, 1;
1672 glTranslate 0, -$self->{w}, 0;
1673
1674 ($w, $h) = ($h, $w);
1675 }
1676
1677 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1679 glEnable GL_TEXTURE_2D;
1680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1681
1682 $tex->draw_quad (0, 0, $w, $h);
1683
1684 glDisable GL_BLEND;
1685 glDisable GL_TEXTURE_2D;
1686}
1687
1688#############################################################################
1689
1690package CFClient::UI::VGauge;
1691
1692our @ISA = CFClient::UI::Base::;
1693
1694use List::Util qw(min max);
1695
1696use CFClient::OpenGL;
1697
1698my %tex = (
1699 food => [
1700 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1701 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1702 ],
1703 grace => [
1704 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1705 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1706 ],
1707 hp => [
1708 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1709 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1710 ],
1711 mana => [
1712 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1713 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1714 ],
1715);
1716
1717# eg. VGauge->new (gauge => 'food'), default gauge: food
1718sub new {
1719 my $class = shift;
1720
1721 my $self = $class->SUPER::new (
1722 type => 'food',
1723 @_
1724 );
1725
1726 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1727
1728 $self
1729}
1730
1731sub size_request {
1732 my ($self) = @_;
1733
1734 #my $tex = $tex{$self->{type}}[0];
1735 #@$tex{qw(w h)}
1736 (0, 0)
1737}
1738
1739sub set_max {
1740 my ($self, $max) = @_;
1741
1742 $self->{max_val} = $max;
1743}
1744
1745sub set_value {
1746 my ($self, $val, $max) = @_;
1747
1748 $self->set_max ($max)
1749 if defined $max;
1750
1751 $max = $self->{max_val};
1752 $self->{val} = $val;
1753
1754 $self->update;
1755}
1756
1757sub _draw {
1758 my ($self) = @_;
1759
1760 my $tex = $tex{$self->{type}};
1761 my ($t1, $t2, $t3) = @$tex;
1762
1763 my ($w, $h) = ($self->{w}, $self->{h});
1764
1765 if ($self->{vertical}) {
1766 glRotate 90, 0, 0, 1;
1767 glTranslate 0, -$self->{w}, 0;
1768
1769 ($w, $h) = ($h, $w);
1770 }
1771
1772 my $ycut = $self->{val} / ($self->{max_val} || 1);
1773
1774 my $ycut1 = max 0, min 1, $ycut;
1775 my $ycut2 = max 0, min 1, $ycut - 1;
1776
1777 my $h1 = $self->{h} * (1 - $ycut1);
1778 my $h2 = $self->{h} * (1 - $ycut2);
1779
1780 glEnable GL_BLEND;
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784
1785 glBindTexture GL_TEXTURE_2D, $t1->{name};
1786 glBegin GL_QUADS;
1787 glTexCoord 0 , 0; glVertex 0 , 0;
1788 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1789 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1790 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1791 glEnd;
1792
1793 my $ycut1 = List::Util::min 1, $ycut;
1794 glBindTexture GL_TEXTURE_2D, $t2->{name};
1795 glBegin GL_QUADS;
1796 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1797 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1798 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1799 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1800 glEnd;
1801
1802 if ($t3) {
1803 glBindTexture GL_TEXTURE_2D, $t3->{name};
1804 glBegin GL_QUADS;
1805 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1806 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1807 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1808 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1809 glEnd;
1810 }
1811
1812 glDisable GL_BLEND;
1813 glDisable GL_TEXTURE_2D;
1814}
1815
1816#############################################################################
1817
1818package CFClient::UI::Gauge;
1819
1820our @ISA = CFClient::UI::VBox::;
1821
1822sub new {
1823 my ($class, %arg) = @_;
1824
1825 my $self = $class->SUPER::new (
1826 tooltip => $arg{type},
1827 can_hover => 1,
1828 %arg,
1829 );
1830
1831 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1832 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1833 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1834
1835 $self
1836}
1837
1838sub set_fontsize {
1839 my ($self, $fsize) = @_;
1840
1841 $self->{value}->set_fontsize ($fsize);
1842 $self->{max} ->set_fontsize ($fsize);
1843}
1844
1845sub set_value {
1846 my ($self, $val, $max) = @_;
1847
1848 $self->set_max ($max)
1849 if defined $max;
1850
1851 $self->{gauge}->set_value ($val, $max);
1852 $self->{value}->set_text ($val);
1853}
1854
1855sub set_max {
1856 my ($self, $max) = @_;
1857
1858 $self->{gauge}->set_max ($max);
1859 $self->{max}->set_text ($max);
1860}
1861
1862#############################################################################
1863
1327package CFClient::UI::Slider; 1864package CFClient::UI::Slider;
1328 1865
1329use strict; 1866use strict;
1330 1867
1331use SDL::OpenGL; 1868use CFClient::OpenGL;
1332 1869
1333our @ISA = CFClient::UI::DrawBG::; 1870our @ISA = CFClient::UI::DrawBG::;
1334 1871
1335my @tex = 1872my @tex =
1336 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1873 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1346 # TODO: calculations are off 1883 # TODO: calculations are off
1347 my $self = $class->SUPER::new ( 1884 my $self = $class->SUPER::new (
1348 fg => [1, 1, 1], 1885 fg => [1, 1, 1],
1349 active_fg => [0, 0, 0], 1886 active_fg => [0, 0, 0],
1350 range => [0, 0, 100, 10], 1887 range => [0, 0, 100, 10],
1351 req_w => 40, 1888 req_w => 20,
1352 req_h => 13, 1889 req_h => 20,
1353 vertical => 0, 1890 vertical => 0,
1354 can_hover => 1, 1891 can_hover => 1,
1355 inner_pad => 5, 1892 inner_pad => 5,
1356 @_ 1893 @_
1357 ); 1894 );
… …
1424 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1961 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1425 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1962 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1426 1963
1427 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1964 my ($value, $lo, $hi, $page) = @{$self->{range}};
1428 1965
1966 $hi = $value + 1 if $lo == $hi;
1967
1429 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 1968 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1430 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 1969 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1431 1970
1432 $page = int $page * $inner_w / ($hi - $lo); 1971 $page = int $page * $inner_w / ($hi - $lo);
1433 $value = int +($value - $lo) * $inner_w / ($hi - $lo); 1972 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
… …
1459 1998
1460package CFClient::UI::TextView; 1999package CFClient::UI::TextView;
1461 2000
1462our @ISA = CFClient::UI::HBox::; 2001our @ISA = CFClient::UI::HBox::;
1463 2002
1464use SDL::OpenGL; 2003use CFClient::OpenGL;
1465 2004
1466sub new { 2005sub new {
1467 my $class = shift; 2006 my $class = shift;
1468 2007
1469 my $self = $class->SUPER::new ( 2008 my $self = $class->SUPER::new (
1470 req_w => $::WIDTH / 6, 2009 fontsize => 1,
1471 req_h => $::HEIGHT / 6, 2010 can_events => 0,
1472 fontsize => $::FONTSIZE, 2011 #font => default_font
1473 @_, 2012 @_,
1474 2013
1475 layout => (new CFClient::Layout), 2014 layout => (new CFClient::Layout),
1476 par => [], 2015 par => [],
1477 height => 0, 2016 height => 0,
1478 children => [ 2017 children => [
1479 (new CFClient::UI::Empty expand => 1), 2018 (new CFClient::UI::Empty expand => 1),
1480 (new CFClient::UI::Slider vertical => 1), 2019 (new CFClient::UI::Slider vertical => 1),
1481 ], 2020 ],
1482 ); 2021 );
1483 2022
2023 $self->{children}[1]->connect (changed => sub {
2024 $self->update;
2025 });
2026
1484 $self 2027 $self
2028}
2029
2030sub set_fontsize {
2031 my ($self, $fontsize) = @_;
2032
2033 $self->{fontsize} = $fontsize;
2034 $self->reflow;
1485} 2035}
1486 2036
1487sub text_height { 2037sub text_height {
1488 my ($self, $text) = @_; 2038 my ($self, $text) = @_;
1489 2039
1490 my $layout = $self->{layout}; 2040 my $layout = $self->{layout};
1491 2041
1492 $layout->set_height ($self->{fontsize}); 2042 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1493 $layout->set_width ($self->{w}); 2043 $layout->set_width ($self->{w});
1494 $layout->set_text ($text); 2044 $layout->set_text ($text);
1495 2045
1496 ($layout->size)[1] 2046 ($layout->size)[1]
1497} 2047}
1498 2048
1499sub reflow { 2049sub reflow {
1500 my ($self) = @_; 2050 my ($self) = @_;
1501 2051
1502 my $height = 0; 2052 $self->{need_reflow}++;
1503 2053 $self->update;
1504 for (@{$self->{par}}) {
1505 $height += $_->[0] = $self->text_height ($_->[2]);
1506 }
1507
1508 $self->{height} = $height;
1509
1510 $self->{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1511}
1512
1513sub size_request {
1514 my ($self) = @_;
1515
1516 ($self->{req_w}, $self->{req_h})
1517} 2054}
1518 2055
1519sub size_allocate { 2056sub size_allocate {
1520 my ($self, $x, $y, $w, $h) = @_; 2057 my ($self, $w, $h) = @_;
1521 2058
1522 $self->SUPER::size_allocate ($x, $y, $w, $h); 2059 $self->SUPER::size_allocate ($w, $h);
1523 2060
2061 $self->{layout}->set_font ($self->{font}) if $self->{font};
1524 $self->{layout}->set_height ($self->{fontsize}); 2062 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1525 $self->{layout}->set_width ($self->{w}); 2063 $self->{layout}->set_width ($self->{children}[0]{w});
1526 2064
1527 $self->reflow; 2065 $self->reflow;
1528 $self->update;
1529} 2066}
1530 2067
1531sub add_paragraph { 2068sub add_paragraph {
1532 my ($self, $color, $text) = @_; 2069 my ($self, $color, $text) = @_;
1533 2070
… …
1548 2085
1549 $self->SUPER::update; 2086 $self->SUPER::update;
1550 2087
1551 return unless $self->{h} > 0; 2088 return unless $self->{h} > 0;
1552 2089
2090 delete $self->{texture};
2091
2092 $ROOT->on_refresh ($self, sub {
2093 if (delete $self->{need_reflow}) {
2094 my $height = 0;
2095
2096 $height += $_->[0] = $self->text_height ($_->[2])
2097 for @{$self->{par}};
2098
2099 $self->{height} = $height;
2100
2101 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2102
2103 delete $self->{texture};
2104 }
2105
1553 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2106 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1554 glClearColor 0, 0, 0, 1; 2107 glClearColor 0, 0, 0, 1;
1555 glClear GL_COLOR_BUFFER_BIT; 2108 glClear GL_COLOR_BUFFER_BIT;
1556 2109
1557 my $y0 = $self->{height} - $self->{h};
1558 my $y1 = $self->{height};
1559
1560 glEnable GL_BLEND; 2110 glEnable GL_BLEND;
1561 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2111 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1562 glEnable GL_TEXTURE_2D; 2112 glEnable GL_TEXTURE_2D;
1563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 2114
2115 my $top = int $self->{children}[1]{range}[0];
2116
2117 my $y0 = $top;
2118 my $y1 = $top + $self->{h};
2119
1565 my $y = 0; 2120 my $y = 0;
1566 2121
1567 my $layout = $self->{layout}; 2122 my $layout = $self->{layout};
1568 2123
2124 $layout->set_font ($self->{font}) if $self->{font};
2125
1569 for my $par (@{$self->{par}}) { 2126 for my $par (@{$self->{par}}) {
1570 my $h = $par->[0]; 2127 my $h = $par->[0];
1571 2128
1572 if ($y0 < $y + $h && $y < $y1) { 2129 if ($y0 < $y + $h && $y < $y1) {
1573 $layout->set_text ($par->[2]); 2130 $layout->set_text ($par->[2]);
1574 2131
1575 glColor @{ $par->[1] }; 2132 glColor @{ $par->[1] };
1576 my ($W, $H) = $layout->size; 2133 my ($W, $H) = $layout->size;
1577 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2134 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
2135 }
2136
2137 $y += $h;
1578 } 2138 }
1579 2139
1580 $y += $h;
1581 }
1582
1583 glDisable GL_TEXTURE_2D; 2140 glDisable GL_TEXTURE_2D;
1584 glDisable GL_BLEND; 2141 glDisable GL_BLEND;
2142 };
1585 }; 2143 });
1586} 2144}
1587 2145
1588sub _draw { 2146sub _draw {
1589 my ($self) = @_; 2147 my ($self) = @_;
1590 2148
… …
1593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2151 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1594 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2152 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1595 glDisable GL_TEXTURE_2D; 2153 glDisable GL_TEXTURE_2D;
1596 } 2154 }
1597 2155
1598} 2156 $self->{children}[1]->draw;
1599 2157
1600#############################################################################
1601
1602package CFClient::UI::MapWidget;
1603
1604use strict;
1605
1606use List::Util qw(min max);
1607
1608use SDL;
1609use SDL::OpenGL;
1610
1611our @ISA = CFClient::UI::Base::;
1612
1613sub new {
1614 my $class = shift;
1615
1616 $class->SUPER::new (
1617 z => -1,
1618 can_focus => 1,
1619 list => (glGenLists 1),
1620 @_
1621 )
1622}
1623
1624sub key_down {
1625 print "MAPKEYDOWN\n";
1626}
1627
1628sub key_up {
1629}
1630
1631sub size_request {
1632 (
1633 1 + 32 * int $::WIDTH / 32,
1634 1 + 32 * int $::HEIGHT / 32,
1635 )
1636}
1637
1638sub update {
1639 my ($self) = @_;
1640
1641 $self->{need_update} = 1;
1642 $self->SUPER::update;
1643}
1644
1645sub draw {
1646 my ($self) = @_;
1647
1648 $self->{need_update}++;#d#
1649 if (delete $self->{need_update}) {
1650 glNewList $self->{list}, GL_COMPILE;
1651
1652 my $sw = int $::WIDTH / 32;
1653 my $sh = int $::HEIGHT / 32;
1654
1655 if ($::MAP) {
1656 my ($w, $h, $data) = $::MAP->draw (0, 0, $sw, $sh);
1657
1658 if ($::CFG->{fow_enable}) {
1659 if ($::CFG->{fow_smooth}) { # smooth fog of war
1660 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1661 glConvolutionFilter2D
1662 GL_CONVOLUTION_2D,
1663 GL_ALPHA,
1664 3, 3,
1665 GL_ALPHA, GL_FLOAT,
1666 pack "f*",
1667 0.1, 0.1, 0.1,
1668 0.1, 0.2, 0.1,
1669 0.1, 0.1, 0.1,
1670 ;
1671 glEnable GL_CONVOLUTION_2D;
1672 }
1673
1674 my $tex = new CFClient::Texture
1675 w => $w,
1676 h => $h,
1677 data => $data,
1678 internalformat => GL_ALPHA,
1679 format => GL_ALPHA;
1680
1681 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1682
1683 glEnable GL_BLEND;
1684 glEnable GL_TEXTURE_2D;
1685 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1686
1687 glColor +($::CFG->{fow_intensity}) x 3, 1;
1688 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1689
1690 glDisable GL_TEXTURE_2D;
1691 glDisable GL_BLEND;
1692 }
1693 }
1694
1695 glEndList;
1696 }
1697
1698 glCallList $self->{list};
1699
1700 if ($FOCUS != $self) {
1701 glColor 64/255, 64/255, 64/255;
1702 glLogicOp GL_AND;
1703 glEnable GL_COLOR_LOGIC_OP;
1704 glBegin GL_QUADS;
1705 glVertex 0, 0;
1706 glVertex 0, $::HEIGHT;
1707 glVertex $::WIDTH, $::HEIGHT;
1708 glVertex $::WIDTH, 0;
1709 glEnd;
1710 glDisable GL_COLOR_LOGIC_OP;
1711 }
1712}
1713
1714my %DIR = (
1715 SDLK_KP8, [1, "north"],
1716 SDLK_KP9, [2, "northeast"],
1717 SDLK_KP6, [3, "east"],
1718 SDLK_KP3, [4, "southeast"],
1719 SDLK_KP2, [5, "south"],
1720 SDLK_KP1, [6, "southwest"],
1721 SDLK_KP4, [7, "west"],
1722 SDLK_KP7, [8, "northwest"],
1723
1724 SDLK_UP, [1, "north"],
1725 SDLK_RIGHT, [3, "east"],
1726 SDLK_DOWN, [5, "south"],
1727 SDLK_LEFT, [7, "west"],
1728);
1729
1730sub key_down {
1731 my ($self, $ev) = @_;
1732
1733 my $mod = $ev->key_mod;
1734 my $sym = $ev->key_sym;
1735
1736 if ($sym == SDLK_KP5) {
1737 $::CONN->user_send ("command stay fire");
1738 } elsif ($sym == SDLK_a) {
1739 $::CONN->user_send ("command apply");
1740 } elsif ($sym == SDLK_QUOTE) {
1741 $self->emit ('activate_console');
1742 } elsif ($sym == SDLK_SLASH) {
1743 $self->emit ('activate_console' => '/');
1744 } elsif (exists $DIR{$sym}) {
1745 if ($mod & KMOD_SHIFT) {
1746 $self->{shft}++;
1747 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1748 } elsif ($mod & KMOD_CTRL) {
1749 $self->{ctrl}++;
1750 $::CONN->user_send ("command run $DIR{$sym}[0]");
1751 } else {
1752 $::CONN->user_send ("command $DIR{$sym}[1]");
1753 }
1754 }
1755}
1756
1757sub key_up {
1758 my ($self, $ev) = @_;
1759
1760 my $mod = $ev->key_mod;
1761 my $sym = $ev->key_sym;
1762
1763 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1764 $::CONN->user_send ("command fire_stop");
1765 }
1766 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1767 $::CONN->user_send ("command run_stop");
1768 }
1769} 2158}
1770 2159
1771############################################################################# 2160#############################################################################
1772 2161
1773package CFClient::UI::Animator; 2162package CFClient::UI::Animator;
1774 2163
1775use SDL::OpenGL; 2164use CFClient::OpenGL;
1776 2165
1777our @ISA = CFClient::UI::Bin::; 2166our @ISA = CFClient::UI::Bin::;
1778 2167
1779sub moveto { 2168sub moveto {
1780 my ($self, $x, $y) = @_; 2169 my ($self, $x, $y) = @_;
… …
1818 2207
1819sub new { 2208sub new {
1820 my $class = shift; 2209 my $class = shift;
1821 2210
1822 my $self = $class->SUPER::new ( 2211 my $self = $class->SUPER::new (
1823 state => 0, 2212 state => 0,
1824 connect_activate => \&toggle_flopper, 2213 connect_activate => \&toggle_flopper,
1825 @_ 2214 @_
1826 ); 2215 );
1827 2216
1828 if ($self->{state}) { 2217 if ($self->{state}) {
… …
1836sub toggle_flopper { 2225sub toggle_flopper {
1837 my ($self) = @_; 2226 my ($self) = @_;
1838 2227
1839 # TODO: use animation 2228 # TODO: use animation
1840 if ($self->{state} = !$self->{state}) { 2229 if ($self->{state} = !$self->{state}) {
1841 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2230 $CFClient::UI::ROOT->add ($self->{other});
1842 $self->{other}->move ( 2231 $self->{other}->move ($self->coord2global (0, $self->{h}));
1843 ($::WIDTH - $self->{other}{w}) * 0.5, 2232 $self->emit ("open");
1844 ($::HEIGHT - $self->{other}{h}) * 0.5,
1845 );
1846 } else { 2233 } else {
1847 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2234 $CFClient::UI::ROOT->remove ($self->{other});
2235 $self->emit ("close");
2236 }
2237
2238 $self->emit (changed => $self->{state});
2239}
2240
2241#############################################################################
2242
2243package CFClient::UI::Tooltip;
2244
2245our @ISA = CFClient::UI::Bin::;
2246
2247use CFClient::OpenGL;
2248
2249sub new {
2250 my $class = shift;
2251
2252 $class->SUPER::new (
2253 @_,
2254 can_events => 0,
2255 )
2256}
2257
2258sub set_markup {
2259 my ($self, $text) = @_;
2260
2261 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2262 $self->{label}->set_markup ($text);
2263 $self->add ($self->{label});
2264}
2265
2266sub size_request {
2267 my ($self) = @_;
2268
2269 $self->child->set_max_size ($::WIDTH * 0.3);
2270
2271 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2272
2273 ($w + 4, $h + 4)
2274}
2275
2276sub size_allocate {
2277 my ($self, $w, $h) = @_;
2278
2279 $self->SUPER::size_allocate ($w - 4, $h - 4);
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284
2285 glPushMatrix;
2286 glTranslate 0.375, 0.375;
2287
2288 my ($w, $h) = @$self{qw(w h)};
2289
2290 glColor 1, 0.8, 0.4;
2291 glBegin GL_QUADS;
2292 glVertex 0 , 0;
2293 glVertex 0 , $h;
2294 glVertex $w, $h;
2295 glVertex $w, 0;
2296 glEnd;
1848 } 2297
1849} 2298 glColor 0, 0, 0;
2299 glBegin GL_LINE_LOOP;
2300 glVertex 0 , 0;
2301 glVertex 0 , $h;
2302 glVertex $w, $h;
2303 glVertex $w, 0;
2304 glEnd;
2305
2306 glPopMatrix;
1850 2307
1851############################################################################# 2308 glTranslate 2, 2;
2309 $self->SUPER::_draw;
2310}
1852 2311
2312#############################################################################
2313
1853package CFClient::UI::Toplevel; 2314package CFClient::UI::Face;
2315
2316our @ISA = CFClient::UI::Base::;
2317
2318use CFClient::OpenGL;
2319
2320sub new {
2321 my $class = shift;
2322
2323 $class->SUPER::new (
2324 aspect => 1,
2325 @_,
2326 )
2327}
2328
2329sub size_request {
2330 (32, 8)
2331}
2332
2333sub draw {
2334 my ($self) = @_;
2335
2336 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2337
2338 if ($tex) {
2339 glEnable GL_BLEND;
2340 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2341 glEnable GL_TEXTURE_2D;
2342 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2343 glColor 1, 1, 1, 1;
2344 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2345 glDisable GL_TEXTURE_2D;
2346 glDisable GL_BLEND;
2347 }
2348}
2349
2350#############################################################################
2351
2352package CFClient::UI::Root;
1854 2353
1855our @ISA = CFClient::UI::Container::; 2354our @ISA = CFClient::UI::Container::;
2355
2356use CFClient::OpenGL;
2357
2358sub check_size {
2359 my ($self) = @_;
2360
2361 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2362}
1856 2363
1857sub size_request { 2364sub size_request {
1858 ($::WIDTH, $::HEIGHT) 2365 ($::WIDTH, $::HEIGHT)
1859} 2366}
1860 2367
1861sub size_allocate { 2368sub configure {
1862 my ($self, $x, $y, $w, $h) = @_; 2369 my ($self, $x, $y, $w, $h) = @_;
1863 2370
1864 $self->_size_allocate ($x, $y, $w, $h); 2371 $self->SUPER::configure ($x, $y, $w, $h);
1865 2372
1866 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1867 for @{$self->{children}}; 2373 for my $child (@{$self->{children}}) {
1868} 2374 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1869 2375
1870sub translate { 2376 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2377 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2378 $child->configure ($X, $Y, $W,$H);
2379 }
2380}
2381
2382sub _topleft {
1871 my ($self, $x, $y) = @_; 2383 my ($self, $x, $y) = @_;
1872 2384
1873 ($x, $y) 2385 ($x, $y)
1874} 2386}
1875 2387
1876sub update { 2388sub update {
1877 my ($self) = @_; 2389 my ($self) = @_;
1878 2390
1879 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2391 $self->check_size;
1880 ::refresh (); 2392 ::refresh ();
1881} 2393}
1882 2394
1883sub add { 2395sub add {
1884 my ($self, $widget) = @_; 2396 my ($self, $child) = @_;
1885 2397
2398 # integerize window positions
2399 $child->{x} = int $child->{x};
2400 $child->{y} = int $child->{y};
2401
1886 $self->SUPER::add ($widget); 2402 $self->SUPER::add ($child);
2403}
1887 2404
1888 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 2405sub on_refresh {
2406 my ($self, $id, $cb) = @_;
2407
2408 $self->{refresh_hook}{$id} = $cb;
1889} 2409}
1890 2410
1891sub draw { 2411sub draw {
1892 my ($self) = @_; 2412 my ($self) = @_;
1893 2413
2414 while (my $rcb = delete $self->{refresh_hook}) {
2415 $_->() for values %$rcb;
2416 }
2417
2418 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2419 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2420 glClear GL_COLOR_BUFFER_BIT;
2421
2422 glMatrixMode GL_PROJECTION;
2423 glLoadIdentity;
2424 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2425 glMatrixMode GL_MODELVIEW;
2426 glLoadIdentity;
2427
1894 $self->_draw; 2428 $self->_draw;
1895} 2429}
1896 2430
1897############################################################################# 2431#############################################################################
1898 2432
1899package CFClient::UI; 2433package CFClient::UI;
1900 2434
2435$ROOT = new CFClient::UI::Root;
1901$TOPLEVEL = new CFClient::UI::Toplevel; 2436$TOOLTIP = new CFClient::UI::Tooltip;
1902 2437
19031 24381
1904 2439

Diff Legend

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