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.109 by root, Sat Apr 15 01:13:47 2006 UTC vs.
Revision 1.242 by elmex, Sat May 27 20:00:40 2006 UTC

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

Diff Legend

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