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.116 by root, Sat Apr 15 21:16:50 2006 UTC vs.
Revision 1.243 by root, Sat May 27 20:46:54 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 (/^on_(.*)$/) {
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} = $x; 284 $self->{x} = int $x;
118 $self->{y} = $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 on_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 => $::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
1053 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy;
1055
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y});
1061 $self->check_size;
1062 };
1063
1064 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y});
1067
1068 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_;
1070
611 ($x, $y) = ($ev->motion_x, $ev->motion_y); 1071 ($x, $y) = ($ev->{x}, $ev->{y});
612 1072
613 $self->{user_w} = $bw + $x - $ox; 1073 $self->{user_x} = $bx + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy; 1074 $self->{user_y} = $by + $y - $oy;
1075 $self->move ($self->{user_x}, $self->{user_y});
615 $self->update; 1076 $self->update;
616 }; 1077 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 } 1078 }
633} 1079}
634 1080
635sub button_up { 1081sub button_up {
636 my ($self, $ev, $x, $y) = @_; 1082 my ($self, $ev, $x, $y) = @_;
… …
648 my ($self) = @_; 1094 my ($self) = @_;
649 1095
650 my ($w, $h ) = ($self->{w}, $self->{h}); 1096 my ($w, $h ) = ($self->{w}, $self->{h});
651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
652 1098
653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
655 glEnable GL_TEXTURE_2D; 1099 glEnable GL_TEXTURE_2D;
656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
657 1101
1102 my $border = $self->border;
1103
658 glColor @{ $self->{border_bg} }; 1104 glColor @{ $self->{border_bg} };
659 $tex[1]->draw_quad (0, 0, $w, $self->{border}); 1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border);
660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch); 1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch); 1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border}); 1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
663 1109
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
664 my $bg = $tex[0]; 1111 my $bg = $tex[0];
665 1112
666 # TODO: repeat texture not scale 1113 # TODO: repeat texture not scale
667 my $rep_x = $cw / $bg->{w}; 1114 my $rep_x = $cw / $bg->{w};
668 my $rep_y = $ch / $bg->{h}; 1115 my $rep_y = $ch / $bg->{h};
669 1116
670 glColor @{ $self->{bg} }; 1117 glColor @{ $self->{bg} };
671 1118
672 $bg->{s} = $rep_x; 1119 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y; 1120 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1; 1121 $bg->{wrap_mode} = 1;
675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch); 1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 }
676 1124
677 glDisable GL_TEXTURE_2D; 1125 glDisable GL_TEXTURE_2D;
678 glDisable GL_BLEND; 1126
1127 $self->{title}->draw if $self->{title};
679 1128
680 $self->child->draw; 1129 $self->child->draw;
681} 1130}
682 1131
683############################################################################# 1132#############################################################################
… …
686 1135
687our @ISA = CFClient::UI::Base::; 1136our @ISA = CFClient::UI::Base::;
688 1137
689use List::Util qw(max sum); 1138use List::Util qw(max sum);
690 1139
691use SDL::OpenGL; 1140use CFClient::OpenGL;
692 1141
693sub new { 1142sub new {
694 my $class = shift; 1143 my $class = shift;
695 1144
696 $class->SUPER::new ( 1145 $class->SUPER::new (
697 col_expand => [], 1146 col_expand => [],
698 @_ 1147 @_,
699 ) 1148 )
1149}
1150
1151sub children {
1152 grep $_, map @$_, grep $_, @{ $_[0]{children} }
700} 1153}
701 1154
702sub add { 1155sub add {
703 my ($self, $x, $y, $child) = @_; 1156 my ($self, $x, $y, $child) = @_;
704 1157
705 $child->set_parent ($self); 1158 $child->set_parent ($self);
706 $self->{children}[$y][$x] = $child; 1159 $self->{children}[$y][$x] = $child;
707 1160
708 $self->{w} = $self->{h} = -1; 1161 $self->check_size (1);
709 $self->update;
710} 1162}
711 1163
712# TODO: move to container class maybe? send childs a signal on removal? 1164# TODO: move to container class maybe? send children a signal on removal?
713sub clear { 1165sub clear {
714 my ($self) = @_; 1166 my ($self) = @_;
715 1167
1168 my @children = $self->children;
716 delete $self->{children}; 1169 delete $self->{children};
1170
1171 for (@children) {
1172 delete $_->{parent};
1173 $_->hide;
1174 }
1175
1176 $self->check_size (1);
717 $self->update; 1177 $self->update;
718} 1178}
719 1179
720sub get_wh { 1180sub get_wh {
721 my ($self) = @_; 1181 my ($self) = @_;
… …
727 or next; 1187 or next;
728 1188
729 for my $x (0 .. $#$row) { 1189 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x] 1190 my $widget = $row->[$x]
731 or next; 1191 or next;
732 my ($w, $h) = $widget->size_request; 1192 my ($w, $h) = @$widget{qw(req_w req_h)};
733 1193
734 $w[$x] = max $w[$x], $w; 1194 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h; 1195 $h[$y] = max $h[$y], $h;
736 } 1196 }
737 } 1197 }
… …
749 (sum @$hs), 1209 (sum @$hs),
750 ) 1210 )
751} 1211}
752 1212
753sub size_allocate { 1213sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_; 1214 my ($self, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757 1215
758 my ($ws, $hs) = $self->get_wh; 1216 my ($ws, $hs) = $self->get_wh;
759 1217
760 my $req_w = sum @$ws; 1218 my $req_w = (sum @$ws) || 1;
761 my $req_h = sum @$hs; 1219 my $req_h = (sum @$hs) || 1;
762 1220
763 # TODO: nicer code && do row_expand 1221 # TODO: nicer code && do row_expand
764 my @col_expand = @{$self->{col_expand}}; 1222 my @col_expand = @{$self->{col_expand}};
765 @col_expand = (1) x @$ws unless @col_expand; 1223 @col_expand = (1) x @$ws unless @col_expand;
766 my $col_expand = (sum @col_expand) || 1; 1224 my $col_expand = (sum @col_expand) || 1;
… …
783 1241
784 for my $c (0 .. $#$row) { 1242 for my $c (0 .. $#$row) {
785 my $col_w = $ws->[$c]; 1243 my $col_w = $ws->[$c];
786 1244
787 if (my $widget = $row->[$c]) { 1245 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h); 1246 $widget->configure ($x, $y, $col_w, $row_h);
789 } 1247 }
790 1248
791 $x += $col_w; 1249 $x += $col_w;
792 } 1250 }
793 1251
… …
838 (List::Util::max map $_->[1], @alloc), 1296 (List::Util::max map $_->[1], @alloc),
839 ) 1297 )
840} 1298}
841 1299
842sub size_allocate { 1300sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_; 1301 my ($self, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846 1302
847 ($h, $w) = ($w, $h); 1303 ($h, $w) = ($w, $h);
848 1304
849 my $children = $self->{children}; 1305 my $children = $self->{children};
850 1306
851 my @h = map +($_->size_request)[0], @$children; 1307 my @h = map $_->{req_w}, @$children;
852 1308
853 my $req_h = List::Util::sum @h; 1309 my $req_h = List::Util::sum @h;
854 1310
855 if ($req_h > $h) { 1311 if ($req_h > $h) {
856 # ah well, not enough space 1312 # ah well, not enough space
… …
872 1328
873 my $y = 0; 1329 my $y = 0;
874 for (0 .. $#$children) { 1330 for (0 .. $#$children) {
875 my $child = $children->[$_]; 1331 my $child = $children->[$_];
876 my $h = $h[$_]; 1332 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w); 1333 $child->configure ($y, 0, $h, $w);
878 1334
879 $y += $h; 1335 $y += $h;
880 } 1336 }
1337
1338 1
881} 1339}
882 1340
883############################################################################# 1341#############################################################################
884 1342
885package CFClient::UI::VBox; 1343package CFClient::UI::VBox;
… …
898 (List::Util::sum map $_->[1], @alloc), 1356 (List::Util::sum map $_->[1], @alloc),
899 ) 1357 )
900} 1358}
901 1359
902sub size_allocate { 1360sub size_allocate {
903 my ($self, $x, $y, $w, $h) = @_; 1361 my ($self, $w, $h) = @_;
904 1362
905 $self->_size_allocate ($x, $y, $w, $h); 1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
906 1364
907 my $children = $self->{children}; 1365 my $children = $self->{children};
908 1366
909 my @h = map +($_->size_request)[1], @$children; 1367 my @h = map $_->{req_h}, @$children;
910 1368
911 my $req_h = List::Util::sum @h; 1369 my $req_h = List::Util::sum @h;
912 1370
913 if ($req_h > $h) { 1371 if ($req_h > $h) {
914 # ah well, not enough space 1372 # ah well, not enough space
… …
928 1386
929 my $y = 0; 1387 my $y = 0;
930 for (0 .. $#$children) { 1388 for (0 .. $#$children) {
931 my $child = $children->[$_]; 1389 my $child = $children->[$_];
932 my $h = $h[$_]; 1390 my $h = $h[$_];
933 $child->size_allocate (0, $y, $w, $h); 1391 $child->configure (0, $y, $w, $h);
934 1392
935 $y += $h; 1393 $y += $h;
936 } 1394 }
1395
1396 1
937} 1397}
938 1398
939############################################################################# 1399#############################################################################
940 1400
941package CFClient::UI::Label; 1401package CFClient::UI::Label;
942 1402
943our @ISA = CFClient::UI::Base::; 1403our @ISA = CFClient::UI::DrawBG::;
944 1404
945use SDL::OpenGL; 1405use CFClient::OpenGL;
946 1406
947sub new { 1407sub new {
948 my ($class, %arg) = @_; 1408 my ($class, %arg) = @_;
949 1409
950 my $self = $class->SUPER::new ( 1410 my $self = $class->SUPER::new (
951 fg => [1, 1, 1], 1411 fg => [1, 1, 1],
952 fontsize => $::FONTSIZE, 1412 #bg => none
953 text => "", 1413 #active_bg => none
1414 #font => default_font
1415 #text => initial text
1416 #markup => initial narkup
1417 #max_w => maximum pixel width
1418 ellipsise => 3, # end
1419 layout => (new CFClient::Layout),
1420 fontsize => 1,
954 align => -1, 1421 align => -1,
955 valign => -1, 1422 valign => -1,
956 padding => 2, 1423 padding => 2,
957 layout => new CFClient::Layout, 1424 can_events => 0,
958 %arg 1425 %arg
959 ); 1426 );
960 1427
1428 if (exists $self->{template}) {
1429 my $layout = new CFClient::Layout;
1430 $layout->set_text (delete $self->{template});
1431 $self->{template} = $layout;
1432 }
1433
1434 if (exists $self->{markup}) {
1435 $self->set_markup (delete $self->{markup});
1436 } else {
961 $self->set_text ($self->{text}); 1437 $self->set_text (delete $self->{text});
1438 }
962 1439
963 $self 1440 $self
964} 1441}
965 1442
966sub escape_text { 1443sub escape($) {
967 local $_ = $_[1]; 1444 local $_ = $_[0];
968 1445
969 s/&/&amp;/g; 1446 s/&/&amp;/g;
970 s/>/&gt;/g; 1447 s/>/&gt;/g;
971 s/</&lt;/g; 1448 s/</&lt;/g;
972 1449
973 $_[1] 1450 $_
1451}
1452
1453sub update {
1454 my ($self) = @_;
1455
1456 delete $self->{texture};
1457 $self->SUPER::update;
974} 1458}
975 1459
976sub set_text { 1460sub set_text {
977 my ($self, $text) = @_; 1461 my ($self, $text) = @_;
978 1462
1463 return if $self->{text} eq "T$text";
979 $self->{text} = $text; 1464 $self->{text} = "T$text";
1465
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
980 $self->{layout}->set_markup ($text); 1467 $self->{layout}->set_text ($text);
981 1468
982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
984 $self->update; 1469 $self->update;
1470 $self->check_size;
985} 1471}
986 1472
987sub get_text { 1473sub set_markup {
988 my ($self, $text) = @_; 1474 my ($self, $markup) = @_;
989 1475
990 $self->{text} 1476 return if $self->{text} eq "M$markup";
1477 $self->{text} = "M$markup";
1478
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup);
1483
1484 $self->update;
1485 $self->check_size;
991} 1486}
992 1487
993sub size_request { 1488sub size_request {
994 my ($self) = @_; 1489 my ($self) = @_;
995 1490
996 $self->{layout}->set_width; 1491 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
997 $self->{layout}->set_height ($self->{fontsize}); 1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496
998 my ($w, $h) = $self->{layout}->size; 1497 my ($w, $h) = $self->{layout}->size;
1498
1499 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502
1503 my ($w2, $h2) = $self->{template}->size;
1504
1505 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2;
1507 }
999 1508
1000 ( 1509 (
1001 $w + $self->{padding} * 2, 1510 $w + $self->{padding} * 2,
1002 $h + $self->{padding} * 2, 1511 $h + $self->{padding} * 2,
1003 ) 1512 )
1004} 1513}
1005 1514
1006sub size_allocate { 1515sub size_allocate {
1007 my ($self, $x, $y, $w, $h) = @_; 1516 my ($self, $w, $h) = @_;
1008
1009 $self->_size_allocate ($x, $y, $w, $h) or return;
1010 1517
1011 delete $self->{texture}; 1518 delete $self->{texture};
1012} 1519}
1013 1520
1014sub update { 1521sub set_fontsize {
1015 my ($self) = @_; 1522 my ($self, $fontsize) = @_;
1016 1523
1524 $self->{fontsize} = $fontsize;
1017 delete $self->{texture}; 1525 delete $self->{texture};
1526
1018 $self->SUPER::update; 1527 $self->update;
1528 $self->check_size;
1019} 1529}
1020 1530
1021sub _draw { 1531sub _draw {
1022 my ($self) = @_; 1532 my ($self) = @_;
1023 1533
1534 $self->SUPER::_draw; # draw background, if applicable
1535
1024 my $tex = $self->{texture} ||= do { 1536 my $tex = $self->{texture} ||= do {
1537 $self->{layout}->set_foreground (@{$self->{fg}});
1538 $self->{layout}->set_font ($self->{font}) if $self->{font};
1025 $self->{layout}->set_width ($self->{w}); 1539 $self->{layout}->set_width ($self->{w});
1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize}); 1540 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543
1027 new_from_layout CFClient::Texture $self->{layout} 1544 my $tex = new_from_layout CFClient::Texture $self->{layout};
1545
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1548 : ($self->{w} - $tex->{w}) * 0.5);
1549
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1552 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1028 }; 1555 };
1029 1556
1030 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1032 glEnable GL_TEXTURE_2D; 1557 glEnable GL_TEXTURE_2D;
1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1034 1559
1560 if ($tex->{format} == GL_ALPHA) {
1035 glColor @{$self->{fg}}; 1561 glColor @{$self->{fg}};
1036 1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1037 my $x = 1563 } else {
1038 $self->{align} < 0 ? $self->{padding} 1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1565 }
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 1566
1049 glDisable GL_TEXTURE_2D; 1567 glDisable GL_TEXTURE_2D;
1050 glDisable GL_BLEND;
1051} 1568}
1052 1569
1053############################################################################# 1570#############################################################################
1054 1571
1055package CFClient::UI::Entry; 1572package CFClient::UI::EntryBase;
1056 1573
1057our @ISA = CFClient::UI::Label::; 1574our @ISA = CFClient::UI::Label::;
1058 1575
1059use SDL; 1576use CFClient::OpenGL;
1060use SDL::OpenGL;
1061 1577
1062sub new { 1578sub new {
1063 my $class = shift; 1579 my $class = shift;
1064 1580
1065 $class->SUPER::new ( 1581 $class->SUPER::new (
1066 fg => [1, 1, 1], 1582 fg => [1, 1, 1],
1067 bg => [0, 0, 0, 0.2], 1583 bg => [0, 0, 0, 0.2],
1068 active_bg => [1, 1, 1, 0.5], 1584 active_bg => [1, 1, 1, 0.5],
1069 active_fg => [0, 0, 0], 1585 active_fg => [0, 0, 0],
1070 can_hover => 1, 1586 can_hover => 1,
1071 can_focus => 1, 1587 can_focus => 1,
1072 valign => 0, 1588 valign => 0,
1589 can_events => 1,
1590 #text => ...
1073 @_ 1591 @_
1074 ) 1592 )
1075} 1593}
1076 1594
1077sub _set_text { 1595sub _set_text {
1078 my ($self, $text) = @_; 1596 my ($self, $text) = @_;
1079 1597
1080 my $old_text = $self->{text}; 1598 delete $self->{cur_h};
1599
1600 return if $self->{text} eq $text;
1601
1602 delete $self->{texture};
1081 1603
1082 $self->{last_activity} = $::NOW; 1604 $self->{last_activity} = $::NOW;
1083
1084 $self->{text} = $text; 1605 $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 1606
1088 $text =~ s/./*/g if $self->{hidden}; 1607 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text ");
1089 1609
1090 $self->{layout}->set_markup ($self->escape_text ($text) . " "); 1610 $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} 1611}
1116 1612
1117sub set_text { 1613sub set_text {
1118 my ($self, $text) = @_; 1614 my ($self, $text) = @_;
1119 1615
1120 $self->{cursor} = length $text; 1616 $self->{cursor} = length $text;
1121 $self->_set_text ($text); 1617 $self->_set_text ($text);
1122 $self->update; 1618 $self->update;
1619 $self->check_size;
1620}
1621
1622sub get_text {
1623 $_[0]{text}
1624}
1625
1626sub size_request {
1627 my ($self) = @_;
1628
1629 my ($w, $h) = $self->SUPER::size_request;
1630
1631 ($w + 1, $h) # add 1 for cursor
1123} 1632}
1124 1633
1125sub key_down { 1634sub key_down {
1126 my ($self, $ev) = @_; 1635 my ($self, $ev) = @_;
1127 1636
1128 my $mod = $ev->key_mod; 1637 my $mod = $ev->{mod};
1129 my $sym = $ev->key_sym; 1638 my $sym = $ev->{sym};
1130
1131 my $uni = $ev->key_unicode; 1639 my $uni = $ev->{unicode};
1132 1640
1133 my $text = $self->get_text; 1641 my $text = $self->get_text;
1134 1642
1135 if ($sym == SDLK_BACKSPACE) { 1643 if ($uni == 8) {
1136 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1644 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1137 } elsif ($sym == SDLK_DELETE) { 1645 } elsif ($uni == 127) {
1138 substr $text, $self->{cursor}, 1, ""; 1646 substr $text, $self->{cursor}, 1, "";
1139 } elsif ($sym == SDLK_LEFT) { 1647 } elsif ($sym == CFClient::SDLK_LEFT) {
1140 --$self->{cursor} if $self->{cursor}; 1648 --$self->{cursor} if $self->{cursor};
1141 } elsif ($sym == SDLK_RIGHT) { 1649 } elsif ($sym == CFClient::SDLK_RIGHT) {
1142 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1650 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1143 } elsif ($sym == SDLK_HOME) { 1651 } elsif ($sym == CFClient::SDLK_HOME) {
1144 $self->{cursor} = 0; 1652 $self->{cursor} = 0;
1145 } elsif ($sym == SDLK_END) { 1653 } elsif ($sym == CFClient::SDLK_END) {
1146 $self->{cursor} = length $text; 1654 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) { 1655 } elsif ($uni == 27) {
1148 $self->emit ('escape'); 1656 $self->_emit ('escape');
1149 } elsif ($uni) { 1657 } elsif ($uni) {
1150 substr $text, $self->{cursor}++, 0, chr $uni; 1658 substr $text, $self->{cursor}++, 0, chr $uni;
1151 } 1659 }
1152 1660
1153 $self->_set_text ($text); 1661 $self->_set_text ($text);
1154 $self->update; 1662 $self->update;
1663 $self->check_size;
1155} 1664}
1156 1665
1157sub focus_in { 1666sub focus_in {
1158 my ($self) = @_; 1667 my ($self) = @_;
1159 1668
… …
1207 1716
1208 $self->SUPER::_draw; 1717 $self->SUPER::_draw;
1209 1718
1210 #TODO: force update every cursor change :( 1719 #TODO: force update every cursor change :(
1211 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1720 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1721
1722 unless (exists $self->{cur_h}) {
1723 my $text = substr $self->{text}, 0, $self->{cursor};
1724 utf8::encode $text;
1725
1726 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1727 }
1728
1212 glColor @{$self->{fg}}; 1729 glColor @{$self->{fg}};
1213 glBegin GL_LINES; 1730 glBegin GL_LINES;
1214 glVertex $self->{cur_x}, $self->{cur_y};
1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1731 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1732 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1216 glEnd; 1733 glEnd;
1217 } 1734 }
1218} 1735}
1219 1736
1220package CFClient::UI::LineEntry; 1737package CFClient::UI::Entry;
1221 1738
1222our @ISA = CFClient::UI::Entry::; 1739our @ISA = CFClient::UI::EntryBase::;
1223 1740
1224use SDL; 1741use CFClient::OpenGL;
1225use SDL::OpenGL;
1226 1742
1227sub key_down { 1743sub key_down {
1228 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1229 1745
1230 my $sym = $ev->key_sym; 1746 my $sym = $ev->{sym};
1231 1747
1232 if ($sym == SDLK_RETURN) { 1748 if ($sym == 13) {
1749 unshift @{$self->{history}},
1750 my $txt = $self->get_text;
1751 $self->{history_pointer} = -1;
1752 $self->{history_saveback} = '';
1233 $self->emit (activate => $self->get_text); 1753 $self->_emit (activate => $txt);
1234 $self->update; 1754 $self->update;
1755
1756 } elsif ($sym == CFClient::SDLK_UP) {
1757 if ($self->{history_pointer} < 0) {
1758 $self->{history_saveback} = $self->get_text;
1759 }
1760 if (@{$self->{history} || []} > 0) {
1761 $self->{history_pointer}++;
1762 if ($self->{history_pointer} >= @{$self->{history} || []}) {
1763 $self->{history_pointer} = @{$self->{history} || []} - 1;
1764 }
1765 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1766 }
1767
1768 } elsif ($sym == CFClient::SDLK_DOWN) {
1769 $self->{history_pointer}--;
1770 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1771
1772 if ($self->{history_pointer} >= 0) {
1773 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1774 } else {
1775 $self->set_text ($self->{history_saveback});
1776 }
1235 1777
1236 } else { 1778 } else {
1237 $self->SUPER::key_down ($ev); 1779 $self->SUPER::key_down ($ev);
1238 } 1780 }
1239 1781
… …
1243 1785
1244package CFClient::UI::Button; 1786package CFClient::UI::Button;
1245 1787
1246our @ISA = CFClient::UI::Label::; 1788our @ISA = CFClient::UI::Label::;
1247 1789
1248use SDL; 1790use CFClient::OpenGL;
1249use SDL::OpenGL;
1250 1791
1251my @tex = 1792my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1793 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1253 qw(b1_button_active.png); 1794 qw(b1_button_active.png);
1254 1795
1255sub new { 1796sub new {
1256 my $class = shift; 1797 my $class = shift;
1257 1798
1258 $class->SUPER::new ( 1799 $class->SUPER::new (
1259 padding => 4, 1800 padding => 4,
1260 fg => [1, 1, 1], 1801 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0], 1802 active_fg => [0, 0, 1],
1263 can_hover => 1, 1803 can_hover => 1,
1804 align => 0,
1805 valign => 0,
1806 can_events => 1,
1264 @_ 1807 @_
1265 ) 1808 )
1266} 1809}
1267 1810
1811sub activate { }
1812
1268sub button_up { 1813sub button_up {
1269 my ($self, $ev, $x, $y) = @_; 1814 my ($self, $ev, $x, $y) = @_;
1270 1815
1816 $self->emit ("activate")
1271 if ($x >= 0 && $x < $self->{w} 1817 if $x >= 0 && $x < $self->{w}
1272 && $y >= 0 && $y < $self->{h}) { 1818 && $y >= 0 && $y < $self->{h};
1273 $self->emit ("activate");
1274 }
1275} 1819}
1276 1820
1277sub _draw { 1821sub _draw {
1278 my ($self) = @_; 1822 my ($self) = @_;
1279 1823
1280 local $self->{fg} = $self->{fg}; 1824 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1282
1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286 1825
1287 if ($GRAB == $self) { 1826 if ($GRAB == $self) {
1288 $self->{fg} = $self->{active_fg}; 1827 $self->{fg} = $self->{active_fg};
1289 } 1828 }
1290 1829
1291 glBindTexture GL_TEXTURE_2D, $tex->{name}; 1830 glEnable GL_TEXTURE_2D;
1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1;
1293 1833
1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 1834 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1295 1835
1296 glDisable GL_TEXTURE_2D; 1836 glDisable GL_TEXTURE_2D;
1297 glDisable GL_BLEND;
1298 1837
1299 $self->SUPER::_draw; 1838 $self->SUPER::_draw;
1300} 1839}
1301 1840
1302############################################################################# 1841#############################################################################
… …
1304package CFClient::UI::CheckBox; 1843package CFClient::UI::CheckBox;
1305 1844
1306our @ISA = CFClient::UI::DrawBG::; 1845our @ISA = CFClient::UI::DrawBG::;
1307 1846
1308my @tex = 1847my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 1848 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png); 1849 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311 1850
1312use SDL; 1851use CFClient::OpenGL;
1313use SDL::OpenGL;
1314 1852
1315sub new { 1853sub new {
1316 my $class = shift; 1854 my $class = shift;
1317 1855
1318 $class->SUPER::new ( 1856 $class->SUPER::new (
1319 padding => 2, 1857 padding => 2,
1320 fg => [1, 1, 1], 1858 fg => [1, 1, 1],
1321 active_fg => [1, 1, 0], 1859 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5],
1322 state => 0, 1862 state => 0,
1323 can_hover => 1, 1863 can_hover => 1,
1324 @_ 1864 @_
1325 ) 1865 )
1326} 1866}
… …
1329 my ($self) = @_; 1869 my ($self) = @_;
1330 1870
1331 ($self->{padding} * 2 + 6) x 2 1871 ($self->{padding} * 2 + 6) x 2
1332} 1872}
1333 1873
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down { 1874sub button_down {
1341 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1342 1876
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1345 $self->{state} = !$self->{state}; 1879 $self->{state} = !$self->{state};
1346 $self->emit (changed => $self->{state}); 1880 $self->_emit (changed => $self->{state});
1347 } 1881 }
1348} 1882}
1349 1883
1350sub _draw { 1884sub _draw {
1351 my ($self) = @_; 1885 my ($self) = @_;
… …
1356 1890
1357 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1358 1892
1359 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1360 1894
1895 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896
1897 glEnable GL_TEXTURE_2D;
1898 $tex->draw_quad_alpha (0, 0, $s, $s);
1899 glDisable GL_TEXTURE_2D;
1900}
1901
1902#############################################################################
1903
1904package CFClient::UI::Image;
1905
1906our @ISA = CFClient::UI::Base::;
1907
1908use CFClient::OpenGL;
1909use Carp qw/confess/;
1910
1911our %loaded_images;
1912
1913sub new {
1914 my $class = shift;
1915
1916 my $self = $class->SUPER::new (can_events => 0, @_);
1917
1918 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1919
1920 $loaded_images{$self->{image}} ||=
1921 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1922
1923 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1924
1925 Scalar::Util::weaken $loaded_images{$self->{image}};
1926
1927 $self->{aspect} = $tex->{w} / $tex->{h};
1928
1929 $self
1930}
1931
1932sub size_request {
1933 my ($self) = @_;
1934
1935 ($self->{tex}->{w}, $self->{tex}->{h})
1936}
1937
1938sub _draw {
1939 my ($self) = @_;
1940
1941 my $tex = $self->{tex};
1942
1943 my ($w, $h) = ($self->{w}, $self->{h});
1944
1945 if ($self->{rot90}) {
1946 glRotate 90, 0, 0, 1;
1947 glTranslate 0, -$self->{w}, 0;
1948
1949 ($w, $h) = ($h, $w);
1950 }
1951
1952 glEnable GL_TEXTURE_2D;
1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1954
1955 $tex->draw_quad_alpha (0, 0, $w, $h);
1956
1957 glDisable GL_TEXTURE_2D;
1958}
1959
1960#############################################################################
1961
1962package CFClient::UI::VGauge;
1963
1964our @ISA = CFClient::UI::Base::;
1965
1966use List::Util qw(min max);
1967
1968use CFClient::OpenGL;
1969
1970my %tex = (
1971 food => [
1972 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1973 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1974 ],
1975 grace => [
1976 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1977 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1978 ],
1979 hp => [
1980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1981 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1982 ],
1983 mana => [
1984 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1985 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1986 ],
1987);
1988
1989# eg. VGauge->new (gauge => 'food'), default gauge: food
1990sub new {
1991 my $class = shift;
1992
1993 my $self = $class->SUPER::new (
1994 type => 'food',
1995 @_
1996 );
1997
1998 $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
1999
2000 $self
2001}
2002
2003sub size_request {
2004 my ($self) = @_;
2005
2006 #my $tex = $tex{$self->{type}}[0];
2007 #@$tex{qw(w h)}
2008 (0, 0)
2009}
2010
2011sub set_max {
2012 my ($self, $max) = @_;
2013
2014 return if $self->{max_val} == $max;
2015
2016 $self->{max_val} = $max;
2017 $self->update;
2018}
2019
2020sub set_value {
2021 my ($self, $val, $max) = @_;
2022
2023 $self->set_max ($max)
2024 if defined $max;
2025
2026 return if $self->{val} == $val;
2027
2028 $self->{val} = $val;
2029 $self->update;
2030}
2031
2032sub _draw {
2033 my ($self) = @_;
2034
2035 my $tex = $tex{$self->{type}};
2036 my ($t1, $t2, $t3) = @$tex;
2037
2038 my ($w, $h) = ($self->{w}, $self->{h});
2039
2040 if ($self->{vertical}) {
2041 glRotate 90, 0, 0, 1;
2042 glTranslate 0, -$self->{w}, 0;
2043
2044 ($w, $h) = ($h, $w);
2045 }
2046
2047 my $ycut = $self->{val} / ($self->{max_val} || 1);
2048
2049 my $ycut1 = max 0, min 1, $ycut;
2050 my $ycut2 = max 0, min 1, $ycut - 1;
2051
2052 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2);
2054
1361 glEnable GL_BLEND; 2055 glEnable GL_BLEND;
2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1362 glEnable GL_TEXTURE_2D; 2057 glEnable GL_TEXTURE_2D;
1363 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1364 2059
1365 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2060 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS;
2062 glTexCoord 0 , 0; glVertex 0 , 0;
2063 glTexCoord 0 , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
2064 glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
2065 glTexCoord $t1->{s}, 0; glVertex $w, 0;
2066 glEnd;
1366 2067
1367 $tex->draw_quad (0, 0, $s, $s); 2068 my $ycut1 = List::Util::min 1, $ycut;
2069 glBindTexture GL_TEXTURE_2D, $t2->{name};
2070 glBegin GL_QUADS;
2071 glTexCoord 0 , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
2072 glTexCoord 0 , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
2073 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
2074 glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
2075 glEnd;
1368 2076
2077 if ($t3) {
2078 glBindTexture GL_TEXTURE_2D, $t3->{name};
2079 glBegin GL_QUADS;
2080 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2081 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h};
2082 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h};
2083 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2084 glEnd;
2085 }
2086
2087 glDisable GL_BLEND;
1369 glDisable GL_TEXTURE_2D; 2088 glDisable GL_TEXTURE_2D;
1370 glDisable GL_BLEND;
1371} 2089}
1372 2090
1373############################################################################# 2091#############################################################################
1374 2092
2093package CFClient::UI::Gauge;
2094
2095our @ISA = CFClient::UI::VBox::;
2096
2097sub new {
2098 my ($class, %arg) = @_;
2099
2100 my $self = $class->SUPER::new (
2101 tooltip => $arg{type},
2102 can_hover => 1,
2103 can_events => 1,
2104 %arg,
2105 );
2106
2107 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
2108 $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2109 $self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");
2110
2111 $self
2112}
2113
2114sub set_fontsize {
2115 my ($self, $fsize) = @_;
2116
2117 $self->{value}->set_fontsize ($fsize);
2118 $self->{max} ->set_fontsize ($fsize);
2119}
2120
2121sub set_max {
2122 my ($self, $max) = @_;
2123
2124 $self->{gauge}->set_max ($max);
2125 $self->{max}->set_text ($max);
2126}
2127
2128sub set_value {
2129 my ($self, $val, $max) = @_;
2130
2131 $self->set_max ($max)
2132 if defined $max;
2133
2134 $self->{gauge}->set_value ($val, $max);
2135 $self->{value}->set_text ($val);
2136}
2137
2138#############################################################################
2139
1375package CFClient::UI::Slider; 2140package CFClient::UI::Slider;
1376 2141
1377use strict; 2142use strict;
1378 2143
1379use SDL::OpenGL; 2144use CFClient::OpenGL;
1380 2145
1381our @ISA = CFClient::UI::DrawBG::; 2146our @ISA = CFClient::UI::DrawBG::;
1382 2147
1383my @tex = 2148my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2149 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1385 qw(s1_slider.png s1_slider_bg.png); 2150 qw(s1_slider.png s1_slider_bg.png);
1386 2151
1387sub new { 2152sub new {
1388 my $class = shift; 2153 my $class = shift;
1389 2154
1390 # range [value, low, high, page] 2155 # range [value, low, high, page, unit]
1391 2156
1392 # TODO: 0-width page 2157 # TODO: 0-width page
1393 # TODO: req_w/h are wrong with vertical 2158 # TODO: req_w/h are wrong with vertical
1394 # TODO: calculations are off 2159 # TODO: calculations are off
1395 my $self = $class->SUPER::new ( 2160 my $self = $class->SUPER::new (
1396 fg => [1, 1, 1], 2161 fg => [1, 1, 1],
1397 active_fg => [0, 0, 0], 2162 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5],
1398 range => [0, 0, 100, 10], 2165 range => [0, 0, 100, 10, 0],
1399 req_w => 40, 2166 req_w => $::WIDTH / 80,
1400 req_h => 13, 2167 req_h => $::WIDTH / 80,
1401 vertical => 0, 2168 vertical => 0,
1402 can_hover => 1, 2169 can_hover => 1,
1403 inner_pad => 5, 2170 inner_pad => 0.02,
1404 @_ 2171 @_
1405 ); 2172 );
1406 2173
2174 $self->set_value ($self->{range}[0]);
2175 $self->update;
2176
1407 $self 2177 $self
2178}
2179
2180sub set_range {
2181 my ($self, $range) = @_;
2182
2183 ($range, $self->{range}) = ($self->{range}, $range);
2184
2185 $self->update
2186 if "@$range" ne "@{$self->{range}}";
2187}
2188
2189sub set_value {
2190 my ($self, $value) = @_;
2191
2192 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2193
2194 $hi = $lo + 1 if $hi <= $lo;
2195
2196 $page = $hi - $lo if $page > $hi - $lo;
2197
2198 $value = $lo if $value < $lo;
2199 $value = $hi - $page if $value > $hi - $page;
2200
2201 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2202 if $unit;
2203
2204 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2205
2206 if ($value != $old_value) {
2207 $self->_emit (changed => $value);
2208 $self->update;
2209 }
1408} 2210}
1409 2211
1410sub size_request { 2212sub size_request {
1411 my ($self) = @_; 2213 my ($self) = @_;
1412 2214
… …
1418 2220
1419sub button_down { 2221sub button_down {
1420 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1421 2223
1422 $self->SUPER::button_down ($ev, $x, $y); 2224 $self->SUPER::button_down ($ev, $x, $y);
2225
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227
1423 $self->mouse_motion ($ev, $x, $y); 2228 $self->mouse_motion ($ev, $x, $y);
1424} 2229}
1425 2230
1426sub mouse_motion { 2231sub mouse_motion {
1427 my ($self, $ev, $x, $y) = @_; 2232 my ($self, $ev, $x, $y) = @_;
1428 2233
1429 if ($GRAB == $self) { 2234 if ($GRAB == $self) {
2235 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2236
2237 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2242 }
2243}
2244
2245sub update {
2246 my ($self) = @_;
2247
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2249 $self->set_value ($self->{range}[0]);
2250
1430 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2251 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100;
1431 2253
1432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2254 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1433 2255
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2256 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2257 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1436 2258
1437 $x -= $inner_pad_px; # substract the padding 2259 $value = ($value - $lo) / $range;
1438 $x = $x * ($hi - $lo) / $inner_w + $lo; 2260 $value = $value * $self->{scale} + $self->{offset};
1439 $x = $lo if $x < $lo;
1440 $x = $hi - $page if $x > $hi - $page;
1441 $self->{range}[0] = $x;
1442 2261
1443 $self->emit (changed => $x); 2262 $self->{knob_x} = $value - $knob_w * 0.5;
1444 $self->update; 2263 $self->{knob_w} = $knob_w;
1445 } 2264 });
1446}
1447 2265
1448# the inner_* stuff is for generating a padding for the slider handle, 2266 $self->SUPER::update;
1449# so that the handle doesn't leave the texture. This calculation isn't 100%
1450# correct propably, but it does the job for now
1451sub _calc_inner_pad_px {
1452 my ($self, $w) = @_;
1453 ($w / 100) * $self->{inner_pad} # % to pixels
1454} 2267}
1455 2268
1456sub _draw { 2269sub _draw {
1457 my ($self) = @_; 2270 my ($self) = @_;
1458 2271
1459 $self->SUPER::_draw (); 2272 $self->SUPER::_draw ();
1460 2273
1461 my ($w, $h) = @$self{qw(w h)}; 2274 glScale $self->{w}, $self->{h};
1462 2275
1463 if ($self->{vertical}) { 2276 if ($self->{vertical}) {
1464 # draw a vertical slider like a rotated horizontal slider 2277 # draw a vertical slider like a rotated horizontal slider
1465 2278
2279 glTranslate 1, 0, 0;
1466 glRotate 90, 0, 0, 1; 2280 glRotate 90, 0, 0, 1;
1467 glTranslate 0, -$self->{w}, 0;
1468
1469 ($w, $h) = ($h, $w);
1470 } 2281 }
1471 2282
1472 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2283 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1473 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2284 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1474 2285
1475 my ($value, $lo, $hi, $page) = @{$self->{range}};
1476
1477 $hi = $value + 1 if $lo == $hi;
1478
1479 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1480 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1481
1482 $page = int $page * $inner_w / ($hi - $lo);
1483 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1484
1485 $w -= $page;
1486 $page &= ~1;
1487 glTranslate $page * 0.5, 0, 0;
1488 $page ||= 2;
1489
1490 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1491 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1492
1493 glEnable GL_BLEND;
1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1495 glEnable GL_TEXTURE_2D; 2286 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2287 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 2288
1498 # draw background 2289 # draw background
1499 $tex[1]->draw_quad (0, 0, $w, $h); 2290 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1500 2291
1501 # draw handle 2292 # draw handle
1502 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2293 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
1503 2294
1504 glDisable GL_BLEND;
1505 glDisable GL_TEXTURE_2D; 2295 glDisable GL_TEXTURE_2D;
1506} 2296}
1507 2297
1508############################################################################# 2298#############################################################################
1509 2299
2300package CFClient::UI::ValSlider;
2301
2302our @ISA = CFClient::UI::HBox::;
2303
2304sub new {
2305 my ($class, %arg) = @_;
2306
2307 my $range = delete $arg{range};
2308
2309 my $self = $class->SUPER::new (
2310 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2311 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2312 to_value => sub { shift },
2313 from_value => sub { shift },
2314 %arg,
2315 );
2316
2317 $self->{slider}->connect (changed => sub {
2318 my ($self, $value) = @_;
2319 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2320 $self->{parent}->emit (changed => $value);
2321 });
2322
2323# $self->{entry}->connect (changed => sub {
2324# my ($self, $value) = @_;
2325# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2326# $self->{parent}->emit (changed => $value);
2327# });
2328
2329 $self->add ($self->{slider}, $self->{entry});
2330
2331 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2332
2333 $self
2334}
2335
2336sub set_range { shift->{slider}->set_range (@_) }
2337sub set_value { shift->{slider}->set_value (@_) }
2338
2339#############################################################################
2340
1510package CFClient::UI::TextView; 2341package CFClient::UI::TextView;
1511 2342
1512our @ISA = CFClient::UI::HBox::; 2343our @ISA = CFClient::UI::HBox::;
1513 2344
1514use SDL::OpenGL; 2345use CFClient::OpenGL;
1515 2346
1516sub new { 2347sub new {
1517 my $class = shift; 2348 my $class = shift;
1518 2349
1519 my $self = $class->SUPER::new ( 2350 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6, 2351 fontsize => 1,
1521 req_h => $::HEIGHT / 6, 2352 can_events => 0,
1522 fontsize => $::FONTSIZE, 2353 #font => default_font
1523 @_, 2354 @_,
1524 2355
1525 layout => (new CFClient::Layout), 2356 layout => (new CFClient::Layout 1),
1526 par => [], 2357 par => [],
1527 height => 0, 2358 height => 0,
1528 children => [ 2359 children => [
1529 (new CFClient::UI::Empty expand => 1), 2360 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1), 2361 (new CFClient::UI::Slider vertical => 1),
1531 ], 2362 ],
1532 ); 2363 );
1533 2364
1534 $self->{children}[1]->connect (changed => sub { 2365 $self->{children}[1]->connect (changed => sub { $self->update });
1535 $self->update;
1536 });
1537 2366
1538 $self 2367 $self
1539} 2368}
1540 2369
1541sub set_fontsize { 2370sub set_fontsize {
… …
1543 2372
1544 $self->{fontsize} = $fontsize; 2373 $self->{fontsize} = $fontsize;
1545 $self->reflow; 2374 $self->reflow;
1546} 2375}
1547 2376
2377sub size_allocate {
2378 my ($self, $w, $h) = @_;
2379
2380 $self->SUPER::size_allocate ($w, $h);
2381
2382 $self->{layout}->set_font ($self->{font}) if $self->{font};
2383 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2384 $self->{layout}->set_width ($self->{children}[0]{w});
2385
2386 $self->reflow;
2387}
2388
1548sub text_height { 2389sub text_size {
1549 my ($self, $text) = @_; 2390 my ($self, $text, $indent) = @_;
1550 2391
1551 my $layout = $self->{layout}; 2392 my $layout = $self->{layout};
1552 2393
1553 $layout->set_height ($self->{fontsize}); 2394 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
1554 $layout->set_width ($self->{w}); 2395 $layout->set_width ($self->{children}[0]{w} - $indent);
1555 $layout->set_text ($text); 2396 $layout->set_markup ($text);
1556 2397
1557 ($layout->size)[1] 2398 $layout->size
1558} 2399}
1559 2400
1560sub reflow { 2401sub reflow {
1561 my ($self) = @_; 2402 my ($self) = @_;
1562 2403
1563 $self->{need_reflow}++; 2404 $self->{need_reflow}++;
1564 $self->update; 2405 $self->update;
1565} 2406}
1566 2407
1567sub size_request { 2408sub set_offset {
1568 my ($self) = @_; 2409 my ($self, $offset) = @_;
1569 2410
1570 ($self->{req_w}, $self->{req_h}) 2411 # todo: base offset on lines or so, not on pixels
2412 $self->{children}[1]->set_value ($offset);
1571} 2413}
1572 2414
1573sub size_allocate { 2415sub clear {
1574 my ($self, $x, $y, $w, $h) = @_; 2416 my ($self) = @_;
1575 2417
1576 $self->SUPER::size_allocate ($x, $y, $w, $h); 2418 $self->{par} = [];
1577 2419 $self->{height} = 0;
1578 $self->{layout}->set_height ($self->{fontsize}); 2420 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
1579 $self->{layout}->set_width ($self->{w});
1580
1581 $self->reflow;
1582} 2421}
1583 2422
1584sub add_paragraph { 2423sub add_paragraph {
1585 my ($self, $color, $text) = @_; 2424 my ($self, $color, $text, $indent) = @_;
1586 2425
1587 #TODO: intelligently "reformat" paragraph 2426 for my $line (split /\n/, $text) {
1588 2427 my ($w, $h) = $self->text_size ($line);
1589 my $height = $self->text_height ($text);
1590
1591 $self->{height} += $height; 2428 $self->{height} += $h;
2429 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2430 }
1592 2431
1593 push @{$self->{par}}, [$height, $color, $text];
1594
1595 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2432 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
1596 $self->{children}[1]->update;
1597} 2433}
1598 2434
1599sub update { 2435sub update {
1600 my ($self) = @_; 2436 my ($self) = @_;
1601 2437
… …
1603 2439
1604 return unless $self->{h} > 0; 2440 return unless $self->{h} > 0;
1605 2441
1606 delete $self->{texture}; 2442 delete $self->{texture};
1607 2443
1608 $ROOT->on_refresh ($self, sub { 2444 $ROOT->on_post_alloc ($self, sub {
2445 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2446
1609 if (delete $self->{need_reflow}) { 2447 if (delete $self->{need_reflow}) {
1610 my $height = 0; 2448 my $height = 0;
1611 2449
1612 $height += $_->[0] = $self->text_height ($_->[2]) 2450 my $layout = $self->{layout};
2451
2452 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2453
1613 for @{$self->{par}}; 2454 for (@{$self->{par}}) {
2455 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2456 $layout->set_width ($W - $_->[3]);
2457 $layout->set_markup ($_->[4]);
2458 my ($w, $h) = $layout->size;
2459 $_->[0] = $w + $_->[3];
2460 $_->[1] = $h;
2461 }
2462
2463 $height += $_->[1];
2464 }
1614 2465
1615 $self->{height} = $height; 2466 $self->{height} = $height;
1616 2467
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2468 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
1618 2469
1619 delete $self->{texture}; 2470 delete $self->{texture};
1620 } 2471 }
1621 2472
1622 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
1623 glClearColor 0, 0, 0, 1; 2474 glClearColor 0.5, 0.5, 0.5, 0;
1624 glClear GL_COLOR_BUFFER_BIT; 2475 glClear GL_COLOR_BUFFER_BIT;
1625 2476
2477 my $top = int $self->{children}[1]{range}[0];
2478
2479 my $y0 = $top;
2480 my $y1 = $top + $H;
2481
2482 my $y = 0;
2483
2484 my $layout = $self->{layout};
2485
2486 $layout->set_font ($self->{font}) if $self->{font};
2487
1626 glEnable GL_BLEND; 2488 glEnable GL_BLEND;
2489 #TODO# not correct in windows where rgba is forced off
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2490 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D;
1629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1630
1631 my $top = int $self->{children}[1]{range}[0];
1632
1633 my $y0 = $top;
1634 my $y1 = $top + $self->{h};
1635
1636 my $y = 0;
1637
1638 my $layout = $self->{layout};
1639 2491
1640 for my $par (@{$self->{par}}) { 2492 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0]; 2493 my $h = $par->[1];
1642 2494
1643 if ($y0 < $y + $h && $y < $y1) { 2495 if ($y0 < $y + $h && $y < $y1) {
2496 $layout->set_foreground (@{ $par->[2] });
2497 $layout->set_width ($W - $par->[3]);
1644 $layout->set_text ($par->[2]); 2498 $layout->set_markup ($par->[4]);
1645 2499
1646 glColor @{ $par->[1] }; 2500 my ($w, $h, $data, $format, $internalformat) = $layout->render;
1647 my ($W, $H) = $layout->size; 2501
1648 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2502 glRasterPos $par->[3], $y - $y0;
2503 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
1649 } 2504 }
1650 2505
1651 $y += $h; 2506 $y += $h;
1652 } 2507 }
1653 2508
1654 glDisable GL_TEXTURE_2D;
1655 glDisable GL_BLEND; 2509 glDisable GL_BLEND;
1656 }; 2510 };
1657 }); 2511 });
1658} 2512}
1659 2513
1660sub _draw { 2514sub _draw {
1661 my ($self) = @_; 2515 my ($self) = @_;
1662 2516
1663 if ($self->{texture}) {
1664 glEnable GL_TEXTURE_2D; 2517 glEnable GL_TEXTURE_2D;
1665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1;
1666 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h}); 2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
1667 glDisable GL_TEXTURE_2D; 2521 glDisable GL_TEXTURE_2D;
1668 }
1669 2522
1670 $self->{children}[1]->draw; 2523 $self->{children}[1]->draw;
1671 2524
1672} 2525}
1673 2526
1674############################################################################# 2527#############################################################################
1675 2528
1676package CFClient::UI::MapWidget;
1677
1678use strict;
1679
1680use List::Util qw(min max);
1681
1682use SDL;
1683use SDL::OpenGL;
1684
1685our @ISA = CFClient::UI::Base::;
1686
1687sub new {
1688 my $class = shift;
1689
1690 $class->SUPER::new (
1691 z => -1,
1692 can_focus => 1,
1693 list => (glGenLists 1),
1694 @_
1695 )
1696}
1697
1698sub key_down {
1699 print "MAPKEYDOWN\n";
1700}
1701
1702sub key_up {
1703}
1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1737}
1738
1739sub size_request {
1740 (
1741 1 + 32 * int $::WIDTH / 32,
1742 1 + 32 * int $::HEIGHT / 32,
1743 )
1744}
1745
1746sub update {
1747 my ($self) = @_;
1748
1749 $self->{need_update} = 1;
1750 $self->SUPER::update;
1751}
1752
1753sub draw {
1754 my ($self) = @_;
1755
1756 if (delete $self->{need_update}) {
1757 glNewList $self->{list}, GL_COMPILE;
1758
1759 if ($::MAP) {
1760 my $sw = int $::WIDTH / 32;
1761 my $sh = int $::HEIGHT / 32;
1762
1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1765
1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 my $tex = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $tex->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 CFClient::Texture->new (
1818 w => $w,
1819 h => $h,
1820 data => $::MAP->mapmap ($w, $h),
1821 type => GL_UNSIGNED_INT_8_8_8_8_REV
1822 )->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; 2529package CFClient::UI::Animator;
1911 2530
1912use SDL::OpenGL; 2531use CFClient::OpenGL;
1913 2532
1914our @ISA = CFClient::UI::Bin::; 2533our @ISA = CFClient::UI::Bin::;
1915 2534
1916sub moveto { 2535sub moveto {
1917 my ($self, $x, $y) = @_; 2536 my ($self, $x, $y) = @_;
… …
1955 2574
1956sub new { 2575sub new {
1957 my $class = shift; 2576 my $class = shift;
1958 2577
1959 my $self = $class->SUPER::new ( 2578 my $self = $class->SUPER::new (
1960 state => 0, 2579 state => 0,
1961 connect_activate => \&toggle_flopper, 2580 on_activate => \&toggle_flopper,
1962 @_ 2581 @_
1963 ); 2582 );
1964 2583
1965 if ($self->{state}) { 2584 if ($self->{state}) {
1966 $self->{state} = 0; 2585 $self->{state} = 0;
… …
1975 2594
1976 # TODO: use animation 2595 # TODO: use animation
1977 if ($self->{state} = !$self->{state}) { 2596 if ($self->{state} = !$self->{state}) {
1978 $CFClient::UI::ROOT->add ($self->{other}); 2597 $CFClient::UI::ROOT->add ($self->{other});
1979 $self->{other}->move ($self->coord2global (0, $self->{h})); 2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
1980 $self->emit ("open"); 2599 $self->_emit ("open");
1981 } else { 2600 } else {
1982 $CFClient::UI::ROOT->remove ($self->{other}); 2601 $CFClient::UI::ROOT->remove ($self->{other});
1983 $self->emit ("close"); 2602 $self->_emit ("close");
1984 } 2603 }
1985 2604
1986 $self->emit (changed => $self->{state}); 2605 $self->_emit (changed => $self->{state});
1987} 2606}
1988 2607
1989############################################################################# 2608#############################################################################
1990 2609
2610package CFClient::UI::Tooltip;
2611
2612our @ISA = CFClient::UI::Bin::;
2613
2614use CFClient::OpenGL;
2615
2616sub new {
2617 my $class = shift;
2618
2619 $class->SUPER::new (
2620 @_,
2621 can_events => 0,
2622 )
2623}
2624
2625sub set_tooltip_from {
2626 my ($self, $widget) = @_;
2627
2628 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip},
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8,
2632 fg => [0, 0, 0, 1],
2633 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP),
2635 );
2636}
2637
2638sub size_request {
2639 my ($self) = @_;
2640
2641 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2642
2643 ($w + 4, $h + 4)
2644}
2645
2646sub size_allocate {
2647 my ($self, $w, $h) = @_;
2648
2649 $self->SUPER::size_allocate ($w - 4, $h - 4);
2650}
2651
2652sub _draw {
2653 my ($self) = @_;
2654
2655 glTranslate 0.375, 0.375;
2656
2657 my ($w, $h) = @$self{qw(w h)};
2658
2659 glColor 1, 0.8, 0.4;
2660 glBegin GL_QUADS;
2661 glVertex 0 , 0;
2662 glVertex 0 , $h;
2663 glVertex $w, $h;
2664 glVertex $w, 0;
2665 glEnd;
2666
2667 glColor 0, 0, 0;
2668 glBegin GL_LINE_LOOP;
2669 glVertex 0 , 0;
2670 glVertex 0 , $h;
2671 glVertex $w, $h;
2672 glVertex $w, 0;
2673 glEnd;
2674
2675 glTranslate 2 - 0.375, 2 - 0.375;
2676 $self->SUPER::_draw;
2677}
2678
2679#############################################################################
2680
2681package CFClient::UI::Face;
2682
2683our @ISA = CFClient::UI::Base::;
2684
2685use CFClient::OpenGL;
2686
2687sub new {
2688 my $class = shift;
2689
2690 my $self = $class->SUPER::new (
2691 aspect => 1,
2692 can_events => 0,
2693 @_,
2694 );
2695
2696 if ($self->{anim} && $self->{animspeed}) {
2697 Scalar::Util::weaken (my $widget = $self);
2698
2699 $self->{timer} = Event->timer (
2700 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2701 hard => 1,
2702 interval => $self->{animspeed},
2703 cb => sub {
2704 ++$widget->{frame};
2705 $widget->update;
2706 },
2707 );
2708 }
2709
2710 $self
2711}
2712
2713sub size_request {
2714 (32, 8)
2715}
2716
2717sub update {
2718 my ($self) = @_;
2719
2720 return unless $self->{visible};
2721
2722 $self->SUPER::update;
2723}
2724
2725sub _draw {
2726 my ($self) = @_;
2727
2728 return unless $::CONN;
2729
2730 my $face;
2731
2732 if ($self->{frame}) {
2733 my $anim = $::CONN->{anim}[$self->{anim}];
2734
2735 $face = $anim->[ $self->{frame} % @$anim ]
2736 if $anim && @$anim;
2737 }
2738
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740
2741 if ($tex) {
2742 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D;
2747 }
2748}
2749
2750sub DESTROY {
2751 my ($self) = @_;
2752
2753 $self->{timer}->cancel
2754 if $self->{timer};
2755
2756 $self->SUPER::DESTROY;
2757}
2758
2759#############################################################################
2760
2761package CFClient::UI::Inventory;
2762
2763our @ISA = CFClient::UI::ScrolledWindow::;
2764
2765sub new {
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805
2806#############################################################################
2807
2808package CFClient::UI::Menu;
2809
2810our @ISA = CFClient::UI::FancyFrame::;
2811
2812use CFClient::OpenGL;
2813
2814sub new {
2815 my $class = shift;
2816
2817 my $self = $class->SUPER::new (
2818 items => [],
2819 z => 100,
2820 @_,
2821 );
2822
2823 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2824
2825 for my $item (@{ $self->{items} }) {
2826 my ($widget, $cb) = @$item;
2827
2828 # handle various types of items, only text for now
2829 if (!ref $widget) {
2830 $widget = new CFClient::UI::Label
2831 can_hover => 1,
2832 can_events => 1,
2833 text => $widget;
2834 }
2835
2836 $self->{item}{$widget} = $item;
2837
2838 $self->{vbox}->add ($widget);
2839 }
2840
2841 $self
2842}
2843
2844# popup given the event (must be a mouse button down event currently)
2845sub popup {
2846 my ($self, $ev) = @_;
2847
2848 $self->_emit ("popdown");
2849
2850 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self;
2852 $self->{button} = $ev->{button};
2853
2854 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856}
2857
2858sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_;
2860
2861 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER};
2864}
2865
2866sub button_up {
2867 my ($self, $ev, $x, $y) = @_;
2868
2869 if ($ev->{button} == $self->{button}) {
2870 undef $GRAB;
2871 $self->hide;
2872
2873 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover};
2875 }
2876}
2877
2878#############################################################################
2879
2880package CFClient::UI::Statusbox;
2881
2882our @ISA = CFClient::UI::VBox::;
2883
2884sub new {
2885 my $class = shift;
2886
2887 $class->SUPER::new (
2888 fontsize => 0.8,
2889 @_,
2890 )
2891}
2892
2893sub reorder {
2894 my ($self) = @_;
2895 my $NOW = time;
2896
2897 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 }
2900
2901 my @widgets;
2902
2903 my @items = sort {
2904 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} };
2907
2908 my $count = 10 + 1;
2909 for my $item (@items) {
2910 last unless --$count;
2911
2912 push @widgets, $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text};
2917
2918 for ($short) {
2919 s/^\s+//;
2920 s/\s+/ /g;
2921 }
2922
2923 new CFClient::UI::Label
2924 markup => $short,
2925 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg},
2931 can_events => 1,
2932 can_hover => 1
2933 };
2934 }
2935
2936 $self->clear;
2937 $self->SUPER::add (reverse @widgets);
2938}
2939
2940sub add {
2941 my ($self, $text, %arg) = @_;
2942
2943 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//;
2945
2946 return unless $text;
2947
2948 my $timeout = time + ((delete $arg{timeout}) || 60);
2949
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951
2952 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) {
2954 $item->{count}++;
2955 } else {
2956 $item->{count} = 1;
2957 $item->{text} = $item->{tooltip} = $text;
2958 }
2959 $item->{id} = ++$self->{id};
2960 $item->{timeout} = $timeout;
2961 delete $item->{label};
2962 } else {
2963 $self->{item}{$group} = {
2964 id => ++$self->{id},
2965 text => $text,
2966 timeout => $timeout,
2967 tooltip => $text,
2968 fg => [0.8, 0.8, 0.8, 0.8],
2969 pri => 0,
2970 count => 1,
2971 %arg,
2972 };
2973 }
2974
2975 $self->reorder;
2976}
2977
2978sub reconfigure {
2979 my ($self) = @_;
2980
2981 delete $_->{label}
2982 for values %{ $self->{item} || {} };
2983
2984 $self->reorder;
2985 $self->SUPER::reconfigure;
2986}
2987
2988#############################################################################
2989
1991package CFClient::UI::Root; 2990package CFClient::UI::Root;
1992 2991
1993our @ISA = CFClient::UI::Container::; 2992our @ISA = CFClient::UI::Container::;
1994 2993
1995use SDL::OpenGL; 2994use CFClient::OpenGL;
2995
2996sub new {
2997 my $class = shift;
2998
2999 $class->SUPER::new (
3000 visible => 1,
3001 @_,
3002 )
3003}
3004
3005sub configure {
3006 my ($self, $x, $y, $w, $h) = @_;
3007
3008 $self->{w} = $w;
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017}
1996 3018
1997sub size_request { 3019sub size_request {
1998 ($::WIDTH, $::HEIGHT) 3020 my ($self) = @_;
3021
3022 ($self->{w}, $self->{h})
1999} 3023}
2000 3024
2001sub size_allocate { 3025sub size_allocate {
2002 my ($self, $x, $y, $w, $h) = @_; 3026 my ($self, $w, $h) = @_;
2003 3027
2004 $self->_size_allocate ($x, $y, $w, $h); 3028 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2005 3030
2006 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request) 3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1
2007 for @{$self->{children}}; 3032 if exists $child->{req_x};
2008}
2009 3033
2010sub _topleft { 3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1
3035 if exists $child->{req_y};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039
3040 $child->configure ($X, $Y, $W, $H);
3041 }
3042}
3043
3044sub coord2local {
2011 my ($self, $x, $y) = @_; 3045 my ($self, $x, $y) = @_;
2012 3046
2013 ($x, $y) 3047 ($x, $y)
2014} 3048}
2015 3049
3050sub coord2global {
3051 my ($self, $x, $y) = @_;
3052
3053 ($x, $y)
3054}
3055
2016sub update { 3056sub update {
2017 my ($self) = @_; 3057 my ($self) = @_;
2018 3058
2019 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT); 3059 $self->check_size;
2020 ::refresh (); 3060 $::WANT_REFRESH++;
2021} 3061}
2022 3062
2023sub add { 3063sub add {
2024 my ($self, $widget) = @_; 3064 my ($self, @children) = @_;
2025 3065
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1;
3074
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079
2026 $self->SUPER::add ($widget); 3080 $self->SUPER::add (@children);
3081}
2027 3082
2028 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request); 3083sub remove {
3084 my ($self, @children) = @_;
3085
3086 $self->SUPER::remove (@children);
3087
3088 while (@children) {
3089 my $w = pop @children;
3090 push @children, $w->children;
3091 $w->set_invisible;
3092 }
2029} 3093}
2030 3094
2031sub on_refresh { 3095sub on_refresh {
2032 my ($self, $id, $cb) = @_; 3096 my ($self, $id, $cb) = @_;
2033 3097
2034 $self->{refresh_hook}{$id} = $cb; 3098 $self->{refresh_hook}{$id} = $cb;
2035} 3099}
2036 3100
3101sub on_post_alloc {
3102 my ($self, $id, $cb) = @_;
3103
3104 $self->{post_alloc_hook}{$id} = $cb;
3105}
3106
2037sub draw { 3107sub draw {
2038 my ($self) = @_; 3108 my ($self) = @_;
2039 3109
2040 while (my $rcb = delete $self->{refresh_hook}) { 3110 while ($self->{refresh_hook}) {
2041 $_->() for values %$rcb; 3111 $_->()
3112 for values %{delete $self->{refresh_hook}};
3113 }
3114
3115 if ($self->{check_size}) {
3116 my @queue;
3117
3118 for (;;) {
3119 if ($self->{check_size}) {
3120 #TODO use array-of-depth approach
3121
3122 @queue = sort { $a->{visible} <=> $b->{visible} }
3123 @queue, values %{delete $self->{check_size}};
3124 }
3125
3126 my $widget = pop @queue || last;
3127
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137
3138 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h;
3140
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3142
3143 $widget->{parent}->check_size
3144 if $widget->{parent};
3145 }
3146 }
3147 }
3148
3149 while ($self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) {
3151 my ($widget, $w, $h) = @$_;
3152
3153 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0;
3155
3156 $widget->{w} = $w;
3157 $widget->{h} = $h;
3158 $widget->emit (size_allocate => $w, $h);
3159 }
3160 }
3161
3162 while ($self->{post_alloc_hook}) {
3163 $_->()
3164 for values %{delete $self->{post_alloc_hook}};
2042 } 3165 }
2043 3166
2044 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3167 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2045 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2046 glClear GL_COLOR_BUFFER_BIT; 3169 glClear GL_COLOR_BUFFER_BIT;
2047 3170
2048 glMatrixMode GL_PROJECTION; 3171 glMatrixMode GL_PROJECTION;
2049 glLoadIdentity; 3172 glLoadIdentity;
2050 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2051 glMatrixMode GL_MODELVIEW; 3174 glMatrixMode GL_MODELVIEW;
2052 glLoadIdentity; 3175 glLoadIdentity;
2053 3176
2054 $self->_draw; 3177 $self->_draw;
2055} 3178}
… …
2057############################################################################# 3180#############################################################################
2058 3181
2059package CFClient::UI; 3182package CFClient::UI;
2060 3183
2061$ROOT = new CFClient::UI::Root; 3184$ROOT = new CFClient::UI::Root;
3185$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2062 3186
20631 31871
2064 3188

Diff Legend

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