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

Diff Legend

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