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.112 by root, Sat Apr 15 12:29:46 2006 UTC vs.
Revision 1.163 by root, Mon Apr 24 06:40:29 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 }
71} 115}
72 116
73# convert position array to integers 117# convert position array to integers
74sub harmonize { 118sub harmonize {
75 my ($vals) = @_; 119 my ($vals) = @_;
76 120
77 my $rem = 0; 121 my $rem = 0;
78 122
79 for ($vals) { 123 for (@$vals) {
80 my $i = int $_ + $rem; 124 my $i = int $_ + $rem;
81 $rem += $_ - $i; 125 $rem += $_ - $i;
82 $_ = $i; 126 $_ = $i;
83 } 127 }
84} 128}
… …
87 131
88package CFClient::UI::Base; 132package CFClient::UI::Base;
89 133
90use strict; 134use strict;
91 135
92use SDL::OpenGL; 136use CFClient::OpenGL;
93 137
94sub new { 138sub new {
95 my $class = shift; 139 my $class = shift;
96 140
97 my $self = bless { 141 my $self = bless {
98 x => 0, 142 x => 0,
99 y => 0, 143 y => 0,
100 z => 0, 144 z => 0,
101 w => -1, 145 can_events => 1,
102 h => -1,
103 @_ 146 @_
104 }, $class; 147 }, $class;
105 148
106 for (keys %$self) { 149 for (keys %$self) {
107 if (/^connect_(.*)$/) { 150 if (/^connect_(.*)$/) {
… …
110 } 153 }
111 154
112 $self 155 $self
113} 156}
114 157
158sub destroy {
159 my ($self) = @_;
160
161 $self->hide;
162 %$self = ();
163}
164
165sub show {
166 my ($self) = @_;
167
168 return if $self->{parent};
169
170 $CFClient::UI::ROOT->add ($self);
171}
172
173sub hide {
174 my ($self) = @_;
175
176 undef $GRAB if $GRAB == $self;
177 undef $HOVER if $HOVER == $self;
178
179 $self->{parent}->remove ($self)
180 if $self->{parent};
181}
182
115sub move { 183sub move {
116 my ($self, $x, $y, $z) = @_; 184 my ($self, $x, $y, $z) = @_;
185
117 $self->{x} = $x; 186 $self->{x} = int $x;
118 $self->{y} = $y; 187 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 188 $self->{z} = $z if defined $z;
120}
121 189
122sub needs_redraw { 190 $self->update;
123 0 191}
192
193sub set_size {
194 my ($self, $w, $h) = @_;
195
196 $self->{user_w} = $w;
197 $self->{user_h} = $h;
198
199 $self->check_size;
124} 200}
125 201
126sub size_request { 202sub size_request {
127 require Carp; 203 require Carp;
128 Carp::confess "size_request is abtract"; 204 Carp::confess "size_request is abstract";
129} 205}
130 206
131sub _size_allocate { 207sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 208 my ($self, $x, $y, $w, $h) = @_;
133 209
210 if ($self->{aspect}) {
211 my $w2 = List::Util::min $w, int $h * $self->{aspect};
212 my $h2 = List::Util::min $h, int $w / $self->{aspect};
213
214 # use alignment to adjust x, y
215
216 $x += int +($w - $w2) * 0.5;
217 $y += int +($h - $h2) * 0.5;
218
219 ($w, $h) = ($w2, $h2);
220 }
221
222 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 223 $self->{x} = $x;
135 $self->{y} = $y; 224 $self->{y} = $y;
225 $self->update;
226 }
136 227
137 return unless $self->{w} != $w || $self->{h} != $h; 228 if ($self->{w} != $w || $self->{h} != $h) {
138
139 $self->{w} = $w; 229 $self->{w} = $w;
140 $self->{h} = $h; 230 $self->{h} = $h;
141 231
232 $self->size_allocate ($w, $h);
233 $self->update;
142 1 234 }
143} 235}
144 236
145sub size_allocate { 237sub size_allocate {
238 # nothing to be done
239}
240
241sub set_max_size {
146 my ($self, $x, $y, $w, $h) = @_; 242 my ($self, $w, $h) = @_;
147 243
148 $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});
149} 253}
150 254
151# translate global coordinates to local coordinate system 255# translate global coordinates to local coordinate system
152sub translate { 256sub coord2local {
153 my ($self, $x, $y) = @_; 257 my ($self, $x, $y) = @_;
154 258
155 $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)
156} 269}
157 270
158sub focus_in { 271sub focus_in {
159 my ($self) = @_; 272 my ($self) = @_;
160 273
161 return if $FOCUS == $self; 274 return if $FOCUS == $self;
162 return unless $self->{can_focus}; 275 return unless $self->{can_focus};
163 276
164 my $focus = $FOCUS; $FOCUS = $self; 277 my $focus = $FOCUS; $FOCUS = $self;
278
279 $self->emit (focus_in => $focus);
280
165 $focus->update if $focus; 281 $focus->update if $focus;
166 $FOCUS->update; 282 $FOCUS->update;
167} 283}
168 284
169sub focus_out { 285sub focus_out {
170 my ($self) = @_; 286 my ($self) = @_;
171 287
172 return unless $FOCUS == $self; 288 return unless $FOCUS == $self;
173 289
174 my $focus = $FOCUS; undef $FOCUS; 290 my $focus = $FOCUS; undef $FOCUS;
291
292 $self->emit (focus_out => $focus);
293
175 $focus->update if $focus; #? 294 $focus->update if $focus; #?
176} 295}
177 296
178sub mouse_motion { } 297sub mouse_motion { }
179sub button_up { } 298sub button_up { }
… …
203 glPopMatrix; 322 glPopMatrix;
204 323
205 if ($self == $HOVER && $self->{can_hover}) { 324 if ($self == $HOVER && $self->{can_hover}) {
206 my ($x, $y) = @$self{qw(x y)}; 325 my ($x, $y) = @$self{qw(x y)};
207 326
208 glColor 0, 0, 1, 0.2; 327 glColor 1, 0.8, 0.5, 0.2;
209 glEnable GL_BLEND; 328 glEnable GL_BLEND;
210 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 329 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
211 glBegin GL_QUADS; 330 glBegin GL_QUADS;
212 glVertex $x , $y; 331 glVertex $x , $y;
213 glVertex $x + $self->{w}, $y; 332 glVertex $x + $self->{w}, $y;
214 glVertex $x + $self->{w}, $y + $self->{h}; 333 glVertex $x + $self->{w}, $y + $self->{h};
215 glVertex $x , $y + $self->{h}; 334 glVertex $x , $y + $self->{h};
216 glEnd; 335 glEnd;
217 glDisable GL_BLEND; 336 glDisable GL_BLEND;
218 } 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 }
219} 352}
220 353
221sub _draw { 354sub _draw {
222 my ($self) = @_; 355 my ($self) = @_;
223 356
224 warn "no draw defined for $self\n"; 357 warn "no draw defined for $self\n";
225} 358}
226 359
227sub find_widget { 360sub find_widget {
228 my ($self, $x, $y) = @_; 361 my ($self, $x, $y) = @_;
362
363 return () unless $self->{can_events};
229 364
230 return $self 365 return $self
231 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 366 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
232 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 367 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
233 368
234 () 369 ()
235} 370}
236 371
237sub set_parent { 372sub set_parent {
238 my ($self, $par) = @_; 373 my ($self, $parent) = @_;
239 374
240 $self->{parent} = $par;
241 Scalar::Util::weaken $self->{parent}; 375 Scalar::Util::weaken ($self->{parent} = $parent);
242} 376}
243 377
244sub get_parent { 378sub check_size {
379 my ($self) = @_;
380
245 $_[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 }
246} 402}
247 403
248sub update { 404sub update {
249 my ($self) = @_; 405 my ($self) = @_;
250 406
… …
253} 409}
254 410
255sub connect { 411sub connect {
256 my ($self, $signal, $cb) = @_; 412 my ($self, $signal, $cb) = @_;
257 413
258 push @{ $self->{cb}{$signal} }, $cb; 414 push @{ $self->{signal_cb}{$signal} }, $cb;
259} 415}
260 416
261sub emit { 417sub emit {
262 my ($self, $signal, @args) = @_; 418 my ($self, $signal, @args) = @_;
263 419
264 $_->($self, @args) 420 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
265 for @{$self->{cb}{$signal} || []};
266} 421}
267 422
268sub DESTROY { 423sub DESTROY {
269 my ($self) = @_; 424 my ($self) = @_;
270 425
… …
276package CFClient::UI::DrawBG; 431package CFClient::UI::DrawBG;
277 432
278our @ISA = CFClient::UI::Base::; 433our @ISA = CFClient::UI::Base::;
279 434
280use strict; 435use strict;
281use SDL::OpenGL; 436use CFClient::OpenGL;
282 437
283sub new { 438sub new {
284 my $class = shift; 439 my $class = shift;
285 440
286 # range [value, low, high, page] 441 # range [value, low, high, page]
… …
315 470
316package CFClient::UI::Empty; 471package CFClient::UI::Empty;
317 472
318our @ISA = CFClient::UI::Base::; 473our @ISA = CFClient::UI::Base::;
319 474
475sub new {
476 my ($class, %arg) = @_;
477 $class->SUPER::new (can_events => 0, %arg);
478}
479
320sub size_request { 480sub size_request {
321 (0, 0) 481 (0, 0)
322} 482}
323 483
324sub draw { } 484sub draw { }
… …
332sub new { 492sub new {
333 my ($class, %arg) = @_; 493 my ($class, %arg) = @_;
334 494
335 my $children = delete $arg{children} || []; 495 my $children = delete $arg{children} || [];
336 496
337 my $self = $class->SUPER::new (children => [], %arg); 497 my $self = $class->SUPER::new (children => [], can_events => 0, %arg);
338 $self->add ($_) for @$children; 498 $self->add ($_) for @$children;
339 499
340 $self 500 $self
341} 501}
342 502
343sub add { 503sub add {
344 my ($self, $chld) = @_; 504 my ($self, $child) = @_;
345 505
346 $chld->set_parent ($self); 506 $child->set_parent ($self);
507
508 use sort 'stable';
347 509
348 $self->{children} = [ 510 $self->{children} = [
349 sort { $a->{z} <=> $b->{z} } 511 sort { $a->{z} <=> $b->{z} }
350 @{$self->{children}}, $chld 512 @{$self->{children}}, $child
351 ]; 513 ];
352 514
353 $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;
354 $self->update; 527 $self->update;
355} 528}
356 529
357sub remove { 530sub clear {
358 my ($self, $widget) = @_; 531 my ($self) = @_;
359 532
360 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 533 my $children = delete $self->{children};
534 $self->{children} = [];
361 535
362 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 536 for (@$children) {
537 delete $_->{parent};
538 $_->hide;
539 }
363} 540}
364 541
365sub find_widget { 542sub find_widget {
366 my ($self, $x, $y) = @_; 543 my ($self, $x, $y) = @_;
367 544
… …
397 574
398 $class->SUPER::new (children => [$child], %arg) 575 $class->SUPER::new (children => [$child], %arg)
399} 576}
400 577
401sub add { 578sub add {
402 my ($self, $widget) = @_; 579 my ($self, $child) = @_;
403 580
404 $self->{children} = []; 581 $self->{children} = [];
405 582
406 $self->SUPER::add ($widget); 583 $self->SUPER::add ($child);
407} 584}
408 585
409sub remove { 586sub remove {
410 my ($self, $widget) = @_; 587 my ($self, $widget) = @_;
411 588
… …
420sub size_request { 597sub size_request {
421 $_[0]{children}[0]->size_request 598 $_[0]{children}[0]->size_request
422} 599}
423 600
424sub size_allocate { 601sub size_allocate {
425 my ($self, $x, $y, $w, $h) = @_; 602 my ($self, $w, $h) = @_;
426 603
427 $self->_size_allocate ($x, $y, $w, $h) or return;
428
429 $self->{children}[0]->size_allocate (0, 0, $w, $h); 604 $self->{children}[0]->configure (0, 0, $w, $h);
430} 605}
431 606
432############################################################################# 607#############################################################################
433 608
434package CFClient::UI::Window; 609package CFClient::UI::Window;
435 610
436our @ISA = CFClient::UI::Bin::; 611our @ISA = CFClient::UI::Bin::;
437 612
438use SDL::OpenGL; 613use CFClient::OpenGL;
439 614
440sub new { 615sub new {
441 my ($class, %arg) = @_; 616 my ($class, %arg) = @_;
442 617
443 my $self = $class->SUPER::new (%arg); 618 my $self = $class->SUPER::new (%arg);
… …
460 $self->child->draw; 635 $self->child->draw;
461 }; 636 };
462} 637}
463 638
464sub size_allocate { 639sub size_allocate {
465 my ($self, $x, $y, $w, $h) = @_; 640 my ($self, $w, $h) = @_;
466 641
467 $self->_size_allocate ($x, $y, $w, $h) or return;
468
469 $self->child->size_allocate (0, 0, $w, $h); 642 $self->child->configure (0, 0, $w, $h);
470 643
471 $self->render_chld; 644 $self->render_chld;
472} 645}
473 646
474sub _draw { 647sub _draw {
… …
490 glDisable GL_TEXTURE_2D; 663 glDisable GL_TEXTURE_2D;
491} 664}
492 665
493############################################################################# 666#############################################################################
494 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
495package CFClient::UI::Frame; 692package CFClient::UI::Frame;
496 693
497our @ISA = CFClient::UI::Bin::; 694our @ISA = CFClient::UI::Bin::;
498 695
499use SDL::OpenGL; 696use CFClient::OpenGL;
500
501sub size_request {
502 my ($self) = @_;
503 my $chld = $self->child
504 or return (0, 0);
505
506 $chld->move (2, 2);
507
508 map { $_ + 4 } $chld->size_request;
509}
510
511sub size_allocate {
512 my ($self, $x, $y, $w, $h) = @_;
513
514 $self->_size_allocate ($x, $y, $w, $h) or return;
515
516 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
517}
518
519sub _draw {
520 my ($self) = @_;
521
522 my $chld = $self->child;
523
524 my ($w, $h) = $chld->size_request;
525
526 glBegin GL_QUADS;
527 glColor 0, 0, 0;
528 glVertex 0 , 0;
529 glVertex 0 , $h + 4;
530 glVertex $w + 4 , $h + 4;
531 glVertex $w + 4 , 0;
532 glEnd;
533
534 $chld->draw;
535}
536
537#############################################################################
538
539package CFClient::UI::FancyFrame;
540
541our @ISA = CFClient::UI::Bin::;
542
543use SDL::OpenGL;
544
545my @tex =
546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
547 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
548 697
549sub new { 698sub new {
550 my $class = shift; 699 my $class = shift;
551 700
552 # TODO: user_x, user_y, overwrite moveto?
553
554 $class->SUPER::new ( 701 my $self = $class->SUPER::new (
555 bg => [1, 1, 1, 1], 702 bg => [1, 1, 1, 1],
556 border_bg => [1, 1, 1, 1], 703 border_bg => [1, 1, 1, 1],
557 border => $::FONTSIZE * 0.8, 704 border => 0.8,
558 @_ 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 => 1,
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,
559 ) 781 )
560} 782}
561 783
562sub size_request {
563 my ($self) = @_;
564
565 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
566
567 my ($w, $h) = $self->SUPER::size_request;
568
569 (
570 $w + $self->{border} * 2,
571 $h + $self->{border} * 2,
572 )
573}
574
575sub size_allocate { 784sub size_allocate {
576 my ($self, $x, $y, $w, $h) = @_; 785 my ($self, $w, $h) = @_;
577 786
578 $self->_size_allocate ($x, $y, $w, $h) or return;
579
580 $h -= List::Util::max 0, $self->{border} * 2; 787 $h -= List::Util::max 0, $self->border * 2;
581 $w -= List::Util::max 0, $self->{border} * 2; 788 $w -= List::Util::max 0, $self->border * 2;
582 789
790 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
791 if $self->{title};
792
583 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 793 $self->child->configure ($self->border, $self->border, $w, $h);
584} 794}
585 795
586sub button_down { 796sub button_down {
587 my ($self, $ev, $x, $y) = @_; 797 my ($self, $ev, $x, $y) = @_;
588 798
799 my $border = $self->border;
800
589 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 801 if ($x < $self->{w} && $x >= $self->{w} - $border
590 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 802 && $y < $self->{h} && $y >= $self->{h} - $border) {
591 803
592 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 804 my ($ox, $oy) = ($ev->{x}, $ev->{y});
593 my ($bw, $bh) = ($self->{w}, $self->{h}); 805 my ($bw, $bh) = ($self->{w}, $self->{h});
594 806
595 $self->{motion} = sub { 807 $self->{motion} = sub {
596 my ($ev, $x, $y) = @_; 808 my ($ev, $x, $y) = @_;
597 809
598 ($x, $y) = ($ev->motion_x, $ev->motion_y); 810 ($x, $y) = ($ev->{x}, $ev->{y});
599 811
600 $self->{user_w} = $bw + $x - $ox; 812 $self->{user_w} = $bw + $x - $ox;
601 $self->{user_h} = $bh + $y - $oy; 813 $self->{user_h} = $bh + $y - $oy;
602 $self->update; 814 $self->check_size;
603 }; 815 };
604 816
605 } elsif ($x >= 0 && $x < $self->{w} 817 } elsif ($x >= 0 && $x < $self->{w}
606 && $y >= 0 && $y < $self->{border}) { 818 && $y >= 0 && $y < $border) {
607 819
608 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 820 my ($ox, $oy) = ($ev->{x}, $ev->{y});
609 my ($bx, $by) = ($self->{x}, $self->{y}); 821 my ($bx, $by) = ($self->{x}, $self->{y});
610 822
611 $self->{motion} = sub { 823 $self->{motion} = sub {
612 my ($ev, $x, $y) = @_; 824 my ($ev, $x, $y) = @_;
613 825
614 ($x, $y) = ($ev->motion_x, $ev->motion_y); 826 ($x, $y) = ($ev->{x}, $ev->{y});
615 827
616 $self->move ($bx + $x - $ox, $by + $y - $oy); 828 $self->move ($bx + $x - $ox, $by + $y - $oy);
617 $self->update; 829 $self->update;
618 }; 830 };
619 } 831 }
… …
640 glEnable GL_BLEND; 852 glEnable GL_BLEND;
641 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 853 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
642 glEnable GL_TEXTURE_2D; 854 glEnable GL_TEXTURE_2D;
643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
644 856
857 my $border = $self->border;
858
645 glColor @{ $self->{border_bg} }; 859 glColor @{ $self->{border_bg} };
646 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 860 $tex[1]->draw_quad (0, 0, $w, $border);
647 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 861 $tex[3]->draw_quad (0, $border, $border, $ch);
648 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 862 $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
649 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 863 $tex[4]->draw_quad (0, $h - $border, $w, $border);
650 864
651 my $bg = $tex[0]; 865 my $bg = $tex[0];
652 866
653 # TODO: repeat texture not scale 867 # TODO: repeat texture not scale
654 my $rep_x = $cw / $bg->{w}; 868 my $rep_x = $cw / $bg->{w};
… …
657 glColor @{ $self->{bg} }; 871 glColor @{ $self->{bg} };
658 872
659 $bg->{s} = $rep_x; 873 $bg->{s} = $rep_x;
660 $bg->{t} = $rep_y; 874 $bg->{t} = $rep_y;
661 $bg->{wrap_mode} = 1; 875 $bg->{wrap_mode} = 1;
662 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 876 $bg->draw_quad ($border, $border, $cw, $ch);
663 877
664 glDisable GL_TEXTURE_2D; 878 glDisable GL_TEXTURE_2D;
665 glDisable GL_BLEND; 879 glDisable GL_BLEND;
666 880
881 $self->{title}->draw if $self->{title};
667 $self->child->draw; 882 $self->child->draw;
668} 883}
669 884
670############################################################################# 885#############################################################################
671 886
… …
673 888
674our @ISA = CFClient::UI::Base::; 889our @ISA = CFClient::UI::Base::;
675 890
676use List::Util qw(max sum); 891use List::Util qw(max sum);
677 892
678use SDL::OpenGL; 893use CFClient::OpenGL;
679 894
680sub new { 895sub new {
681 my $class = shift; 896 my $class = shift;
682 897
683 $class->SUPER::new ( 898 $class->SUPER::new (
… …
685 @_ 900 @_
686 ) 901 )
687} 902}
688 903
689sub add { 904sub add {
690 my ($self, $x, $y, $chld) = @_; 905 my ($self, $x, $y, $child) = @_;
691 906
907 $child->set_parent ($self);
692 $self->{children}[$y][$x] = $chld; 908 $self->{children}[$y][$x] = $child;
693 $chld->set_parent ($self);
694 909
695 $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
696 $self->update; 924 $self->update;
697} 925}
698 926
699sub get_wh { 927sub get_wh {
700 my ($self) = @_; 928 my ($self) = @_;
… …
706 or next; 934 or next;
707 935
708 for my $x (0 .. $#$row) { 936 for my $x (0 .. $#$row) {
709 my $widget = $row->[$x] 937 my $widget = $row->[$x]
710 or next; 938 or next;
711 my ($w, $h) = $widget->size_request; 939 my ($w, $h) = @$widget{qw(req_w req_h)};
712 940
713 $w[$x] = max $w[$x], $w; 941 $w[$x] = max $w[$x], $w;
714 $h[$y] = max $h[$y], $h; 942 $h[$y] = max $h[$y], $h;
715 } 943 }
716 } 944 }
… …
728 (sum @$hs), 956 (sum @$hs),
729 ) 957 )
730} 958}
731 959
732sub size_allocate { 960sub size_allocate {
733 my ($self, $x, $y, $w, $h) = @_; 961 my ($self, $w, $h) = @_;
734
735 $self->_size_allocate ($x, $y, $w, $h) or return;
736 962
737 my ($ws, $hs) = $self->get_wh; 963 my ($ws, $hs) = $self->get_wh;
738 964
739 my $req_w = sum @$ws; 965 my $req_w = sum @$ws;
740 my $req_h = sum @$hs; 966 my $req_h = sum @$hs;
… …
762 988
763 for my $c (0 .. $#$row) { 989 for my $c (0 .. $#$row) {
764 my $col_w = $ws->[$c]; 990 my $col_w = $ws->[$c];
765 991
766 if (my $widget = $row->[$c]) { 992 if (my $widget = $row->[$c]) {
767 $widget->size_allocate ($x, $y, $col_w, $row_h); 993 $widget->configure ($x, $y, $col_w, $row_h);
768 } 994 }
769 995
770 $x += $col_w; 996 $x += $col_w;
771 } 997 }
772 998
… …
817 (List::Util::max map $_->[1], @alloc), 1043 (List::Util::max map $_->[1], @alloc),
818 ) 1044 )
819} 1045}
820 1046
821sub size_allocate { 1047sub size_allocate {
822 my ($self, $x, $y, $w, $h) = @_; 1048 my ($self, $w, $h) = @_;
823
824 $self->_size_allocate ($x, $y, $w, $h);
825 1049
826 ($h, $w) = ($w, $h); 1050 ($h, $w) = ($w, $h);
827 1051
828 my $children = $self->{children}; 1052 my $children = $self->{children};
829 1053
830 my @h = map +($_->size_request)[0], @$children; 1054 my @h = map $_->{req_w}, @$children;
831 1055
832 my $req_h = List::Util::sum @h; 1056 my $req_h = List::Util::sum @h;
833 1057
834 if ($req_h > $h) { 1058 if ($req_h > $h) {
835 # ah well, not enough space 1059 # ah well, not enough space
… …
851 1075
852 my $y = 0; 1076 my $y = 0;
853 for (0 .. $#$children) { 1077 for (0 .. $#$children) {
854 my $child = $children->[$_]; 1078 my $child = $children->[$_];
855 my $h = $h[$_]; 1079 my $h = $h[$_];
856 $child->size_allocate ($y, 0, $h, $w); 1080 $child->configure ($y, 0, $h, $w);
857 1081
858 $y += $h; 1082 $y += $h;
859 } 1083 }
1084
1085 1
860} 1086}
861 1087
862############################################################################# 1088#############################################################################
863 1089
864package CFClient::UI::VBox; 1090package CFClient::UI::VBox;
… …
877 (List::Util::sum map $_->[1], @alloc), 1103 (List::Util::sum map $_->[1], @alloc),
878 ) 1104 )
879} 1105}
880 1106
881sub size_allocate { 1107sub size_allocate {
882 my ($self, $x, $y, $w, $h) = @_; 1108 my ($self, $w, $h) = @_;
883
884 $self->_size_allocate ($x, $y, $w, $h);
885 1109
886 my $children = $self->{children}; 1110 my $children = $self->{children};
887 1111
888 my @h = map +($_->size_request)[1], @$children; 1112 my @h = map $_->{req_h}, @$children;
889 1113
890 my $req_h = List::Util::sum @h; 1114 my $req_h = List::Util::sum @h;
891 1115
892 if ($req_h > $h) { 1116 if ($req_h > $h) {
893 # ah well, not enough space 1117 # ah well, not enough space
… …
907 1131
908 my $y = 0; 1132 my $y = 0;
909 for (0 .. $#$children) { 1133 for (0 .. $#$children) {
910 my $child = $children->[$_]; 1134 my $child = $children->[$_];
911 my $h = $h[$_]; 1135 my $h = $h[$_];
912 $child->size_allocate (0, $y, $w, $h); 1136 $child->configure (0, $y, $w, $h);
913 1137
914 $y += $h; 1138 $y += $h;
915 } 1139 }
1140
1141 1
916} 1142}
917 1143
918############################################################################# 1144#############################################################################
919 1145
920package CFClient::UI::Label; 1146package CFClient::UI::Label;
921 1147
922our @ISA = CFClient::UI::Base::; 1148our @ISA = CFClient::UI::Base::;
923 1149
924use SDL::OpenGL; 1150use CFClient::OpenGL;
925 1151
926sub new { 1152sub new {
927 my ($class, %arg) = @_; 1153 my ($class, %arg) = @_;
928 1154
929 my $self = $class->SUPER::new ( 1155 my $self = $class->SUPER::new (
930 fg => [1, 1, 1], 1156 fg => [1, 1, 1],
1157 #font => default_font
931 fontsize => $::FONTSIZE, 1158 fontsize => 1,
932 text => "", 1159 text => "",
933 align => -1, 1160 align => -1,
1161 valign => -1,
934 padding => 2, 1162 padding => 2,
935 layout => new CFClient::Layout, 1163 layout => new CFClient::Layout,
1164 can_events => 0,
936 %arg 1165 %arg
937 ); 1166 );
938 1167
939 $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};
940 1176
941 $self 1177 $self
942} 1178}
943 1179
944sub escape_text { 1180sub escape {
945 local $_ = $_[1]; 1181 local $_ = $_[1];
946 1182
947 s/&/&amp;/g; 1183 s/&/&amp;/g;
948 s/>/&gt;/g; 1184 s/>/&gt;/g;
949 s/</&lt;/g; 1185 s/</&lt;/g;
… …
952} 1188}
953 1189
954sub set_text { 1190sub set_text {
955 my ($self, $text) = @_; 1191 my ($self, $text) = @_;
956 1192
957 $self->{text} = $text;
958 $self->{layout}->set_markup ($text); 1193 $self->{layout}->set_text ($text);
959 1194
960 delete $self->{texture}; 1195 delete $self->{texture};
961# $self->{w} = $self->{h} = -1; 1196 $self->check_size;
962 $self->update; 1197 $self->update;
963} 1198}
964 1199
965sub get_text { 1200sub set_markup {
966 my ($self, $text) = @_; 1201 my ($self, $markup) = @_;
967 1202
968 $self->{text} 1203 $self->{layout}->set_markup ($markup);
1204
1205 delete $self->{texture};
1206 $self->check_size;
1207 $self->update;
969} 1208}
970 1209
971sub size_request { 1210sub size_request {
972 my ($self) = @_; 1211 my ($self) = @_;
973 1212
974 $self->{layout}->set_width; 1213 $self->{layout}->set_font ($self->{font}) if $self->{font};
1214 $self->{layout}->set_width ($self->{max_w} || -1);
975 $self->{layout}->set_height ($self->{fontsize}); 1215 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1216
976 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 }
977 1228
978 ( 1229 (
979 $w + $self->{padding} * 2, 1230 $w + $self->{padding} * 2,
980 $h + $self->{padding} * 2, 1231 $h + $self->{padding} * 2,
981 ) 1232 )
982} 1233}
983 1234
984sub size_allocate { 1235sub size_allocate {
985 my ($self, $x, $y, $w, $h) = @_; 1236 my ($self, $w, $h) = @_;
986
987 $self->_size_allocate ($x, $y, $w, $h) or return;
988 1237
989 delete $self->{texture}; 1238 delete $self->{texture};
990} 1239}
991 1240
992sub update { 1241sub set_fontsize {
993 my ($self) = @_; 1242 my ($self, $fontsize) = @_;
994 1243
1244 $self->{fontsize} = $fontsize;
995 delete $self->{texture}; 1245 delete $self->{texture};
1246 $self->check_size;
996 $self->SUPER::update; 1247 $self->update;
997} 1248}
998 1249
999sub _draw { 1250sub _draw {
1000 my ($self) = @_; 1251 my ($self) = @_;
1001 1252
1002 my $tex = $self->{texture} ||= do { 1253 my $tex = $self->{texture} ||= do {
1254 $self->{layout}->set_font ($self->{font}) if $self->{font};
1003 $self->{layout}->set_width ($self->{w}); 1255 $self->{layout}->set_width ($self->{w});
1004 $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);
1005 new_from_layout CFClient::Texture $self->{layout} 1257 new_from_layout CFClient::Texture $self->{layout}
1006 }; 1258 };
1007 1259
1008 glEnable GL_BLEND; 1260 glEnable GL_BLEND;
1009 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1010 glEnable GL_TEXTURE_2D; 1262 glEnable GL_TEXTURE_2D;
1011 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1263 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1012 1264
1013 glColor @{$self->{fg}}; 1265 glColor @{$self->{fg}};
1014 1266
1015 my $x = 1267 $self->{ox} = int (
1016 $self->{align} < 0 ? $self->{padding} 1268 $self->{align} < 0 ? $self->{padding}
1017 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1269 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1018 : ($self->{w} - $tex->{w}) * 0.5; 1270 : ($self->{w} - $tex->{w}) * 0.5
1271 );
1019 1272
1020 $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});
1021 1280
1022 glDisable GL_TEXTURE_2D; 1281 glDisable GL_TEXTURE_2D;
1023 glDisable GL_BLEND; 1282 glDisable GL_BLEND;
1024} 1283}
1025 1284
1026############################################################################# 1285#############################################################################
1027 1286
1028package CFClient::UI::Entry; 1287package CFClient::UI::EntryBase;
1029 1288
1030our @ISA = CFClient::UI::Label::; 1289our @ISA = CFClient::UI::Label::;
1031 1290
1032use SDL; 1291use CFClient::OpenGL;
1033use SDL::OpenGL;
1034 1292
1035sub new { 1293sub new {
1036 my $class = shift; 1294 my $class = shift;
1037 1295
1038 $class->SUPER::new ( 1296 $class->SUPER::new (
… …
1040 bg => [0, 0, 0, 0.2], 1298 bg => [0, 0, 0, 0.2],
1041 active_bg => [1, 1, 1, 0.5], 1299 active_bg => [1, 1, 1, 0.5],
1042 active_fg => [0, 0, 0], 1300 active_fg => [0, 0, 0],
1043 can_hover => 1, 1301 can_hover => 1,
1044 can_focus => 1, 1302 can_focus => 1,
1303 valign => 0,
1304 can_events => 1,
1045 @_ 1305 @_
1046 ) 1306 )
1047} 1307}
1048 1308
1049sub _set_text { 1309sub _set_text {
1050 my ($self, $text) = @_; 1310 my ($self, $text) = @_;
1051 1311
1052 my $old_text = $self->{text}; 1312 delete $self->{cur_h};
1313
1314 return if $self->{text} eq $text;
1315
1316 delete $self->{texture};
1053 1317
1054 $self->{last_activity} = $::NOW; 1318 $self->{last_activity} = $::NOW;
1055
1056 $self->{text} = $text; 1319 $self->{text} = $text;
1057 $self->{layout}->set_width ($self->{w});
1058 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1059 1320
1060 $text =~ s/./*/g if $self->{hidden}; 1321 $text =~ s/./*/g if $self->{hidden};
1322 $self->{layout}->set_text ("$text ");
1061 1323
1062 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1324 $self->emit (changed => $self->{text});
1325}
1063 1326
1064 $text = substr $text, 0, $self->{cursor}; 1327sub get_text {
1065 utf8::encode $text; 1328 $_[0]{text}
1066
1067 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1068
1069 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1070 if $old_text ne $self->{text};
1071} 1329}
1072 1330
1073sub size_request { 1331sub size_request {
1074 my ($self) = @_; 1332 my ($self) = @_;
1075 1333
… …
1077 1335
1078 ($w + 1, $h) # add 1 for cursor 1336 ($w + 1, $h) # add 1 for cursor
1079} 1337}
1080 1338
1081sub size_allocate { 1339sub size_allocate {
1082 my ($self, $x, $y, $w, $h) = @_; 1340 my ($self, $w, $h) = @_;
1083 1341
1084 $self->SUPER::size_allocate ($x, $y, $w, $h); 1342 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1085
1086 $self->_set_text ($self->{text});
1087} 1343}
1088 1344
1089sub set_text { 1345sub set_text {
1090 my ($self, $text) = @_; 1346 my ($self, $text) = @_;
1091 1347
… …
1095} 1351}
1096 1352
1097sub key_down { 1353sub key_down {
1098 my ($self, $ev) = @_; 1354 my ($self, $ev) = @_;
1099 1355
1100 my $mod = $ev->key_mod; 1356 my $mod = $ev->{mod};
1101 my $sym = $ev->key_sym; 1357 my $sym = $ev->{sym};
1102
1103 my $uni = $ev->key_unicode; 1358 my $uni = $ev->{unicode};
1104 1359
1105 my $text = $self->get_text; 1360 my $text = $self->get_text;
1106 1361
1107 if ($sym == SDLK_BACKSPACE) { 1362 if ($sym == 8) {
1108 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1363 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1109 } elsif ($sym == SDLK_DELETE) { 1364 } elsif ($sym == 127) {
1110 substr $text, $self->{cursor}, 1, ""; 1365 substr $text, $self->{cursor}, 1, "";
1111 } elsif ($sym == SDLK_LEFT) { 1366 } elsif ($sym == CFClient::SDLK_LEFT) {
1112 --$self->{cursor} if $self->{cursor}; 1367 --$self->{cursor} if $self->{cursor};
1113 } elsif ($sym == SDLK_RIGHT) { 1368 } elsif ($sym == CFClient::SDLK_RIGHT) {
1114 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1369 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1115 } elsif ($sym == SDLK_HOME) { 1370 } elsif ($sym == CFClient::SDLK_HOME) {
1116 $self->{cursor} = 0; 1371 $self->{cursor} = 0;
1117 } elsif ($sym == SDLK_END) { 1372 } elsif ($sym == CFClient::SDLK_END) {
1118 $self->{cursor} = length $text; 1373 $self->{cursor} = length $text;
1119 } elsif ($sym == SDLK_ESCAPE) { 1374 } elsif ($sym == 27) {
1120 $self->emit ('escape'); 1375 $self->emit ('escape');
1121 } elsif ($uni) { 1376 } elsif ($uni) {
1122 substr $text, $self->{cursor}++, 0, chr $uni; 1377 substr $text, $self->{cursor}++, 0, chr $uni;
1123 } 1378 }
1124 1379
… …
1179 1434
1180 $self->SUPER::_draw; 1435 $self->SUPER::_draw;
1181 1436
1182 #TODO: force update every cursor change :( 1437 #TODO: force update every cursor change :(
1183 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
1184 glColor @{$self->{fg}}; 1447 glColor @{$self->{fg}};
1185 glBegin GL_LINES; 1448 glBegin GL_LINES;
1186 glVertex $self->{cur_x}, $self->{cur_y};
1187 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};
1188 glEnd; 1451 glEnd;
1189 } 1452 }
1190} 1453}
1191 1454
1192package CFClient::UI::LineEntry; 1455package CFClient::UI::Entry;
1193 1456
1194our @ISA = CFClient::UI::Entry::; 1457our @ISA = CFClient::UI::EntryBase::;
1195 1458
1196use SDL; 1459use CFClient::OpenGL;
1197use SDL::OpenGL;
1198 1460
1199sub key_down { 1461sub key_down {
1200 my ($self, $ev) = @_; 1462 my ($self, $ev) = @_;
1201 1463
1202 my $sym = $ev->key_sym; 1464 my $sym = $ev->{sym};
1203 1465
1204 if ($sym == SDLK_RETURN) { 1466 if ($sym == 13) {
1205 $self->emit (activate => $self->get_text); 1467 $self->emit (activate => $self->get_text);
1206 $self->update; 1468 $self->update;
1207 1469
1208 } else { 1470 } else {
1209 $self->SUPER::key_down ($ev); 1471 $self->SUPER::key_down ($ev);
… …
1215 1477
1216package CFClient::UI::Button; 1478package CFClient::UI::Button;
1217 1479
1218our @ISA = CFClient::UI::Label::; 1480our @ISA = CFClient::UI::Label::;
1219 1481
1220use SDL; 1482use CFClient::OpenGL;
1221use SDL::OpenGL;
1222 1483
1223my @tex = 1484my @tex =
1224 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1485 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1225 qw(b1_button_active.png); 1486 qw(b1_button_active.png);
1226 1487
1227sub new { 1488sub new {
1228 my $class = shift; 1489 my $class = shift;
1229 1490
1230 $class->SUPER::new ( 1491 $class->SUPER::new (
1231 padding => 4, 1492 padding => 4,
1232 fg => [1, 1, 1], 1493 fg => [1, 1, 1],
1233 bg => [1, 1, 1, 0.2], 1494 bg => [1, 1, 1, 0.2],
1234 active_fg => [1, 1, 0], 1495 active_fg => [0, 0, 1],
1235 can_hover => 1, 1496 can_hover => 1,
1497 align => 0,
1498 valign => 0,
1499 can_events => 1,
1236 @_ 1500 @_
1237 ) 1501 )
1238} 1502}
1239 1503
1240sub button_up { 1504sub button_up {
… …
1248 1512
1249sub _draw { 1513sub _draw {
1250 my ($self) = @_; 1514 my ($self) = @_;
1251 1515
1252 local $self->{fg} = $self->{fg}; 1516 local $self->{fg} = $self->{fg};
1253 my $tex = $tex[0];
1254
1255 glEnable GL_BLEND;
1256 glEnable GL_TEXTURE_2D;
1257 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1258 1517
1259 if ($GRAB == $self) { 1518 if ($GRAB == $self) {
1260 $self->{fg} = $self->{active_fg}; 1519 $self->{fg} = $self->{active_fg};
1261 } 1520 }
1262 1521
1263 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;
1264 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;
1265 1527
1266 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1528 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1267 1529
1268 glDisable GL_TEXTURE_2D; 1530 glDisable GL_TEXTURE_2D;
1269 glDisable GL_BLEND; 1531 glDisable GL_BLEND;
1270 1532
1271 $self->SUPER::_draw; 1533 $self->SUPER::_draw;
… …
1276package CFClient::UI::CheckBox; 1538package CFClient::UI::CheckBox;
1277 1539
1278our @ISA = CFClient::UI::DrawBG::; 1540our @ISA = CFClient::UI::DrawBG::;
1279 1541
1280my @tex = 1542my @tex =
1281 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1543 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1282 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1544 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1283 1545
1284use SDL; 1546use CFClient::OpenGL;
1285use SDL::OpenGL;
1286 1547
1287sub new { 1548sub new {
1288 my $class = shift; 1549 my $class = shift;
1289 1550
1290 $class->SUPER::new ( 1551 $class->SUPER::new (
… …
1301 my ($self) = @_; 1562 my ($self) = @_;
1302 1563
1303 ($self->{padding} * 2 + 6) x 2 1564 ($self->{padding} * 2 + 6) x 2
1304} 1565}
1305 1566
1306sub size_allocate {
1307 my ($self, $x, $y, $w, $h) = @_;
1308
1309 $self->_size_allocate ($x, $y, $w, $h);
1310}
1311
1312sub button_down { 1567sub button_down {
1313 my ($self, $ev, $x, $y) = @_; 1568 my ($self, $ev, $x, $y) = @_;
1314 1569
1315 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1570 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1316 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1571 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
… …
1342 glDisable GL_BLEND; 1597 glDisable GL_BLEND;
1343} 1598}
1344 1599
1345############################################################################# 1600#############################################################################
1346 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_events => 1,
1801 can_hover => 1,
1802 %arg,
1803 );
1804
1805 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1806 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1807 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1808
1809 $self
1810}
1811
1812sub set_fontsize {
1813 my ($self, $fsize) = @_;
1814
1815 $self->{value}->set_fontsize ($fsize);
1816 $self->{max} ->set_fontsize ($fsize);
1817}
1818
1819sub set_value {
1820 my ($self, $val, $max) = @_;
1821
1822 $self->set_max ($max)
1823 if defined $max;
1824
1825 $self->{gauge}->set_value ($val, $max);
1826 $self->{value}->set_text ($val);
1827}
1828
1829sub set_max {
1830 my ($self, $max) = @_;
1831
1832 $self->{gauge}->set_max ($max);
1833 $self->{max}->set_text ($max);
1834}
1835
1836#############################################################################
1837
1347package CFClient::UI::Slider; 1838package CFClient::UI::Slider;
1348 1839
1349use strict; 1840use strict;
1350 1841
1351use SDL::OpenGL; 1842use CFClient::OpenGL;
1352 1843
1353our @ISA = CFClient::UI::DrawBG::; 1844our @ISA = CFClient::UI::DrawBG::;
1354 1845
1355my @tex = 1846my @tex =
1356 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1847 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
… …
1366 # TODO: calculations are off 1857 # TODO: calculations are off
1367 my $self = $class->SUPER::new ( 1858 my $self = $class->SUPER::new (
1368 fg => [1, 1, 1], 1859 fg => [1, 1, 1],
1369 active_fg => [0, 0, 0], 1860 active_fg => [0, 0, 0],
1370 range => [0, 0, 100, 10], 1861 range => [0, 0, 100, 10],
1371 req_w => 40, 1862 req_w => 20,
1372 req_h => 13, 1863 req_h => 20,
1373 vertical => 0, 1864 vertical => 0,
1374 can_hover => 1, 1865 can_hover => 1,
1375 inner_pad => 5, 1866 inner_pad => 5,
1376 @_ 1867 @_
1377 ); 1868 );
… …
1481 1972
1482package CFClient::UI::TextView; 1973package CFClient::UI::TextView;
1483 1974
1484our @ISA = CFClient::UI::HBox::; 1975our @ISA = CFClient::UI::HBox::;
1485 1976
1486use SDL::OpenGL; 1977use CFClient::OpenGL;
1487 1978
1488sub new { 1979sub new {
1489 my $class = shift; 1980 my $class = shift;
1490 1981
1491 my $self = $class->SUPER::new ( 1982 my $self = $class->SUPER::new (
1492 req_w => $::WIDTH / 6,
1493 req_h => $::HEIGHT / 6,
1494 fontsize => $::FONTSIZE, 1983 fontsize => 1,
1984 #font => default_font
1495 @_, 1985 @_,
1496 1986
1497 layout => (new CFClient::Layout), 1987 layout => (new CFClient::Layout),
1498 par => [], 1988 par => [],
1499 height => 0, 1989 height => 0,
… …
1520sub text_height { 2010sub text_height {
1521 my ($self, $text) = @_; 2011 my ($self, $text) = @_;
1522 2012
1523 my $layout = $self->{layout}; 2013 my $layout = $self->{layout};
1524 2014
1525 $layout->set_height ($self->{fontsize}); 2015 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1526 $layout->set_width ($self->{w}); 2016 $layout->set_width ($self->{w});
1527 $layout->set_text ($text); 2017 $layout->set_text ($text);
1528 2018
1529 ($layout->size)[1] 2019 ($layout->size)[1]
1530} 2020}
… …
1534 2024
1535 $self->{need_reflow}++; 2025 $self->{need_reflow}++;
1536 $self->update; 2026 $self->update;
1537} 2027}
1538 2028
1539sub size_request {
1540 my ($self) = @_;
1541
1542 ($self->{req_w}, $self->{req_h})
1543}
1544
1545sub size_allocate { 2029sub size_allocate {
1546 my ($self, $x, $y, $w, $h) = @_; 2030 my ($self, $w, $h) = @_;
1547 2031
1548 $self->SUPER::size_allocate ($x, $y, $w, $h); 2032 $self->SUPER::size_allocate ($w, $h);
1549 2033
2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1550 $self->{layout}->set_height ($self->{fontsize}); 2035 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 $self->{layout}->set_width ($self->{w}); 2036 $self->{layout}->set_width ($self->{children}[0]{w});
1552 2037
1553 $self->reflow; 2038 $self->reflow;
1554} 2039}
1555 2040
1556sub add_paragraph { 2041sub add_paragraph {
… …
1575 2060
1576 return unless $self->{h} > 0; 2061 return unless $self->{h} > 0;
1577 2062
1578 delete $self->{texture}; 2063 delete $self->{texture};
1579 2064
1580 $TOPLEVEL->on_refresh ($self, sub { 2065 $ROOT->on_refresh ($self, sub {
1581 if (delete $self->{need_reflow}) { 2066 if (delete $self->{need_reflow}) {
1582 my $height = 0; 2067 my $height = 0;
1583 2068
1584 $height += $_->[0] = $self->text_height ($_->[2]) 2069 $height += $_->[0] = $self->text_height ($_->[2])
1585 for @{$self->{par}}; 2070 for @{$self->{par}};
… …
1606 my $y1 = $top + $self->{h}; 2091 my $y1 = $top + $self->{h};
1607 2092
1608 my $y = 0; 2093 my $y = 0;
1609 2094
1610 my $layout = $self->{layout}; 2095 my $layout = $self->{layout};
2096
2097 $layout->set_font ($self->{font}) if $self->{font};
1611 2098
1612 for my $par (@{$self->{par}}) { 2099 for my $par (@{$self->{par}}) {
1613 my $h = $par->[0]; 2100 my $h = $par->[0];
1614 2101
1615 if ($y0 < $y + $h && $y < $y1) { 2102 if ($y0 < $y + $h && $y < $y1) {
… …
1643 2130
1644} 2131}
1645 2132
1646############################################################################# 2133#############################################################################
1647 2134
1648package CFClient::UI::MapWidget;
1649
1650use strict;
1651
1652use List::Util qw(min max);
1653
1654use SDL;
1655use SDL::OpenGL;
1656
1657our @ISA = CFClient::UI::Base::;
1658
1659sub new {
1660 my $class = shift;
1661
1662 $class->SUPER::new (
1663 z => -1,
1664 can_focus => 1,
1665 list => (glGenLists 1),
1666 @_
1667 )
1668}
1669
1670sub key_down {
1671 print "MAPKEYDOWN\n";
1672}
1673
1674sub key_up {
1675}
1676
1677sub button_down {
1678 my ($self, $ev, $x, $y) = @_;
1679
1680 $self->focus_in;
1681
1682 if ($ev->button == 2) {
1683 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1684 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1685
1686 $self->{motion} = sub {
1687 my ($ev, $x, $y) = @_;
1688
1689 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1690
1691 $::CFG->{map_shift_x} = $bw + $x - $ox;
1692 $::CFG->{map_shift_y} = $bh + $y - $oy;
1693
1694 $self->update;
1695 };
1696 }
1697}
1698
1699sub button_up {
1700 my ($self, $ev, $x, $y) = @_;
1701
1702 delete $self->{motion};
1703}
1704
1705sub mouse_motion {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->{motion}->($ev, $x, $y) if $self->{motion};
1709}
1710
1711sub size_request {
1712 (
1713 1 + 32 * int $::WIDTH / 32,
1714 1 + 32 * int $::HEIGHT / 32,
1715 )
1716}
1717
1718sub update {
1719 my ($self) = @_;
1720
1721 $self->{need_update} = 1;
1722 $self->SUPER::update;
1723}
1724
1725sub draw {
1726 my ($self) = @_;
1727
1728 if (delete $self->{need_update}) {
1729 glNewList $self->{list}, GL_COMPILE;
1730
1731 if ($::MAP) {
1732 my $sw = int $::WIDTH / 32;
1733 my $sh = int $::HEIGHT / 32;
1734
1735 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1736 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1737
1738 glTranslate $sx0 - 32, $sy0 - 32, 0;
1739
1740 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1741
1742 if ($::CFG->{fow_enable}) {
1743 if ($::CFG->{fow_smooth}) { # smooth fog of war
1744 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1745 glConvolutionFilter2D
1746 GL_CONVOLUTION_2D,
1747 GL_ALPHA,
1748 3, 3,
1749 GL_ALPHA, GL_FLOAT,
1750 pack "f*",
1751 0.1, 0.1, 0.1,
1752 0.1, 0.2, 0.1,
1753 0.1, 0.1, 0.1,
1754 ;
1755 glEnable GL_CONVOLUTION_2D;
1756 }
1757
1758 my $tex = new CFClient::Texture
1759 w => $w,
1760 h => $h,
1761 data => $data,
1762 internalformat => GL_ALPHA,
1763 format => GL_ALPHA;
1764
1765 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1766
1767 glEnable GL_BLEND;
1768 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1769 glEnable GL_TEXTURE_2D;
1770 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1771
1772 glColor +($::CFG->{fow_intensity}) x 3, 1;
1773 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1774
1775 glDisable GL_TEXTURE_2D;
1776 glDisable GL_BLEND;
1777 }
1778
1779 # HACK BEGIN
1780 {
1781 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1782 my ($w, $h) = (250, 250);
1783
1784 glEnable GL_BLEND;
1785 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1786 glEnable GL_TEXTURE_2D;
1787 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1788
1789 CFClient::Texture->new (
1790 w => $w,
1791 h => $h,
1792 data => $::MAP->mapmap ($w, $h),
1793 type => GL_UNSIGNED_INT_8_8_8_8_REV
1794 )->draw_quad (100, 100);
1795
1796 glDisable GL_TEXTURE_2D;
1797 glDisable GL_BLEND;
1798 }
1799 # HACK END
1800 }
1801
1802 glEndList;
1803 }
1804
1805 glPushMatrix;
1806 glCallList $self->{list};
1807 glPopMatrix;
1808
1809 if ($FOCUS != $self) {
1810 glColor 64/255, 64/255, 64/255;
1811 glLogicOp GL_AND;
1812 glEnable GL_COLOR_LOGIC_OP;
1813 glBegin GL_QUADS;
1814 glVertex 0, 0;
1815 glVertex 0, $::HEIGHT;
1816 glVertex $::WIDTH, $::HEIGHT;
1817 glVertex $::WIDTH, 0;
1818 glEnd;
1819 glDisable GL_COLOR_LOGIC_OP;
1820 }
1821}
1822
1823my %DIR = (
1824 SDLK_KP8, [1, "north"],
1825 SDLK_KP9, [2, "northeast"],
1826 SDLK_KP6, [3, "east"],
1827 SDLK_KP3, [4, "southeast"],
1828 SDLK_KP2, [5, "south"],
1829 SDLK_KP1, [6, "southwest"],
1830 SDLK_KP4, [7, "west"],
1831 SDLK_KP7, [8, "northwest"],
1832
1833 SDLK_UP, [1, "north"],
1834 SDLK_RIGHT, [3, "east"],
1835 SDLK_DOWN, [5, "south"],
1836 SDLK_LEFT, [7, "west"],
1837);
1838
1839sub key_down {
1840 my ($self, $ev) = @_;
1841
1842 my $mod = $ev->key_mod;
1843 my $sym = $ev->key_sym;
1844
1845 if ($sym == SDLK_KP5) {
1846 $::CONN->user_send ("command stay fire");
1847 } elsif ($sym == SDLK_a) {
1848 $::CONN->user_send ("command apply");
1849 } elsif ($sym == SDLK_QUOTE) {
1850 $self->emit ('activate_console');
1851 } elsif ($sym == SDLK_SLASH) {
1852 $self->emit ('activate_console' => '/');
1853 } elsif (exists $DIR{$sym}) {
1854 if ($mod & KMOD_SHIFT) {
1855 $self->{shft}++;
1856 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1857 } elsif ($mod & KMOD_CTRL) {
1858 $self->{ctrl}++;
1859 $::CONN->user_send ("command run $DIR{$sym}[0]");
1860 } else {
1861 $::CONN->user_send ("command $DIR{$sym}[1]");
1862 }
1863 }
1864}
1865
1866sub key_up {
1867 my ($self, $ev) = @_;
1868
1869 my $mod = $ev->key_mod;
1870 my $sym = $ev->key_sym;
1871
1872 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1873 $::CONN->user_send ("command fire_stop");
1874 }
1875 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1876 $::CONN->user_send ("command run_stop");
1877 }
1878}
1879
1880#############################################################################
1881
1882package CFClient::UI::Animator; 2135package CFClient::UI::Animator;
1883 2136
1884use SDL::OpenGL; 2137use CFClient::OpenGL;
1885 2138
1886our @ISA = CFClient::UI::Bin::; 2139our @ISA = CFClient::UI::Bin::;
1887 2140
1888sub moveto { 2141sub moveto {
1889 my ($self, $x, $y) = @_; 2142 my ($self, $x, $y) = @_;
… …
1929 my $class = shift; 2182 my $class = shift;
1930 2183
1931 my $self = $class->SUPER::new ( 2184 my $self = $class->SUPER::new (
1932 state => 0, 2185 state => 0,
1933 connect_activate => \&toggle_flopper, 2186 connect_activate => \&toggle_flopper,
2187 can_events => 1,
1934 @_ 2188 @_
1935 ); 2189 );
1936 2190
1937 if ($self->{state}) { 2191 if ($self->{state}) {
1938 $self->{state} = 0; 2192 $self->{state} = 0;
… …
1945sub toggle_flopper { 2199sub toggle_flopper {
1946 my ($self) = @_; 2200 my ($self) = @_;
1947 2201
1948 # TODO: use animation 2202 # TODO: use animation
1949 if ($self->{state} = !$self->{state}) { 2203 if ($self->{state} = !$self->{state}) {
1950 $CFClient::UI::TOPLEVEL->add ($self->{other}); 2204 $CFClient::UI::ROOT->add ($self->{other});
1951 $self->{other}->move ( 2205 $self->{other}->move ($self->coord2global (0, $self->{h}));
1952 ($::WIDTH - $self->{other}{w}) * 0.5, 2206 $self->emit ("open");
1953 ($::HEIGHT - $self->{other}{h}) * 0.5,
1954 );
1955 } else { 2207 } else {
1956 $CFClient::UI::TOPLEVEL->remove ($self->{other}); 2208 $CFClient::UI::ROOT->remove ($self->{other});
2209 $self->emit ("close");
2210 }
2211
2212 $self->emit (changed => $self->{state});
2213}
2214
2215#############################################################################
2216
2217package CFClient::UI::Tooltip;
2218
2219our @ISA = CFClient::UI::Bin::;
2220
2221use CFClient::OpenGL;
2222
2223sub new {
2224 my $class = shift;
2225
2226 $class->SUPER::new (
2227 @_,
2228 can_events => 0,
2229 )
2230}
2231
2232sub set_markup {
2233 my ($self, $text) = @_;
2234
2235 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
2236 $self->{label}->set_markup ($text);
2237 $self->add ($self->{label});
2238}
2239
2240sub size_request {
2241 my ($self) = @_;
2242
2243 $self->child->set_max_size ($::WIDTH * 0.3);
2244
2245 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2246
2247 ($w + 4, $h + 4)
2248}
2249
2250sub size_allocate {
2251 my ($self, $w, $h) = @_;
2252
2253 $self->SUPER::size_allocate ($w - 4, $h - 4);
2254}
2255
2256sub _draw {
2257 my ($self) = @_;
2258
2259 glPushMatrix;
2260 glTranslate 0.375, 0.375;
2261
2262 my ($w, $h) = @$self{qw(w h)};
2263
2264 glColor 1, 0.8, 0.4;
2265 glBegin GL_QUADS;
2266 glVertex 0 , 0;
2267 glVertex 0 , $h;
2268 glVertex $w, $h;
2269 glVertex $w, 0;
2270 glEnd;
1957 } 2271
1958} 2272 glColor 0, 0, 0;
2273 glBegin GL_LINE_LOOP;
2274 glVertex 0 , 0;
2275 glVertex 0 , $h;
2276 glVertex $w, $h;
2277 glVertex $w, 0;
2278 glEnd;
2279
2280 glPopMatrix;
1959 2281
1960############################################################################# 2282 glTranslate 2, 2;
2283 $self->SUPER::_draw;
2284}
1961 2285
2286#############################################################################
2287
1962package CFClient::UI::Toplevel; 2288package CFClient::UI::Face;
2289
2290our @ISA = CFClient::UI::Base::;
2291
2292use CFClient::OpenGL;
2293
2294sub new {
2295 my $class = shift;
2296
2297 $class->SUPER::new (
2298 aspect => 1,
2299 @_,
2300 )
2301}
2302
2303sub size_request {
2304 (32, 8)
2305}
2306
2307sub draw {
2308 my ($self) = @_;
2309
2310 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
2311
2312 if ($tex) {
2313 glEnable GL_BLEND;
2314 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2315 glEnable GL_TEXTURE_2D;
2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2317 glColor 1, 1, 1, 1;
2318 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
2319 glDisable GL_TEXTURE_2D;
2320 glDisable GL_BLEND;
2321 }
2322}
2323
2324#############################################################################
2325
2326package CFClient::UI::Root;
1963 2327
1964our @ISA = CFClient::UI::Container::; 2328our @ISA = CFClient::UI::Container::;
1965 2329
1966use SDL::OpenGL; 2330use CFClient::OpenGL;
2331
2332sub check_size {
2333 my ($self) = @_;
2334
2335 $self->configure (0, 0, $::WIDTH, $::HEIGHT);
2336}
1967 2337
1968sub size_request { 2338sub size_request {
1969 ($::WIDTH, $::HEIGHT) 2339 ($::WIDTH, $::HEIGHT)
1970} 2340}
1971 2341
1972sub size_allocate { 2342sub configure {
1973 my ($self, $x, $y, $w, $h) = @_; 2343 my ($self, $x, $y, $w, $h) = @_;
1974 2344
1975 $self->_size_allocate ($x, $y, $w, $h); 2345 $self->SUPER::configure ($x, $y, $w, $h);
1976 2346
1977 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1978 for @{$self->{children}}; 2347 for my $child (@{$self->{children}}) {
1979} 2348 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
1980 2349
1981sub translate { 2350 $X = List::Util::max 0, List::Util::min $w - $W, $X;
2351 $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
2352 $child->configure ($X, $Y, $W,$H);
2353 }
2354}
2355
2356sub _topleft {
1982 my ($self, $x, $y) = @_; 2357 my ($self, $x, $y) = @_;
1983 2358
1984 ($x, $y) 2359 ($x, $y)
1985} 2360}
1986 2361
1987sub update { 2362sub update {
1988 my ($self) = @_; 2363 my ($self) = @_;
1989 2364
1990 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2365 $self->check_size;
1991 ::refresh (); 2366 ::refresh ();
1992} 2367}
1993 2368
1994sub add { 2369sub add {
1995 my ($self, $widget) = @_; 2370 my ($self, $child) = @_;
1996 2371
2372 # integerize window positions
2373 $child->{x} = int $child->{x};
2374 $child->{y} = int $child->{y};
2375
1997 $self->SUPER::add ($widget); 2376 $self->SUPER::add ($child);
1998
1999 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
2000} 2377}
2001 2378
2002sub on_refresh { 2379sub on_refresh {
2003 my ($self, $id, $cb) = @_; 2380 my ($self, $id, $cb) = @_;
2004 2381
… …
2027 2404
2028############################################################################# 2405#############################################################################
2029 2406
2030package CFClient::UI; 2407package CFClient::UI;
2031 2408
2409$ROOT = new CFClient::UI::Root;
2032$TOPLEVEL = new CFClient::UI::Toplevel; 2410$TOOLTIP = new CFClient::UI::Tooltip;
2033 2411
20341 24121
2035 2413

Diff Legend

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