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.134 by root, Wed Apr 19 06:06:45 2006 UTC vs.
Revision 1.214 by root, Wed May 17 22:59:13 2006 UTC

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

Diff Legend

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