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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

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

Diff Legend

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