ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.121 by root, Mon Apr 17 19:21:00 2006 UTC vs.
Revision 1.219 by root, Sun May 21 00:34:59 2006 UTC

1package CFClient::UI; 1package CFClient::UI;
2 2
3use utf8;
3use strict; 4use strict;
4 5
5use Scalar::Util (); 6use Scalar::Util ();
6use List::Util (); 7use List::Util ();
7 8
8use CFClient; 9use CFClient;
9 10
10our ($FOCUS, $HOVER, $GRAB); # various widgets 11our ($FOCUS, $HOVER, $GRAB); # various widgets
11 12
12our $ROOT; 13our $ROOT;
14our $TOOLTIP;
13our $BUTTON_STATE; 15our $BUTTON_STATE;
16
17our %WIDGET; # all widgets, weak-referenced
18
19sub check_tooltip {
20 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) {
25 $TOOLTIP->{owner} = $widget;
26
27 my $tip = $widget->{tooltip};
28
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 }
43
44 return;
45 }
46 }
47 }
48
49 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner};
51}
14 52
15# class methods for events 53# class methods for events
16sub feed_sdl_key_down_event { 54sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
56 if $FOCUS;
18} 57}
19 58
20sub feed_sdl_key_up_event { 59sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
61 if $FOCUS;
22} 62}
23 63
24sub feed_sdl_button_down_event { 64sub feed_sdl_button_down_event {
25 my ($ev) = @_; 65 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 66 my ($x, $y) = ($ev->{x}, $ev->{y});
27 67
28 if (!$BUTTON_STATE) { 68 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 69 my $widget = $ROOT->find_widget ($x, $y);
30 70
31 $GRAB = $widget; 71 $GRAB = $widget;
32 $GRAB->update if $GRAB; 72 $GRAB->update if $GRAB;
33 }
34 73
74 check_tooltip;
75 }
76
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 77 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 78
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 79 if ($GRAB) {
80 ($x, $y) = $GRAB->coord2local ($x, $y);
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
38} 83}
39 84
40sub feed_sdl_button_up_event { 85sub feed_sdl_button_up_event {
41 my ($ev) = @_; 86 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 87 my ($x, $y) = ($ev->{x}, $ev->{y});
43 88
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 89 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 90
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 92
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 93 if ($GRAB) {
94 ($x, $y) = $GRAB->coord2local ($x, $y);
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
49 97
50 if (!$BUTTON_STATE) { 98 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 99 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 100 $grab->update if $grab;
53 $GRAB->update if $GRAB; 101 $GRAB->update if $GRAB;
102
103 check_tooltip;
54 } 104 }
55} 105}
56 106
57sub feed_sdl_motion_event { 107sub feed_sdl_motion_event {
58 my ($ev) = @_; 108 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 109 my ($x, $y) = ($ev->{x}, $ev->{y});
60 110
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 111 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 112
63 if ($widget != $HOVER) { 113 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 114 my $hover = $HOVER; $HOVER = $widget;
65 115
66 $hover->update if $hover && $hover->{can_hover}; 116 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 117 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 118
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 119 check_tooltip;
120 }
121
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
125 }
71} 126}
72 127
73# convert position array to integers 128# convert position array to integers
74sub harmonize { 129sub harmonize {
75 my ($vals) = @_; 130 my ($vals) = @_;
… …
81 $rem += $_ - $i; 136 $rem += $_ - $i;
82 $_ = $i; 137 $_ = $i;
83 } 138 }
84} 139}
85 140
141# call when resolution changes etc.
142sub rescale_widgets {
143 my ($sx, $sy) = @_;
144
145 # make a copy, otherwise for complains about freed values.
146 my @widgets = values %WIDGET;
147
148 for my $widget (@widgets) {
149 if ($widget->{toplevel}) {
150 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x};
151 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
152 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w};
153 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
154 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y};
155 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
156 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h};
157 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
158 }
159
160 $widget->reconfigure;
161 }
162}
163
86############################################################################# 164#############################################################################
87 165
88package CFClient::UI::Base; 166package CFClient::UI::Base;
89 167
90use strict; 168use strict;
91 169
92use SDL::OpenGL; 170use CFClient::OpenGL;
93 171
94sub new { 172sub new {
95 my $class = shift; 173 my $class = shift;
96 174
97 my $self = bless { 175 my $self = bless {
98 x => 0, 176 x => 0,
99 y => 0, 177 y => 0,
100 z => 0, 178 z => 0,
101 w => -1, 179 can_events => 1,
102 h => -1,
103 @_ 180 @_
104 }, $class; 181 }, $class;
105 182
106 for (keys %$self) { 183 for (keys %$self) {
107 if (/^connect_(.*)$/) { 184 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_}); 185 $self->connect ($1 => delete $self->{$_});
109 } 186 }
110 } 187 }
111 188
189 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
190
112 $self 191 $self
192}
193
194sub destroy {
195 my ($self) = @_;
196
197 $self->hide;
198 %$self = ();
199}
200
201sub show {
202 my ($self) = @_;
203
204 return if $self->{parent};
205
206 $CFClient::UI::ROOT->add ($self);
207}
208
209sub hide {
210 my ($self) = @_;
211
212 undef $GRAB if $GRAB == $self;
213 undef $HOVER if $HOVER == $self;
214
215 $self->{parent}->remove ($self)
216 if $self->{parent};
113} 217}
114 218
115sub move { 219sub move {
116 my ($self, $x, $y, $z) = @_; 220 my ($self, $x, $y, $z) = @_;
221
117 $self->{x} = int $x; 222 $self->{x} = int $x;
118 $self->{y} = int $y; 223 $self->{y} = int $y;
119 $self->{z} = $z if defined $z; 224 $self->{z} = $z if defined $z;
120}
121 225
122sub needs_redraw { 226 $self->update;
123 0 227}
228
229sub set_size {
230 my ($self, $w, $h) = @_;
231
232 $self->{user_w} = $w;
233 $self->{user_h} = $h;
234
235 $self->check_size;
124} 236}
125 237
126sub size_request { 238sub size_request {
127 require Carp; 239 require Carp;
128 Carp::confess "size_request is abtract"; 240 Carp::confess "size_request is abstract";
129} 241}
130 242
131sub _size_allocate { 243sub configure {
132 my ($self, $x, $y, $w, $h) = @_; 244 my ($self, $x, $y, $w, $h) = @_;
133 245
246 if ($self->{aspect}) {
247 my $w2 = List::Util::min $w, int $h * $self->{aspect};
248 my $h2 = List::Util::min $h, int $w / $self->{aspect};
249
250 # use alignment to adjust x, y
251
252 $x += int +($w - $w2) * 0.5;
253 $y += int +($h - $h2) * 0.5;
254
255 ($w, $h) = ($w2, $h2);
256 }
257
258 if ($self->{x} != $x || $self->{y} != $y) {
134 $self->{x} = $x; 259 $self->{x} = $x;
135 $self->{y} = $y; 260 $self->{y} = $y;
261 $self->update;
262 }
136 263
137 return unless $self->{w} != $w || $self->{h} != $h; 264 if ($self->{w} != $w || $self->{h} != $h) {
138 265 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
139 $self->{w} = $w;
140 $self->{h} = $h;
141
142 1 266 }
143} 267}
144 268
145sub size_allocate { 269sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_; 270 # nothing to be done
147
148 $self->_size_allocate ($x, $y, $w, $h);
149} 271}
150 272
151# return top left coordinates 273sub reconfigure {
152sub _topleft { 274 my ($self) = @_;
275
276 $self->check_size (1);
277 $self->update;
278}
279
280sub children {
281}
282
283sub set_max_size {
153 my ($self, $x, $y) = @_; 284 my ($self, $w, $h) = @_;
154 285
155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 286 delete $self->{max_w}; $self->{max_w} = $w if $w;
287 delete $self->{max_h}; $self->{max_h} = $h if $h;
288}
289
290sub set_tooltip {
291 my ($self, $tooltip) = @_;
292
293 $self->{tooltip} = $tooltip;
294
295 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
296 delete $CFClient::UI::TOOLTIP->{owner};
297 CFClient::UI::check_tooltip;
298 }
156} 299}
157 300
158# translate global coordinates to local coordinate system 301# translate global coordinates to local coordinate system
159sub coord2local { 302sub coord2local {
160 my ($self, $x, $y) = @_; 303 my ($self, $x, $y) = @_;
161 304
162 my ($X, $Y) = $self->_topleft; 305 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
163 ($x - $X, $y - $Y)
164} 306}
165 307
166# translate local coordinates to global coordinate system 308# translate local coordinates to global coordinate system
167sub coord2global { 309sub coord2global {
168 my ($self, $x, $y) = @_; 310 my ($self, $x, $y) = @_;
169 311
170 my ($X, $Y) = $self->_topleft; 312 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
171 ($x + $X, $y + $Y)
172} 313}
173 314
174sub focus_in { 315sub focus_in {
175 my ($self) = @_; 316 my ($self) = @_;
176 317
… …
225 glPopMatrix; 366 glPopMatrix;
226 367
227 if ($self == $HOVER && $self->{can_hover}) { 368 if ($self == $HOVER && $self->{can_hover}) {
228 my ($x, $y) = @$self{qw(x y)}; 369 my ($x, $y) = @$self{qw(x y)};
229 370
230 glColor 0, 0, 1, 0.2; 371 glColor 1, 0.8, 0.5, 0.2;
231 glEnable GL_BLEND; 372 glEnable GL_BLEND;
232 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 373 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
233 glBegin GL_QUADS; 374 glBegin GL_QUADS;
234 glVertex $x , $y; 375 glVertex $x , $y;
235 glVertex $x + $self->{w}, $y; 376 glVertex $x + $self->{w}, $y;
236 glVertex $x + $self->{w}, $y + $self->{h}; 377 glVertex $x + $self->{w}, $y + $self->{h};
237 glVertex $x , $y + $self->{h}; 378 glVertex $x , $y + $self->{h};
238 glEnd; 379 glEnd;
239 glDisable GL_BLEND; 380 glDisable GL_BLEND;
240 } 381 }
382
383 if ($ENV{PCLIENT_DEBUG}) {
384 glPushMatrix;
385 glColor 1, 1, 0, 1;
386 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
387 glBegin GL_LINE_LOOP;
388 glVertex 0 , 0;
389 glVertex $self->{w}, 0;
390 glVertex $self->{w}, $self->{h};
391 glVertex 0 , $self->{h};
392 glEnd;
393 glPopMatrix;
394 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
395 }
241} 396}
242 397
243sub _draw { 398sub _draw {
244 my ($self) = @_; 399 my ($self) = @_;
245 400
246 warn "no draw defined for $self\n"; 401 warn "no draw defined for $self\n";
247} 402}
248 403
249sub find_widget { 404sub find_widget {
250 my ($self, $x, $y) = @_; 405 my ($self, $x, $y) = @_;
406
407 return () unless $self->{can_events};
251 408
252 return $self 409 return $self
253 if $x >= $self->{x} && $x < $self->{x} + $self->{w} 410 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
254 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 411 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
255 412
… …
258 415
259sub set_parent { 416sub set_parent {
260 my ($self, $parent) = @_; 417 my ($self, $parent) = @_;
261 418
262 Scalar::Util::weaken ($self->{parent} = $parent); 419 Scalar::Util::weaken ($self->{parent} = $parent);
420
421 # TODO: req_w _does_change after ->reconfigure
422 $self->check_size
423 unless exists $self->{req_w};
424}
425
426sub check_size {
427 my ($self, $forced) = @_;
428
429 $self->{force_alloc} = 1 if $forced;
430 $CFClient::UI::ROOT->{check_size}{$self} = $self;
263} 431}
264 432
265sub update { 433sub update {
266 my ($self) = @_; 434 my ($self) = @_;
267 435
… …
270} 438}
271 439
272sub connect { 440sub connect {
273 my ($self, $signal, $cb) = @_; 441 my ($self, $signal, $cb) = @_;
274 442
275 push @{ $self->{cb}{$signal} }, $cb; 443 push @{ $self->{signal_cb}{$signal} }, $cb;
276} 444}
277 445
278sub emit { 446sub emit {
279 my ($self, $signal, @args) = @_; 447 my ($self, $signal, @args) = @_;
280 448
281 $_->($self, @args) 449 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
282 for @{$self->{cb}{$signal} || []};
283} 450}
284 451
285sub DESTROY { 452sub DESTROY {
286 my ($self) = @_; 453 my ($self) = @_;
287 454
455 delete $WIDGET{$self+0};
288 #$self->deactivate; 456 #$self->deactivate;
289} 457}
290 458
291############################################################################# 459#############################################################################
292 460
293package CFClient::UI::DrawBG; 461package CFClient::UI::DrawBG;
294 462
295our @ISA = CFClient::UI::Base::; 463our @ISA = CFClient::UI::Base::;
296 464
297use strict; 465use strict;
298use SDL::OpenGL; 466use CFClient::OpenGL;
299 467
300sub new { 468sub new {
301 my $class = shift; 469 my $class = shift;
302 470
303 # range [value, low, high, page] 471 # range [value, low, high, page]
304 472
305 $class->SUPER::new ( 473 $class->SUPER::new (
306 bg => [0, 0, 0, 0.2], 474 #bg => [0, 0, 0, 0.2],
307 active_bg => [1, 1, 1, 0.5], 475 #active_bg => [1, 1, 1, 0.5],
308 @_ 476 @_
309 ) 477 )
310} 478}
311 479
312sub _draw { 480sub _draw {
313 my ($self) = @_; 481 my ($self) = @_;
314 482
483 my $color = $FOCUS == $self && $self->{active_bg}
484 ? $self->{active_bg}
485 : $self->{bg};
486
487 if ($color && (@$color < 4 || $color->[3])) {
315 my ($w, $h) = @$self{qw(w h)}; 488 my ($w, $h) = @$self{qw(w h)};
316 489
317 glEnable GL_BLEND; 490 glEnable GL_BLEND;
318 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 491 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
319 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 492 glColor @$color;
320 493
321 glBegin GL_QUADS; 494 glBegin GL_QUADS;
322 glVertex 0 , 0; 495 glVertex 0 , 0;
323 glVertex 0 , $h; 496 glVertex 0 , $h;
324 glVertex $w, $h; 497 glVertex $w, $h;
325 glVertex $w, 0; 498 glVertex $w, 0;
326 glEnd; 499 glEnd;
327 500
328 glDisable GL_BLEND; 501 glDisable GL_BLEND;
502 }
329} 503}
330 504
331############################################################################# 505#############################################################################
332 506
333package CFClient::UI::Empty; 507package CFClient::UI::Empty;
334 508
335our @ISA = CFClient::UI::Base::; 509our @ISA = CFClient::UI::Base::;
510
511sub new {
512 my ($class, %arg) = @_;
513 $class->SUPER::new (can_events => 0, %arg);
514}
336 515
337sub size_request { 516sub size_request {
338 (0, 0) 517 (0, 0)
339} 518}
340 519
… …
349sub new { 528sub new {
350 my ($class, %arg) = @_; 529 my ($class, %arg) = @_;
351 530
352 my $children = delete $arg{children} || []; 531 my $children = delete $arg{children} || [];
353 532
354 my $self = $class->SUPER::new (children => [], %arg); 533 my $self = $class->SUPER::new (
534 children => [],
535 can_events => 0,
536 %arg,
537 );
355 $self->add ($_) for @$children; 538 $self->add ($_) for @$children;
356 539
357 $self 540 $self
358} 541}
359 542
360sub add { 543sub add {
361 my ($self, $child) = @_; 544 my ($self, @widgets) = @_;
362 545
363 $child->set_parent ($self); 546 $_->set_parent ($self)
547 for @widgets;
364 548
365 use sort 'stable'; 549 use sort 'stable';
366 550
367 $self->{children} = [ 551 $self->{children} = [
368 sort { $a->{z} <=> $b->{z} } 552 sort { $a->{z} <=> $b->{z} }
369 @{$self->{children}}, $child 553 @{$self->{children}}, @widgets
370 ]; 554 ];
371 555
372 $self->{w} = $self->{h} = -1; 556 $self->check_size (1);
373 $self->update; 557 $self->update;
374} 558}
375 559
560sub children {
561 @{ $_[0]{children} }
562}
563
376sub remove { 564sub remove {
377 my ($self, $widget) = @_; 565 my ($self, $child) = @_;
378 566
567 delete $child->{parent};
568 $child->hide;
569
379 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 570 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
380 571
381 $self->size_allocate (0, 0, $self->{w}, $self->{h}); 572 $self->check_size;
573 $self->update;
574}
575
576sub clear {
577 my ($self) = @_;
578
579 my $children = delete $self->{children};
580 $self->{children} = [];
581
582 for (@$children) {
583 delete $_->{parent};
584 $_->hide;
585 }
586
587 $self->check_size;
588 $self->update;
382} 589}
383 590
384sub find_widget { 591sub find_widget {
385 my ($self, $x, $y) = @_; 592 my ($self, $x, $y) = @_;
386 593
… …
416 623
417 $class->SUPER::new (children => [$child], %arg) 624 $class->SUPER::new (children => [$child], %arg)
418} 625}
419 626
420sub add { 627sub add {
421 my ($self, $widget) = @_; 628 my ($self, $child) = @_;
422 629
423 $self->{children} = []; 630 $self->{children} = [];
424 631
425 $self->SUPER::add ($widget); 632 $self->SUPER::add ($child);
426} 633}
427 634
428sub remove { 635sub remove {
429 my ($self, $widget) = @_; 636 my ($self, $widget) = @_;
430 637
… …
439sub size_request { 646sub size_request {
440 $_[0]{children}[0]->size_request 647 $_[0]{children}[0]->size_request
441} 648}
442 649
443sub size_allocate { 650sub size_allocate {
444 my ($self, $x, $y, $w, $h) = @_; 651 my ($self, $w, $h) = @_;
445 652
446 $self->_size_allocate ($x, $y, $w, $h) or return;
447
448 $self->{children}[0]->size_allocate (0, 0, $w, $h); 653 $self->{children}[0]->configure (0, 0, $w, $h);
449} 654}
450 655
451############################################################################# 656#############################################################################
452 657
453package CFClient::UI::Window; 658package CFClient::UI::Window;
454 659
455our @ISA = CFClient::UI::Bin::; 660our @ISA = CFClient::UI::Bin::;
456 661
457use SDL::OpenGL; 662use CFClient::OpenGL;
458 663
459sub new { 664sub new {
460 my ($class, %arg) = @_; 665 my ($class, %arg) = @_;
461 666
462 my $self = $class->SUPER::new (%arg); 667 my $self = $class->SUPER::new (%arg);
463} 668}
464 669
465sub update { 670sub update {
466 my ($self) = @_; 671 my ($self) = @_;
467 672
468 # we want to do this delayed... 673 $ROOT->on_post_alloc ($self => sub { $self->render_child });
469 $self->render_chld;
470 $self->SUPER::update; 674 $self->SUPER::update;
471} 675}
472 676
677sub size_allocate {
678 my ($self, $w, $h) = @_;
679
680 $self->SUPER::size_allocate ($w, $h);
681 $self->update;
682}
683
684sub _render {
685 $_[0]{children}[0]->draw;
686}
687
473sub render_chld { 688sub render_child {
474 my ($self) = @_; 689 my ($self) = @_;
475 690
476 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 691 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
477 glClearColor 0, 0, 0, 1; 692 glClearColor 0, 0, 0, 0;
478 glClear GL_COLOR_BUFFER_BIT; 693 glClear GL_COLOR_BUFFER_BIT;
479 $self->child->draw; 694
695 $self->_render;
480 }; 696 };
481}
482
483sub size_allocate {
484 my ($self, $x, $y, $w, $h) = @_;
485
486 $self->_size_allocate ($x, $y, $w, $h) or return;
487
488 $self->child->size_allocate (0, 0, $w, $h);
489
490 $self->render_chld;
491} 697}
492 698
493sub _draw { 699sub _draw {
494 my ($self) = @_; 700 my ($self) = @_;
495 701
496 my ($w, $h) = ($self->w, $self->h); 702 my ($w, $h) = ($self->w, $self->h);
497 703
498 my $tex = $self->{texture} 704 my $tex = $self->{texture}
499 or return; 705 or return;
500 706
501 glEnable GL_BLEND;
502 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
503 glEnable GL_TEXTURE_2D; 707 glEnable GL_TEXTURE_2D;
504 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
709 glColor 1, 1, 1, 1;
505 710
506 $tex->draw_quad (0, 0, $w, $h); 711 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
507 712
508 glDisable GL_BLEND;
509 glDisable GL_TEXTURE_2D; 713 glDisable GL_TEXTURE_2D;
510} 714}
511 715
512############################################################################# 716#############################################################################
513 717
514package CFClient::UI::Frame; 718package CFClient::UI::ViewPort;
515 719
516our @ISA = CFClient::UI::Bin::; 720our @ISA = CFClient::UI::Window::;
517
518use SDL::OpenGL;
519 721
520sub size_request { 722sub size_request {
521 my ($self) = @_; 723 my ($self) = @_;
522 my $chld = $self->child
523 or return (0, 0);
524 724
525 $chld->move (2, 2); 725 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
726 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
526 727
527 map { $_ + 4 } $chld->size_request; 728 @$self{qw(child_w child_h)}
528} 729}
529 730
530sub size_allocate { 731sub size_allocate {
531 my ($self, $x, $y, $w, $h) = @_; 732 my ($self, $w, $h) = @_;
733
734 $self->update;
735}
736
737sub set_offset {
738 my ($self, $x, $y) = @_;
739
740 $self->{view_x} = int $x;
741 $self->{view_y} = int $y;
742
743 $self->update;
744}
745
746# hmm, this does not work for topleft of $self... but we should not ask for that
747sub coord2local {
748 my ($self, $x, $y) = @_;
749
750 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
751}
752
753sub coord2global {
754 my ($self, $x, $y) = @_;
755
756 $x = List::Util::min $self->{w}, $x - $self->{view_x};
757 $y = List::Util::min $self->{h}, $y - $self->{view_y};
758
759 $self->SUPER::coord2global ($x, $y)
760}
761
762sub find_widget {
763 my ($self, $x, $y) = @_;
764
765 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
766 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
767 ) {
768 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
769 } else {
770 $self->CFClient::UI::Base::find_widget ($x, $y)
532 771 }
533 $self->_size_allocate ($x, $y, $w, $h) or return;
534
535 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
536} 772}
537 773
538sub _draw { 774sub _render {
539 my ($self) = @_; 775 my ($self) = @_;
540 776
541 my $chld = $self->child; 777 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
542 778
543 my ($w, $h) = $chld->size_request; 779 $self->SUPER::_render;
544
545 glBegin GL_QUADS;
546 glColor 0, 0, 0;
547 glVertex 0 , 0;
548 glVertex 0 , $h + 4;
549 glVertex $w + 4 , $h + 4;
550 glVertex $w + 4 , 0;
551 glEnd;
552
553 $chld->draw;
554} 780}
555 781
556############################################################################# 782#############################################################################
557 783
558package CFClient::UI::FancyFrame; 784package CFClient::UI::ScrolledWindow;
559 785
560our @ISA = CFClient::UI::Bin::; 786our @ISA = CFClient::UI::HBox::;
561
562use SDL::OpenGL;
563
564my @tex =
565 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
566 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
567 787
568sub new { 788sub new {
569 my $class = shift; 789 my $class = shift;
570 790
791 my $self;
792
793 my $slider = new CFClient::UI::Slider
794 vertical => 1,
795 range => [0, 0, 1, 0.01], # HACK fix
796 connect_changed => sub {
797 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
798 },
799 ;
800
801 $self = $class->SUPER::new (
802 vp => (new CFClient::UI::ViewPort expand => 1),
803 slider => $slider,
804 @_,
805 );
806
807 $self->{vp}->add ($self->{scrolled});
808 $self->add ($self->{vp});
809 $self->add ($self->{slider});
810
811 $self
812}
813
814#TODO# update range on size_allocate depending on child
815# update viewport offset on scroll
816
817#############################################################################
818
819package CFClient::UI::Frame;
820
821our @ISA = CFClient::UI::Bin::;
822
823use CFClient::OpenGL;
824
825sub new {
826 my $class = shift;
827
828 $class->SUPER::new (
829 bg => undef,
830 @_,
831 )
832}
833
834sub _draw {
835 my ($self) = @_;
836
837 if ($self->{bg}) {
838 my ($w, $h) = @$self{qw(w h)};
839
840 glEnable GL_BLEND;
841 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
842 glColor @{ $self->{bg} };
843
844 glBegin GL_QUADS;
845 glVertex 0 , 0;
846 glVertex 0 , $h;
847 glVertex $w, $h;
848 glVertex $w, 0;
849 glEnd;
850
851 glDisable GL_BLEND;
852 }
853
854 $self->SUPER::_draw;
855}
856
857#############################################################################
858
859package CFClient::UI::FancyFrame;
860
861our @ISA = CFClient::UI::Bin::;
862
863use CFClient::OpenGL;
864
865my @tex =
866 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
867 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
868
869sub new {
870 my $class = shift;
871
571 # TODO: user_x, user_y, overwrite moveto? 872 # TODO: user_x, user_y, overwrite moveto?
572 873
573 $class->SUPER::new ( 874 my $self = $class->SUPER::new (
574 bg => [1, 1, 1, 1], 875 bg => [1, 1, 1, 1],
575 border_bg => [1, 1, 1, 1], 876 border_bg => [1, 1, 1, 1],
576 border => int $::FONTSIZE * 0.8, 877 border => 0.6,
878 toplevel => 1,
879 can_events => 1,
577 @_ 880 @_
881 );
882
883 $self->{title} &&= new CFClient::UI::Label
884 align => 0,
885 valign => 1,
886 text => $self->{title},
887 fontsize => $self->{border};
888
889 $self
890}
891
892sub border {
893 int $_[0]{border} * $::FONTSIZE
894}
895
896sub size_request {
897 my ($self) = @_;
898
899 my ($w, $h) = $self->SUPER::size_request;
900
901 (
902 $w + $self->border * 2,
903 $h + $self->border * 2,
578 ) 904 )
579} 905}
580 906
581sub size_request {
582 my ($self) = @_;
583
584 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
585
586 my ($w, $h) = $self->SUPER::size_request;
587
588 (
589 $w + $self->{border} * 2,
590 $h + $self->{border} * 2,
591 )
592}
593
594sub size_allocate { 907sub size_allocate {
595 my ($self, $x, $y, $w, $h) = @_; 908 my ($self, $w, $h) = @_;
596 909
597 $self->_size_allocate ($x, $y, $w, $h) or return;
598
599 $h -= List::Util::max 0, $self->{border} * 2; 910 $h -= List::Util::max 0, $self->border * 2;
600 $w -= List::Util::max 0, $self->{border} * 2; 911 $w -= List::Util::max 0, $self->border * 2;
601 912
913 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
914 if $self->{title};
915
602 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h); 916 $self->child->configure ($self->border, $self->border, $w, $h);
603} 917}
604 918
605sub button_down { 919sub button_down {
606 my ($self, $ev, $x, $y) = @_; 920 my ($self, $ev, $x, $y) = @_;
607 921
608 if ($x < $self->{w} && $x >= $self->{w} - $self->{border} 922 my ($w, $h) = @$self{qw(w h)};
609 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) { 923 my $border = $self->border;
610 924
925 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
926 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
927
928 if ($lr & $td) {
929 my ($wx, $wy) = ($self->{x}, $self->{y});
611 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 930 my ($ox, $oy) = ($ev->{x}, $ev->{y});
612 my ($bw, $bh) = ($self->{w}, $self->{h}); 931 my ($bw, $bh) = ($self->{w}, $self->{h});
932
933 my $mx = $x < $border;
934 my $my = $y < $border;
613 935
614 $self->{motion} = sub { 936 $self->{motion} = sub {
615 my ($ev, $x, $y) = @_; 937 my ($ev, $x, $y) = @_;
616 938
617 ($x, $y) = ($ev->motion_x, $ev->motion_y); 939 my $dx = $ev->{x} - $ox;
940 my $dy = $ev->{y} - $oy;
618 941
619 $self->{user_w} = $bw + $x - $ox; 942 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
620 $self->{user_h} = $bh + $y - $oy; 943 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
621 $self->update; 944 $self->move ($wx + $dx * $mx, $wy + $dy * $my);
945 $self->check_size;
622 }; 946 };
623 947
624 } elsif ($x >= 0 && $x < $self->{w} 948 } elsif ($lr ^ $td) {
625 && $y >= 0 && $y < $self->{border}) {
626
627 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 949 my ($ox, $oy) = ($ev->{x}, $ev->{y});
628 my ($bx, $by) = ($self->{x}, $self->{y}); 950 my ($bx, $by) = ($self->{x}, $self->{y});
629 951
630 $self->{motion} = sub { 952 $self->{motion} = sub {
631 my ($ev, $x, $y) = @_; 953 my ($ev, $x, $y) = @_;
632 954
633 ($x, $y) = ($ev->motion_x, $ev->motion_y); 955 ($x, $y) = ($ev->{x}, $ev->{y});
634 956
635 $self->move ($bx + $x - $ox, $by + $y - $oy); 957 $self->move ($bx + $x - $ox, $by + $y - $oy);
636 $self->update; 958 $self->update;
637 }; 959 };
638 } 960 }
… …
654 my ($self) = @_; 976 my ($self) = @_;
655 977
656 my ($w, $h ) = ($self->{w}, $self->{h}); 978 my ($w, $h ) = ($self->{w}, $self->{h});
657 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 979 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
658 980
659 glEnable GL_BLEND;
660 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
661 glEnable GL_TEXTURE_2D; 981 glEnable GL_TEXTURE_2D;
662 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
663 983
984 my $border = $self->border;
985
664 glColor @{ $self->{border_bg} }; 986 glColor @{ $self->{border_bg} };
665 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 987 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
666 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 988 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
667 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 989 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
668 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 990 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
669 991
992 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
670 my $bg = $tex[0]; 993 my $bg = $tex[0];
671 994
672 # TODO: repeat texture not scale 995 # TODO: repeat texture not scale
673 my $rep_x = $cw / $bg->{w}; 996 my $rep_x = $cw / $bg->{w};
674 my $rep_y = $ch / $bg->{h}; 997 my $rep_y = $ch / $bg->{h};
675 998
676 glColor @{ $self->{bg} }; 999 glColor @{ $self->{bg} };
677 1000
678 $bg->{s} = $rep_x; 1001 $bg->{s} = $rep_x;
679 $bg->{t} = $rep_y; 1002 $bg->{t} = $rep_y;
680 $bg->{wrap_mode} = 1; 1003 $bg->{wrap_mode} = 1;
681 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1004 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1005 }
682 1006
683 glDisable GL_TEXTURE_2D; 1007 glDisable GL_TEXTURE_2D;
684 glDisable GL_BLEND; 1008
1009 $self->{title}->draw if $self->{title};
685 1010
686 $self->child->draw; 1011 $self->child->draw;
687} 1012}
688 1013
689############################################################################# 1014#############################################################################
… …
692 1017
693our @ISA = CFClient::UI::Base::; 1018our @ISA = CFClient::UI::Base::;
694 1019
695use List::Util qw(max sum); 1020use List::Util qw(max sum);
696 1021
697use SDL::OpenGL; 1022use CFClient::OpenGL;
698 1023
699sub new { 1024sub new {
700 my $class = shift; 1025 my $class = shift;
701 1026
702 $class->SUPER::new ( 1027 $class->SUPER::new (
… …
709 my ($self, $x, $y, $child) = @_; 1034 my ($self, $x, $y, $child) = @_;
710 1035
711 $child->set_parent ($self); 1036 $child->set_parent ($self);
712 $self->{children}[$y][$x] = $child; 1037 $self->{children}[$y][$x] = $child;
713 1038
714 $self->{w} = $self->{h} = -1; 1039 $child->check_size;
715 $self->update; 1040}
1041
1042sub children {
1043 grep $_, map @$_, grep $_, @{ $_[0]{children} }
716} 1044}
717 1045
718# TODO: move to container class maybe? send childs a signal on removal? 1046# TODO: move to container class maybe? send childs a signal on removal?
719sub clear { 1047sub clear {
720 my ($self) = @_; 1048 my ($self) = @_;
721 1049
1050 my @children = $self->children;
722 delete $self->{children}; 1051 delete $self->{children};
1052
1053 for (@children) {
1054 delete $_->{parent};
1055 $_->hide;
1056 }
1057
723 $self->update; 1058 $self->update;
724} 1059}
725 1060
726sub get_wh { 1061sub get_wh {
727 my ($self) = @_; 1062 my ($self) = @_;
… …
733 or next; 1068 or next;
734 1069
735 for my $x (0 .. $#$row) { 1070 for my $x (0 .. $#$row) {
736 my $widget = $row->[$x] 1071 my $widget = $row->[$x]
737 or next; 1072 or next;
738 my ($w, $h) = $widget->size_request; 1073 my ($w, $h) = @$widget{qw(req_w req_h)};
739 1074
740 $w[$x] = max $w[$x], $w; 1075 $w[$x] = max $w[$x], $w;
741 $h[$y] = max $h[$y], $h; 1076 $h[$y] = max $h[$y], $h;
742 } 1077 }
743 } 1078 }
… …
755 (sum @$hs), 1090 (sum @$hs),
756 ) 1091 )
757} 1092}
758 1093
759sub size_allocate { 1094sub size_allocate {
760 my ($self, $x, $y, $w, $h) = @_; 1095 my ($self, $w, $h) = @_;
761
762 $self->_size_allocate ($x, $y, $w, $h) or return;
763 1096
764 my ($ws, $hs) = $self->get_wh; 1097 my ($ws, $hs) = $self->get_wh;
765 1098
766 my $req_w = sum @$ws; 1099 my $req_w = sum @$ws;
767 my $req_h = sum @$hs; 1100 my $req_h = sum @$hs;
… …
789 1122
790 for my $c (0 .. $#$row) { 1123 for my $c (0 .. $#$row) {
791 my $col_w = $ws->[$c]; 1124 my $col_w = $ws->[$c];
792 1125
793 if (my $widget = $row->[$c]) { 1126 if (my $widget = $row->[$c]) {
794 $widget->size_allocate ($x, $y, $col_w, $row_h); 1127 $widget->configure ($x, $y, $col_w, $row_h);
795 } 1128 }
796 1129
797 $x += $col_w; 1130 $x += $col_w;
798 } 1131 }
799 1132
… …
844 (List::Util::max map $_->[1], @alloc), 1177 (List::Util::max map $_->[1], @alloc),
845 ) 1178 )
846} 1179}
847 1180
848sub size_allocate { 1181sub size_allocate {
849 my ($self, $x, $y, $w, $h) = @_; 1182 my ($self, $w, $h) = @_;
850
851 $self->_size_allocate ($x, $y, $w, $h);
852 1183
853 ($h, $w) = ($w, $h); 1184 ($h, $w) = ($w, $h);
854 1185
855 my $children = $self->{children}; 1186 my $children = $self->{children};
856 1187
857 my @h = map +($_->size_request)[0], @$children; 1188 my @h = map $_->{req_w}, @$children;
858 1189
859 my $req_h = List::Util::sum @h; 1190 my $req_h = List::Util::sum @h;
860 1191
861 if ($req_h > $h) { 1192 if ($req_h > $h) {
862 # ah well, not enough space 1193 # ah well, not enough space
… …
878 1209
879 my $y = 0; 1210 my $y = 0;
880 for (0 .. $#$children) { 1211 for (0 .. $#$children) {
881 my $child = $children->[$_]; 1212 my $child = $children->[$_];
882 my $h = $h[$_]; 1213 my $h = $h[$_];
883 $child->size_allocate ($y, 0, $h, $w); 1214 $child->configure ($y, 0, $h, $w);
884 1215
885 $y += $h; 1216 $y += $h;
886 } 1217 }
1218
1219 1
887} 1220}
888 1221
889############################################################################# 1222#############################################################################
890 1223
891package CFClient::UI::VBox; 1224package CFClient::UI::VBox;
… …
904 (List::Util::sum map $_->[1], @alloc), 1237 (List::Util::sum map $_->[1], @alloc),
905 ) 1238 )
906} 1239}
907 1240
908sub size_allocate { 1241sub size_allocate {
909 my ($self, $x, $y, $w, $h) = @_; 1242 my ($self, $w, $h) = @_;
910 1243
911 $self->_size_allocate ($x, $y, $w, $h); 1244 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
912 1245
913 my $children = $self->{children}; 1246 my $children = $self->{children};
914 1247
915 my @h = map +($_->size_request)[1], @$children; 1248 my @h = map $_->{req_h}, @$children;
916 1249
917 my $req_h = List::Util::sum @h; 1250 my $req_h = List::Util::sum @h;
918 1251
919 if ($req_h > $h) { 1252 if ($req_h > $h) {
920 # ah well, not enough space 1253 # ah well, not enough space
… …
934 1267
935 my $y = 0; 1268 my $y = 0;
936 for (0 .. $#$children) { 1269 for (0 .. $#$children) {
937 my $child = $children->[$_]; 1270 my $child = $children->[$_];
938 my $h = $h[$_]; 1271 my $h = $h[$_];
939 $child->size_allocate (0, $y, $w, $h); 1272 $child->configure (0, $y, $w, $h);
940 1273
941 $y += $h; 1274 $y += $h;
942 } 1275 }
1276
1277 1
943} 1278}
944 1279
945############################################################################# 1280#############################################################################
946 1281
947package CFClient::UI::Label; 1282package CFClient::UI::Label;
948 1283
949our @ISA = CFClient::UI::Base::; 1284our @ISA = CFClient::UI::DrawBG::;
950 1285
951use SDL::OpenGL; 1286use CFClient::OpenGL;
952 1287
953sub new { 1288sub new {
954 my ($class, %arg) = @_; 1289 my ($class, %arg) = @_;
955 1290
956 my $self = $class->SUPER::new ( 1291 my $self = $class->SUPER::new (
957 fg => [1, 1, 1], 1292 fg => [1, 1, 1],
958 fontsize => $::FONTSIZE, 1293 #bg => none
959 text => "", 1294 #active_bg => none
1295 #font => default_font
1296 #text => initial text
1297 #markup => initial narkup
1298 #max_w => maximum pixel width
1299 ellipsise => 3, # end
1300 layout => (new CFClient::Layout),
1301 fontsize => 1,
960 align => -1, 1302 align => -1,
961 valign => -1, 1303 valign => -1,
962 padding => 2, 1304 padding => 2,
963 layout => new CFClient::Layout, 1305 can_events => 0,
964 %arg 1306 %arg
965 ); 1307 );
966 1308
967 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1309 if (exists $self->{template}) {
1310 my $layout = new CFClient::Layout;
1311 $layout->set_text (delete $self->{template});
1312 $self->{template} = $layout;
1313 }
968 1314
969 $self->set_text (delete $self->{text}) if exists $self->{text}; 1315 if (exists $self->{markup}) {
970 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1316 $self->set_markup (delete $self->{markup});
1317 } else {
1318 $self->set_text (delete $self->{text});
1319 }
971 1320
972 $self 1321 $self
973} 1322}
974 1323
975sub escape_text { 1324sub escape($) {
976 local $_ = $_[1]; 1325 local $_ = $_[0];
977 1326
978 s/&/&amp;/g; 1327 s/&/&amp;/g;
979 s/>/&gt;/g; 1328 s/>/&gt;/g;
980 s/</&lt;/g; 1329 s/</&lt;/g;
981 1330
982 $_[1] 1331 $_
1332}
1333
1334sub update {
1335 my ($self) = @_;
1336
1337 delete $self->{texture};
1338 $self->SUPER::update;
983} 1339}
984 1340
985sub set_text { 1341sub set_text {
986 my ($self, $text) = @_; 1342 my ($self, $text) = @_;
987 1343
1344 return if $self->{text} eq "T$text";
1345 $self->{text} = "T$text";
1346
1347 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
988 $self->{layout}->set_text ($text); 1348 $self->{layout}->set_text ($text);
989 1349
990 delete $self->{texture};
991 $self->update; 1350 $self->update;
1351 $self->check_size;
992} 1352}
993 1353
994sub set_markup { 1354sub set_markup {
995 my ($self, $markup) = @_; 1355 my ($self, $markup) = @_;
996 1356
1357 return if $self->{text} eq "M$markup";
1358 $self->{text} = "M$markup";
1359
1360 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1361
1362 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
997 $self->{layout}->set_markup ($markup); 1363 $self->{layout}->set_markup ($markup);
998 1364
999 delete $self->{texture};
1000 $self->update; 1365 $self->update;
1366 $self->check_size;
1001} 1367}
1002 1368
1003sub size_request { 1369sub size_request {
1004 my ($self) = @_; 1370 my ($self) = @_;
1005 1371
1006 $self->{layout}->set_width; 1372 $self->{layout}->set_font ($self->{font}) if $self->{font};
1373 $self->{layout}->set_width ($self->{max_w} || -1);
1374 $self->{layout}->set_ellipsise ($self->{ellipsise});
1375 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1007 $self->{layout}->set_height ($self->{fontsize}); 1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1008 1377
1009 my ($w, $h) = $self->{layout}->size; 1378 my ($w, $h) = $self->{layout}->size;
1379
1380 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383
1384 my ($w2, $h2) = $self->{template}->size;
1385
1386 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2;
1388 }
1010 1389
1011 ( 1390 (
1012 $w + $self->{padding} * 2, 1391 $w + $self->{padding} * 2,
1013 $h + $self->{padding} * 2, 1392 $h + $self->{padding} * 2,
1014 ) 1393 )
1015} 1394}
1016 1395
1017sub size_allocate { 1396sub size_allocate {
1018 my ($self, $x, $y, $w, $h) = @_; 1397 my ($self, $w, $h) = @_;
1019
1020 $self->_size_allocate ($x, $y, $w, $h) or return;
1021 1398
1022 delete $self->{texture}; 1399 delete $self->{texture};
1023} 1400}
1024 1401
1025sub update { 1402sub set_fontsize {
1026 my ($self) = @_; 1403 my ($self, $fontsize) = @_;
1027 1404
1405 $self->{fontsize} = $fontsize;
1028 delete $self->{texture}; 1406 delete $self->{texture};
1407
1029 $self->SUPER::update; 1408 $self->update;
1409 $self->check_size;
1030} 1410}
1031 1411
1032sub _draw { 1412sub _draw {
1033 my ($self) = @_; 1413 my ($self) = @_;
1034 1414
1415 $self->SUPER::_draw; # draw background, if applicable
1416
1035 my $tex = $self->{texture} ||= do { 1417 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font};
1036 $self->{layout}->set_width ($self->{w}); 1420 $self->{layout}->set_width ($self->{w});
1037 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize}); 1421 $self->{layout}->set_ellipsise ($self->{ellipsise});
1422 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1423 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1424
1038 new_from_layout CFClient::Texture $self->{layout} 1425 my $tex = new_from_layout CFClient::Texture $self->{layout};
1426
1427 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1428 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1429 : ($self->{w} - $tex->{w}) * 0.5);
1430
1431 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1432 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1433 : ($self->{h} - $tex->{h}) * 0.5);
1434
1435 $tex
1039 }; 1436 };
1040 1437
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1043 glEnable GL_TEXTURE_2D; 1438 glEnable GL_TEXTURE_2D;
1044 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1439 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1045 1440
1441 if ($tex->{format} == GL_ALPHA) {
1046 glColor @{$self->{fg}}; 1442 glColor @{$self->{fg}};
1047 1443 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1048 my $x = 1444 } else {
1049 $self->{align} < 0 ? $self->{padding} 1445 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1050 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1446 }
1051 : ($self->{w} - $tex->{w}) * 0.5;
1052
1053 my $y =
1054 $self->{valign} < 0 ? $self->{padding}
1055 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1056 : ($self->{h} - $tex->{h}) * 0.5;
1057
1058 $tex->draw_quad (int $x, int $y);
1059 1447
1060 glDisable GL_TEXTURE_2D; 1448 glDisable GL_TEXTURE_2D;
1061 glDisable GL_BLEND;
1062} 1449}
1063 1450
1064############################################################################# 1451#############################################################################
1065 1452
1066package CFClient::UI::EntryBase; 1453package CFClient::UI::EntryBase;
1067 1454
1068our @ISA = CFClient::UI::Label::; 1455our @ISA = CFClient::UI::Label::;
1069 1456
1070use SDL; 1457use CFClient::OpenGL;
1071use SDL::OpenGL;
1072 1458
1073sub new { 1459sub new {
1074 my $class = shift; 1460 my $class = shift;
1075 1461
1076 $class->SUPER::new ( 1462 $class->SUPER::new (
1077 fg => [1, 1, 1], 1463 fg => [1, 1, 1],
1078 bg => [0, 0, 0, 0.2], 1464 bg => [0, 0, 0, 0.2],
1079 active_bg => [1, 1, 1, 0.5], 1465 active_bg => [1, 1, 1, 0.5],
1080 active_fg => [0, 0, 0], 1466 active_fg => [0, 0, 0],
1081 can_hover => 1, 1467 can_hover => 1,
1082 can_focus => 1, 1468 can_focus => 1,
1083 valign => 0, 1469 valign => 0,
1470 can_events => 1,
1084 @_ 1471 @_
1085 ) 1472 )
1086} 1473}
1087 1474
1088sub _set_text { 1475sub _set_text {
… …
1090 1477
1091 delete $self->{cur_h}; 1478 delete $self->{cur_h};
1092 1479
1093 return if $self->{text} eq $text; 1480 return if $self->{text} eq $text;
1094 1481
1482 delete $self->{texture};
1483
1095 $self->{last_activity} = $::NOW; 1484 $self->{last_activity} = $::NOW;
1096 $self->{text} = $text; 1485 $self->{text} = $text;
1097 1486
1098 $text =~ s/./*/g if $self->{hidden}; 1487 $text =~ s/./*/g if $self->{hidden};
1099 $self->{layout}->set_text ("$text "); 1488 $self->{layout}->set_text ("$text ");
1100 1489
1101 $self->emit (changed => $self->{text}); 1490 $self->emit (changed => $self->{text});
1102}
1103
1104sub get_text {
1105 $_[0]{text}
1106}
1107
1108sub size_request {
1109 my ($self) = @_;
1110
1111 my ($w, $h) = $self->SUPER::size_request;
1112
1113 ($w + 1, $h) # add 1 for cursor
1114}
1115
1116sub size_allocate {
1117 my ($self, $x, $y, $w, $h) = @_;
1118
1119 $self->SUPER::size_allocate ($x, $y, $w, $h);
1120
1121 $self->_set_text ($self->{text});
1122} 1491}
1123 1492
1124sub set_text { 1493sub set_text {
1125 my ($self, $text) = @_; 1494 my ($self, $text) = @_;
1126 1495
1127 $self->{cursor} = length $text; 1496 $self->{cursor} = length $text;
1128 $self->_set_text ($text); 1497 $self->_set_text ($text);
1129 $self->update; 1498 $self->update;
1499 $self->check_size;
1500}
1501
1502sub get_text {
1503 $_[0]{text}
1504}
1505
1506sub size_request {
1507 my ($self) = @_;
1508
1509 my ($w, $h) = $self->SUPER::size_request;
1510
1511 ($w + 1, $h) # add 1 for cursor
1512}
1513
1514sub size_allocate {
1515 my ($self, $w, $h) = @_;
1516
1517 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1130} 1518}
1131 1519
1132sub key_down { 1520sub key_down {
1133 my ($self, $ev) = @_; 1521 my ($self, $ev) = @_;
1134 1522
1135 my $mod = $ev->key_mod; 1523 my $mod = $ev->{mod};
1136 my $sym = $ev->key_sym; 1524 my $sym = $ev->{sym};
1137
1138 my $uni = $ev->key_unicode; 1525 my $uni = $ev->{unicode};
1139 1526
1140 my $text = $self->get_text; 1527 my $text = $self->get_text;
1141 1528
1142 if ($sym == SDLK_BACKSPACE) { 1529 if ($uni == 8) {
1143 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1530 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1144 } elsif ($sym == SDLK_DELETE) { 1531 } elsif ($uni == 127) {
1145 substr $text, $self->{cursor}, 1, ""; 1532 substr $text, $self->{cursor}, 1, "";
1146 } elsif ($sym == SDLK_LEFT) { 1533 } elsif ($sym == CFClient::SDLK_LEFT) {
1147 --$self->{cursor} if $self->{cursor}; 1534 --$self->{cursor} if $self->{cursor};
1148 } elsif ($sym == SDLK_RIGHT) { 1535 } elsif ($sym == CFClient::SDLK_RIGHT) {
1149 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1536 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1150 } elsif ($sym == SDLK_HOME) { 1537 } elsif ($sym == CFClient::SDLK_HOME) {
1151 $self->{cursor} = 0; 1538 $self->{cursor} = 0;
1152 } elsif ($sym == SDLK_END) { 1539 } elsif ($sym == CFClient::SDLK_END) {
1153 $self->{cursor} = length $text; 1540 $self->{cursor} = length $text;
1154 } elsif ($sym == SDLK_ESCAPE) { 1541 } elsif ($uni == 27) {
1155 $self->emit ('escape'); 1542 $self->emit ('escape');
1156 } elsif ($uni) { 1543 } elsif ($uni) {
1157 substr $text, $self->{cursor}++, 0, chr $uni; 1544 substr $text, $self->{cursor}++, 0, chr $uni;
1158 } 1545 }
1159 1546
1160 $self->_set_text ($text); 1547 $self->_set_text ($text);
1161 $self->update; 1548 $self->update;
1549 $self->check_size;
1162} 1550}
1163 1551
1164sub focus_in { 1552sub focus_in {
1165 my ($self) = @_; 1553 my ($self) = @_;
1166 1554
… …
1224 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1612 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1225 } 1613 }
1226 1614
1227 glColor @{$self->{fg}}; 1615 glColor @{$self->{fg}};
1228 glBegin GL_LINES; 1616 glBegin GL_LINES;
1229 glVertex $self->{cur_x}, $self->{cur_y};
1230 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1617 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1618 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1231 glEnd; 1619 glEnd;
1232 } 1620 }
1233} 1621}
1234 1622
1235package CFClient::UI::Entry; 1623package CFClient::UI::Entry;
1236 1624
1237our @ISA = CFClient::UI::EntryBase::; 1625our @ISA = CFClient::UI::EntryBase::;
1238 1626
1239use SDL; 1627use CFClient::OpenGL;
1240use SDL::OpenGL;
1241 1628
1242sub key_down { 1629sub key_down {
1243 my ($self, $ev) = @_; 1630 my ($self, $ev) = @_;
1244 1631
1245 my $sym = $ev->key_sym; 1632 my $sym = $ev->{sym};
1246 1633
1247 if ($sym == SDLK_RETURN) { 1634 if ($sym == 13) {
1635 unshift @{$self->{history}},
1636 my $txt = $self->get_text;
1637 $self->{history_pointer} = -1;
1638 $self->{history_saveback} = '';
1248 $self->emit (activate => $self->get_text); 1639 $self->emit (activate => $txt);
1249 $self->update; 1640 $self->update;
1641
1642 } elsif ($sym == CFClient::SDLK_UP) {
1643 if ($self->{history_pointer} < 0) {
1644 $self->{history_saveback} = $self->get_text;
1645 }
1646 if (@{$self->{history} || []} > 0) {
1647 $self->{history_pointer}++;
1648 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1649 $self->{history_pointer} = @{$self->{history} || []} - 1;
1650 }
1651 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1652 }
1653
1654 } elsif ($sym == CFClient::SDLK_DOWN) {
1655 $self->{history_pointer}--;
1656 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1657
1658 if ($self->{history_pointer} >= 0) {
1659 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1660 } else {
1661 $self->set_text ($self->{history_saveback});
1662 }
1250 1663
1251 } else { 1664 } else {
1252 $self->SUPER::key_down ($ev); 1665 $self->SUPER::key_down ($ev);
1253 } 1666 }
1254 1667
… …
1258 1671
1259package CFClient::UI::Button; 1672package CFClient::UI::Button;
1260 1673
1261our @ISA = CFClient::UI::Label::; 1674our @ISA = CFClient::UI::Label::;
1262 1675
1263use SDL; 1676use CFClient::OpenGL;
1264use SDL::OpenGL;
1265 1677
1266my @tex = 1678my @tex =
1267 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1679 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1268 qw(b1_button_active.png); 1680 qw(b1_button_active.png);
1269 1681
1270sub new { 1682sub new {
1271 my $class = shift; 1683 my $class = shift;
1272 1684
1273 $class->SUPER::new ( 1685 $class->SUPER::new (
1274 padding => 4, 1686 padding => 4,
1687 fg => [1, 1, 1],
1688 active_fg => [0, 0, 1],
1689 can_hover => 1,
1690 align => 0,
1691 valign => 0,
1692 can_events => 1,
1693 @_
1694 )
1695}
1696
1697sub button_up {
1698 my ($self, $ev, $x, $y) = @_;
1699
1700 if ($x >= 0 && $x < $self->{w}
1701 && $y >= 0 && $y < $self->{h}) {
1702 $self->emit ("activate");
1703 }
1704}
1705
1706sub _draw {
1707 my ($self) = @_;
1708
1709 local $self->{fg} = $self->{fg};
1710
1711 if ($GRAB == $self) {
1712 $self->{fg} = $self->{active_fg};
1713 }
1714
1715 glEnable GL_TEXTURE_2D;
1716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1717 glColor 0, 0, 0, 1;
1718
1719 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1720
1721 glDisable GL_TEXTURE_2D;
1722
1723 $self->SUPER::_draw;
1724}
1725
1726#############################################################################
1727
1728package CFClient::UI::CheckBox;
1729
1730our @ISA = CFClient::UI::DrawBG::;
1731
1732my @tex =
1733 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1734 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1735
1736use CFClient::OpenGL;
1737
1738sub new {
1739 my $class = shift;
1740
1741 $class->SUPER::new (
1742 padding => 2,
1275 fg => [1, 1, 1], 1743 fg => [1, 1, 1],
1276 bg => [1, 1, 1, 0.2],
1277 active_fg => [1, 1, 0], 1744 active_fg => [1, 1, 0],
1745 bg => [0, 0, 0, 0.2],
1746 active_bg => [1, 1, 1, 0.5],
1747 state => 0,
1278 can_hover => 1, 1748 can_hover => 1,
1279 @_ 1749 @_
1280 ) 1750 )
1281} 1751}
1282 1752
1753sub size_request {
1754 my ($self) = @_;
1755
1756 ($self->{padding} * 2 + 6) x 2
1757}
1758
1283sub button_up { 1759sub button_down {
1284 my ($self, $ev, $x, $y) = @_; 1760 my ($self, $ev, $x, $y) = @_;
1285 1761
1286 if ($x >= 0 && $x < $self->{w} 1762 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1287 && $y >= 0 && $y < $self->{h}) { 1763 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1288 $self->emit ("activate"); 1764 $self->{state} = !$self->{state};
1765 $self->emit (changed => $self->{state});
1289 } 1766 }
1290} 1767}
1291 1768
1292sub _draw { 1769sub _draw {
1293 my ($self) = @_; 1770 my ($self) = @_;
1294 1771
1295 local $self->{fg} = $self->{fg}; 1772 $self->SUPER::_draw;
1296 1773
1297 if ($GRAB == $self) { 1774 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1298 $self->{fg} = $self->{active_fg}; 1775
1776 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1777
1778 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1779
1780 my $tex = $self->{state} ? $tex[1] : $tex[0];
1781
1782 glEnable GL_TEXTURE_2D;
1783 $tex->draw_quad_alpha (0, 0, $s, $s);
1784 glDisable GL_TEXTURE_2D;
1785}
1786
1787#############################################################################
1788
1789package CFClient::UI::Image;
1790
1791our @ISA = CFClient::UI::Base::;
1792
1793use CFClient::OpenGL;
1794use Carp qw/confess/;
1795
1796our %loaded_images;
1797
1798sub new {
1799 my $class = shift;
1800
1801 my $self = $class->SUPER::new (can_events => 0, @_);
1802
1803 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1804
1805 $loaded_images{$self->{image}} ||=
1806 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1807
1808 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1809
1810 Scalar::Util::weaken $loaded_images{$self->{image}};
1811
1812 $self->{aspect} = $tex->{w} / $tex->{h};
1813
1814 $self
1815}
1816
1817sub size_request {
1818 my ($self) = @_;
1819
1820 ($self->{tex}->{w}, $self->{tex}->{h})
1821}
1822
1823sub _draw {
1824 my ($self) = @_;
1825
1826 my $tex = $self->{tex};
1827
1828 my ($w, $h) = ($self->{w}, $self->{h});
1829
1830 if ($self->{rot90}) {
1831 glRotate 90, 0, 0, 1;
1832 glTranslate 0, -$self->{w}, 0;
1833
1834 ($w, $h) = ($h, $w);
1299 } 1835 }
1836
1837 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839
1840 $tex->draw_quad_alpha (0, 0, $w, $h);
1841
1842 glDisable GL_TEXTURE_2D;
1843}
1844
1845#############################################################################
1846
1847package CFClient::UI::VGauge;
1848
1849our @ISA = CFClient::UI::Base::;
1850
1851use List::Util qw(min max);
1852
1853use CFClient::OpenGL;
1854
1855my %tex = (
1856 food => [
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1858 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1859 ],
1860 grace => [
1861 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1862 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1863 ],
1864 hp => [
1865 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1866 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1867 ],
1868 mana => [
1869 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1870 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1871 ],
1872);
1873
1874# eg. VGauge->new (gauge => 'food'), default gauge: food
1875sub new {
1876 my $class = shift;
1877
1878 my $self = $class->SUPER::new (
1879 type => 'food',
1880 @_
1881 );
1882
1883 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1884
1885 $self
1886}
1887
1888sub size_request {
1889 my ($self) = @_;
1890
1891 #my $tex = $tex{$self->{type}}[0];
1892 #@$tex{qw(w h)}
1893 (0, 0)
1894}
1895
1896sub set_max {
1897 my ($self, $max) = @_;
1898
1899 return if $self->{max_val} == $max;
1900
1901 $self->{max_val} = $max;
1902 $self->update;
1903}
1904
1905sub set_value {
1906 my ($self, $val, $max) = @_;
1907
1908 $self->set_max ($max)
1909 if defined $max;
1910
1911 return if $self->{val} == $val;
1912
1913 $self->{val} = $val;
1914 $self->update;
1915}
1916
1917sub _draw {
1918 my ($self) = @_;
1919
1920 my $tex = $tex{$self->{type}};
1921 my ($t1, $t2, $t3) = @$tex;
1922
1923 my ($w, $h) = ($self->{w}, $self->{h});
1924
1925 if ($self->{vertical}) {
1926 glRotate 90, 0, 0, 1;
1927 glTranslate 0, -$self->{w}, 0;
1928
1929 ($w, $h) = ($h, $w);
1930 }
1931
1932 my $ycut = $self->{val} / ($self->{max_val} || 1);
1933
1934 my $ycut1 = max 0, min 1, $ycut;
1935 my $ycut2 = max 0, min 1, $ycut - 1;
1936
1937 my $h1 = $self->{h} * (1 - $ycut1);
1938 my $h2 = $self->{h} * (1 - $ycut2);
1300 1939
1301 glEnable GL_BLEND; 1940 glEnable GL_BLEND;
1302 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1941 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1303 glEnable GL_TEXTURE_2D; 1942 glEnable GL_TEXTURE_2D;
1304 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1943 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1305 glColor 0, 0, 0, 1;
1306 1944
1307 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 1945 glBindTexture GL_TEXTURE_2D, $t1->{name};
1946 glBegin GL_QUADS;
1947 glTexCoord 0 , 0; glVertex 0 , 0;
1948 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
1949 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
1950 glTexCoord $t1->{s}, 0; glVertex $w, 0;
1951 glEnd;
1308 1952
1953 my $ycut1 = List::Util::min 1, $ycut;
1954 glBindTexture GL_TEXTURE_2D, $t2->{name};
1955 glBegin GL_QUADS;
1956 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
1957 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
1958 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
1959 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
1960 glEnd;
1961
1962 if ($t3) {
1963 glBindTexture GL_TEXTURE_2D, $t3->{name};
1964 glBegin GL_QUADS;
1965 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1966 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
1967 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
1968 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1969 glEnd;
1970 }
1971
1972 glDisable GL_BLEND;
1309 glDisable GL_TEXTURE_2D; 1973 glDisable GL_TEXTURE_2D;
1310 glDisable GL_BLEND;
1311
1312 $self->SUPER::_draw;
1313} 1974}
1314 1975
1315############################################################################# 1976#############################################################################
1316 1977
1317package CFClient::UI::CheckBox; 1978package CFClient::UI::Gauge;
1318 1979
1319our @ISA = CFClient::UI::DrawBG::; 1980our @ISA = CFClient::UI::VBox::;
1320
1321my @tex =
1322 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1323 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1324
1325use SDL;
1326use SDL::OpenGL;
1327 1981
1328sub new { 1982sub new {
1329 my $class = shift; 1983 my ($class, %arg) = @_;
1330 1984
1331 $class->SUPER::new ( 1985 my $self = $class->SUPER::new (
1332 padding => 2, 1986 tooltip => $arg{type},
1333 fg => [1, 1, 1],
1334 active_fg => [1, 1, 0],
1335 state => 0,
1336 can_hover => 1, 1987 can_hover => 1,
1337 @_ 1988 can_events => 1,
1989 %arg,
1338 ) 1990 );
1339}
1340 1991
1341sub size_request { 1992 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1993 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1994 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
1995
1996 $self
1997}
1998
1999sub set_fontsize {
2000 my ($self, $fsize) = @_;
2001
2002 $self->{value}->set_fontsize ($fsize);
2003 $self->{max} ->set_fontsize ($fsize);
2004}
2005
2006sub set_max {
1342 my ($self) = @_; 2007 my ($self, $max) = @_;
1343 2008
1344 ($self->{padding} * 2 + 6) x 2 2009 $self->{gauge}->set_max ($max);
2010 $self->{max}->set_text ($max);
1345} 2011}
1346 2012
1347sub size_allocate { 2013sub set_value {
1348 my ($self, $x, $y, $w, $h) = @_;
1349
1350 $self->_size_allocate ($x, $y, $w, $h);
1351}
1352
1353sub button_down {
1354 my ($self, $ev, $x, $y) = @_; 2014 my ($self, $val, $max) = @_;
1355 2015
1356 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2016 $self->set_max ($max)
1357 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2017 if defined $max;
1358 $self->{state} = !$self->{state};
1359 $self->emit (changed => $self->{state});
1360 }
1361}
1362 2018
1363sub _draw { 2019 $self->{gauge}->set_value ($val, $max);
1364 my ($self) = @_; 2020 $self->{value}->set_text ($val);
1365
1366 $self->SUPER::_draw;
1367
1368 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1369
1370 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1371
1372 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1373
1374 glEnable GL_BLEND;
1375 glEnable GL_TEXTURE_2D;
1376 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1377
1378 my $tex = $self->{state} ? $tex[1] : $tex[0];
1379
1380 $tex->draw_quad (0, 0, $s, $s);
1381
1382 glDisable GL_TEXTURE_2D;
1383 glDisable GL_BLEND;
1384} 2021}
1385 2022
1386############################################################################# 2023#############################################################################
1387 2024
1388package CFClient::UI::Slider; 2025package CFClient::UI::Slider;
1389 2026
1390use strict; 2027use strict;
1391 2028
1392use SDL::OpenGL; 2029use CFClient::OpenGL;
1393 2030
1394our @ISA = CFClient::UI::DrawBG::; 2031our @ISA = CFClient::UI::DrawBG::;
1395 2032
1396my @tex = 2033my @tex =
1397 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2034 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1398 qw(s1_slider.png s1_slider_bg.png); 2035 qw(s1_slider.png s1_slider_bg.png);
1399 2036
1400sub new { 2037sub new {
1401 my $class = shift; 2038 my $class = shift;
1402 2039
1403 # range [value, low, high, page] 2040 # range [value, low, high, page, unit]
1404 2041
1405 # TODO: 0-width page 2042 # TODO: 0-width page
1406 # TODO: req_w/h are wrong with vertical 2043 # TODO: req_w/h are wrong with vertical
1407 # TODO: calculations are off 2044 # TODO: calculations are off
1408 my $self = $class->SUPER::new ( 2045 my $self = $class->SUPER::new (
1409 fg => [1, 1, 1], 2046 fg => [1, 1, 1],
1410 active_fg => [0, 0, 0], 2047 active_fg => [0, 0, 0],
2048 bg => [0, 0, 0, 0.2],
2049 active_bg => [1, 1, 1, 0.5],
1411 range => [0, 0, 100, 10], 2050 range => [0, 0, 100, 10],
1412 req_w => 40, 2051 req_w => $::WIDTH / 80,
1413 req_h => 13, 2052 req_h => $::WIDTH / 80,
1414 vertical => 0, 2053 vertical => 0,
1415 can_hover => 1, 2054 can_hover => 1,
1416 inner_pad => 5, 2055 inner_pad => 0.02,
1417 @_ 2056 @_
1418 ); 2057 );
1419 2058
2059 $self->set_value ($self->{range}[0]);
2060 $self->update;
2061
1420 $self 2062 $self
2063}
2064
2065sub set_value {
2066 my ($self, $value) = @_;
2067
2068 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2069
2070 $hi = $lo + 1 if $hi <= $lo;
2071
2072 $value = $lo if $value < $lo;
2073 $value = $hi if $value > $hi;
2074
2075 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2076 if $unit;
2077
2078 $page = $hi - $lo if $page > $hi - $lo;
2079
2080 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2081
2082 if ($value != $old_value) {
2083 $self->emit (changed => $value);
2084 $self->update;
2085 }
1421} 2086}
1422 2087
1423sub size_request { 2088sub size_request {
1424 my ($self) = @_; 2089 my ($self) = @_;
1425 2090
… …
1438 2103
1439sub mouse_motion { 2104sub mouse_motion {
1440 my ($self, $ev, $x, $y) = @_; 2105 my ($self, $ev, $x, $y) = @_;
1441 2106
1442 if ($GRAB == $self) { 2107 if ($GRAB == $self) {
2108 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2109
2110 my (undef, $lo, $hi, $page) = @{$self->{range}};
2111
2112 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad};
2113
2114 $self->set_value ($x * ($hi - $lo) + $lo);
2115 }
2116}
2117
2118sub update {
2119 my ($self) = @_;
2120
2121 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2122 $self->set_value ($self->{range}[0]);
2123
1443 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2124 my ($value, $lo, $hi, $page) = @{$self->{range}};
1444 2125
1445 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2126 my $inner_w = 1 - 2 * $self->{inner_pad};
1446 2127
1447 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2128 $self->{scale} = ($inner_w / ($hi - $lo)) || 1;
1448 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1449 2129
1450 $x -= $inner_pad_px; # substract the padding 2130 $page = $self->{scale} * $page || 10 / ($self->{w} || 1);
1451 $x = $x * ($hi - $lo) / $inner_w + $lo; 2131 $value = $self->{scale} * ($value - $lo);
1452 $x = $lo if $x < $lo;
1453 $x = $hi - $page if $x > $hi - $page;
1454 $self->{range}[0] = $x;
1455 2132
1456 $self->emit (changed => $x); 2133 $value = $self->{inner_pad} + ($value - $page * 0.5);
1457 $self->update; 2134
2135 $value = 0 if $value < 0;
2136 $page = 1 - $value if $value + $page > 1;
2137
2138 $self->{knob_x} = $value;
2139 $self->{knob_w} = $page;
1458 } 2140 });
1459}
1460 2141
1461# the inner_* stuff is for generating a padding for the slider handle, 2142 $self->SUPER::update;
1462# so that the handle doesn't leave the texture. This calculation isn't 100%
1463# correct propably, but it does the job for now
1464sub _calc_inner_pad_px {
1465 my ($self, $w) = @_;
1466 ($w / 100) * $self->{inner_pad} # % to pixels
1467} 2143}
1468 2144
1469sub _draw { 2145sub _draw {
1470 my ($self) = @_; 2146 my ($self) = @_;
1471 2147
1472 $self->SUPER::_draw (); 2148 $self->SUPER::_draw ();
1473 2149
1474 my ($w, $h) = @$self{qw(w h)}; 2150 glScale $self->{w}, $self->{h};
1475 2151
1476 if ($self->{vertical}) { 2152 if ($self->{vertical}) {
1477 # draw a vertical slider like a rotated horizontal slider 2153 # draw a vertical slider like a rotated horizontal slider
1478 2154
2155 glTranslate 1, 0, 0;
1479 glRotate 90, 0, 0, 1; 2156 glRotate 90, 0, 0, 1;
1480 glTranslate 0, -$self->{w}, 0;
1481
1482 ($w, $h) = ($h, $w);
1483 } 2157 }
1484 2158
1485 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2159 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1486 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2160 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1487 2161
1488 my ($value, $lo, $hi, $page) = @{$self->{range}};
1489
1490 $hi = $value + 1 if $lo == $hi;
1491
1492 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1493 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1494
1495 $page = int $page * $inner_w / ($hi - $lo);
1496 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1497
1498 $w -= $page;
1499 $page &= ~1;
1500 glTranslate $page * 0.5, 0, 0;
1501 $page ||= 2;
1502
1503 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1504 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1505
1506 glEnable GL_BLEND;
1507 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1508 glEnable GL_TEXTURE_2D; 2162 glEnable GL_TEXTURE_2D;
1509 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2163 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1510 2164
1511 # draw background 2165 # draw background
1512 $tex[1]->draw_quad (0, 0, $w, $h); 2166 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1513 2167
1514 # draw handle 2168 # draw handle
1515 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2169 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1516 2170
1517 glDisable GL_BLEND;
1518 glDisable GL_TEXTURE_2D; 2171 glDisable GL_TEXTURE_2D;
1519} 2172}
1520 2173
1521############################################################################# 2174#############################################################################
1522 2175
1523package CFClient::UI::TextView; 2176package CFClient::UI::TextView;
1524 2177
1525our @ISA = CFClient::UI::HBox::; 2178our @ISA = CFClient::UI::HBox::;
1526 2179
1527use SDL::OpenGL; 2180use CFClient::OpenGL;
1528 2181
1529sub new { 2182sub new {
1530 my $class = shift; 2183 my $class = shift;
1531 2184
1532 my $self = $class->SUPER::new ( 2185 my $self = $class->SUPER::new (
1533 req_w => $::WIDTH / 6, 2186 fontsize => 1,
1534 req_h => $::HEIGHT / 6, 2187 can_events => 0,
1535 fontsize => $::FONTSIZE, 2188 #font => default_font
1536 @_, 2189 @_,
1537 2190
1538 layout => (new CFClient::Layout), 2191 layout => (new CFClient::Layout 1),
1539 par => [], 2192 par => [],
1540 height => 0, 2193 height => 0,
1541 children => [ 2194 children => [
1542 (new CFClient::UI::Empty expand => 1), 2195 (new CFClient::UI::Empty expand => 1),
1543 (new CFClient::UI::Slider vertical => 1), 2196 (new CFClient::UI::Slider vertical => 1),
1544 ], 2197 ],
1545 ); 2198 );
1546 2199
1547 $self->{children}[1]->connect (changed => sub { 2200 $self->{children}[1]->connect (changed => sub { $self->update });
1548 $self->update;
1549 });
1550 2201
1551 $self 2202 $self
1552} 2203}
1553 2204
1554sub set_fontsize { 2205sub set_fontsize {
… …
1561sub text_height { 2212sub text_height {
1562 my ($self, $text) = @_; 2213 my ($self, $text) = @_;
1563 2214
1564 my $layout = $self->{layout}; 2215 my $layout = $self->{layout};
1565 2216
1566 $layout->set_height ($self->{fontsize}); 2217 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1567 $layout->set_width ($self->{w}); 2218 $layout->set_width ($self->{children}[0]{w});
1568 $layout->set_text ($text); 2219 $layout->set_markup ($text);
1569 2220
1570 ($layout->size)[1] 2221 ($layout->size)[1]
1571} 2222}
1572 2223
1573sub reflow { 2224sub reflow {
… …
1575 2226
1576 $self->{need_reflow}++; 2227 $self->{need_reflow}++;
1577 $self->update; 2228 $self->update;
1578} 2229}
1579 2230
1580sub size_request {
1581 my ($self) = @_;
1582
1583 ($self->{req_w}, $self->{req_h})
1584}
1585
1586sub size_allocate { 2231sub size_allocate {
1587 my ($self, $x, $y, $w, $h) = @_; 2232 my ($self, $w, $h) = @_;
1588 2233
1589 $self->SUPER::size_allocate ($x, $y, $w, $h); 2234 $self->SUPER::size_allocate ($w, $h);
1590 2235
2236 $self->{layout}->set_font ($self->{font}) if $self->{font};
1591 $self->{layout}->set_height ($self->{fontsize}); 2237 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1592 $self->{layout}->set_width ($self->{w}); 2238 $self->{layout}->set_width ($self->{children}[0]{w});
1593 2239
1594 $self->reflow; 2240 $self->reflow;
1595} 2241}
1596 2242
1597sub add_paragraph { 2243sub add_paragraph {
… …
1616 2262
1617 return unless $self->{h} > 0; 2263 return unless $self->{h} > 0;
1618 2264
1619 delete $self->{texture}; 2265 delete $self->{texture};
1620 2266
1621 $ROOT->on_refresh ($self, sub { 2267 $ROOT->on_post_alloc ($self, sub {
1622 if (delete $self->{need_reflow}) { 2268 if (delete $self->{need_reflow}) {
1623 my $height = 0; 2269 my $height = 0;
1624 2270
1625 $height += $_->[0] = $self->text_height ($_->[2]) 2271 $height += $_->[0] = $self->text_height ($_->[2])
1626 for @{$self->{par}}; 2272 for @{$self->{par}};
… …
1630 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2276 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1631 2277
1632 delete $self->{texture}; 2278 delete $self->{texture};
1633 } 2279 }
1634 2280
1635 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2281 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
1636 glClearColor 0, 0, 0, 1; 2282 glClearColor 0.5, 0.5, 0.5, 0;
1637 glClear GL_COLOR_BUFFER_BIT; 2283 glClear GL_COLOR_BUFFER_BIT;
1638 2284
1639 glEnable GL_BLEND;
1640 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1641 glEnable GL_TEXTURE_2D; 2285 glEnable GL_TEXTURE_2D;
1642 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2286 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1643 2287
1644 my $top = int $self->{children}[1]{range}[0]; 2288 my $top = int $self->{children}[1]{range}[0];
1645 2289
… …
1648 2292
1649 my $y = 0; 2293 my $y = 0;
1650 2294
1651 my $layout = $self->{layout}; 2295 my $layout = $self->{layout};
1652 2296
2297 $layout->set_font ($self->{font}) if $self->{font};
2298
1653 for my $par (@{$self->{par}}) { 2299 for my $par (@{$self->{par}}) {
1654 my $h = $par->[0]; 2300 my $h = $par->[0];
1655 2301
1656 if ($y0 < $y + $h && $y < $y1) { 2302 if ($y0 < $y + $h && $y < $y1) {
2303 $layout->set_foreground (@{ $par->[1] });
1657 $layout->set_text ($par->[2]); 2304 $layout->set_markup ($par->[2]);
1658 2305
1659 glColor @{ $par->[1] };
1660 my ($W, $H) = $layout->size; 2306 my ($W, $H) = $layout->size;
1661 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2307 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
1662 } 2308 }
1663 2309
1664 $y += $h; 2310 $y += $h;
1665 } 2311 }
1666 2312
1667 glDisable GL_TEXTURE_2D; 2313 glDisable GL_TEXTURE_2D;
1668 glDisable GL_BLEND;
1669 }; 2314 };
1670 }); 2315 });
1671} 2316}
1672 2317
1673sub _draw { 2318sub _draw {
1674 my ($self) = @_; 2319 my ($self) = @_;
1675 2320
1676 if ($self->{texture}) {
1677 glEnable GL_TEXTURE_2D; 2321 glEnable GL_TEXTURE_2D;
1678 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2322 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2323 glColor 1, 1, 1, 1;
1679 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2324 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1680 glDisable GL_TEXTURE_2D; 2325 glDisable GL_TEXTURE_2D;
1681 }
1682 2326
1683 $self->{children}[1]->draw; 2327 $self->{children}[1]->draw;
1684 2328
1685} 2329}
1686 2330
1687############################################################################# 2331#############################################################################
1688 2332
1689package CFClient::UI::MapWidget;
1690
1691use strict;
1692
1693use List::Util qw(min max);
1694
1695use SDL;
1696use SDL::OpenGL;
1697
1698our @ISA = CFClient::UI::Base::;
1699
1700sub new {
1701 my $class = shift;
1702
1703 $class->SUPER::new (
1704 z => -1,
1705 can_focus => 1,
1706 list => (glGenLists 1),
1707 @_
1708 )
1709}
1710
1711sub key_down {
1712 print "MAPKEYDOWN\n";
1713}
1714
1715sub key_up {
1716}
1717
1718sub button_down {
1719 my ($self, $ev, $x, $y) = @_;
1720
1721 $self->focus_in;
1722
1723 if ($ev->button == 2) {
1724 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1725 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1726
1727 $self->{motion} = sub {
1728 my ($ev, $x, $y) = @_;
1729
1730 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1731
1732 $::CFG->{map_shift_x} = $bw + $x - $ox;
1733 $::CFG->{map_shift_y} = $bh + $y - $oy;
1734
1735 $self->update;
1736 };
1737 }
1738}
1739
1740sub button_up {
1741 my ($self, $ev, $x, $y) = @_;
1742
1743 delete $self->{motion};
1744}
1745
1746sub mouse_motion {
1747 my ($self, $ev, $x, $y) = @_;
1748
1749 $self->{motion}->($ev, $x, $y) if $self->{motion};
1750}
1751
1752sub size_request {
1753 (
1754 1 + 32 * int $::WIDTH / 32,
1755 1 + 32 * int $::HEIGHT / 32,
1756 )
1757}
1758
1759sub update {
1760 my ($self) = @_;
1761
1762 $self->{need_update} = 1;
1763 $self->SUPER::update;
1764}
1765
1766sub draw {
1767 my ($self) = @_;
1768
1769 if (delete $self->{need_update}) {
1770 glNewList $self->{list}, GL_COMPILE;
1771
1772 if ($::MAP) {
1773 my $sw = int $::WIDTH / 32;
1774 my $sh = int $::HEIGHT / 32;
1775
1776 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1777 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1778
1779 glTranslate $sx0 - 32, $sy0 - 32, 0;
1780
1781 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1782
1783 if ($::CFG->{fow_enable}) {
1784 if ($::CFG->{fow_smooth}) { # smooth fog of war
1785 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1786 glConvolutionFilter2D
1787 GL_CONVOLUTION_2D,
1788 GL_ALPHA,
1789 3, 3,
1790 GL_ALPHA, GL_FLOAT,
1791 pack "f*",
1792 0.1, 0.1, 0.1,
1793 0.1, 0.2, 0.1,
1794 0.1, 0.1, 0.1,
1795 ;
1796 glEnable GL_CONVOLUTION_2D;
1797 }
1798
1799 $self->{fow_texture} = new CFClient::Texture
1800 w => $w,
1801 h => $h,
1802 data => $data,
1803 internalformat => GL_ALPHA,
1804 format => GL_ALPHA;
1805
1806 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1807
1808 glEnable GL_BLEND;
1809 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1810 glEnable GL_TEXTURE_2D;
1811 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1812
1813 glColor +($::CFG->{fow_intensity}) x 3, 1;
1814 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1815
1816 glDisable GL_TEXTURE_2D;
1817 glDisable GL_BLEND;
1818 }
1819
1820 # HACK BEGIN
1821 {
1822 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1823 my ($w, $h) = (250, 250);
1824
1825 glEnable GL_BLEND;
1826 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1827 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829
1830 $self->{mapmap_texture} =
1831 new CFClient::Texture
1832 w => $w,
1833 h => $h,
1834 data => $::MAP->mapmap ($w, $h),
1835 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1836
1837 $self->{mapmap_texture}->draw_quad (100, 100);
1838
1839 glDisable GL_TEXTURE_2D;
1840 glDisable GL_BLEND;
1841 }
1842 # HACK END
1843 }
1844
1845 glEndList;
1846 }
1847
1848 glPushMatrix;
1849 glCallList $self->{list};
1850 glPopMatrix;
1851
1852 if ($FOCUS != $self) {
1853 glColor 64/255, 64/255, 64/255;
1854 glLogicOp GL_AND;
1855 glEnable GL_COLOR_LOGIC_OP;
1856 glBegin GL_QUADS;
1857 glVertex 0, 0;
1858 glVertex 0, $::HEIGHT;
1859 glVertex $::WIDTH, $::HEIGHT;
1860 glVertex $::WIDTH, 0;
1861 glEnd;
1862 glDisable GL_COLOR_LOGIC_OP;
1863 }
1864}
1865
1866my %DIR = (
1867 SDLK_KP8, [1, "north"],
1868 SDLK_KP9, [2, "northeast"],
1869 SDLK_KP6, [3, "east"],
1870 SDLK_KP3, [4, "southeast"],
1871 SDLK_KP2, [5, "south"],
1872 SDLK_KP1, [6, "southwest"],
1873 SDLK_KP4, [7, "west"],
1874 SDLK_KP7, [8, "northwest"],
1875
1876 SDLK_UP, [1, "north"],
1877 SDLK_RIGHT, [3, "east"],
1878 SDLK_DOWN, [5, "south"],
1879 SDLK_LEFT, [7, "west"],
1880);
1881
1882sub key_down {
1883 my ($self, $ev) = @_;
1884
1885 my $mod = $ev->key_mod;
1886 my $sym = $ev->key_sym;
1887
1888 if ($sym == SDLK_KP5) {
1889 $::CONN->user_send ("command stay fire");
1890 } elsif ($sym == SDLK_a) {
1891 $::CONN->user_send ("command apply");
1892 } elsif ($sym == SDLK_QUOTE) {
1893 $self->emit ('activate_console');
1894 } elsif ($sym == SDLK_SLASH) {
1895 $self->emit ('activate_console' => '/');
1896 } elsif (exists $DIR{$sym}) {
1897 if ($mod & KMOD_SHIFT) {
1898 $self->{shft}++;
1899 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1900 } elsif ($mod & KMOD_CTRL) {
1901 $self->{ctrl}++;
1902 $::CONN->user_send ("command run $DIR{$sym}[0]");
1903 } else {
1904 $::CONN->user_send ("command $DIR{$sym}[1]");
1905 }
1906 }
1907}
1908
1909sub key_up {
1910 my ($self, $ev) = @_;
1911
1912 my $mod = $ev->key_mod;
1913 my $sym = $ev->key_sym;
1914
1915 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1916 $::CONN->user_send ("command fire_stop");
1917 }
1918 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1919 $::CONN->user_send ("command run_stop");
1920 }
1921}
1922
1923#############################################################################
1924
1925package CFClient::UI::Animator; 2333package CFClient::UI::Animator;
1926 2334
1927use SDL::OpenGL; 2335use CFClient::OpenGL;
1928 2336
1929our @ISA = CFClient::UI::Bin::; 2337our @ISA = CFClient::UI::Bin::;
1930 2338
1931sub moveto { 2339sub moveto {
1932 my ($self, $x, $y) = @_; 2340 my ($self, $x, $y) = @_;
… …
1970 2378
1971sub new { 2379sub new {
1972 my $class = shift; 2380 my $class = shift;
1973 2381
1974 my $self = $class->SUPER::new ( 2382 my $self = $class->SUPER::new (
1975 state => 0, 2383 state => 0,
1976 connect_activate => \&toggle_flopper, 2384 connect_activate => \&toggle_flopper,
1977 @_ 2385 @_
1978 ); 2386 );
1979 2387
1980 if ($self->{state}) { 2388 if ($self->{state}) {
… …
2001 $self->emit (changed => $self->{state}); 2409 $self->emit (changed => $self->{state});
2002} 2410}
2003 2411
2004############################################################################# 2412#############################################################################
2005 2413
2414package CFClient::UI::Tooltip;
2415
2416our @ISA = CFClient::UI::Bin::;
2417
2418use CFClient::OpenGL;
2419
2420sub new {
2421 my $class = shift;
2422
2423 $class->SUPER::new (
2424 @_,
2425 can_events => 0,
2426 )
2427}
2428
2429sub set_tooltip_from {
2430 my ($self, $widget) = @_;
2431
2432 $self->add (new CFClient::UI::Label
2433 markup => $widget->{tooltip},
2434 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2435 fontsize => 0.8,
2436 fg => [0, 0, 0, 1],
2437 ellipsise => 0,
2438 font => ($widget->{tooltip_font} || $::FONT_PROP),
2439 );
2440}
2441
2442sub size_request {
2443 my ($self) = @_;
2444
2445 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2446
2447 ($w + 4, $h + 4)
2448}
2449
2450sub size_allocate {
2451 my ($self, $w, $h) = @_;
2452
2453 $self->SUPER::size_allocate ($w - 4, $h - 4);
2454}
2455
2456sub _draw {
2457 my ($self) = @_;
2458
2459 glTranslate 0.375, 0.375;
2460
2461 my ($w, $h) = @$self{qw(w h)};
2462
2463 glColor 1, 0.8, 0.4;
2464 glBegin GL_QUADS;
2465 glVertex 0 , 0;
2466 glVertex 0 , $h;
2467 glVertex $w, $h;
2468 glVertex $w, 0;
2469 glEnd;
2470
2471 glColor 0, 0, 0;
2472 glBegin GL_LINE_LOOP;
2473 glVertex 0 , 0;
2474 glVertex 0 , $h;
2475 glVertex $w, $h;
2476 glVertex $w, 0;
2477 glEnd;
2478
2479 glTranslate 2 - 0.375, 2 - 0.375;
2480 $self->SUPER::_draw;
2481}
2482
2483#############################################################################
2484
2485package CFClient::UI::Face;
2486
2487our @ISA = CFClient::UI::Base::;
2488
2489use CFClient::OpenGL;
2490
2491sub new {
2492 my $class = shift;
2493
2494 my $self = $class->SUPER::new (
2495 aspect => 1,
2496 @_,
2497 );
2498
2499 if ($self->{anim} && $self->{animspeed}) {
2500 Scalar::Util::weaken (my $widget = $self);
2501
2502 $self->{timer} = Event->timer (
2503 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2504 hard => 1,
2505 interval => $self->{animspeed},
2506 cb => sub {
2507 ++$widget->{frame};
2508 $widget->update;
2509 },
2510 );
2511 }
2512
2513 $self
2514}
2515
2516sub size_request {
2517 (32, 8)
2518}
2519
2520sub _draw {
2521 my ($self) = @_;
2522
2523 return unless $::CONN;#d# manage and cache textures differently
2524
2525 my $face;
2526
2527 if ($self->{frame}) {
2528 my $anim = $::CONN->{anim}[$self->{anim}];
2529
2530 $face = $anim->[ $self->{frame} % @$anim ]
2531 if $anim && @$anim;
2532 }
2533
2534 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2535
2536 if ($tex) {
2537 glEnable GL_TEXTURE_2D;
2538 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2539 glColor 1, 1, 1, 1;
2540 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2541 glDisable GL_TEXTURE_2D;
2542 }
2543}
2544
2545sub DESTROY {
2546 my ($self) = @_;
2547
2548 $self->{timer}->cancel
2549 if $self->{timer};
2550
2551 $self->SUPER::DESTROY;
2552}
2553
2554#############################################################################
2555
2556package CFClient::UI::InventoryItem;
2557
2558our @ISA = CFClient::UI::HBox::;
2559
2560sub _item_to_desc {
2561 my ($item) = @_;
2562
2563 my $desc =
2564 $item->{nrof} < 2
2565 ? $item->{name}
2566 : "$item->{nrof} × $item->{name_pl}";
2567
2568 $item->{flags} & Crossfire::Protocol::F_OPEN
2569 and $desc .= " (open)";
2570 $item->{flags} & Crossfire::Protocol::F_APPLIED
2571 and $desc .= " (applied)";
2572 $item->{flags} & Crossfire::Protocol::F_UNPAID
2573 and $desc .= " (unpaid)";
2574 $item->{flags} & Crossfire::Protocol::F_MAGIC
2575 and $desc .= " (magic)";
2576 $item->{flags} & Crossfire::Protocol::F_CURSED
2577 and $desc .= " (cursed)";
2578 $item->{flags} & Crossfire::Protocol::F_DAMNED
2579 and $desc .= " (damned)";
2580 $item->{flags} & Crossfire::Protocol::F_LOCKED
2581 and $desc .= " *";
2582
2583 $desc
2584}
2585
2586sub new {
2587 my $class = shift;
2588
2589 my %args = @_;
2590
2591 my $item = delete $args{item};
2592
2593 my $desc = _item_to_desc ($item);
2594
2595 my $self = $class->SUPER::new (
2596 can_hover => 1,
2597 can_events => 1,
2598 tooltip => ((CFClient::UI::Label::escape $desc)
2599 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2600 connect_button_down => sub {
2601 my ($self, $ev, $x, $y) = @_;
2602
2603 # todo: maybe put examine on 1? but should just be a tooltip :(
2604 if ($ev->{button} == 1) {
2605 my $targ = $::CONN->{player}{tag};
2606
2607 if ($item->{container} == $::CONN->{player}{tag}) {
2608 $targ = $main::OPENCONT;
2609 }
2610
2611 $::CONN->send ("move $targ $item->{tag} 0");
2612 } elsif ($ev->{button} == 2) {
2613 $::CONN->send ("apply $item->{tag}");
2614 } elsif ($ev->{button} == 3) {
2615 my @menu_items = (
2616 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2617 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2618 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2619 (
2620 $item->{flags} & Crossfire::Protocol::F_LOCKED
2621 ? (
2622 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2623 )
2624 : (
2625 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2626 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2627 )
2628 ),
2629 );
2630
2631 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2632 }
2633
2634 1
2635 },
2636 %args
2637 );
2638
2639
2640 $self->add (new CFClient::UI::Face
2641 can_events => 0,
2642 face => $item->{face},
2643 anim => $item->{anim},
2644 animspeed => $item->{animspeed},
2645 );
2646
2647 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2648
2649 $self->{item} = $item;
2650
2651 $self->update_item;
2652
2653 $self
2654}
2655
2656sub update_item {
2657 my ($self) = @_;
2658
2659 my $desc = _item_to_desc ($self->{item});
2660
2661 $self->{name_lbl}->set_text ($desc);
2662}
2663
2664#############################################################################
2665
2666package CFClient::UI::Inventory;
2667
2668our @ISA = CFClient::UI::ScrolledWindow::;
2669
2670sub new {
2671 my $class = shift;
2672
2673 my $self = $class->SUPER::new (
2674 scrolled => (new CFClient::UI::VBox),
2675 @_,
2676 );
2677
2678 $self
2679}
2680
2681sub set_items {
2682 my ($self, $items) = @_;
2683
2684 $self->{scrolled}->clear;
2685 return unless $items;
2686
2687 my @items = sort {
2688 ($a->{type} <=> $b->{type})
2689 or ($a->{name} cmp $b->{name})
2690 } @$items;
2691
2692 $self->{real_items} = \@items;
2693
2694 for my $item (@items) {
2695 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2696 $item->update_item ();
2697 }
2698
2699 $self->{scrolled}->add (@items);
2700
2701# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2702}
2703
2704sub size_request {
2705 my ($self) = @_;
2706 ($self->{req_w}, $self->{req_h});
2707}
2708
2709#############################################################################
2710
2711package CFClient::UI::Menu;
2712
2713our @ISA = CFClient::UI::FancyFrame::;
2714
2715use CFClient::OpenGL;
2716
2717sub new {
2718 my $class = shift;
2719
2720 my $self = $class->SUPER::new (
2721 items => [],
2722 z => 100,
2723 @_,
2724 );
2725
2726 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2727
2728 for my $item (@{ $self->{items} }) {
2729 my ($widget, $cb) = @$item;
2730
2731 # handle various types of items, only text for now
2732 if (!ref $widget) {
2733 $widget = new CFClient::UI::Label
2734 can_hover => 1,
2735 can_events => 1,
2736 text => $widget;
2737 }
2738
2739 $self->{item}{$widget} = $item;
2740
2741 $self->{vbox}->add ($widget);
2742 }
2743
2744 $self
2745}
2746
2747# popup given the event (must be a mouse button down event currently)
2748sub popup {
2749 my ($self, $ev) = @_;
2750
2751 $self->emit ("popdown");
2752
2753 # maybe save $GRAB? must be careful about events...
2754 $GRAB = $self;
2755 $self->{button} = $ev->{button};
2756
2757 $self->show;
2758 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2759}
2760
2761sub mouse_motion {
2762 my ($self, $ev, $x, $y) = @_;
2763
2764 # TODO: should use vbox->find_widget or so
2765 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2766 $self->{hover} = $self->{item}{$HOVER};
2767}
2768
2769sub button_up {
2770 my ($self, $ev, $x, $y) = @_;
2771
2772 if ($ev->{button} == $self->{button}) {
2773 undef $GRAB;
2774 $self->hide;
2775
2776 $self->emit ("popdown");
2777 $self->{hover}[1]->() if $self->{hover};
2778 }
2779}
2780
2781#############################################################################
2782
2783package CFClient::UI::Statusbox;
2784
2785our @ISA = CFClient::UI::VBox::;
2786
2787sub new {
2788 my $class = shift;
2789
2790 $class->SUPER::new (
2791 fontsize => 0.8,
2792 @_,
2793 )
2794}
2795
2796sub reorder {
2797 my ($self) = @_;
2798 my $NOW = time;
2799
2800 while (my ($k, $v) = each %{ $self->{item} }) {
2801 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2802 }
2803
2804 my @widgets;
2805
2806 my @items = sort {
2807 $a->{pri} <=> $b->{pri}
2808 or $b->{id} <=> $a->{id}
2809 } values %{ $self->{item} };
2810
2811 my $count = 10 + 1;
2812 for my $item (@items) {
2813 last unless --$count;
2814
2815 push @widgets, $item->{label} ||= do {
2816 # TODO: doesn't handle markup well (read as: at all)
2817 my $short = $item->{count} > 1
2818 ? "<b>$item->{count} ×</b> $item->{text}"
2819 : $item->{text};
2820
2821 for ($short) {
2822 s/^\s+//;
2823 s/\s+/ /g;
2824 }
2825
2826 new CFClient::UI::Label
2827 markup => $short,
2828 tooltip => $item->{tooltip},
2829 tooltip_font => $::FONT_PROP,
2830 tooltip_width => 0.67,
2831 fontsize => $item->{fontsize} || $self->{fontsize},
2832 max_w => $::WIDTH * 0.44,
2833 fg => $item->{fg},
2834 can_events => 1,
2835 can_hover => 1
2836 };
2837 }
2838
2839 $self->clear;
2840 $self->SUPER::add (reverse @widgets);
2841}
2842
2843sub add {
2844 my ($self, $text, %arg) = @_;
2845
2846 $text =~ s/^\s+//;
2847 $text =~ s/\s+$//;
2848
2849 my $timeout = time + ((delete $arg{timeout}) || 60);
2850
2851 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2852
2853 if (my $item = $self->{item}{$group}) {
2854 if ($item->{text} eq $text) {
2855 $item->{count}++;
2856 } else {
2857 $item->{count} = 1;
2858 $item->{text} = $item->{tooltip} = $text;
2859 }
2860 $item->{id} = ++$self->{id};
2861 $item->{timeout} = $timeout;
2862 delete $item->{label};
2863 } else {
2864 $self->{item}{$group} = {
2865 id => ++$self->{id},
2866 text => $text,
2867 timeout => $timeout,
2868 tooltip => $text,
2869 fg => [0.8, 0.8, 0.8, 0.8],
2870 pri => 0,
2871 count => 1,
2872 %arg,
2873 };
2874 }
2875
2876 $self->reorder;
2877}
2878
2879sub reconfigure {
2880 my ($self) = @_;
2881
2882 delete $_->{label}
2883 for values %{ $self->{item} || {} };
2884
2885 $self->reorder;
2886 $self->SUPER::reconfigure;
2887}
2888
2889#############################################################################
2890
2006package CFClient::UI::Root; 2891package CFClient::UI::Root;
2007 2892
2008our @ISA = CFClient::UI::Container::; 2893our @ISA = CFClient::UI::Container::;
2009 2894
2010use SDL::OpenGL; 2895use CFClient::OpenGL;
2896
2897sub new {
2898 my $class = shift;
2899
2900 $class->SUPER::new (
2901 @_,
2902 )
2903}
2904
2905sub configure {
2906 my ($self, $x, $y, $w, $h) = @_;
2907
2908 $self->{w} = $w;
2909 $self->{h} = $h;
2910}
2911
2912sub check_size {
2913 my ($self) = @_;
2914
2915 $self->size_allocate ($self->{w}, $self->{h})
2916 if $self->{w};
2917}
2011 2918
2012sub size_request { 2919sub size_request {
2013 ($::WIDTH, $::HEIGHT) 2920 my ($self) = @_;
2921
2922 ($self->{w}, $self->{h})
2014} 2923}
2015 2924
2016sub size_allocate { 2925sub size_allocate {
2017 my ($self, $x, $y, $w, $h) = @_; 2926 my ($self, $w, $h) = @_;
2018 2927
2019 $self->_size_allocate ($x, $y, $w, $h); 2928 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2929 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2020 2930
2021 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 2931 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2022 for @{$self->{children}}; 2932 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2023}
2024 2933
2025sub _topleft { 2934 for my $child ($self->children) {
2935 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2936
2937 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2938 if exists $child->{req_x};
2939
2940 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
2941 if exists $child->{req_y};
2942
2943 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2944 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2945
2946 $child->configure ($X, $Y, $W, $H);
2947 }
2948}
2949
2950sub coord2local {
2026 my ($self, $x, $y) = @_; 2951 my ($self, $x, $y) = @_;
2027 2952
2028 ($x, $y) 2953 ($x, $y)
2029} 2954}
2030 2955
2956sub coord2global {
2957 my ($self, $x, $y) = @_;
2958
2959 ($x, $y)
2960}
2961
2031sub update { 2962sub update {
2032 my ($self) = @_; 2963 my ($self) = @_;
2033 2964
2034 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 2965 $self->check_size;
2035 ::refresh (); 2966 $::WANT_REFRESH++;
2036} 2967}
2037 2968
2038sub add { 2969sub add {
2039 my ($self, $widget) = @_; 2970 my ($self, @children) = @_;
2040 2971
2972 for my $child (@children) {
2973 $child->{toplevel} = 1;
2974
2975 # integerise window positions
2976 $child->{x} = int $child->{x};
2977 $child->{y} = int $child->{y};
2978 }
2979
2041 $self->SUPER::add ($widget); 2980 $self->SUPER::add (@children);
2042
2043 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2044} 2981}
2045 2982
2046sub on_refresh { 2983sub on_refresh {
2047 my ($self, $id, $cb) = @_; 2984 my ($self, $id, $cb) = @_;
2048 2985
2049 $self->{refresh_hook}{$id} = $cb; 2986 $self->{refresh_hook}{$id} = $cb;
2050} 2987}
2051 2988
2989sub on_post_alloc {
2990 my ($self, $id, $cb) = @_;
2991
2992 $self->{post_alloc_hook}{$id} = $cb;
2993}
2994
2052sub draw { 2995sub draw {
2053 my ($self) = @_; 2996 my ($self) = @_;
2054 2997
2055 while (my $rcb = delete $self->{refresh_hook}) { 2998 while ($self->{refresh_hook}) {
2056 $_->() for values %$rcb; 2999 $_->()
3000 for values %{delete $self->{refresh_hook}};
3001 }
3002
3003 if ($self->{check_size}) {
3004 my @queue = ([], []);
3005
3006 for (;;) {
3007 if ($self->{check_size}) {
3008 # heuristic: check containers last
3009 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
3010 for values %{delete $self->{check_size}}
3011 }
3012
3013 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
3014
3015 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3016 ? @$widget{qw(user_w user_h)}
3017 : $widget->size_request;
3018
3019 if (delete $widget->{force_alloc}
3020 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3021 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3022
3023 $widget->{req_w} = $w;
3024 $widget->{req_h} = $h;
3025
3026 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3027
3028 $widget->{parent}->check_size
3029 if $widget->{parent};
3030 }
3031 }
3032 }
3033
3034 while ($self->{size_alloc}) {
3035 for (values %{delete $self->{size_alloc}}) {
3036 my ($widget, $w, $h) = @$_;
3037
3038 $w = 0 if $w < 0;
3039 $h = 0 if $h < 0;
3040
3041 $widget->{w} = $w;
3042 $widget->{h} = $h;
3043 $widget->size_allocate ($w, $h);
3044 $widget->emit (size_allocate => $w, $h);
3045 }
3046 }
3047
3048 while ($self->{post_alloc_hook}) {
3049 $_->()
3050 for values %{delete $self->{post_alloc_hook}};
2057 } 3051 }
2058 3052
2059 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3053 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2060 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3054 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2061 glClear GL_COLOR_BUFFER_BIT; 3055 glClear GL_COLOR_BUFFER_BIT;
2062 3056
2063 glMatrixMode GL_PROJECTION; 3057 glMatrixMode GL_PROJECTION;
2064 glLoadIdentity; 3058 glLoadIdentity;
2065 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3059 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2066 glMatrixMode GL_MODELVIEW; 3060 glMatrixMode GL_MODELVIEW;
2067 glLoadIdentity; 3061 glLoadIdentity;
2068 3062
2069 $self->_draw; 3063 $self->_draw;
2070} 3064}
… …
2072############################################################################# 3066#############################################################################
2073 3067
2074package CFClient::UI; 3068package CFClient::UI;
2075 3069
2076$ROOT = new CFClient::UI::Root; 3070$ROOT = new CFClient::UI::Root;
3071$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2077 3072
20781 30731
2079 3074

Diff Legend

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