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

Diff Legend

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