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.260 by elmex, Tue May 30 14:35:09 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;
10use CFClient::Texture;
9 11
10our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
11 13
14our $LAYOUT;
12our $ROOT; 15our $ROOT;
16our $TOOLTIP;
13our $BUTTON_STATE; 17our $BUTTON_STATE;
18
19our %WIDGET; # all widgets, weak-referenced
20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
14 70
15# class methods for events 71# class methods for events
16sub feed_sdl_key_down_event { 72sub feed_sdl_key_down_event {
17 $FOCUS->key_down ($_[0]) if $FOCUS; 73 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS;
18} 75}
19 76
20sub feed_sdl_key_up_event { 77sub feed_sdl_key_up_event {
21 $FOCUS->key_up ($_[0]) if $FOCUS; 78 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS;
22} 80}
23 81
24sub feed_sdl_button_down_event { 82sub feed_sdl_button_down_event {
25 my ($ev) = @_; 83 my ($ev) = @_;
26 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 84 my ($x, $y) = ($ev->{x}, $ev->{y});
27 85
28 if (!$BUTTON_STATE) { 86 if (!$BUTTON_STATE) {
29 my $widget = $ROOT->find_widget ($x, $y); 87 my $widget = $ROOT->find_widget ($x, $y);
30 88
31 $GRAB = $widget; 89 $GRAB = $widget;
32 $GRAB->update if $GRAB; 90 $GRAB->update if $GRAB;
33 }
34 91
92 check_tooltip;
93 }
94
35 $BUTTON_STATE |= 1 << ($ev->button - 1); 95 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
36 96
37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
98 if $GRAB;
38} 99}
39 100
40sub feed_sdl_button_up_event { 101sub feed_sdl_button_up_event {
41 my ($ev) = @_; 102 my ($ev) = @_;
42 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 103 my ($x, $y) = ($ev->{x}, $ev->{y});
43 104
44 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 105 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
45 106
46 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
47 108
48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB; 109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
110 if $GRAB;
49 111
50 if (!$BUTTON_STATE) { 112 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 113 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 114 $grab->update if $grab;
53 $GRAB->update if $GRAB; 115 $GRAB->update if $GRAB;
116
117 check_tooltip;
54 } 118 }
55} 119}
56 120
57sub feed_sdl_motion_event { 121sub feed_sdl_motion_event {
58 my ($ev) = @_; 122 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 123 my ($x, $y) = ($ev->{x}, $ev->{y});
60 124
61 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 125 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
62 126
63 if ($widget != $HOVER) { 127 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget; 128 my $hover = $HOVER; $HOVER = $widget;
65 129
66 $hover->update if $hover && $hover->{can_hover}; 130 $hover->update if $hover && $hover->{can_hover};
67 $HOVER->update if $HOVER && $HOVER->{can_hover}; 131 $HOVER->update if $HOVER && $HOVER->{can_hover};
68 }
69 132
133 check_tooltip;
134 }
135
70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER; 136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER;
71} 138}
72 139
73# convert position array to integers 140# convert position array to integers
74sub harmonize { 141sub harmonize {
75 my ($vals) = @_; 142 my ($vals) = @_;
… …
81 $rem += $_ - $i; 148 $rem += $_ - $i;
82 $_ = $i; 149 $_ = $i;
83 } 150 }
84} 151}
85 152
153sub full_refresh {
154 # make a copy, otherwise for complains about freed values.
155 my @widgets = values %WIDGET;
156
157 $_->update
158 for @widgets;
159}
160
161sub reconfigure_widgets {
162 # make a copy, otherwise C<for> complains about freed values.
163 my @widgets = values %WIDGET;
164
165 $_->reconfigure
166 for @widgets;
167}
168
169# call when resolution changes etc.
170sub rescale_widgets {
171 my ($sx, $sy) = @_;
172
173 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
179 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
180 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
181 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
182 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
183 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187
188 }
189 }
190
191 reconfigure_widgets;
192}
193
86############################################################################# 194#############################################################################
87 195
88package CFClient::UI::Base; 196package CFClient::UI::Base;
89 197
90use strict; 198use strict;
91 199
92use SDL::OpenGL; 200use CFClient::OpenGL;
93 201
94sub new { 202sub new {
95 my $class = shift; 203 my $class = shift;
96 204
97 my $self = bless { 205 my $self = bless {
98 x => 0, 206 x => "center",
99 y => 0, 207 y => "center",
100 z => 0, 208 z => 0,
209 w => undef,
210 h => undef,
211 can_events => 1,
101 @_ 212 @_
102 }, $class; 213 }, $class;
103 214
215 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
216
104 for (keys %$self) { 217 for (keys %$self) {
105 if (/^connect_(.*)$/) { 218 if (/^on_(.*)$/) {
106 $self->connect ($1 => delete $self->{$_}); 219 $self->connect ($1 => delete $self->{$_});
107 } 220 }
108 } 221 }
109 222
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231
232 $self->show if $layout->{show};
233 }
234
110 $self 235 $self
111} 236}
112 237
238sub destroy {
239 my ($self) = @_;
240
241 $self->hide;
242 %$self = ();
243}
244
113sub show { 245sub show {
114 my ($self) = @_; 246 my ($self) = @_;
115 247
116 return if $self->{parent}; 248 return if $self->{parent};
117 249
118 $CFClient::UI::ROOT->add ($self); 250 $CFClient::UI::ROOT->add ($self);
119} 251}
120 252
253sub set_visible {
254 my ($self) = @_;
255
256 return if $self->{visible};
257
258 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1;
260
261 $self->emit (visibility_change => 1);
262
263 $self->realloc if !exists $self->{req_w};
264
265 $_->set_visible for $self->children;
266}
267
268sub set_invisible {
269 my ($self) = @_;
270
271 return unless $self->{visible};
272
273 $_->set_invisible for $self->children;
274
275 delete $self->{root};
276 delete $self->{visible};
277
278 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self;
280
281 CFClient::UI::check_tooltip
282 if $TOOLTIP->{owner} == $self;
283
284 $self->focus_out;
285
286 $self->emit (visibility_change => 0);
287}
288
289sub set_visibility {
290 my ($self, $visible) = @_;
291
292 return if $self->{visible} == $visible;
293
294 $visible ? $self->hide
295 : $self->show;
296}
297
298sub toggle_visibility {
299 my ($self) = @_;
300
301 $self->{visible}
302 ? $self->hide
303 : $self->show;
304}
305
121sub hide { 306sub hide {
122 my ($self) = @_; 307 my ($self) = @_;
123 308
124 return unless $self->{parent}; 309 $self->set_invisible;
125 310
126 $self->{parent}->remove ($self); 311 $self->{parent}->remove ($self)
312 if $self->{parent};
127} 313}
128 314
129sub move { 315sub move_abs {
130 my ($self, $x, $y, $z) = @_; 316 my ($self, $x, $y, $z) = @_;
131 317
132 $self->{x} = int $x; 318 $self->{x} = List::Util::max 0, int $x;
133 $self->{y} = int $y; 319 $self->{y} = List::Util::max 0, int $y;
134 $self->{z} = $z if defined $z; 320 $self->{z} = $z if defined $z;
135 321
136 $self->update; 322 $self->update;
137} 323}
138 324
139sub needs_redraw { 325sub set_size {
140 0 326 my ($self, $w, $h) = @_;
327
328 $self->{force_w} = $w;
329 $self->{force_h} = $h;
330
331 $self->realloc;
141} 332}
142 333
143sub size_request { 334sub size_request {
144 require Carp; 335 require Carp;
145 Carp::confess "size_request is abtract"; 336 Carp::confess "size_request is abstract";
146} 337}
147 338
148sub configure { 339sub configure {
149 my ($self, $x, $y, $w, $h) = @_; 340 my ($self, $x, $y, $w, $h) = @_;
150 341
342 if ($self->{aspect}) {
343 my ($ow, $oh) = ($w, $h);
344
345 $w = List::Util::min $w, int $h * $self->{aspect};
346 $h = List::Util::min $h, int $w / $self->{aspect};
347
348 # use alignment to adjust x, y
349
350 $x += int 0.5 * ($ow - $w);
351 $y += int 0.5 * ($oh - $h);
352 }
353
354 if ($self->{x} ne $x || $self->{y} ne $y) {
151 $self->{x} = $x; 355 $self->{x} = $x;
152 $self->{y} = $y; 356 $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; 357 $self->update;
358 }
359
360 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible};
362
363 $self->{alloc_w} = $w;
364 $self->{alloc_h} = $h;
365
366 $self->{root}{size_alloc}{$self+0} = $self;
367 }
161} 368}
162 369
163sub size_allocate { 370sub size_allocate {
164 # nothing to be done 371 # nothing to be done
165} 372}
166 373
167# return top left coordinates 374sub children {
168sub _topleft { 375}
376
377sub set_max_size {
169 my ($self, $x, $y) = @_; 378 my ($self, $w, $h) = @_;
170 379
171 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y}); 380 delete $self->{max_w}; $self->{max_w} = $w if $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h;
382}
383
384sub set_tooltip {
385 my ($self, $tooltip) = @_;
386
387 $tooltip =~ s/^\s+//;
388 $tooltip =~ s/\s+$//;
389
390 return if $self->{tooltip} eq $tooltip;
391
392 $self->{tooltip} = $tooltip;
393
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip;
397 }
172} 398}
173 399
174# translate global coordinates to local coordinate system 400# translate global coordinates to local coordinate system
175sub coord2local { 401sub coord2local {
176 my ($self, $x, $y) = @_; 402 my ($self, $x, $y) = @_;
177 403
178 my ($X, $Y) = $self->_topleft; 404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
179 ($x - $X, $y - $Y)
180} 405}
181 406
182# translate local coordinates to global coordinate system 407# translate local coordinates to global coordinate system
183sub coord2global { 408sub coord2global {
184 my ($self, $x, $y) = @_; 409 my ($self, $x, $y) = @_;
185 410
186 my ($X, $Y) = $self->_topleft; 411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
187 ($x + $X, $y + $Y)
188} 412}
189 413
190sub focus_in { 414sub focus_in {
191 my ($self) = @_; 415 my ($self) = @_;
192 416
193 return if $FOCUS == $self; 417 return if $FOCUS == $self;
194 return unless $self->{can_focus}; 418 return unless $self->{can_focus};
195 419
196 my $focus = $FOCUS; $FOCUS = $self; 420 my $focus = $FOCUS; $FOCUS = $self;
197 421
198 $self->emit (focus_in => $focus); 422 $self->_emit (focus_in => $focus);
199 423
200 $focus->update if $focus; 424 $focus->update if $focus;
201 $FOCUS->update; 425 $FOCUS->update;
202} 426}
203 427
… …
206 430
207 return unless $FOCUS == $self; 431 return unless $FOCUS == $self;
208 432
209 my $focus = $FOCUS; undef $FOCUS; 433 my $focus = $FOCUS; undef $FOCUS;
210 434
211 $self->emit (focus_out => $focus); 435 $self->_emit (focus_out => $focus);
212 436
213 $focus->update if $focus; #? 437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
440 unless $FOCUS;
214} 441}
215 442
216sub mouse_motion { } 443sub mouse_motion { }
217sub button_up { } 444sub button_up { }
218sub key_down { } 445sub key_down { }
219sub key_up { } 446sub key_up { }
220 447
221sub button_down { 448sub button_down {
222 my ($self, $ev, $x, $y) = @_; 449 my ($self, $ev, $x, $y) = @_;
223 450
224 $self->focus_in; 451 $self->focus_in;
… …
227sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
228sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
229sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
230sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
231sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
459
460sub find_widget {
461 my ($self, $x, $y) = @_;
462
463 return () unless $self->{can_events};
464
465 return $self
466 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
467 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
468
469 ()
470}
471
472sub set_parent {
473 my ($self, $parent) = @_;
474
475 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500}
501
502sub realloc {
503 my ($self) = @_;
504
505 if ($self->{visible}) {
506 return if $self->{root}{realloc}{$self+0};
507
508 $self->{root}{realloc}{$self+0} = $self;
509 $self->{root}->update;
510 } else {
511 delete $self->{req_w};
512 delete $self->{req_h};
513 }
514}
515
516sub update {
517 my ($self) = @_;
518
519 $self->{parent}->update
520 if $self->{parent};
521}
522
523sub reconfigure {
524 my ($self) = @_;
525
526 $self->realloc;
527 $self->update;
528}
232 529
233sub draw { 530sub draw {
234 my ($self) = @_; 531 my ($self) = @_;
235 532
236 return unless $self->{h} && $self->{w}; 533 return unless $self->{h} && $self->{w};
… …
252 glVertex $x + $self->{w}, $y + $self->{h}; 549 glVertex $x + $self->{w}, $y + $self->{h};
253 glVertex $x , $y + $self->{h}; 550 glVertex $x , $y + $self->{h};
254 glEnd; 551 glEnd;
255 glDisable GL_BLEND; 552 glDisable GL_BLEND;
256 } 553 }
554
555 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix;
557 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
559 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1;
564 glEnd;
565 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 }
257} 568}
258 569
259sub _draw { 570sub _draw {
260 my ($self) = @_; 571 my ($self) = @_;
261 572
262 warn "no draw defined for $self\n"; 573 warn "no draw defined for $self\n";
263} 574}
264 575
265sub find_widget {
266 my ($self, $x, $y) = @_;
267
268 return $self
269 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
270 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
271
272 ()
273}
274
275sub set_parent {
276 my ($self, $parent) = @_;
277
278 Scalar::Util::weaken ($self->{parent} = $parent);
279}
280
281sub check_size {
282 my ($self) = @_;
283
284 my ($w, $h) = $self->size_request;
285
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}
294
295sub update {
296 my ($self) = @_;
297
298 $self->{parent}->update
299 if $self->{parent};
300}
301
302sub connect {
303 my ($self, $signal, $cb) = @_;
304
305 push @{ $self->{signal_cb}{$signal} }, $cb;
306}
307
308sub emit {
309 my ($self, $signal, @args) = @_;
310
311 for my $cb (@{$self->{signal_cb}{$signal} || []}) {
312 $cb->($self, @args);
313 }
314}
315
316sub DESTROY { 576sub DESTROY {
317 my ($self) = @_; 577 my ($self) = @_;
318 578
579 delete $WIDGET{$self+0};
319 #$self->deactivate; 580 #$self->deactivate;
320} 581}
321 582
322############################################################################# 583#############################################################################
323 584
324package CFClient::UI::DrawBG; 585package CFClient::UI::DrawBG;
325 586
326our @ISA = CFClient::UI::Base::; 587our @ISA = CFClient::UI::Base::;
327 588
328use strict; 589use strict;
329use SDL::OpenGL; 590use CFClient::OpenGL;
330 591
331sub new { 592sub new {
332 my $class = shift; 593 my $class = shift;
333 594
334 # range [value, low, high, page] 595 # range [value, low, high, page]
335 596
336 $class->SUPER::new ( 597 $class->SUPER::new (
337 bg => [0, 0, 0, 0.2], 598 #bg => [0, 0, 0, 0.2],
338 active_bg => [1, 1, 1, 0.5], 599 #active_bg => [1, 1, 1, 0.5],
339 @_ 600 @_
340 ) 601 )
341} 602}
342 603
343sub _draw { 604sub _draw {
344 my ($self) = @_; 605 my ($self) = @_;
345 606
607 my $color = $FOCUS == $self && $self->{active_bg}
608 ? $self->{active_bg}
609 : $self->{bg};
610
611 if ($color && (@$color < 4 || $color->[3])) {
346 my ($w, $h) = @$self{qw(w h)}; 612 my ($w, $h) = @$self{qw(w h)};
347 613
348 glEnable GL_BLEND; 614 glEnable GL_BLEND;
349 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
350 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 616 glColor @$color;
351 617
352 glBegin GL_QUADS; 618 glBegin GL_QUADS;
353 glVertex 0 , 0; 619 glVertex 0 , 0;
354 glVertex 0 , $h; 620 glVertex 0 , $h;
355 glVertex $w, $h; 621 glVertex $w, $h;
356 glVertex $w, 0; 622 glVertex $w, 0;
357 glEnd; 623 glEnd;
358 624
359 glDisable GL_BLEND; 625 glDisable GL_BLEND;
626 }
360} 627}
361 628
362############################################################################# 629#############################################################################
363 630
364package CFClient::UI::Empty; 631package CFClient::UI::Empty;
365
366our @ISA = CFClient::UI::Base::;
367
368sub size_request {
369 (0, 0)
370}
371
372sub draw { }
373
374#############################################################################
375
376package CFClient::UI::Container;
377 632
378our @ISA = CFClient::UI::Base::; 633our @ISA = CFClient::UI::Base::;
379 634
380sub new { 635sub new {
381 my ($class, %arg) = @_; 636 my ($class, %arg) = @_;
637 $class->SUPER::new (can_events => 0, %arg);
638}
639
640sub size_request {
641 my ($self) = @_;
642
643 ($self->{w} + 0, $self->{h} + 0)
644}
645
646sub draw { }
647
648#############################################################################
649
650package CFClient::UI::Container;
651
652our @ISA = CFClient::UI::Base::;
653
654sub new {
655 my ($class, %arg) = @_;
382 656
383 my $children = delete $arg{children} || []; 657 my $children = delete $arg{children} || [];
384 658
385 my $self = $class->SUPER::new (children => [], %arg); 659 my $self = $class->SUPER::new (
660 children => [],
661 can_events => 0,
662 %arg,
663 );
386 $self->add ($_) for @$children; 664 $self->add ($_) for @$children;
387 665
388 $self 666 $self
389} 667}
390 668
391sub add { 669sub add {
392 my ($self, $child) = @_; 670 my ($self, @widgets) = @_;
393 671
394 $child->set_parent ($self); 672 $_->set_parent ($self)
673 for @widgets;
395 674
396 use sort 'stable'; 675 use sort 'stable';
397 676
398 $self->{children} = [ 677 $self->{children} = [
399 sort { $a->{z} <=> $b->{z} } 678 sort { $a->{z} <=> $b->{z} }
400 @{$self->{children}}, $child 679 @{$self->{children}}, @widgets
401 ]; 680 ];
402 681
403 $child->check_size; 682 $self->realloc;
683}
684
685sub children {
686 @{ $_[0]{children} }
404} 687}
405 688
406sub remove { 689sub remove {
407 my ($self, $child) = @_; 690 my ($self, $child) = @_;
408 691
409 delete $child->{parent}; 692 delete $child->{parent};
693 $child->hide;
410 694
411 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 695 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
412 696
413 $self->check_size; 697 $self->realloc;
698}
699
700sub clear {
701 my ($self) = @_;
702
703 my $children = delete $self->{children};
704 $self->{children} = [];
705
706 for (@$children) {
707 delete $_->{parent};
708 $_->hide;
709 }
710
711 $self->realloc;
414} 712}
415 713
416sub find_widget { 714sub find_widget {
417 my ($self, $x, $y) = @_; 715 my ($self, $x, $y) = @_;
418 716
… …
482 780
483package CFClient::UI::Window; 781package CFClient::UI::Window;
484 782
485our @ISA = CFClient::UI::Bin::; 783our @ISA = CFClient::UI::Bin::;
486 784
487use SDL::OpenGL; 785use CFClient::OpenGL;
488 786
489sub new { 787sub new {
490 my ($class, %arg) = @_; 788 my ($class, %arg) = @_;
491 789
492 my $self = $class->SUPER::new (%arg); 790 my $self = $class->SUPER::new (%arg);
493} 791}
494 792
495sub update { 793sub update {
496 my ($self) = @_; 794 my ($self) = @_;
497 795
498 # we want to do this delayed... 796 $ROOT->on_post_alloc ($self => sub { $self->render_child });
499 $self->render_chld;
500 $self->SUPER::update; 797 $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} 798}
512 799
513sub size_allocate { 800sub size_allocate {
514 my ($self, $w, $h) = @_; 801 my ($self, $w, $h) = @_;
515 802
516 $self->child->configure (0, 0, $w, $h); 803 $self->SUPER::size_allocate ($w, $h);
804 $self->update;
805}
517 806
807sub _render {
808 $_[0]{children}[0]->draw;
809}
810
811sub render_child {
812 my ($self) = @_;
813
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT;
817
518 $self->render_chld; 818 $self->_render;
819 };
519} 820}
520 821
521sub _draw { 822sub _draw {
522 my ($self) = @_; 823 my ($self) = @_;
523 824
524 my ($w, $h) = ($self->w, $self->h); 825 my ($w, $h) = ($self->w, $self->h);
525 826
526 my $tex = $self->{texture} 827 my $tex = $self->{texture}
527 or return; 828 or return;
528 829
529 glEnable GL_BLEND;
530 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
531 glEnable GL_TEXTURE_2D; 830 glEnable GL_TEXTURE_2D;
532 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1;
533 833
534 $tex->draw_quad (0, 0, $w, $h); 834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
535 835
536 glDisable GL_BLEND;
537 glDisable GL_TEXTURE_2D; 836 glDisable GL_TEXTURE_2D;
538} 837}
539 838
540############################################################################# 839#############################################################################
541 840
542package CFClient::UI::ViewPort; 841package CFClient::UI::ViewPort;
543 842
544our @ISA = CFClient::UI::Window::; 843our @ISA = CFClient::UI::Window::;
545
546sub new { die }
547
548sub size_request {
549 my ($self) = @_;
550
551 @$self{qw(child_w child_h)} = $self->child->size_request;
552 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
553
554 @$self{qw(child_w child_h)}
555}
556
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 {
583 my ($self, $x, $y, $w, $h) = @_;
584
585 $self->child->configure (2, 2, $w - 4, $h - 4);
586}
587
588sub _draw {
589 my ($self) = @_;
590
591 my $chld = $self->child;
592
593 my ($w, $h) = $chld->size_request;
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}
605
606#############################################################################
607
608package CFClient::UI::FancyFrame;
609
610our @ISA = CFClient::UI::Bin::;
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 844
618sub new { 845sub new {
619 my $class = shift; 846 my $class = shift;
620 847
621 # TODO: user_x, user_y, overwrite moveto?
622
623 $class->SUPER::new ( 848 $class->SUPER::new (
849 scroll_x => 0,
850 scroll_y => 1,
851 @_,
852 )
853}
854
855sub size_request {
856 my ($self) = @_;
857
858 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
859
860 $w = 10 if $self->{scroll_x};
861 $h = 10 if $self->{scroll_y};
862
863 ($w, $h)
864}
865
866sub size_allocate {
867 my ($self, $w, $h) = @_;
868
869 my $child = $self->child;
870
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873
874 $self->child->configure (0, 0, $w, $h);
875 $self->update;
876}
877
878sub set_offset {
879 my ($self, $x, $y) = @_;
880
881 $self->{view_x} = int $x;
882 $self->{view_y} = int $y;
883
884 $self->update;
885}
886
887# hmm, this does not work for topleft of $self... but we should not ask for that
888sub coord2local {
889 my ($self, $x, $y) = @_;
890
891 $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
892}
893
894sub coord2global {
895 my ($self, $x, $y) = @_;
896
897 $x = List::Util::min $self->{w}, $x - $self->{view_x};
898 $y = List::Util::min $self->{h}, $y - $self->{view_y};
899
900 $self->SUPER::coord2global ($x, $y)
901}
902
903sub find_widget {
904 my ($self, $x, $y) = @_;
905
906 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
907 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
908 ) {
909 $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
910 } else {
911 $self->CFClient::UI::Base::find_widget ($x, $y)
912 }
913}
914
915sub _render {
916 my ($self) = @_;
917
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919
920 $self->SUPER::_render;
921}
922
923#############################################################################
924
925package CFClient::UI::ScrolledWindow;
926
927our @ISA = CFClient::UI::HBox::;
928
929sub new {
930 my $class = shift;
931
932 my $self;
933
934 my $slider = new CFClient::UI::Slider
935 vertical => 1,
936 range => [0, 0, 1, 0.01], # HACK fix
937 on_changed => sub {
938 $self->{vp}->set_offset (0, $_[1]);
939 },
940 ;
941
942 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1),
944 slider => $slider,
945 @_,
946 );
947
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider});
951
952 $self
953}
954
955sub update {
956 my ($self) = @_;
957
958 $self->SUPER::update;
959
960 # todo: overwrite size_allocate of child
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963}
964
965sub size_allocate {
966 my ($self, $w, $h) = @_;
967
968 $self->SUPER::size_allocate ($w, $h);
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976
977#############################################################################
978
979package CFClient::UI::Frame;
980
981our @ISA = CFClient::UI::Bin::;
982
983use CFClient::OpenGL;
984
985sub new {
986 my $class = shift;
987
988 $class->SUPER::new (
989 bg => undef,
990 @_,
991 )
992}
993
994sub _draw {
995 my ($self) = @_;
996
997 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)};
999
1000 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} };
1003
1004 glBegin GL_QUADS;
1005 glVertex 0 , 0;
1006 glVertex 0 , $h;
1007 glVertex $w, $h;
1008 glVertex $w, 0;
1009 glEnd;
1010
1011 glDisable GL_BLEND;
1012 }
1013
1014 $self->SUPER::_draw;
1015}
1016
1017#############################################################################
1018
1019package CFClient::UI::FancyFrame;
1020
1021our @ISA = CFClient::UI::Bin::;
1022
1023use CFClient::OpenGL;
1024
1025my $bg =
1026 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1027 mipmap => 1, wrap => 1;
1028
1029my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032
1033sub new {
1034 my $class = shift;
1035
1036 my $self = $class->SUPER::new (
624 bg => [1, 1, 1, 1], 1037 bg => [1, 1, 1, 1],
625 border_bg => [1, 1, 1, 1], 1038 border_bg => [1, 1, 1, 1],
626 border => 0.8, 1039 border => 0.6,
1040 can_events => 1,
1041 min_w => 16,
1042 min_h => 16,
627 @_ 1043 @_
628 ) 1044 );
1045
1046 $self->{title} &&= new CFClient::UI::Label
1047 align => 0,
1048 valign => 1,
1049 text => $self->{title},
1050 fontsize => $self->{border};
1051
1052 $self
629} 1053}
630 1054
631sub border { 1055sub border {
632 int $_[0]{border} * $::FONTSIZE 1056 int $_[0]{border} * $::FONTSIZE
633} 1057}
634 1058
635sub size_request { 1059sub size_request {
636 my ($self) = @_; 1060 my ($self) = @_;
637
638 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
639 1061
640 my ($w, $h) = $self->SUPER::size_request; 1062 my ($w, $h) = $self->SUPER::size_request;
641 1063
642 ( 1064 (
643 $w + $self->border * 2, 1065 $w + $self->border * 2,
… …
649 my ($self, $w, $h) = @_; 1071 my ($self, $w, $h) = @_;
650 1072
651 $h -= List::Util::max 0, $self->border * 2; 1073 $h -= List::Util::max 0, $self->border * 2;
652 $w -= List::Util::max 0, $self->border * 2; 1074 $w -= List::Util::max 0, $self->border * 2;
653 1075
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
654 $self->child->configure ($self->border, $self->border, $w, $h); 1079 $self->child->configure ($self->border, $self->border, $w, $h);
655} 1080}
656 1081
657sub button_down { 1082sub button_down {
658 my ($self, $ev, $x, $y) = @_; 1083 my ($self, $ev, $x, $y) = @_;
659 1084
1085 my ($w, $h) = @$self{qw(w h)};
660 my $border = $self->border; 1086 my $border = $self->border;
661 1087
662 if ($x < $self->{w} && $x >= $self->{w} - $border 1088 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
663 && $y < $self->{h} && $y >= $self->{h} - $border) { 1089 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
664 1090
1091 if ($lr & $td) {
1092 my ($wx, $wy) = ($self->{x}, $self->{y});
665 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1093 my ($ox, $oy) = ($ev->{x}, $ev->{y});
666 my ($bw, $bh) = ($self->{w}, $self->{h}); 1094 my ($bw, $bh) = ($self->{w}, $self->{h});
1095
1096 my $mx = $x < $border;
1097 my $my = $y < $border;
667 1098
668 $self->{motion} = sub { 1099 $self->{motion} = sub {
669 my ($ev, $x, $y) = @_; 1100 my ($ev, $x, $y) = @_;
670 1101
671 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1102 my $dx = $ev->{x} - $ox;
1103 my $dy = $ev->{y} - $oy;
672 1104
673 $self->{user_w} = $bw + $x - $ox; 1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
674 $self->{user_h} = $bh + $y - $oy; 1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
675 $self->check_size; 1107
1108 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
676 }; 1110 };
677 1111
678 } elsif ($x >= 0 && $x < $self->{w} 1112 } elsif ($lr ^ $td) {
679 && $y >= 0 && $y < $border) {
680
681 my ($ox, $oy) = ($ev->button_x, $ev->button_y); 1113 my ($ox, $oy) = ($ev->{x}, $ev->{y});
682 my ($bx, $by) = ($self->{x}, $self->{y}); 1114 my ($bx, $by) = ($self->{x}, $self->{y});
683 1115
684 $self->{motion} = sub { 1116 $self->{motion} = sub {
685 my ($ev, $x, $y) = @_; 1117 my ($ev, $x, $y) = @_;
686 1118
687 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1119 ($x, $y) = ($ev->{x}, $ev->{y});
688 1120
689 $self->move ($bx + $x - $ox, $by + $y - $oy); 1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
690 $self->update;
691 }; 1122 };
692 } 1123 }
693} 1124}
694 1125
695sub button_up { 1126sub button_up {
… …
708 my ($self) = @_; 1139 my ($self) = @_;
709 1140
710 my ($w, $h ) = ($self->{w}, $self->{h}); 1141 my ($w, $h ) = ($self->{w}, $self->{h});
711 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
712 1143
713 glEnable GL_BLEND;
714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
715 glEnable GL_TEXTURE_2D; 1144 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
717 1146
718 my $border = $self->border; 1147 my $border = $self->border;
719 1148
720 glColor @{ $self->{border_bg} }; 1149 glColor @{ $self->{border_bg} };
721 $tex[1]->draw_quad (0, 0, $w, $border); 1150 $border[0]->draw_quad_alpha (0, 0, $w, $border);
722 $tex[3]->draw_quad (0, $border, $border, $ch); 1151 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
723 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1152 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
724 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1153 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
725 1154
726 my $bg = $tex[0]; 1155 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1156 glColor @{ $self->{bg} };
727 1157
728 # TODO: repeat texture not scale 1158 # TODO: repeat texture not scale
729 my $rep_x = $cw / $bg->{w}; 1159 # solve this better(?)
730 my $rep_y = $ch / $bg->{h}; 1160 $bg->{s} = $cw / $bg->{w};
731 1161 $bg->{t} = $ch / $bg->{h};
732 glColor @{ $self->{bg} };
733
734 $bg->{s} = $rep_x;
735 $bg->{t} = $rep_y;
736 $bg->{wrap_mode} = 1;
737 $bg->draw_quad ($border, $border, $cw, $ch); 1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 }
738 1164
739 glDisable GL_TEXTURE_2D; 1165 glDisable GL_TEXTURE_2D;
740 glDisable GL_BLEND; 1166
1167 $self->{title}->draw if $self->{title};
741 1168
742 $self->child->draw; 1169 $self->child->draw;
743} 1170}
744 1171
745############################################################################# 1172#############################################################################
… …
748 1175
749our @ISA = CFClient::UI::Base::; 1176our @ISA = CFClient::UI::Base::;
750 1177
751use List::Util qw(max sum); 1178use List::Util qw(max sum);
752 1179
753use SDL::OpenGL; 1180use CFClient::OpenGL;
754 1181
755sub new { 1182sub new {
756 my $class = shift; 1183 my $class = shift;
757 1184
758 $class->SUPER::new ( 1185 $class->SUPER::new (
759 col_expand => [], 1186 col_expand => [],
760 @_ 1187 @_,
761 ) 1188 )
1189}
1190
1191sub children {
1192 grep $_, map @$_, grep $_, @{ $_[0]{children} }
762} 1193}
763 1194
764sub add { 1195sub add {
765 my ($self, $x, $y, $child) = @_; 1196 my ($self, $x, $y, $child) = @_;
766 1197
767 $child->set_parent ($self); 1198 $child->set_parent ($self);
768 $self->{children}[$y][$x] = $child; 1199 $self->{children}[$y][$x] = $child;
769 1200
770 $child->check_size; 1201 $self->realloc;
771} 1202}
772 1203
773# TODO: move to container class maybe? send childs a signal on removal? 1204# TODO: move to container class maybe? send children a signal on removal?
774sub clear { 1205sub clear {
775 my ($self) = @_; 1206 my ($self) = @_;
776 1207
1208 my @children = $self->children;
777 delete $self->{children}; 1209 delete $self->{children};
778 $self->update; 1210
1211 for (@children) {
1212 delete $_->{parent};
1213 $_->hide;
1214 }
1215
1216 $self->realloc;
779} 1217}
780 1218
781sub get_wh { 1219sub get_wh {
782 my ($self) = @_; 1220 my ($self) = @_;
783 1221
… …
788 or next; 1226 or next;
789 1227
790 for my $x (0 .. $#$row) { 1228 for my $x (0 .. $#$row) {
791 my $widget = $row->[$x] 1229 my $widget = $row->[$x]
792 or next; 1230 or next;
793 my ($w, $h) = $widget->size_request; 1231 my ($w, $h) = @$widget{qw(req_w req_h)};
794 1232
795 $w[$x] = max $w[$x], $w; 1233 $w[$x] = max $w[$x], $w;
796 $h[$y] = max $h[$y], $h; 1234 $h[$y] = max $h[$y], $h;
797 } 1235 }
798 } 1236 }
… …
814sub size_allocate { 1252sub size_allocate {
815 my ($self, $w, $h) = @_; 1253 my ($self, $w, $h) = @_;
816 1254
817 my ($ws, $hs) = $self->get_wh; 1255 my ($ws, $hs) = $self->get_wh;
818 1256
819 my $req_w = sum @$ws; 1257 my $req_w = (sum @$ws) || 1;
820 my $req_h = sum @$hs; 1258 my $req_h = (sum @$hs) || 1;
821 1259
822 # TODO: nicer code && do row_expand 1260 # TODO: nicer code && do row_expand
823 my @col_expand = @{$self->{col_expand}}; 1261 my @col_expand = @{$self->{col_expand}};
824 @col_expand = (1) x @$ws unless @col_expand; 1262 @col_expand = (1) x @$ws unless @col_expand;
825 my $col_expand = (sum @col_expand) || 1; 1263 my $col_expand = (sum @col_expand) || 1;
… …
879 } 1317 }
880} 1318}
881 1319
882############################################################################# 1320#############################################################################
883 1321
884package CFClient::UI::HBox; 1322package CFClient::UI::Box;
885
886# TODO: wrap into common Box base class
887 1323
888our @ISA = CFClient::UI::Container::; 1324our @ISA = CFClient::UI::Container::;
889 1325
890sub size_request { 1326sub size_request {
891 my ($self) = @_; 1327 my ($self) = @_;
892 1328
893 my @alloc = map [$_->size_request], @{$self->{children}}; 1329 $self->{vertical}
894 1330 ? (
895 ( 1331 (List::Util::max map $_->{req_w}, @{$self->{children}}),
896 (List::Util::sum map $_->[0], @alloc), 1332 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
897 (List::Util::max map $_->[1], @alloc), 1333 )
898 ) 1334 : (
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 )
899} 1338}
900 1339
901sub size_allocate { 1340sub size_allocate {
902 my ($self, $w, $h) = @_; 1341 my ($self, $w, $h) = @_;
903 1342
904 ($h, $w) = ($w, $h); 1343 my $space = $self->{vertical} ? $h : $w;
905
906 my $children = $self->{children}; 1344 my $children = $self->{children};
907 1345
908 my @h = map +($_->size_request)[0], @$children; 1346 my @req;
909 1347
910 my $req_h = List::Util::sum @h; 1348 if ($self->{homogeneous}) {
911 1349 @req = ($space / (@$children || 1)) x @$children;
912 if ($req_h > $h) {
913 # ah well, not enough space
914 $_ *= $h / $req_h for @h;
915 } else { 1350 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1352 my $req = List::Util::sum @req;
1353
1354 if ($req > $space) {
1355 # ah well, not enough space
1356 $_ *= $space / $req for @req;
1357 } else {
916 my $exp = List::Util::sum map $_->{expand}, @$children; 1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
917 $exp ||= 1;
918 1359
1360 $space = ($space - $req) / $expand; # remaining space to give away
1361
1362 $req[$_] += $space * $children->[$_]{expand}
919 for (0 .. $#$children) { 1363 for 0 .. $#$children;
920 my $child = $children->[$_];
921
922 my $alloc_h = $h[$_];
923 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
924 $h[$_] = $alloc_h;
925 } 1364 }
926 } 1365 }
927 1366
928 CFClient::UI::harmonize \@h; 1367 CFClient::UI::harmonize \@req;
929 1368
930 my $y = 0; 1369 my $pos = 0;
931 for (0 .. $#$children) { 1370 for (0 .. $#$children) {
932 my $child = $children->[$_];
933 my $h = $h[$_]; 1371 my $alloc = $req[$_];
934 $child->configure ($y, 0, $h, $w); 1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
935 1373
936 $y += $h; 1374 $pos += $alloc;
937 } 1375 }
938 1376
939 1 1377 1
940} 1378}
941 1379
942############################################################################# 1380#############################################################################
943 1381
1382package CFClient::UI::HBox;
1383
1384our @ISA = CFClient::UI::Box::;
1385
1386sub new {
1387 my $class = shift;
1388
1389 $class->SUPER::new (
1390 vertical => 0,
1391 @_,
1392 )
1393}
1394
1395#############################################################################
1396
944package CFClient::UI::VBox; 1397package CFClient::UI::VBox;
945 1398
946# TODO: wrap into common Box base class
947
948our @ISA = CFClient::UI::Container::; 1399our @ISA = CFClient::UI::Box::;
949 1400
950sub size_request { 1401sub new {
951 my ($self) = @_; 1402 my $class = shift;
952 1403
953 my @alloc = map [$_->size_request], @{$self->{children}}; 1404 $class->SUPER::new (
954 1405 vertical => 1,
955 ( 1406 @_,
956 (List::Util::max map $_->[0], @alloc),
957 (List::Util::sum map $_->[1], @alloc),
958 ) 1407 )
959} 1408}
960 1409
961sub size_allocate {
962 my ($self, $w, $h) = @_;
963
964 my $children = $self->{children};
965
966 my @h = map +($_->size_request)[1], @$children;
967
968 my $req_h = List::Util::sum @h;
969
970 if ($req_h > $h) {
971 # ah well, not enough space
972 $_ *= $h / $req_h for @h;
973 } else {
974 my $exp = List::Util::sum map $_->{expand}, @$children;
975 $exp ||= 1;
976
977 for (0 .. $#$children) {
978 my $child = $children->[$_];
979
980 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
981 }
982 }
983
984 CFClient::UI::harmonize \@h;
985
986 my $y = 0;
987 for (0 .. $#$children) {
988 my $child = $children->[$_];
989 my $h = $h[$_];
990 $child->configure (0, $y, $w, $h);
991
992 $y += $h;
993 }
994
995 1
996}
997
998############################################################################# 1410#############################################################################
999 1411
1000package CFClient::UI::Label; 1412package CFClient::UI::Label;
1001 1413
1002our @ISA = CFClient::UI::Base::; 1414our @ISA = CFClient::UI::DrawBG::;
1003 1415
1004use SDL::OpenGL; 1416use CFClient::OpenGL;
1005 1417
1006sub new { 1418sub new {
1007 my ($class, %arg) = @_; 1419 my ($class, %arg) = @_;
1008 1420
1009 my $self = $class->SUPER::new ( 1421 my $self = $class->SUPER::new (
1010 fg => [1, 1, 1], 1422 fg => [1, 1, 1],
1423 #bg => none
1424 #active_bg => none
1425 #font => default_font
1426 #text => initial text
1427 #markup => initial narkup
1428 #max_w => maximum pixel width
1429 ellipsise => 3, # end
1430 layout => (new CFClient::Layout),
1011 fontsize => 1, 1431 fontsize => 1,
1012 text => "",
1013 align => -1, 1432 align => -1,
1014 valign => -1, 1433 valign => -1,
1015 padding => 2, 1434 padding_x => 2,
1016 layout => new CFClient::Layout, 1435 padding_y => 2,
1436 can_events => 0,
1017 %arg 1437 %arg
1018 ); 1438 );
1019 1439
1020 $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d# 1440 if (exists $self->{template}) {
1441 my $layout = new CFClient::Layout;
1442 $layout->set_text (delete $self->{template});
1443 $self->{template} = $layout;
1444 }
1021 1445
1022 $self->set_text (delete $self->{text}) if exists $self->{text}; 1446 if (exists $self->{markup}) {
1023 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1447 $self->set_markup (delete $self->{markup});
1448 } else {
1449 $self->set_text (delete $self->{text});
1450 }
1024 1451
1025 $self 1452 $self
1026} 1453}
1027 1454
1028sub escape_text { 1455sub escape($) {
1029 local $_ = $_[1]; 1456 local $_ = $_[0];
1030 1457
1031 s/&/&amp;/g; 1458 s/&/&amp;/g;
1032 s/>/&gt;/g; 1459 s/>/&gt;/g;
1033 s/</&lt;/g; 1460 s/</&lt;/g;
1034 1461
1035 $_[1] 1462 $_
1463}
1464
1465sub update {
1466 my ($self) = @_;
1467
1468 delete $self->{texture};
1469 $self->SUPER::update;
1036} 1470}
1037 1471
1038sub set_text { 1472sub set_text {
1039 my ($self, $text) = @_; 1473 my ($self, $text) = @_;
1040 1474
1475 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text";
1477
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1041 $self->{layout}->set_text ($text); 1479 $self->{layout}->set_text ($text);
1042 1480
1043 delete $self->{texture}; 1481 $self->realloc;
1044 $self->update; 1482 $self->update;
1045} 1483}
1046 1484
1047sub set_markup { 1485sub set_markup {
1048 my ($self, $markup) = @_; 1486 my ($self, $markup) = @_;
1049 1487
1488 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup";
1490
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1050 $self->{layout}->set_markup ($markup); 1494 $self->{layout}->set_markup ($markup);
1051 1495
1052 delete $self->{texture}; 1496 $self->realloc;
1053 $self->update; 1497 $self->update;
1054} 1498}
1055 1499
1056sub size_request { 1500sub size_request {
1057 my ($self) = @_; 1501 my ($self) = @_;
1058 1502
1059 $self->{layout}->set_width; 1503 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1060 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1061 1508
1062 my ($w, $h) = $self->{layout}->size; 1509 my ($w, $h) = $self->{layout}->size;
1063 1510
1511 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font};
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514
1515 my ($w2, $h2) = $self->{template}->size;
1516
1517 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2;
1064 ( 1519 }
1065 $w + $self->{padding} * 2, 1520
1066 $h + $self->{padding} * 2, 1521 ($w, $h)
1067 )
1068} 1522}
1069 1523
1070sub size_allocate { 1524sub size_allocate {
1071 my ($self, $w, $h) = @_; 1525 my ($self, $w, $h) = @_;
1072 1526
1073 delete $self->{texture}; 1527 delete $self->{texture};
1074} 1528}
1075 1529
1530sub set_fontsize {
1531 my ($self, $fontsize) = @_;
1532
1533 $self->{fontsize} = $fontsize;
1534 delete $self->{texture};
1535
1536 $self->realloc;
1537}
1538
1076sub _draw { 1539sub _draw {
1077 my ($self) = @_; 1540 my ($self) = @_;
1078 1541
1542 $self->SUPER::_draw; # draw background, if applicable
1543
1079 my $tex = $self->{texture} ||= do { 1544 my $tex = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font};
1080 $self->{layout}->set_width ($self->{w}); 1547 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1081 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551
1082 new_from_layout CFClient::Texture $self->{layout} 1552 my $tex = new_from_layout CFClient::Texture $self->{layout};
1553
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5);
1557
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5);
1561
1562 $tex
1083 }; 1563 };
1084 1564
1085 glEnable GL_BLEND;
1086 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1087 glEnable GL_TEXTURE_2D; 1565 glEnable GL_TEXTURE_2D;
1088 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1089 1567
1568 if ($tex->{format} == GL_ALPHA) {
1090 glColor @{$self->{fg}}; 1569 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}); 1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1105 1574
1106 glDisable GL_TEXTURE_2D; 1575 glDisable GL_TEXTURE_2D;
1107 glDisable GL_BLEND;
1108} 1576}
1109 1577
1110############################################################################# 1578#############################################################################
1111 1579
1112package CFClient::UI::EntryBase; 1580package CFClient::UI::EntryBase;
1113 1581
1114our @ISA = CFClient::UI::Label::; 1582our @ISA = CFClient::UI::Label::;
1115 1583
1116use SDL; 1584use CFClient::OpenGL;
1117use SDL::OpenGL;
1118 1585
1119sub new { 1586sub new {
1120 my $class = shift; 1587 my $class = shift;
1121 1588
1122 $class->SUPER::new ( 1589 $class->SUPER::new (
1123 fg => [1, 1, 1], 1590 fg => [1, 1, 1],
1124 bg => [0, 0, 0, 0.2], 1591 bg => [0, 0, 0, 0.2],
1125 active_bg => [1, 1, 1, 0.5], 1592 active_bg => [1, 1, 1, 0.5],
1126 active_fg => [0, 0, 0], 1593 active_fg => [0, 0, 0],
1127 can_hover => 1, 1594 can_hover => 1,
1128 can_focus => 1, 1595 can_focus => 1,
1129 valign => 0, 1596 valign => 0,
1597 can_events => 1,
1598 #text => ...
1130 @_ 1599 @_
1131 ) 1600 )
1132} 1601}
1133 1602
1134sub _set_text { 1603sub _set_text {
… …
1144 $self->{text} = $text; 1613 $self->{text} = $text;
1145 1614
1146 $text =~ s/./*/g if $self->{hidden}; 1615 $text =~ s/./*/g if $self->{hidden};
1147 $self->{layout}->set_text ("$text "); 1616 $self->{layout}->set_text ("$text ");
1148 1617
1149 $self->emit (changed => $self->{text}); 1618 $self->_emit (changed => $self->{text});
1619}
1620
1621sub set_text {
1622 my ($self, $text) = @_;
1623
1624 $self->{cursor} = length $text;
1625 $self->_set_text ($text);
1626
1627 $self->realloc;
1150} 1628}
1151 1629
1152sub get_text { 1630sub get_text {
1153 $_[0]{text} 1631 $_[0]{text}
1154} 1632}
… …
1159 my ($w, $h) = $self->SUPER::size_request; 1637 my ($w, $h) = $self->SUPER::size_request;
1160 1638
1161 ($w + 1, $h) # add 1 for cursor 1639 ($w + 1, $h) # add 1 for cursor
1162} 1640}
1163 1641
1164sub size_allocate {
1165 my ($self, $w, $h) = @_;
1166
1167 $self->_set_text ($self->{text});
1168}
1169
1170sub set_text {
1171 my ($self, $text) = @_;
1172
1173 $self->{cursor} = length $text;
1174 $self->_set_text ($text);
1175 $self->update;
1176}
1177
1178sub key_down { 1642sub key_down {
1179 my ($self, $ev) = @_; 1643 my ($self, $ev) = @_;
1180 1644
1181 my $mod = $ev->key_mod; 1645 my $mod = $ev->{mod};
1182 my $sym = $ev->key_sym; 1646 my $sym = $ev->{sym};
1183
1184 my $uni = $ev->key_unicode; 1647 my $uni = $ev->{unicode};
1185 1648
1186 my $text = $self->get_text; 1649 my $text = $self->get_text;
1187 1650
1188 if ($sym == SDLK_BACKSPACE) { 1651 if ($uni == 8) {
1189 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1652 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1190 } elsif ($sym == SDLK_DELETE) { 1653 } elsif ($uni == 127) {
1191 substr $text, $self->{cursor}, 1, ""; 1654 substr $text, $self->{cursor}, 1, "";
1192 } elsif ($sym == SDLK_LEFT) { 1655 } elsif ($sym == CFClient::SDLK_LEFT) {
1193 --$self->{cursor} if $self->{cursor}; 1656 --$self->{cursor} if $self->{cursor};
1194 } elsif ($sym == SDLK_RIGHT) { 1657 } elsif ($sym == CFClient::SDLK_RIGHT) {
1195 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1658 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1196 } elsif ($sym == SDLK_HOME) { 1659 } elsif ($sym == CFClient::SDLK_HOME) {
1197 $self->{cursor} = 0; 1660 $self->{cursor} = 0;
1198 } elsif ($sym == SDLK_END) { 1661 } elsif ($sym == CFClient::SDLK_END) {
1199 $self->{cursor} = length $text; 1662 $self->{cursor} = length $text;
1200 } elsif ($sym == SDLK_ESCAPE) { 1663 } elsif ($uni == 27) {
1201 $self->emit ('escape'); 1664 $self->_emit ('escape');
1202 } elsif ($uni) { 1665 } elsif ($uni) {
1203 substr $text, $self->{cursor}++, 0, chr $uni; 1666 substr $text, $self->{cursor}++, 0, chr $uni;
1204 } 1667 }
1205 1668
1206 $self->_set_text ($text); 1669 $self->_set_text ($text);
1207 $self->update; 1670
1671 $self->realloc;
1208} 1672}
1209 1673
1210sub focus_in { 1674sub focus_in {
1211 my ($self) = @_; 1675 my ($self) = @_;
1212 1676
… …
1280 1744
1281package CFClient::UI::Entry; 1745package CFClient::UI::Entry;
1282 1746
1283our @ISA = CFClient::UI::EntryBase::; 1747our @ISA = CFClient::UI::EntryBase::;
1284 1748
1285use SDL; 1749use CFClient::OpenGL;
1286use SDL::OpenGL;
1287 1750
1288sub key_down { 1751sub key_down {
1289 my ($self, $ev) = @_; 1752 my ($self, $ev) = @_;
1290 1753
1291 my $sym = $ev->key_sym; 1754 my $sym = $ev->{sym};
1292 1755
1293 if ($sym == SDLK_RETURN) { 1756 if ($sym == 13) {
1757 unshift @{$self->{history}},
1758 my $txt = $self->get_text;
1759 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = '';
1294 $self->emit (activate => $self->get_text); 1761 $self->_emit (activate => $txt);
1295 $self->update; 1762 $self->update;
1763
1764 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text;
1767 }
1768 if (@{$self->{history} || []} > 0) {
1769 $self->{history_pointer}++;
1770 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1771 $self->{history_pointer} = @{$self->{history} || []} - 1;
1772 }
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 }
1775
1776 } elsif ($sym == CFClient::SDLK_DOWN) {
1777 $self->{history_pointer}--;
1778 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1779
1780 if ($self->{history_pointer} >= 0) {
1781 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1782 } else {
1783 $self->set_text ($self->{history_saveback});
1784 }
1296 1785
1297 } else { 1786 } else {
1298 $self->SUPER::key_down ($ev); 1787 $self->SUPER::key_down ($ev);
1299 } 1788 }
1300 1789
… …
1304 1793
1305package CFClient::UI::Button; 1794package CFClient::UI::Button;
1306 1795
1307our @ISA = CFClient::UI::Label::; 1796our @ISA = CFClient::UI::Label::;
1308 1797
1309use SDL; 1798use CFClient::OpenGL;
1310use SDL::OpenGL;
1311 1799
1312my @tex = 1800my @tex =
1313 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1314 qw(b1_button_active.png); 1802 qw(b1_button_active.png);
1315 1803
1316sub new { 1804sub new {
1317 my $class = shift; 1805 my $class = shift;
1318 1806
1319 $class->SUPER::new ( 1807 $class->SUPER::new (
1320 padding => 4, 1808 padding_x => 4,
1809 padding_y => 4,
1321 fg => [1, 1, 1], 1810 fg => [1, 1, 1],
1322 bg => [1, 1, 1, 0.2],
1323 active_fg => [0, 0, 1], 1811 active_fg => [0, 0, 1],
1324 can_hover => 1, 1812 can_hover => 1,
1325 align => 0, 1813 align => 0,
1326 valign => 0, 1814 valign => 0,
1815 can_events => 1,
1327 @_ 1816 @_
1328 ) 1817 )
1329} 1818}
1330 1819
1820sub activate { }
1821
1331sub button_up { 1822sub button_up {
1332 my ($self, $ev, $x, $y) = @_; 1823 my ($self, $ev, $x, $y) = @_;
1333 1824
1825 $self->emit ("activate")
1334 if ($x >= 0 && $x < $self->{w} 1826 if $x >= 0 && $x < $self->{w}
1335 && $y >= 0 && $y < $self->{h}) { 1827 && $y >= 0 && $y < $self->{h};
1336 $self->emit ("activate");
1337 }
1338} 1828}
1339 1829
1340sub _draw { 1830sub _draw {
1341 my ($self) = @_; 1831 my ($self) = @_;
1342 1832
1343 local $self->{fg} = $self->{fg}; 1833 local $self->{fg} = $self->{fg};
1344 1834
1345 if ($GRAB == $self) { 1835 if ($GRAB == $self) {
1346 $self->{fg} = $self->{active_fg}; 1836 $self->{fg} = $self->{active_fg};
1347 } 1837 }
1838
1839 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1;
1842
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844
1845 glDisable GL_TEXTURE_2D;
1846
1847 $self->SUPER::_draw;
1848}
1849
1850#############################################################################
1851
1852package CFClient::UI::CheckBox;
1853
1854our @ISA = CFClient::UI::DrawBG::;
1855
1856my @tex =
1857 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1858 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1859
1860use CFClient::OpenGL;
1861
1862sub new {
1863 my $class = shift;
1864
1865 $class->SUPER::new (
1866 padding_x => 2,
1867 padding_y => 2,
1868 fg => [1, 1, 1],
1869 active_fg => [1, 1, 0],
1870 bg => [0, 0, 0, 0.2],
1871 active_bg => [1, 1, 1, 0.5],
1872 state => 0,
1873 can_hover => 1,
1874 @_
1875 )
1876}
1877
1878sub size_request {
1879 my ($self) = @_;
1880
1881 (6) x 2
1882}
1883
1884sub button_down {
1885 my ($self, $ev, $x, $y) = @_;
1886
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state};
1890 $self->_emit (changed => $self->{state});
1891 }
1892}
1893
1894sub _draw {
1895 my ($self) = @_;
1896
1897 $self->SUPER::_draw;
1898
1899 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1900
1901 my ($w, $h) = @$self{qw(w h)};
1902
1903 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1904
1905 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1906
1907 my $tex = $self->{state} ? $tex[1] : $tex[0];
1908
1909 glEnable GL_TEXTURE_2D;
1910 $tex->draw_quad_alpha (0, 0, $s, $s);
1911 glDisable GL_TEXTURE_2D;
1912}
1913
1914#############################################################################
1915
1916package CFClient::UI::Image;
1917
1918our @ISA = CFClient::UI::Base::;
1919
1920use CFClient::OpenGL;
1921use Carp qw/confess/;
1922
1923our %loaded_images;
1924
1925sub new {
1926 my $class = shift;
1927
1928 my $self = $class->SUPER::new (can_events => 0, @_);
1929
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1931
1932 $loaded_images{$self->{image}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1934
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1936
1937 Scalar::Util::weaken $loaded_images{$self->{image}};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940
1941 $self
1942}
1943
1944sub size_request {
1945 my ($self) = @_;
1946
1947 ($self->{tex}->{w}, $self->{tex}->{h})
1948}
1949
1950sub _draw {
1951 my ($self) = @_;
1952
1953 my $tex = $self->{tex};
1954
1955 my ($w, $h) = ($self->{w}, $self->{h});
1956
1957 if ($self->{rot90}) {
1958 glRotate 90, 0, 0, 1;
1959 glTranslate 0, -$self->{w}, 0;
1960
1961 ($w, $h) = ($h, $w);
1962 }
1963
1964 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966
1967 $tex->draw_quad_alpha (0, 0, $w, $h);
1968
1969 glDisable GL_TEXTURE_2D;
1970}
1971
1972#############################################################################
1973
1974package CFClient::UI::VGauge;
1975
1976our @ISA = CFClient::UI::Base::;
1977
1978use List::Util qw(min max);
1979
1980use CFClient::OpenGL;
1981
1982my %tex = (
1983 food => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1985 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1986 ],
1987 grace => [
1988 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1989 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1990 ],
1991 hp => [
1992 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1993 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1994 ],
1995 mana => [
1996 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1997 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1998 ],
1999);
2000
2001# eg. VGauge->new (gauge => 'food'), default gauge: food
2002sub new {
2003 my $class = shift;
2004
2005 my $self = $class->SUPER::new (
2006 type => 'food',
2007 @_
2008 );
2009
2010 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
2011
2012 $self
2013}
2014
2015sub size_request {
2016 my ($self) = @_;
2017
2018 #my $tex = $tex{$self->{type}}[0];
2019 #@$tex{qw(w h)}
2020 (0, 0)
2021}
2022
2023sub set_max {
2024 my ($self, $max) = @_;
2025
2026 return if $self->{max_val} == $max;
2027
2028 $self->{max_val} = $max;
2029 $self->update;
2030}
2031
2032sub set_value {
2033 my ($self, $val, $max) = @_;
2034
2035 $self->set_max ($max)
2036 if defined $max;
2037
2038 return if $self->{val} == $val;
2039
2040 $self->{val} = $val;
2041 $self->update;
2042}
2043
2044sub _draw {
2045 my ($self) = @_;
2046
2047 my $tex = $tex{$self->{type}};
2048 my ($t1, $t2, $t3) = @$tex;
2049
2050 my ($w, $h) = ($self->{w}, $self->{h});
2051
2052 if ($self->{vertical}) {
2053 glRotate 90, 0, 0, 1;
2054 glTranslate 0, -$self->{w}, 0;
2055
2056 ($w, $h) = ($h, $w);
2057 }
2058
2059 my $ycut = $self->{val} / ($self->{max_val} || 1);
2060
2061 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1;
2063
2064 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2);
1348 2066
1349 glEnable GL_BLEND; 2067 glEnable GL_BLEND;
1350 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1351 glEnable GL_TEXTURE_2D; 2069 glEnable GL_TEXTURE_2D;
1352 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1353 glColor 0, 0, 0, 1;
1354 2071
1355 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2072 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS;
2074 glTexCoord 0 , 0; glVertex 0 , 0;
2075 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2076 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2077 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2078 glEnd;
1356 2079
2080 my $ycut1 = List::Util::min 1, $ycut;
2081 glBindTexture GL_TEXTURE_2D, $t2->{name};
2082 glBegin GL_QUADS;
2083 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2084 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2085 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2086 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2087 glEnd;
2088
2089 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd;
2097 }
2098
2099 glDisable GL_BLEND;
1357 glDisable GL_TEXTURE_2D; 2100 glDisable GL_TEXTURE_2D;
1358 glDisable GL_BLEND;
1359
1360 $self->SUPER::_draw;
1361} 2101}
1362 2102
1363############################################################################# 2103#############################################################################
1364 2104
1365package CFClient::UI::CheckBox; 2105package CFClient::UI::Gauge;
1366 2106
1367our @ISA = CFClient::UI::DrawBG::; 2107our @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 2108
1376sub new { 2109sub new {
1377 my $class = shift; 2110 my ($class, %arg) = @_;
1378 2111
1379 $class->SUPER::new ( 2112 my $self = $class->SUPER::new (
1380 padding => 2, 2113 tooltip => $arg{type},
1381 fg => [1, 1, 1],
1382 active_fg => [1, 1, 0],
1383 state => 0,
1384 can_hover => 1, 2114 can_hover => 1,
1385 @_ 2115 can_events => 1,
2116 %arg,
1386 ) 2117 );
1387}
1388 2118
1389sub size_request { 2119 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
1390 my ($self) = @_; 2120 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
1391 2121 $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 2122
1461 $self 2123 $self
1462} 2124}
1463 2125
1464sub size_request { 2126sub set_fontsize {
1465 my ($self) = @_; 2127 my ($self, $fsize) = @_;
1466 2128
1467 my $tex = $tex{$self->{gauge}}[0]; 2129 $self->{value}->set_fontsize ($fsize);
1468 2130 $self->{max} ->set_fontsize ($fsize);
1469 @$tex{qw(w h)}
1470} 2131}
1471 2132
1472sub set_max { 2133sub set_max {
1473 my ($self, $max) = @_; 2134 my ($self, $max) = @_;
1474 2135
1475 $self->{max_val} = $max; 2136 $self->{gauge}->set_max ($max);
2137 $self->{max}->set_text ($max);
1476} 2138}
1477 2139
1478sub set_value { 2140sub set_value {
1479 my ($self, $val, $max) = @_; 2141 my ($self, $val, $max) = @_;
1480 2142
1481 $self->set_max ($max) 2143 $self->set_max ($max)
1482 if defined $max; 2144 if defined $max;
1483 2145
1484 $max = $self->{max_val}; 2146 $self->{gauge}->set_value ($val, $max);
1485 $self->{val} = $val; 2147 $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} 2148}
1534 2149
1535############################################################################# 2150#############################################################################
1536 2151
1537package CFClient::UI::Slider; 2152package CFClient::UI::Slider;
1538 2153
1539use strict; 2154use strict;
1540 2155
1541use SDL::OpenGL; 2156use CFClient::OpenGL;
1542 2157
1543our @ISA = CFClient::UI::DrawBG::; 2158our @ISA = CFClient::UI::DrawBG::;
1544 2159
1545my @tex = 2160my @tex =
1546 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2161 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1547 qw(s1_slider.png s1_slider_bg.png); 2162 qw(s1_slider.png s1_slider_bg.png);
1548 2163
1549sub new { 2164sub new {
1550 my $class = shift; 2165 my $class = shift;
1551 2166
1552 # range [value, low, high, page] 2167 # range [value, low, high, page, unit]
1553 2168
1554 # TODO: 0-width page 2169 # TODO: 0-width page
1555 # TODO: req_w/h are wrong with vertical 2170 # TODO: req_w/h are wrong with vertical
1556 # TODO: calculations are off 2171 # TODO: calculations are off
1557 my $self = $class->SUPER::new ( 2172 my $self = $class->SUPER::new (
1558 fg => [1, 1, 1], 2173 fg => [1, 1, 1],
1559 active_fg => [0, 0, 0], 2174 active_fg => [0, 0, 0],
2175 bg => [0, 0, 0, 0.2],
2176 active_bg => [1, 1, 1, 0.5],
1560 range => [0, 0, 100, 10], 2177 range => [0, 0, 100, 10, 0],
1561 req_w => 20, 2178 min_w => $::WIDTH / 80,
1562 req_h => 20, 2179 min_h => $::WIDTH / 80,
1563 vertical => 0, 2180 vertical => 0,
1564 can_hover => 1, 2181 can_hover => 1,
1565 inner_pad => 5, 2182 inner_pad => 0.02,
1566 @_ 2183 @_
1567 ); 2184 );
1568 2185
2186 $self->set_value ($self->{range}[0]);
2187 $self->update;
2188
1569 $self 2189 $self
1570} 2190}
1571 2191
2192sub changed { }
2193
2194sub set_range {
2195 my ($self, $range) = @_;
2196
2197 ($range, $self->{range}) = ($self->{range}, $range);
2198
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}";
2201}
2202
2203sub set_value {
2204 my ($self, $value) = @_;
2205
2206 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2207
2208 $hi = $lo + 1 if $hi <= $lo;
2209
2210 $page = $hi - $lo if $page > $hi - $lo;
2211
2212 $value = $lo if $value < $lo;
2213 $value = $hi - $page if $value > $hi - $page;
2214
2215 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2216 if $unit;
2217
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219
2220 if ($value != $old_value) {
2221 $self->_emit (changed => $value);
2222 $self->update;
2223 }
2224}
2225
1572sub size_request { 2226sub size_request {
1573 my ($self) = @_; 2227 my ($self) = @_;
1574 2228
1575 my $w = $self->{req_w}; 2229 ($self->{req_w}, $self->{req_h})
1576 my $h = $self->{req_h};
1577
1578 $self->{vertical} ? ($h, $w) : ($w, $h)
1579} 2230}
1580 2231
1581sub button_down { 2232sub button_down {
1582 my ($self, $ev, $x, $y) = @_; 2233 my ($self, $ev, $x, $y) = @_;
1583 2234
1584 $self->SUPER::button_down ($ev, $x, $y); 2235 $self->SUPER::button_down ($ev, $x, $y);
2236
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238
1585 $self->mouse_motion ($ev, $x, $y); 2239 $self->mouse_motion ($ev, $x, $y);
1586} 2240}
1587 2241
1588sub mouse_motion { 2242sub mouse_motion {
1589 my ($self, $ev, $x, $y) = @_; 2243 my ($self, $ev, $x, $y) = @_;
1590 2244
1591 if ($GRAB == $self) { 2245 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247
2248 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2253 }
2254}
2255
2256sub update {
2257 my ($self) = @_;
2258
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2260 $self->set_value ($self->{range}[0]);
2261
1592 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2262 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100;
1593 2264
1594 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2265 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1595 2266
1596 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2267 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1597 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2268 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1598 2269
1599 $x -= $inner_pad_px; # substract the padding 2270 $value = ($value - $lo) / $range;
1600 $x = $x * ($hi - $lo) / $inner_w + $lo; 2271 $value = $value * $self->{scale} + $self->{offset};
1601 $x = $lo if $x < $lo;
1602 $x = $hi - $page if $x > $hi - $page;
1603 $self->{range}[0] = $x;
1604 2272
1605 $self->emit (changed => $x); 2273 $self->{knob_x} = $value - $knob_w * 0.5;
1606 $self->update; 2274 $self->{knob_w} = $knob_w;
1607 } 2275 });
1608}
1609 2276
1610# the inner_* stuff is for generating a padding for the slider handle, 2277 $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} 2278}
1617 2279
1618sub _draw { 2280sub _draw {
1619 my ($self) = @_; 2281 my ($self) = @_;
1620 2282
1621 $self->SUPER::_draw (); 2283 $self->SUPER::_draw ();
1622 2284
1623 my ($w, $h) = @$self{qw(w h)}; 2285 glScale $self->{w}, $self->{h};
1624 2286
1625 if ($self->{vertical}) { 2287 if ($self->{vertical}) {
1626 # draw a vertical slider like a rotated horizontal slider 2288 # draw a vertical slider like a rotated horizontal slider
1627 2289
2290 glTranslate 1, 0, 0;
1628 glRotate 90, 0, 0, 1; 2291 glRotate 90, 0, 0, 1;
1629 glTranslate 0, -$self->{w}, 0;
1630
1631 ($w, $h) = ($h, $w);
1632 } 2292 }
1633 2293
1634 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2294 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1635 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2295 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1636 2296
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; 2297 glEnable GL_TEXTURE_2D;
1658 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2298 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1659 2299
1660 # draw background 2300 # draw background
1661 $tex[1]->draw_quad (0, 0, $w, $h); 2301 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1662 2302
1663 # draw handle 2303 # draw handle
1664 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2304 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1665 2305
1666 glDisable GL_BLEND;
1667 glDisable GL_TEXTURE_2D; 2306 glDisable GL_TEXTURE_2D;
1668} 2307}
1669 2308
1670############################################################################# 2309#############################################################################
1671 2310
2311package CFClient::UI::ValSlider;
2312
2313our @ISA = CFClient::UI::HBox::;
2314
2315sub new {
2316 my ($class, %arg) = @_;
2317
2318 my $range = delete $arg{range};
2319
2320 my $self = $class->SUPER::new (
2321 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2322 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2323 to_value => sub { shift },
2324 from_value => sub { shift },
2325 %arg,
2326 );
2327
2328 $self->{slider}->connect (changed => sub {
2329 my ($self, $value) = @_;
2330 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2331 $self->{parent}->emit (changed => $value);
2332 });
2333
2334# $self->{entry}->connect (changed => sub {
2335# my ($self, $value) = @_;
2336# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2337# $self->{parent}->emit (changed => $value);
2338# });
2339
2340 $self->add ($self->{slider}, $self->{entry});
2341
2342 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2343
2344 $self
2345}
2346
2347sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) }
2349
2350#############################################################################
2351
1672package CFClient::UI::TextView; 2352package CFClient::UI::TextView;
1673 2353
1674our @ISA = CFClient::UI::HBox::; 2354our @ISA = CFClient::UI::HBox::;
1675 2355
1676use SDL::OpenGL; 2356use CFClient::OpenGL;
1677 2357
1678sub new { 2358sub new {
1679 my $class = shift; 2359 my $class = shift;
1680 2360
1681 my $self = $class->SUPER::new ( 2361 my $self = $class->SUPER::new (
1682 fontsize => 1, 2362 fontsize => 1,
2363 can_events => 0,
2364 #font => default_font
1683 @_, 2365 @_,
1684 2366
1685 layout => (new CFClient::Layout), 2367 layout => (new CFClient::Layout 1),
1686 par => [], 2368 par => [],
1687 height => 0, 2369 height => 0,
1688 children => [ 2370 children => [
1689 (new CFClient::UI::Empty expand => 1), 2371 (new CFClient::UI::Empty expand => 1),
1690 (new CFClient::UI::Slider vertical => 1), 2372 (new CFClient::UI::Slider vertical => 1),
1691 ], 2373 ],
1692 ); 2374 );
1693 2375
1694 $self->{children}[1]->connect (changed => sub { 2376 $self->{children}[1]->connect (changed => sub { $self->update });
1695 $self->update;
1696 });
1697 2377
1698 $self 2378 $self
1699} 2379}
1700 2380
1701sub set_fontsize { 2381sub set_fontsize {
… …
1703 2383
1704 $self->{fontsize} = $fontsize; 2384 $self->{fontsize} = $fontsize;
1705 $self->reflow; 2385 $self->reflow;
1706} 2386}
1707 2387
2388sub size_allocate {
2389 my ($self, $w, $h) = @_;
2390
2391 $self->SUPER::size_allocate ($w, $h);
2392
2393 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w});
2396
2397 $self->reflow;
2398}
2399
1708sub text_height { 2400sub text_size {
1709 my ($self, $text) = @_; 2401 my ($self, $text, $indent) = @_;
1710 2402
1711 my $layout = $self->{layout}; 2403 my $layout = $self->{layout};
1712 2404
1713 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1714 $layout->set_width ($self->{w}); 2406 $layout->set_width ($self->{children}[0]{w} - $indent);
1715 $layout->set_text ($text); 2407 $layout->set_markup ($text);
1716 2408
1717 ($layout->size)[1] 2409 $layout->size
1718} 2410}
1719 2411
1720sub reflow { 2412sub reflow {
1721 my ($self) = @_; 2413 my ($self) = @_;
1722 2414
1723 $self->{need_reflow}++; 2415 $self->{need_reflow}++;
1724 $self->update; 2416 $self->update;
1725} 2417}
1726 2418
1727sub size_allocate { 2419sub set_offset {
2420 my ($self, $offset) = @_;
2421
2422 # todo: base offset on lines or so, not on pixels
2423 $self->{children}[1]->set_value ($offset);
2424}
2425
2426sub clear {
1728 my ($self, $w, $h) = @_; 2427 my ($self) = @_;
1729 2428
1730 $self->SUPER::size_allocate ($w, $h); 2429 $self->{par} = [];
1731 2430 $self->{height} = 0;
1732 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1733 $self->{layout}->set_width ($self->{children}[0]{w});
1734
1735 $self->reflow;
1736} 2432}
1737 2433
1738sub add_paragraph { 2434sub add_paragraph {
1739 my ($self, $color, $text) = @_; 2435 my ($self, $color, $text, $indent) = @_;
1740 2436
1741 #TODO: intelligently "reformat" paragraph 2437 for my $line (split /\n/, $text) {
1742 2438 my ($w, $h) = $self->text_size ($line);
1743 my $height = $self->text_height ($text);
1744
1745 $self->{height} += $height; 2439 $self->{height} += $h;
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2441 }
1746 2442
1747 push @{$self->{par}}, [$height, $color, $text];
1748
1749 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1750 $self->{children}[1]->update;
1751} 2444}
1752 2445
1753sub update { 2446sub update {
1754 my ($self) = @_; 2447 my ($self) = @_;
1755 2448
… …
1757 2450
1758 return unless $self->{h} > 0; 2451 return unless $self->{h} > 0;
1759 2452
1760 delete $self->{texture}; 2453 delete $self->{texture};
1761 2454
1762 $ROOT->on_refresh ($self, sub { 2455 $ROOT->on_post_alloc ($self, sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457
1763 if (delete $self->{need_reflow}) { 2458 if (delete $self->{need_reflow}) {
1764 my $height = 0; 2459 my $height = 0;
1765 2460
1766 $height += $_->[0] = $self->text_height ($_->[2]) 2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
1767 for @{$self->{par}}; 2465 for (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2467 $layout->set_width ($W - $_->[3]);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3];
2471 $_->[1] = $h;
2472 }
2473
2474 $height += $_->[1];
2475 }
1768 2476
1769 $self->{height} = $height; 2477 $self->{height} = $height;
1770 2478
1771 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1772 2480
1773 delete $self->{texture}; 2481 delete $self->{texture};
1774 } 2482 }
1775 2483
1776 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1777 glClearColor 0, 0, 0, 1; 2485 glClearColor 0.5, 0.5, 0.5, 0;
1778 glClear GL_COLOR_BUFFER_BIT; 2486 glClear GL_COLOR_BUFFER_BIT;
1779 2487
2488 my $top = int $self->{children}[1]{range}[0];
2489
2490 my $y0 = $top;
2491 my $y1 = $top + $H;
2492
2493 my $y = 0;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
1780 glEnable GL_BLEND; 2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
1781 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1782 glEnable GL_TEXTURE_2D;
1783 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1784
1785 my $top = int $self->{children}[1]{range}[0];
1786
1787 my $y0 = $top;
1788 my $y1 = $top + $self->{h};
1789
1790 my $y = 0;
1791
1792 my $layout = $self->{layout};
1793 2502
1794 for my $par (@{$self->{par}}) { 2503 for my $par (@{$self->{par}}) {
1795 my $h = $par->[0]; 2504 my $h = $par->[1];
1796 2505
1797 if ($y0 < $y + $h && $y < $y1) { 2506 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
1798 $layout->set_text ($par->[2]); 2509 $layout->set_markup ($par->[4]);
1799 2510
1800 glColor @{ $par->[1] }; 2511 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1801 my ($W, $H) = $layout->size; 2512
1802 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2513 glRasterPos $par->[3], $y - $y0;
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1803 } 2515 }
1804 2516
1805 $y += $h; 2517 $y += $h;
1806 } 2518 }
1807 2519
1808 glDisable GL_TEXTURE_2D;
1809 glDisable GL_BLEND; 2520 glDisable GL_BLEND;
1810 }; 2521 };
1811 }); 2522 });
1812} 2523}
1813 2524
1814sub _draw { 2525sub _draw {
1815 my ($self) = @_; 2526 my ($self) = @_;
1816 2527
1817 if ($self->{texture}) {
1818 glEnable GL_TEXTURE_2D; 2528 glEnable GL_TEXTURE_2D;
1819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1;
1820 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1821 glDisable GL_TEXTURE_2D; 2532 glDisable GL_TEXTURE_2D;
1822 }
1823 2533
1824 $self->{children}[1]->draw; 2534 $self->{children}[1]->draw;
1825 2535
1826} 2536}
1827 2537
1828############################################################################# 2538#############################################################################
1829 2539
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; 2540package CFClient::UI::Animator;
2067 2541
2068use SDL::OpenGL; 2542use CFClient::OpenGL;
2069 2543
2070our @ISA = CFClient::UI::Bin::; 2544our @ISA = CFClient::UI::Bin::;
2071 2545
2072sub moveto { 2546sub moveto {
2073 my ($self, $x, $y) = @_; 2547 my ($self, $x, $y) = @_;
… …
2111 2585
2112sub new { 2586sub new {
2113 my $class = shift; 2587 my $class = shift;
2114 2588
2115 my $self = $class->SUPER::new ( 2589 my $self = $class->SUPER::new (
2116 state => 0, 2590 state => 0,
2117 connect_activate => \&toggle_flopper, 2591 on_activate => \&toggle_flopper,
2118 @_ 2592 @_
2119 ); 2593 );
2120 2594
2121 if ($self->{state}) {
2122 $self->{state} = 0;
2123 $self->toggle_flopper;
2124 }
2125
2126 $self 2595 $self
2127} 2596}
2128 2597
2129sub toggle_flopper { 2598sub toggle_flopper {
2130 my ($self) = @_; 2599 my ($self) = @_;
2131 2600
2132 # TODO: use animation 2601 $self->{other}->toggle_visibility;
2133 if ($self->{state} = !$self->{state}) { 2602}
2134 $CFClient::UI::ROOT->add ($self->{other}); 2603
2135 $self->{other}->move ($self->coord2global (0, $self->{h})); 2604#############################################################################
2605
2606package CFClient::UI::Tooltip;
2607
2608our @ISA = CFClient::UI::Bin::;
2609
2610use CFClient::OpenGL;
2611
2612sub new {
2613 my $class = shift;
2614
2615 $class->SUPER::new (
2616 @_,
2617 can_events => 0,
2618 )
2619}
2620
2621sub set_tooltip_from {
2622 my ($self, $widget) = @_;
2623
2624 my $tooltip = $widget->{tooltip};
2625
2626 if ($ENV{CFPLUS_DEBUG} & 2) {
2627 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}";
2631 }
2632
2633 $self->add (new CFClient::UI::Label
2634 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8,
2637 fg => [0, 0, 0, 1],
2638 ellipsise => 0,
2639 font => ($widget->{tooltip_font} || $::FONT_PROP),
2640 );
2641}
2642
2643sub size_request {
2644 my ($self) = @_;
2645
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647
2648 ($w + 4, $h + 4)
2649}
2650
2651sub size_allocate {
2652 my ($self, $w, $h) = @_;
2653
2654 $self->SUPER::size_allocate ($w - 4, $h - 4);
2655}
2656
2657sub visibility_change {
2658 my ($self, $visible) = @_;
2659
2660 return unless $visible;
2661
2662 $self->{root}->on_post_alloc ("move_$self" => sub {
2663 my $widget = $self->{owner}
2664 or return;
2665
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH;
2670
2671 $self->move_abs ($x, $y);
2672 });
2673}
2674
2675sub _draw {
2676 my ($self) = @_;
2677
2678 glTranslate 0.375, 0.375;
2679
2680 my ($w, $h) = @$self{qw(w h)};
2681
2682 glColor 1, 0.8, 0.4;
2683 glBegin GL_QUADS;
2684 glVertex 0 , 0;
2685 glVertex 0 , $h;
2686 glVertex $w, $h;
2687 glVertex $w, 0;
2688 glEnd;
2689
2690 glColor 0, 0, 0;
2691 glBegin GL_LINE_LOOP;
2692 glVertex 0 , 0;
2693 glVertex 0 , $h;
2694 glVertex $w, $h;
2695 glVertex $w, 0;
2696 glEnd;
2697
2698 glTranslate 2 - 0.375, 2 - 0.375;
2699
2700 $self->SUPER::_draw;
2701}
2702
2703#############################################################################
2704
2705package CFClient::UI::Face;
2706
2707our @ISA = CFClient::UI::Base::;
2708
2709use CFClient::OpenGL;
2710
2711sub new {
2712 my $class = shift;
2713
2714 my $self = $class->SUPER::new (
2715 aspect => 1,
2716 can_events => 0,
2717 @_,
2718 );
2719
2720 if ($self->{anim} && $self->{animspeed}) {
2721 Scalar::Util::weaken (my $widget = $self);
2722
2723 $self->{timer} = Event->timer (
2724 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2725 hard => 1,
2726 interval => $self->{animspeed},
2727 cb => sub {
2728 ++$widget->{frame};
2729 $widget->update;
2730 },
2731 );
2732 }
2733
2734 $self
2735}
2736
2737sub size_request {
2738 (32, 8)
2739}
2740
2741sub update {
2742 my ($self) = @_;
2743
2744 return unless $self->{visible};
2745
2746 $self->SUPER::update;
2747}
2748
2749sub _draw {
2750 my ($self) = @_;
2751
2752 return unless $::CONN;
2753
2754 my $face;
2755
2756 if ($self->{frame}) {
2757 my $anim = $::CONN->{anim}[$self->{anim}];
2758
2759 $face = $anim->[ $self->{frame} % @$anim ]
2760 if $anim && @$anim;
2761 }
2762
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764
2765 if ($tex) {
2766 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D;
2771 }
2772}
2773
2774sub DESTROY {
2775 my ($self) = @_;
2776
2777 $self->{timer}->cancel
2778 if $self->{timer};
2779
2780 $self->SUPER::DESTROY;
2781}
2782
2783#############################################################################
2784
2785package CFClient::UI::Inventory;
2786
2787our @ISA = CFClient::UI::ScrolledWindow::;
2788
2789sub new {
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824
2825#############################################################################
2826
2827package CFClient::UI::Menu;
2828
2829our @ISA = CFClient::UI::FancyFrame::;
2830
2831use CFClient::OpenGL;
2832
2833sub new {
2834 my $class = shift;
2835
2836 my $self = $class->SUPER::new (
2837 items => [],
2838 z => 100,
2839 @_,
2840 );
2841
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843
2844 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item;
2846
2847 # handle various types of items, only text for now
2848 if (!ref $widget) {
2849 $widget = new CFClient::UI::Label
2850 can_hover => 1,
2851 can_events => 1,
2852 text => $widget;
2853 }
2854
2855 $self->{item}{$widget} = $item;
2856
2857 $self->{vbox}->add ($widget);
2858 }
2859
2860 $self
2861}
2862
2863# popup given the event (must be a mouse button down event currently)
2864sub popup {
2865 my ($self, $ev) = @_;
2866
2867 $self->_emit ("popdown");
2868
2869 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self;
2871 $self->{button} = $ev->{button};
2872
2873 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875}
2876
2877sub mouse_motion {
2878 my ($self, $ev, $x, $y) = @_;
2879
2880 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER};
2883}
2884
2885sub button_up {
2886 my ($self, $ev, $x, $y) = @_;
2887
2888 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB;
2890 $self->hide;
2891
2136 $self->emit ("open"); 2892 $self->_emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover};
2894 }
2895}
2896
2897#############################################################################
2898
2899package CFClient::UI::Statusbox;
2900
2901our @ISA = CFClient::UI::VBox::;
2902
2903sub new {
2904 my $class = shift;
2905
2906 $class->SUPER::new (
2907 fontsize => 0.8,
2908 @_,
2909 )
2910}
2911
2912sub reorder {
2913 my ($self) = @_;
2914 my $NOW = time;
2915
2916 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 }
2919
2920 my @widgets;
2921
2922 my @items = sort {
2923 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} };
2926
2927 my $count = 10 + 1;
2928 for my $item (@items) {
2929 last unless --$count;
2930
2931 push @widgets, $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text};
2936
2937 for ($short) {
2938 s/^\s+//;
2939 s/\s+/ /g;
2940 }
2941
2942 new CFClient::UI::Label
2943 markup => $short,
2944 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg},
2950 can_events => 1,
2951 can_hover => 1
2952 };
2953 }
2954
2955 $self->clear;
2956 $self->SUPER::add (reverse @widgets);
2957}
2958
2959sub add {
2960 my ($self, $text, %arg) = @_;
2961
2962 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//;
2964
2965 return unless $text;
2966
2967 my $timeout = time + ((delete $arg{timeout}) || 60);
2968
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970
2971 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) {
2973 $item->{count}++;
2974 } else {
2975 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text;
2977 }
2978 $item->{id} = ++$self->{id};
2979 $item->{timeout} = $timeout;
2980 delete $item->{label};
2137 } else { 2981 } else {
2138 $CFClient::UI::ROOT->remove ($self->{other}); 2982 $self->{item}{$group} = {
2139 $self->emit ("close"); 2983 id => ++$self->{id},
2984 text => $text,
2985 timeout => $timeout,
2986 tooltip => $text,
2987 fg => [0.8, 0.8, 0.8, 0.8],
2988 pri => 0,
2989 count => 1,
2990 %arg,
2991 };
2140 } 2992 }
2141 2993
2142 $self->emit (changed => $self->{state}); 2994 $self->reorder;
2995}
2996
2997sub reconfigure {
2998 my ($self) = @_;
2999
3000 delete $_->{label}
3001 for values %{ $self->{item} || {} };
3002
3003 $self->reorder;
3004 $self->SUPER::reconfigure;
2143} 3005}
2144 3006
2145############################################################################# 3007#############################################################################
2146 3008
2147package CFClient::UI::Root; 3009package CFClient::UI::Root;
2148 3010
2149our @ISA = CFClient::UI::Container::; 3011our @ISA = CFClient::UI::Container::;
2150 3012
2151use SDL::OpenGL; 3013use CFClient::OpenGL;
2152 3014
2153sub check_size { 3015sub new {
2154 my ($self) = @_; 3016 my $class = shift;
2155 3017
2156 $self->configure (0, 0, $::WITH, $::HEIGHT); 3018 my $self = $class->SUPER::new (
3019 visible => 1,
3020 @_,
3021 );
3022
3023 Scalar::Util::weaken ($self->{root} = $self);
3024
3025 $self
2157} 3026}
2158 3027
2159sub size_request { 3028sub size_request {
2160 ($::WIDTH, $::HEIGHT) 3029 my ($self) = @_;
2161}
2162 3030
2163sub configure { 3031 ($self->{w}, $self->{h})
3032}
3033
3034sub _to_pixel {
3035 my ($coord, $size, $max) = @_;
3036
3037 $coord =
3038 $coord eq "center" ? ($max - $size) * 0.5
3039 : $coord eq "max" ? $max
3040 : $coord;
3041
3042 $coord = 0 if $coord < 0;
3043 $coord = $max - $size if $coord > $max - $size;
3044
3045 int $coord + 0.5
3046}
3047
3048sub size_allocate {
2164 my ($self, $x, $y, $w, $h) = @_; 3049 my ($self, $w, $h) = @_;
2165 3050
2166 $self->SUPER::configure ($x, $y, $w, $h); 3051 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2167 3053
2168 $_->configure ($_->{x}, $_->{y}, $_->size_request) 3054 $X = $child->{force_x} if exists $child->{force_x};
2169 for @{$self->{children}}; 3055 $Y = $child->{force_y} if exists $child->{force_y};
2170}
2171 3056
2172sub _topleft { 3057 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h};
3059
3060 $child->configure ($X, $Y, $W, $H);
3061 }
3062}
3063
3064sub coord2local {
2173 my ($self, $x, $y) = @_; 3065 my ($self, $x, $y) = @_;
2174 3066
2175 ($x, $y) 3067 ($x, $y)
2176} 3068}
2177 3069
3070sub coord2global {
3071 my ($self, $x, $y) = @_;
3072
3073 ($x, $y)
3074}
3075
2178sub update { 3076sub update {
2179 my ($self) = @_; 3077 my ($self) = @_;
2180 3078
2181 $self->check_size; 3079 $::WANT_REFRESH++;
2182 ::refresh ();
2183} 3080}
2184 3081
2185sub add { 3082sub add {
2186 my ($self, $child) = @_; 3083 my ($self, @children) = @_;
2187 3084
3085 $_->{is_toplevel} = 1
3086 for @children;
3087
2188 $self->SUPER::add ($child); 3088 $self->SUPER::add (@children);
3089}
3090
3091sub remove {
3092 my ($self, @children) = @_;
3093
3094 $self->SUPER::remove (@children);
3095
3096 delete $self->{is_toplevel}
3097 for @children;
3098
3099 while (@children) {
3100 my $w = pop @children;
3101 push @children, $w->children;
3102 $w->set_invisible;
3103 }
2189} 3104}
2190 3105
2191sub on_refresh { 3106sub on_refresh {
2192 my ($self, $id, $cb) = @_; 3107 my ($self, $id, $cb) = @_;
2193 3108
2194 $self->{refresh_hook}{$id} = $cb; 3109 $self->{refresh_hook}{$id} = $cb;
2195} 3110}
2196 3111
3112sub on_post_alloc {
3113 my ($self, $id, $cb) = @_;
3114
3115 $self->{post_alloc_hook}{$id} = $cb;
3116}
3117
2197sub draw { 3118sub draw {
2198 my ($self) = @_; 3119 my ($self) = @_;
2199 3120
2200 while (my $rcb = delete $self->{refresh_hook}) { 3121 while ($self->{refresh_hook}) {
2201 $_->() for values %$rcb; 3122 $_->()
3123 for values %{delete $self->{refresh_hook}};
2202 } 3124 }
3125
3126 if ($self->{realloc}) {
3127 my @queue;
3128
3129 while () {
3130 if ($self->{realloc}) {
3131 #TODO use array-of-depth approach
3132
3133 use sort 'stable';
3134
3135 @queue = sort { $a->{visible} <=> $b->{visible} }
3136 @queue, values %{delete $self->{realloc}};
3137 }
3138
3139 my $widget = pop @queue || last;
3140
3141 $widget->{visible} or last; # do not resize invisible widgets
3142
3143 my ($w, $h) = $widget->size_request;
3144
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3147
3148 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h};
3150
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3152 || delete $widget->{force_realloc}) {
3153 $widget->{req_w} = $w;
3154 $widget->{req_h} = $h;
3155
3156 $self->{size_alloc}{$widget+0} = $widget;
3157
3158 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent;
3160 #unshift @queue, $parent;
3161 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent;
3163 }
3164 }
3165
3166 delete $self->{realloc}{$widget+0};
3167 }
3168 }
3169
3170 while (my $size_alloc = delete $self->{size_alloc}) {
3171 my @queue = sort { $b->{visible} <=> $a->{visible} }
3172 values %$size_alloc;
3173
3174 while () {
3175 my $widget = pop @queue || last;
3176
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178
3179 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0;
3181
3182 $w = int $w + 0.5;
3183 $h = int $h + 0.5;
3184
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3186 $widget->{w} = $w;
3187 $widget->{h} = $h;
3188
3189 $widget->emit (size_allocate => $w, $h);
3190 }
3191 }
3192 }
3193
3194 while ($self->{post_alloc_hook}) {
3195 $_->()
3196 for values %{delete $self->{post_alloc_hook}};
3197 }
3198
2203 3199
2204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3200 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2206 glClear GL_COLOR_BUFFER_BIT; 3202 glClear GL_COLOR_BUFFER_BIT;
2207 3203
2208 glMatrixMode GL_PROJECTION; 3204 glMatrixMode GL_PROJECTION;
2209 glLoadIdentity; 3205 glLoadIdentity;
2210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2211 glMatrixMode GL_MODELVIEW; 3207 glMatrixMode GL_MODELVIEW;
2212 glLoadIdentity; 3208 glLoadIdentity;
2213 3209
2214 $self->_draw; 3210 $self->_draw;
2215} 3211}
2216 3212
2217############################################################################# 3213#############################################################################
2218 3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226 $vb->add (my $hb = new CFClient::UI::HBox);
3227 $hb->add (new CFClient::UI::Label text => "Key: ");
3228 $hb->add ($self->{keylbl} = new CFClient::UI::Label);
3229 $hb->add (new CFClient::UI::Button
3230 text => "bind",
3231 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3232 on_activate => sub {
3233 $self->ask_for_bind;
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3238 text => "start recording",
3239 tooltip => "Start/Stops recording of actions."
3240 ."All subsequent actions after the recording started will be captured."
3241 ."The actions are displayed after the record was stopped."
3242 ."To bind the action you have to click on the 'Bind' button",
3243 on_activate => sub {
3244 unless ($self->{recording}) {
3245 $self->start;
3246 } else {
3247 $self->stop;
3248 }
3249 });
3250
3251 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3252
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add (new CFClient::UI::Button
3255 text => "ok",
3256 tooltip => "This closes the binding editor and saves the binding",
3257 on_activate => sub {
3258 $self->hide;
3259 $self->commit;
3260 });
3261
3262 $hb->add (new CFClient::UI::Button
3263 text => "cancel",
3264 tooltip => "This closes the binding editor without saving",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->{binding_cancel}->()
3268 if $self->{binding_cancel};
3269 });
3270
3271 $self->update_binding_widgets;
3272
3273 $self
3274}
3275
3276sub commit {
3277 my ($self) = @_;
3278 my ($mod, $sym, $cmds) = $self->get_binding;
3279 if ($sym != 0 && @$cmds > 0) {
3280 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3281 ."'. Don't forget 'Save Config'!");
3282 $self->{binding_change}->($mod, $sym, $cmds)
3283 if $self->{binding_change};
3284 } else {
3285 $::STATUSBOX->add ("No action bound, no keys specified!");
3286 $self->{binding_cancel}->()
3287 if $self->{binding_cancel};
3288 }
3289}
3290
3291sub start {
3292 my ($self) = @_;
3293
3294 $self->{rec_btn}->set_text ("stop recording");
3295 $self->{recording} = 1;
3296 $self->clear_command_list;
3297 $::CONN->start_record if $::CONN;
3298}
3299
3300sub stop {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("start recording");
3304 $self->{recording} = 0;
3305
3306 my $rec;
3307 $rec = $::CONN->stop_record if $::CONN;
3308 return unless ref $rec eq 'ARRAY';
3309 $self->set_command_list ($rec);
3310}
3311
3312sub ask_for_bind {
3313 my ($self, $commit) = @_;
3314
3315 CFClient::Binder::open_binding_dialog (sub {
3316 my ($mod, $sym) = @_;
3317 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3318 $self->update_binding_widgets;
3319 $self->commit if $commit;
3320 });
3321}
3322
3323sub set_binding {
3324 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3325
3326 $self->clear_command_list;
3327 $self->{recording} = 0;
3328 $self->{rec_btn}->set_text ("start recording");
3329
3330 $self->{binding} = [$mod, $sym];
3331 $self->{commands} = $cmds;
3332
3333 $self->{binding_change} = $cb;
3334 $self->{binding_cancel} = $ccb;
3335
3336 $self->update_binding_widgets;
3337}
3338
3339sub update_binding_widgets {
3340 my ($self) = @_;
3341 my ($mod, $sym, $cmds) = $self->get_binding;
3342 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3343 $self->set_command_list ($cmds);
3344}
3345
3346sub get_binding {
3347 my ($self) = @_;
3348 return (
3349 $self->{binding}->[0],
3350 $self->{binding}->[1],
3351 [ grep { defined $_ } @{$self->{commands}} ]
3352 );
3353}
3354
3355sub clear_command_list {
3356 my ($self) = @_;
3357 $self->{cmdbox}->clear ();
3358}
3359
3360sub set_command_list {
3361 my ($self, $cmds) = @_;
3362
3363 $self->{cmdbox}->clear ();
3364 $self->{commands} = $cmds;
3365
3366 my $idx = 0;
3367
3368 for (@$cmds) {
3369 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3370
3371 my $i = $idx;
3372 $hb->add (new CFClient::UI::Button
3373 text => "delete",
3374 tooltip => "Deletes the action from the record",
3375 on_activate => sub {
3376 $self->{cmdbox}->remove ($hb);
3377 $cmds->[$i] = undef;
3378 });
3379
3380 $hb->add (new CFClient::UI::Label text => $_);
3381
3382 $idx++
3383 }
3384}
3385
3386
3387#############################################################################
3388
2219package CFClient::UI; 3389package CFClient::UI;
2220 3390
2221$ROOT = new CFClient::UI::Root; 3391$ROOT = new CFClient::UI::Root;
3392$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2222 3393
22231 33941
2224 3395

Diff Legend

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