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.196 by root, Fri May 12 00:16:34 2006 UTC vs.
Revision 1.294 by root, Tue Jun 6 03:19:26 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17sub check_tooltip { 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
18 if (!$GRAB) { 23 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
23 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
24 32
25 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
26 34
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 36
29 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 38 $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 } 39 }
40 40
41 return; 41 return;
42 } 42 }
43 } 43 }
44 } 44 }
45 45
46 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
48} 71}
49 72
50# class methods for events 73# class methods for events
51sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
52 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
53 if $FOCUS; 76 if $FOCUS;
54} 77}
55 78
56sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
57 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
58 if $FOCUS; 81 if $FOCUS;
59} 82}
60 83
61sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
62 my ($ev) = @_; 85 my ($ev) = @_;
… …
66 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
67 90
68 $GRAB = $widget; 91 $GRAB = $widget;
69 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
70 93
71 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
72 } 95 }
73 96
74 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
75 98
76 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
77 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
78 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
79 }
80} 101}
81 102
82sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
83 my ($ev) = @_; 104 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
85 106
86 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
87 108
88 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
89 110
90 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
91 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
92 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
93 }
94 113
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 if ($HOVER) {
120 ($x, $y) = $HOVER->coord2local ($x, $y);
121 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
122 } 139 if $HOVER;
123} 140}
124 141
125# convert position array to integers 142# convert position array to integers
126sub harmonize { 143sub harmonize {
127 my ($vals) = @_; 144 my ($vals) = @_;
… …
133 $rem += $_ - $i; 150 $rem += $_ - $i;
134 $_ = $i; 151 $_ = $i;
135 } 152 }
136} 153}
137 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
171# call when resolution changes etc.
172sub rescale_widgets {
173 my ($sx, $sy) = @_;
174
175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
190 }
191 }
192
193 reconfigure_widgets;
194}
195
138############################################################################# 196#############################################################################
139 197
140package CFClient::UI::Base; 198package CFClient::UI::Base;
141 199
142use strict; 200use strict;
… …
145 203
146sub new { 204sub new {
147 my $class = shift; 205 my $class = shift;
148 206
149 my $self = bless { 207 my $self = bless {
150 x => 0, 208 x => "center",
151 y => 0, 209 y => "center",
152 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
153 can_events => 1, 213 can_events => 1,
154 @_ 214 @_
155 }, $class; 215 }, $class;
156 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
157 for (keys %$self) { 219 for (keys %$self) {
158 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
159 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
160 } 222 }
161 } 223 }
162 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
163 $self 237 $self
164} 238}
165 239
166sub destroy { 240sub destroy {
167 my ($self) = @_; 241 my ($self) = @_;
… …
176 return if $self->{parent}; 250 return if $self->{parent};
177 251
178 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
179} 253}
180 254
181sub hide { 255sub set_visible {
182 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
183 279
184 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
185 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
186 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
187 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
188 if $self->{parent}; 314 if $self->{parent};
189} 315}
190 316
191sub move { 317sub move_abs {
192 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
193 319
194 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
195 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
196 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
197 323
198 $self->update; 324 $self->update;
199} 325}
200 326
201sub set_size { 327sub set_size {
202 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
203 329
204 $self->{user_w} = $w; 330 $self->{force_w} = $w;
205 $self->{user_h} = $h; 331 $self->{force_h} = $h;
206 332
207 $self->check_size; 333 $self->realloc;
208} 334}
209 335
210sub size_request { 336sub size_request {
211 require Carp; 337 require Carp;
212 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
214 340
215sub configure { 341sub configure {
216 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
217 343
218 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
219 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
220 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
221 349
222 # use alignment to adjust x, y 350 # use alignment to adjust x, y
223 351
224 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
225 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
226
227 ($w, $h) = ($w2, $h2);
228 } 354 }
229 355
230 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
231 $self->{x} = $x; 357 $self->{x} = $x;
232 $self->{y} = $y; 358 $self->{y} = $y;
233 $self->update; 359 $self->update;
234 } 360 }
235 361
236 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
237 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
238 } 369 }
239} 370}
240 371
241sub size_allocate { 372sub size_allocate {
242 # nothing to be done 373 # nothing to be done
243} 374}
244 375
245sub children { 376sub children {
377 # nop
246} 378}
247 379
248# call when resolution changes etc. 380sub visible_children {
249sub reconfigure { 381 $_[0]->children
250 my ($self) = @_;
251
252 $_->reconfigure
253 for $self->children;
254
255 $self->check_size;
256 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
257 $self->update;
258} 382}
259 383
260sub set_max_size { 384sub set_max_size {
261 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
262 386
263 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
264 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
391}
392
393sub set_tooltip {
394 my ($self, $tooltip) = @_;
395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
401 $self->{tooltip} = $tooltip;
402
403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
404 delete $CFClient::UI::TOOLTIP->{owner};
405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
406 }
265} 407}
266 408
267# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
268sub coord2local { 410sub coord2local {
269 my ($self, $x, $y) = @_; 411 my ($self, $x, $y) = @_;
… …
284 return if $FOCUS == $self; 426 return if $FOCUS == $self;
285 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
286 428
287 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
288 430
289 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
290 432
291 $focus->update if $focus; 433 $focus->update if $focus;
292 $FOCUS->update; 434 $FOCUS->update;
293} 435}
294 436
… …
297 439
298 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
299 441
300 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
301 443
302 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
303 445
304 $focus->update if $focus; #? 446 $focus->update if $focus; #?
305}
306 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
307sub mouse_motion { } 452sub mouse_motion { 0 }
308sub button_up { } 453sub button_up { 0 }
309sub key_down { } 454sub key_down { 0 }
310sub key_up { } 455sub key_up { 0 }
311 456
312sub button_down { 457sub button_down {
313 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
314 459
315 $self->focus_in; 460 $self->focus_in;
316}
317 461
318sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
319sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
320sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
321sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
322sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
323 538
324sub draw { 539sub draw {
325 my ($self) = @_; 540 my ($self) = @_;
326 541
327 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
328 553
329 glPushMatrix; 554 glPushMatrix;
330 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
331 $self->_draw;
332 glPopMatrix;
333 556
334 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
335 my ($x, $y) = @$self{qw(x y)};
336
337 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
338 glEnable GL_BLEND; 559 glEnable GL_BLEND;
339 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
340 glBegin GL_QUADS; 561 glBegin GL_QUADS;
341 glVertex $x , $y;
342 glVertex $x + $self->{w}, $y;
343 glVertex $x + $self->{w}, $y + $self->{h};
344 glVertex $x , $y + $self->{h};
345 glEnd;
346 glDisable GL_BLEND;
347 }
348
349 if ($ENV{PCLIENT_DEBUG}) {
350 glPushMatrix;
351 glColor 1, 1, 0, 1;
352 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
353 glBegin GL_LINE_LOOP;
354 glVertex 0 , 0; 562 glVertex 0 , 0;
355 glVertex $self->{w}, 0; 563 glVertex $self->{w}, 0;
356 glVertex $self->{w}, $self->{h}; 564 glVertex $self->{w}, $self->{h};
357 glVertex 0 , $self->{h}; 565 glVertex 0 , $self->{h};
358 glEnd; 566 glEnd;
567 glDisable GL_BLEND;
568 }
569
570 if ($ENV{CFPLUS_DEBUG} & 1) {
571 glPushMatrix;
572 glColor 1, 1, 0, 1;
573 glTranslate 0.375, 0.375;
574 glBegin GL_LINE_LOOP;
575 glVertex 0 , 0;
576 glVertex $self->{w} - 1, 0;
577 glVertex $self->{w} - 1, $self->{h} - 1;
578 glVertex 0 , $self->{h} - 1;
579 glEnd;
359 glPopMatrix; 580 glPopMatrix;
360 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
361 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
362} 586}
363 587
364sub _draw { 588sub _draw {
365 my ($self) = @_; 589 my ($self) = @_;
366 590
367 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
368} 592}
369 593
370sub find_widget {
371 my ($self, $x, $y) = @_;
372
373 return () unless $self->{can_events};
374
375 return $self
376 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
377 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
378
379 ()
380}
381
382sub set_parent {
383 my ($self, $parent) = @_;
384
385 Scalar::Util::weaken ($self->{parent} = $parent);
386
387 $self->check_size
388 unless exists $self->{req_w};
389}
390
391sub check_size {
392 my ($self) = @_;
393
394 $CFClient::UI::ROOT->{check_size}{$self} = $self;
395}
396
397sub update {
398 my ($self) = @_;
399
400 $self->{parent}->update
401 if $self->{parent};
402}
403
404sub connect {
405 my ($self, $signal, $cb) = @_;
406
407 push @{ $self->{signal_cb}{$signal} }, $cb;
408}
409
410sub emit {
411 my ($self, $signal, @args) = @_;
412
413 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
414}
415
416sub DESTROY { 594sub DESTROY {
417 my ($self) = @_; 595 my ($self) = @_;
418 596
597 delete $WIDGET{$self+0};
419 #$self->deactivate; 598 #$self->deactivate;
420} 599}
421 600
422############################################################################# 601#############################################################################
423 602
… …
432 my $class = shift; 611 my $class = shift;
433 612
434 # range [value, low, high, page] 613 # range [value, low, high, page]
435 614
436 $class->SUPER::new ( 615 $class->SUPER::new (
437 bg => [0, 0, 0, 0.2], 616 #bg => [0, 0, 0, 0.2],
438 active_bg => [1, 1, 1, 0.5], 617 #active_bg => [1, 1, 1, 0.5],
439 @_ 618 @_
440 ) 619 )
441} 620}
442 621
443sub _draw { 622sub _draw {
444 my ($self) = @_; 623 my ($self) = @_;
445 624
625 my $color = $FOCUS == $self && $self->{active_bg}
626 ? $self->{active_bg}
627 : $self->{bg};
628
629 if ($color && (@$color < 4 || $color->[3])) {
446 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
447 631
448 glEnable GL_BLEND; 632 glEnable GL_BLEND;
449 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
450 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 634 glColor_premultiply @$color;
451 635
452 glBegin GL_QUADS; 636 glBegin GL_QUADS;
453 glVertex 0 , 0; 637 glVertex 0 , 0;
454 glVertex 0 , $h; 638 glVertex 0 , $h;
455 glVertex $w, $h; 639 glVertex $w, $h;
456 glVertex $w, 0; 640 glVertex $w, 0;
457 glEnd; 641 glEnd;
458 642
459 glDisable GL_BLEND; 643 glDisable GL_BLEND;
644 }
460} 645}
461 646
462############################################################################# 647#############################################################################
463 648
464package CFClient::UI::Empty; 649package CFClient::UI::Empty;
… …
469 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
470 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
471} 656}
472 657
473sub size_request { 658sub size_request {
474 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
475} 662}
476 663
477sub draw { } 664sub draw { }
478 665
479############################################################################# 666#############################################################################
… …
483our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
484 671
485sub new { 672sub new {
486 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
487 674
488 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
489 676
490 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
491 children => [], 678 children => [],
492 can_events => 0, 679 can_events => 0,
493 %arg, 680 %arg,
494 ); 681 );
682
495 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
496 685
497 $self 686 $self
498} 687}
499 688
500sub add { 689sub add {
… …
508 $self->{children} = [ 697 $self->{children} = [
509 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
510 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
511 ]; 700 ];
512 701
513 $self->check_size; 702 $self->realloc;
514 $self->update;
515} 703}
516 704
517sub children { 705sub children {
518 @{ $_[0]{children} } 706 @{ $_[0]{children} }
519} 707}
… …
524 delete $child->{parent}; 712 delete $child->{parent};
525 $child->hide; 713 $child->hide;
526 714
527 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
528 716
529 $self->check_size; 717 $self->realloc;
530 $self->update;
531} 718}
532 719
533sub clear { 720sub clear {
534 my ($self) = @_; 721 my ($self) = @_;
535 722
… …
539 for (@$children) { 726 for (@$children) {
540 delete $_->{parent}; 727 delete $_->{parent};
541 $_->hide; 728 $_->hide;
542 } 729 }
543 730
544 $self->check_size; 731 $self->realloc;
545 $self->update;
546} 732}
547 733
548sub find_widget { 734sub find_widget {
549 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
550 736
551 $x -= $self->{x}; 737 $x -= $self->{x};
552 $y -= $self->{y}; 738 $y -= $self->{y};
553 739
554 my $res; 740 my $res;
555 741
556 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
557 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
558 and return $res; 744 and return $res;
559 } 745 }
560 746
561 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
610 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
611} 797}
612 798
613############################################################################# 799#############################################################################
614 800
801# back-buffered drawing area
802
615package CFClient::UI::Window; 803package CFClient::UI::Window;
616 804
617our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
618 806
619use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
625} 813}
626 814
627sub update { 815sub update {
628 my ($self) = @_; 816 my ($self) = @_;
629 817
630 $ROOT->on_refresh ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
631 $self->SUPER::update; 819 $self->SUPER::update;
632} 820}
633 821
634sub size_allocate { 822sub size_allocate {
635 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
… …
637 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
638 $self->update; 826 $self->update;
639} 827}
640 828
641sub _render { 829sub _render {
830 my ($self) = @_;
831
642 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
643} 833}
644 834
645sub render_child { 835sub render_child {
646 my ($self) = @_; 836 my ($self) = @_;
647 837
648 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
649 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
650 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
651 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
652 $self->_render; 849 $self->_render;
653# glColorMask 1, 1, 1, 0;
654# glEnable GL_BLEND;
655# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
656# glRasterPos 0, 0;
657# glCopyPixels 0, 0, $self->{w}, $self->{h};
658# glDisable GL_BLEND;
659# glColorMask 1, 1, 1, 1;
660 }; 850 };
661} 851}
662 852
663sub _draw { 853sub _draw {
664 my ($self) = @_; 854 my ($self) = @_;
665 855
666 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
667 857
668 my $tex = $self->{texture} 858 my $tex = $self->{texture}
669 or return; 859 or return;
670 860
671 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
… …
681 871
682package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
683 873
684our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
685 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
686sub size_request { 886sub size_request {
687 my ($self) = @_; 887 my ($self) = @_;
688 888
689 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
690 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
691 890
692 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
693} 895}
694 896
695sub size_allocate { 897sub size_allocate {
696 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
697 899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
698 $self->update; 906 $self->update;
699} 907}
700 908
701sub set_offset { 909sub set_offset {
702 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
736} 944}
737 945
738sub _render { 946sub _render {
739 my ($self) = @_; 947 my ($self) = @_;
740 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
741 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
742 953
743 $self->SUPER::_render; 954 $self->SUPER::_render;
744} 955}
745 956
746############################################################################# 957#############################################################################
747 958
748package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
749 960
750our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
962
963sub new {
964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
967
968 my $self;
969
970 my $slider = new CFClient::UI::Slider
971 vertical => 1,
972 range => [0, 0, 1, 0.01], # HACK fix
973 on_changed => sub {
974 $self->{vp}->set_offset (0, $_[1]);
975 },
976 ;
977
978 $self = $class->SUPER::new (
979 vp => (new CFClient::UI::ViewPort expand => 1),
980 slider => $slider,
981 %arg,
982 );
983
984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
986
987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1004}
1005
1006sub size_allocate {
1007 my ($self, $w, $h) = @_;
1008
1009 $self->SUPER::size_allocate ($w, $h);
1010
1011 my $child = $self->{vp}->child;
1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1013}
1014
1015#TODO# update range on size_allocate depending on child
1016# update viewport offset on scroll
1017
1018#############################################################################
1019
1020package CFClient::UI::Frame;
1021
1022our @ISA = CFClient::UI::Bin::;
1023
1024use CFClient::OpenGL;
751 1025
752sub new { 1026sub new {
753 my $class = shift; 1027 my $class = shift;
754 1028
755 my $self;
756
757 my $slider = new CFClient::UI::Slider
758 vertical => 1,
759 range => [0, 0, 1, 0.01], # HACK fix
760 connect_changed => sub {
761 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
762 },
763 ;
764
765 $self = $class->SUPER::new ( 1029 $class->SUPER::new (
766 vp => (new CFClient::UI::ViewPort), 1030 bg => undef,
767 slider => $slider,
768 @_, 1031 @_,
1032 )
1033}
1034
1035sub _draw {
1036 my ($self) = @_;
1037
1038 if ($self->{bg}) {
1039 my ($w, $h) = @$self{qw(w h)};
1040
1041 glEnable GL_BLEND;
1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1043 glColor_premultiply @{ $self->{bg} };
1044
1045 glBegin GL_QUADS;
1046 glVertex 0 , 0;
1047 glVertex 0 , $h;
1048 glVertex $w, $h;
1049 glVertex $w, 0;
1050 glEnd;
1051
1052 glDisable GL_BLEND;
1053 }
1054
1055 $self->SUPER::_draw;
1056}
1057
1058#############################################################################
1059
1060package CFClient::UI::FancyFrame;
1061
1062our @ISA = CFClient::UI::Bin::;
1063
1064use CFClient::OpenGL;
1065
1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1073
1074sub new {
1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1078
1079 my $self = $class->SUPER::new (
1080 bg => [1, 1, 1, 1],
1081 border_bg => [1, 1, 1, 1],
1082 border => 0.6,
1083 can_events => 1,
1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
769 ); 1087 );
770 1088
771 $self->{vp}->add ($self->{scrolled});
772 $self->add ($self->{vp});
773 $self->add ($self->{slider});
774
775 $self
776}
777
778#TODO# update range on size_allocate depeneing on child
779# update viewport offset on scroll
780
781#############################################################################
782
783package CFClient::UI::Frame;
784
785our @ISA = CFClient::UI::Bin::;
786
787use CFClient::OpenGL;
788
789sub new {
790 my $class = shift;
791
792 my $self = $class->SUPER::new (
793 bg => [1, 1, 1, 1],
794 border_bg => [1, 1, 1, 1],
795 border => 0.8,
796 @_
797 );
798
799 $self
800}
801
802sub _draw {
803 my ($self) = @_;
804
805 my ($w, $h) = ($self->{w}, $self->{h});
806
807 glEnable GL_BLEND;
808 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
809 glEnable GL_TEXTURE_2D;
810 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
811
812# glBegin GL_QUADS;
813# glColor 0, 0, 0, 0;
814# glVertex 0 , 0;
815# glVertex 0 , $h;
816# glVertex $w, $h;
817# glVertex $w, 0;
818# glEnd;
819
820
821 $self->child->draw;
822 glDisable GL_BLEND;
823 glDisable GL_TEXTURE_2D;
824}
825
826#############################################################################
827
828package CFClient::UI::FancyFrame;
829
830our @ISA = CFClient::UI::Bin::;
831
832use CFClient::OpenGL;
833
834my @tex =
835 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
836 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
837
838sub new {
839 my $class = shift;
840
841 # TODO: user_x, user_y, overwrite moveto?
842
843 my $self = $class->SUPER::new (
844 bg => [1, 1, 1, 1],
845 border_bg => [1, 1, 1, 1],
846 border => 0.6,
847 can_events => 1,
848 @_
849 );
850
851 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
852 align => 0, 1090 align => 0,
853 valign => 1, 1091 valign => 1,
854 text => $self->{title}, 1092 text => $title,
855 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
856 1095
857 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
858} 1104}
859 1105
860sub border { 1106sub border {
861 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
862} 1108}
863 1109
864sub size_request { 1110sub size_request {
865 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
866 1115
867 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
868 1117
869 ( 1118 (
870 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
873} 1122}
874 1123
875sub size_allocate { 1124sub size_allocate {
876 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
877 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
878 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
879 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
880 1137
881 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
882 if $self->{title};
883
884 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
885} 1139}
886 1140
887sub button_down { 1141sub button_down {
888 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
889 1143
… …
905 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
906 1160
907 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
908 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
909 1163
910 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
911 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
912 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
913 $self->check_size; 1168 $self->realloc;
914 }; 1169 };
915 1170
916 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
917 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
918 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
920 $self->{motion} = sub { 1175 $self->{motion} = sub {
921 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
922 1177
923 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
924 1179
925 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
926 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
927 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
928 } 1188 1
929} 1189}
930 1190
931sub button_up { 1191sub button_up {
932 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
933 1193
934 delete $self->{motion}; 1194 !!delete $self->{motion}
935} 1195}
936 1196
937sub mouse_motion { 1197sub mouse_motion {
938 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
939 1199
940 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
941} 1203}
942 1204
943sub _draw { 1205sub _draw {
944 my ($self) = @_; 1206 my ($self) = @_;
945 1207
1208 my $child = $self->{children}[0];
1209
946 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
947 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
948 1212
949 glEnable GL_BLEND;
950 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
951 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
952 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
953 1215
954 my $border = $self->border; 1216 my $border = $self->border;
955 1217
956 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
957 $tex[1]->draw_quad (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
958 $tex[3]->draw_quad (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
959 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
960 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
961 1223
962 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
963 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
964 1226
965 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
966 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
967 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
968
969 glColor @{ $self->{bg} };
970
971 $bg->{s} = $rep_x;
972 $bg->{t} = $rep_y;
973 $bg->{wrap_mode} = 1;
974 $bg->draw_quad ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1232 }
975 1233
976 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
977 glDisable GL_BLEND;
978 }
979 1235
980 $self->{title}->draw if $self->{title};
981
982 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
983} 1242}
984 1243
985############################################################################# 1244#############################################################################
986 1245
987package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
995sub new { 1254sub new {
996 my $class = shift; 1255 my $class = shift;
997 1256
998 $class->SUPER::new ( 1257 $class->SUPER::new (
999 col_expand => [], 1258 col_expand => [],
1000 @_ 1259 @_,
1001 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1002} 1265}
1003 1266
1004sub add { 1267sub add {
1005 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1006 1269
1007 $child->set_parent ($self); 1270 $child->set_parent ($self);
1008 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1009 1272
1010 $child->check_size; 1273 $self->realloc;
1011} 1274}
1012 1275
1013sub children {
1014 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1015}
1016
1017# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1018sub clear { 1277sub clear {
1019 my ($self) = @_; 1278 my ($self) = @_;
1020 1279
1021 my @children = $self->children; 1280 my @children = $self->children;
1022 delete $self->{children}; 1281 delete $self->{children};
… …
1024 for (@children) { 1283 for (@children) {
1025 delete $_->{parent}; 1284 delete $_->{parent};
1026 $_->hide; 1285 $_->hide;
1027 } 1286 }
1028 1287
1029 $self->update; 1288 $self->realloc;
1030} 1289}
1031 1290
1032sub get_wh { 1291sub get_wh {
1033 my ($self) = @_; 1292 my ($self) = @_;
1034 1293
… …
1065sub size_allocate { 1324sub size_allocate {
1066 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1067 1326
1068 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1069 1328
1070 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1071 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1072 1331
1073 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1074 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1075 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1076 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1130 } 1389 }
1131} 1390}
1132 1391
1133############################################################################# 1392#############################################################################
1134 1393
1135package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1136
1137# TODO: wrap into common Box base class
1138 1395
1139our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1140 1397
1141sub size_request { 1398sub size_request {
1142 my ($self) = @_; 1399 my ($self) = @_;
1143 1400
1144 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1145 1402 ? (
1146 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1147 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1148 (List::Util::max map $_->[1], @alloc), 1405 )
1149 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1150} 1410}
1151 1411
1152sub size_allocate { 1412sub size_allocate {
1153 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1154 1414
1155 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1156
1157 my $children = $self->{children}; 1416 my $children = $self->{children};
1158 1417
1159 my @h = map $_->{req_w}, @$children; 1418 my @req;
1160 1419
1161 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1162 1421 @req = ($space / (@$children || 1)) x @$children;
1163 if ($req_h > $h) {
1164 # ah well, not enough space
1165 $_ *= $h / $req_h for @h;
1166 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1167 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1168 $exp ||= 1;
1169 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1170 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1171 my $child = $children->[$_];
1172
1173 my $alloc_h = $h[$_];
1174 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1175 $h[$_] = $alloc_h;
1176 } 1436 }
1177 } 1437 }
1178 1438
1179 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1180 1440
1181 my $y = 0; 1441 my $pos = 0;
1182 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1183 my $child = $children->[$_];
1184 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1185 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1186 1445
1187 $y += $h; 1446 $pos += $alloc;
1188 } 1447 }
1189 1448
1190 1 1449 1
1191} 1450}
1192 1451
1193############################################################################# 1452#############################################################################
1194 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1195package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1196 1470
1197# TODO: wrap into common Box base class
1198
1199our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1200 1472
1201sub size_request { 1473sub new {
1202 my ($self) = @_; 1474 my $class = shift;
1203 1475
1204 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1205 1477 vertical => 1,
1206 ( 1478 @_,
1207 (List::Util::max map $_->[0], @alloc),
1208 (List::Util::sum map $_->[1], @alloc),
1209 ) 1479 )
1210} 1480}
1211 1481
1212sub size_allocate {
1213 my ($self, $w, $h) = @_;
1214
1215 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1216
1217 my $children = $self->{children};
1218
1219 my @h = map $_->{req_h}, @$children;
1220
1221 my $req_h = List::Util::sum @h;
1222
1223 if ($req_h > $h) {
1224 # ah well, not enough space
1225 $_ *= $h / $req_h for @h;
1226 } else {
1227 my $exp = List::Util::sum map $_->{expand}, @$children;
1228 $exp ||= 1;
1229
1230 for (0 .. $#$children) {
1231 my $child = $children->[$_];
1232
1233 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1234 }
1235 }
1236
1237 CFClient::UI::harmonize \@h;
1238
1239 my $y = 0;
1240 for (0 .. $#$children) {
1241 my $child = $children->[$_];
1242 my $h = $h[$_];
1243 $child->configure (0, $y, $w, $h);
1244
1245 $y += $h;
1246 }
1247
1248 1
1249}
1250
1251############################################################################# 1482#############################################################################
1252 1483
1253package CFClient::UI::Label; 1484package CFClient::UI::Label;
1254 1485
1255our @ISA = CFClient::UI::Base::; 1486our @ISA = CFClient::UI::DrawBG::;
1256 1487
1257use CFClient::OpenGL; 1488use CFClient::OpenGL;
1258 1489
1259sub new { 1490sub new {
1260 my ($class, %arg) = @_; 1491 my ($class, %arg) = @_;
1261 1492
1262 my $self = $class->SUPER::new ( 1493 my $self = $class->SUPER::new (
1263 fg => [1, 1, 1], 1494 fg => [1, 1, 1],
1495 #bg => none
1496 #active_bg => none
1264 #font => default_font 1497 #font => default_font
1265 #text => initial text 1498 #text => initial text
1266 #markup => initial narkup 1499 #markup => initial narkup
1500 #max_w => maximum pixel width
1501 ellipsise => 3, # end
1267 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1268 fontsize => 1, 1503 fontsize => 1,
1269 align => -1, 1504 align => -1,
1270 valign => -1, 1505 valign => -1,
1271 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1272 can_events => 0, 1508 can_events => 0,
1273 %arg 1509 %arg
1274 ); 1510 );
1275 1511
1276 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1286 } 1522 }
1287 1523
1288 $self 1524 $self
1289} 1525}
1290 1526
1291sub escape { 1527sub escape($) {
1292 local $_ = $_[1]; 1528 local $_ = $_[0];
1293 1529
1294 s/&/&amp;/g; 1530 s/&/&amp;/g;
1295 s/>/&gt;/g; 1531 s/>/&gt;/g;
1296 s/</&lt;/g; 1532 s/</&lt;/g;
1297 1533
1298 $_[1] 1534 $_
1299} 1535}
1300 1536
1301sub update { 1537sub update {
1302 my ($self) = @_; 1538 my ($self) = @_;
1303 1539
1304 delete $self->{texture}; 1540 delete $self->{texture};
1305 $self->SUPER::update; 1541 $self->SUPER::update;
1306} 1542}
1307 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1308sub set_text { 1551sub set_text {
1309 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1310 1553
1311 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1312 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1313 1556
1314 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1315 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1316 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1317 $self->update; 1562 $self->update;
1318 $self->check_size;
1319} 1563}
1320 1564
1321sub set_markup { 1565sub set_markup {
1322 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1323 1567
… …
1327 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1328 1572
1329 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1330 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1331 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1332 $self->update; 1578 $self->update;
1333 $self->check_size;
1334} 1579}
1335 1580
1336sub size_request { 1581sub size_request {
1337 my ($self) = @_; 1582 my ($self) = @_;
1338 1583
1584 $self->{size_req} ||= do {
1339 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1340 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1341 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1342 1590
1343 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1344 1592
1345 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1346 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1347 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1596
1349 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1350 1598
1351 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1352 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1353 } 1604 };
1354 1605
1355 ( 1606 @{ $self->{size_req} }
1356 $w + $self->{padding} * 2,
1357 $h + $self->{padding} * 2,
1358 )
1359} 1607}
1360 1608
1361sub size_allocate { 1609sub size_allocate {
1362 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1363 1611
1612 delete $self->{ox};
1613
1364 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1365} 1616}
1366 1617
1367sub set_fontsize { 1618sub set_fontsize {
1368 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1369 1620
1370 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1371 delete $self->{texture}; 1622 delete $self->{texture};
1372 1623
1373 $self->update; 1624 $self->realloc;
1374 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1375} 1633}
1376 1634
1377sub _draw { 1635sub _draw {
1378 my ($self) = @_; 1636 my ($self) = @_;
1637
1638 $self->SUPER::_draw; # draw background, if applicable
1379 1639
1380 my $tex = $self->{texture} ||= do { 1640 my $tex = $self->{texture} ||= do {
1381 $self->{layout}->set_foreground (@{$self->{fg}}); 1641 $self->{layout}->set_foreground (@{$self->{fg}});
1382 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1642 $self->{layout}->set_font ($self->{font}) if $self->{font};
1383 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1647
1386 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1387
1388 $self->{ox} = int $self->{align} < 0 ? $self->{padding}
1389 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1390 : ($self->{w} - $tex->{w}) * 0.5;
1391
1392 $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
1393 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1394 : ($self->{h} - $tex->{h}) * 0.5;
1395
1396 $tex
1397 }; 1649 };
1398 1650
1651 unless (exists $self->{ox}) {
1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1654 : ($self->{w} - $tex->{w}) * 0.5);
1655
1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1658 : ($self->{h} - $tex->{h}) * 0.5);
1659 };
1660
1399 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1400 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1401 1665
1402 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1403 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1404 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1405 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1406 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1407 } 1673 }
1408 1674
1409 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1410} 1676}
1411 1677
… …
1427 active_fg => [0, 0, 0], 1693 active_fg => [0, 0, 0],
1428 can_hover => 1, 1694 can_hover => 1,
1429 can_focus => 1, 1695 can_focus => 1,
1430 valign => 0, 1696 valign => 0,
1431 can_events => 1, 1697 can_events => 1,
1698 #text => ...
1699 #hidden => "*",
1432 @_ 1700 @_
1433 ) 1701 )
1434} 1702}
1435 1703
1436sub _set_text { 1704sub _set_text {
… …
1438 1706
1439 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1440 1708
1441 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1442 1710
1443 delete $self->{texture};
1444
1445 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1446 $self->{text} = $text; 1712 $self->{text} = $text;
1447 1713
1448 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1449 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1450 1717
1451 $self->emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1452} 1722}
1453 1723
1454sub set_text { 1724sub set_text {
1455 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1456 1726
1457 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1458 $self->_set_text ($text); 1728 $self->_set_text ($text);
1459 $self->check_size;
1460 $self->update;
1461} 1729}
1462 1730
1463sub get_text { 1731sub get_text {
1464 $_[0]{text} 1732 $_[0]{text}
1465} 1733}
… …
1468 my ($self) = @_; 1736 my ($self) = @_;
1469 1737
1470 my ($w, $h) = $self->SUPER::size_request; 1738 my ($w, $h) = $self->SUPER::size_request;
1471 1739
1472 ($w + 1, $h) # add 1 for cursor 1740 ($w + 1, $h) # add 1 for cursor
1473}
1474
1475sub size_allocate {
1476 my ($self, $w, $h) = @_;
1477
1478 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1479} 1741}
1480 1742
1481sub key_down { 1743sub key_down {
1482 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1483 1745
… …
1485 my $sym = $ev->{sym}; 1747 my $sym = $ev->{sym};
1486 my $uni = $ev->{unicode}; 1748 my $uni = $ev->{unicode};
1487 1749
1488 my $text = $self->get_text; 1750 my $text = $self->get_text;
1489 1751
1490 if ($sym == 8) { 1752 if ($uni == 8) {
1491 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1753 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1492 } elsif ($sym == 127) { 1754 } elsif ($uni == 127) {
1493 substr $text, $self->{cursor}, 1, ""; 1755 substr $text, $self->{cursor}, 1, "";
1494 } elsif ($sym == CFClient::SDLK_LEFT) { 1756 } elsif ($sym == CFClient::SDLK_LEFT) {
1495 --$self->{cursor} if $self->{cursor}; 1757 --$self->{cursor} if $self->{cursor};
1496 } elsif ($sym == CFClient::SDLK_RIGHT) { 1758 } elsif ($sym == CFClient::SDLK_RIGHT) {
1497 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1759 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1498 } elsif ($sym == CFClient::SDLK_HOME) { 1760 } elsif ($sym == CFClient::SDLK_HOME) {
1499 $self->{cursor} = 0; 1761 $self->{cursor} = 0;
1500 } elsif ($sym == CFClient::SDLK_END) { 1762 } elsif ($sym == CFClient::SDLK_END) {
1501 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1502 } elsif ($sym == 27) { 1764 } elsif ($uni == 27) {
1503 $self->emit ('escape'); 1765 $self->_emit ('escape');
1504 } elsif ($uni) { 1766 } elsif ($uni) {
1505 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1506 } 1770 }
1507 1771
1508 $self->_set_text ($text); 1772 $self->_set_text ($text);
1509 $self->update; 1773
1774 $self->realloc;
1775
1776 1
1510} 1777}
1511 1778
1512sub focus_in { 1779sub focus_in {
1513 my ($self) = @_; 1780 my ($self) = @_;
1514 1781
… …
1529 utf8::encode $text; 1796 utf8::encode $text;
1530 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1531 1798
1532 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1533 $self->update; 1800 $self->update;
1801
1802 1
1534} 1803}
1535 1804
1536sub mouse_motion { 1805sub mouse_motion {
1537 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1538# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1539} 1810}
1540 1811
1541sub _draw { 1812sub _draw {
1542 my ($self) = @_; 1813 my ($self) = @_;
1543 1814
1544 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1545 1816
1546 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1547 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1548 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1549 } else { 1820 } else {
1550 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1551 } 1822 }
1552 1823
1553 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1554 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1555 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1556 glVertex 0 , 0; 1827 glVertex 0 , 0;
1557 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1558 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1559 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1594 if ($sym == 13) { 1865 if ($sym == 13) {
1595 unshift @{$self->{history}}, 1866 unshift @{$self->{history}},
1596 my $txt = $self->get_text; 1867 my $txt = $self->get_text;
1597 $self->{history_pointer} = -1; 1868 $self->{history_pointer} = -1;
1598 $self->{history_saveback} = ''; 1869 $self->{history_saveback} = '';
1599 $self->emit (activate => $txt); 1870 $self->_emit (activate => $txt);
1600 $self->update; 1871 $self->update;
1601 1872
1602 } elsif ($sym == CFClient::SDLK_UP) { 1873 } elsif ($sym == CFClient::SDLK_UP) {
1603 if ($self->{history_pointer} < 0) { 1874 if ($self->{history_pointer} < 0) {
1604 $self->{history_saveback} = $self->get_text; 1875 $self->{history_saveback} = $self->get_text;
… …
1620 } else { 1891 } else {
1621 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1622 } 1893 }
1623 1894
1624 } else { 1895 } else {
1625 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1626 } 1899 1
1627
1628} 1900}
1629 1901
1630############################################################################# 1902#############################################################################
1631 1903
1632package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1641 1913
1642sub new { 1914sub new {
1643 my $class = shift; 1915 my $class = shift;
1644 1916
1645 $class->SUPER::new ( 1917 $class->SUPER::new (
1646 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1647 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1648 bg => [1, 1, 1, 0.2],
1649 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1650 can_hover => 1, 1922 can_hover => 1,
1651 align => 0, 1923 align => 0,
1652 valign => 0, 1924 valign => 0,
1653 can_events => 1, 1925 can_events => 1,
1654 @_ 1926 @_
1655 ) 1927 )
1656} 1928}
1657 1929
1930sub activate { }
1931
1658sub button_up { 1932sub button_up {
1659 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1660 1934
1935 $self->emit ("activate")
1661 if ($x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1662 && $y >= 0 && $y < $self->{h}) { 1937 && $y >= 0 && $y < $self->{h};
1663 $self->emit ("activate"); 1938
1664 } 1939 1
1665} 1940}
1666 1941
1667sub _draw { 1942sub _draw {
1668 my ($self) = @_; 1943 my ($self) = @_;
1669 1944
1670 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1671
1672 if ($GRAB == $self) {
1673 $self->{fg} = $self->{active_fg};
1674 }
1675 1946
1676 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1678 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1679 1950
… …
1698 1969
1699sub new { 1970sub new {
1700 my $class = shift; 1971 my $class = shift;
1701 1972
1702 $class->SUPER::new ( 1973 $class->SUPER::new (
1703 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1704 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1705 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1978 bg => [0, 0, 0, 0.2],
1979 active_bg => [1, 1, 1, 0.5],
1706 state => 0, 1980 state => 0,
1707 can_hover => 1, 1981 can_hover => 1,
1708 @_ 1982 @_
1709 ) 1983 )
1710} 1984}
1711 1985
1712sub size_request { 1986sub size_request {
1713 my ($self) = @_; 1987 my ($self) = @_;
1714 1988
1715 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1716} 1990}
1717 1991
1718sub button_down { 1992sub button_down {
1719 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1720 1994
1721 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1722 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1723 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1724 $self->emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1725 } 2003 1
1726} 2004}
1727 2005
1728sub _draw { 2006sub _draw {
1729 my ($self) = @_; 2007 my ($self) = @_;
1730 2008
1731 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1732 2010
1733 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1734 2012
1735 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1736 2016
1737 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1738 2018
2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
2020
1739 glEnable GL_TEXTURE_2D; 2021 glEnable GL_TEXTURE_2D;
1740
1741 my $tex = $self->{state} ? $tex[1] : $tex[0];
1742
1743 $tex->draw_quad_alpha (0, 0, $s, $s); 2022 $tex->draw_quad_alpha (0, 0, $s, $s);
1744
1745 glDisable GL_TEXTURE_2D; 2023 glDisable GL_TEXTURE_2D;
1746} 2024}
1747 2025
1748############################################################################# 2026#############################################################################
1749 2027
… …
1897 2175
1898 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
1899 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
1900 2178
1901 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1902 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1903 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
1904 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1905 2184
1906 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
1907 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
1996 qw(s1_slider.png s1_slider_bg.png); 2275 qw(s1_slider.png s1_slider_bg.png);
1997 2276
1998sub new { 2277sub new {
1999 my $class = shift; 2278 my $class = shift;
2000 2279
2001 # range [value, low, high, page] 2280 # range [value, low, high, page, unit]
2002 2281
2003 # TODO: 0-width page 2282 # TODO: 0-width page
2004 # TODO: req_w/h are wrong with vertical 2283 # TODO: req_w/h are wrong with vertical
2005 # TODO: calculations are off 2284 # TODO: calculations are off
2006 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2007 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2008 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2288 bg => [0, 0, 0, 0.2],
2289 active_bg => [1, 1, 1, 0.5],
2009 range => [0, 0, 100, 10], 2290 range => [0, 0, 100, 10, 0],
2010 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2011 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2012 vertical => 0, 2293 vertical => 0,
2013 can_hover => 1, 2294 can_hover => 1,
2014 inner_pad => 5, 2295 inner_pad => 0.02,
2015 @_ 2296 @_
2016 ); 2297 );
2017 2298
2299 $self->set_value ($self->{range}[0]);
2300 $self->update;
2301
2018 $self 2302 $self
2019} 2303}
2020 2304
2305sub changed { }
2306
2307sub set_range {
2308 my ($self, $range) = @_;
2309
2310 ($range, $self->{range}) = ($self->{range}, $range);
2311
2312 $self->update
2313 if "@$range" ne "@{$self->{range}}";
2314}
2315
2316sub set_value {
2317 my ($self, $value) = @_;
2318
2319 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2320
2321 $hi = $lo + 1 if $hi <= $lo;
2322
2323 $page = $hi - $lo if $page > $hi - $lo;
2324
2325 $value = $lo if $value < $lo;
2326 $value = $hi - $page if $value > $hi - $page;
2327
2328 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2329 if $unit;
2330
2331 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2332
2333 if ($value != $old_value) {
2334 $self->_emit (changed => $value);
2335 $self->update;
2336 }
2337}
2338
2021sub size_request { 2339sub size_request {
2022 my ($self) = @_; 2340 my ($self) = @_;
2023 2341
2024 my $w = $self->{req_w}; 2342 ($self->{req_w}, $self->{req_h})
2025 my $h = $self->{req_h};
2026
2027 $self->{vertical} ? ($h, $w) : ($w, $h)
2028} 2343}
2029 2344
2030sub button_down { 2345sub button_down {
2031 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
2032 2347
2033 $self->SUPER::button_down ($ev, $x, $y); 2348 $self->SUPER::button_down ($ev, $x, $y);
2349
2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2351
2034 $self->mouse_motion ($ev, $x, $y); 2352 $self->mouse_motion ($ev, $x, $y)
2035} 2353}
2036 2354
2037sub mouse_motion { 2355sub mouse_motion {
2038 my ($self, $ev, $x, $y) = @_; 2356 my ($self, $ev, $x, $y) = @_;
2039 2357
2040 if ($GRAB == $self) { 2358 if ($GRAB == $self) {
2359 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2360
2361 my (undef, $lo, $hi, $page) = @{$self->{range}};
2362
2363 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2364
2365 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2366 } else {
2367 return 0;
2368 }
2369
2370 1
2371}
2372
2373sub update {
2374 my ($self) = @_;
2375
2376 delete $self->{knob_w};
2377 $self->SUPER::update;
2378}
2379
2380sub _draw {
2381 my ($self) = @_;
2382
2383 unless ($self->{knob_w}) {
2384 $self->set_value ($self->{range}[0]);
2385
2041 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2386 my ($value, $lo, $hi, $page) = @{$self->{range}};
2387 my $range = ($hi - $page - $lo) || 1e-100;
2042 2388
2043 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2389 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2044 2390
2045 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2391 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2046 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2392 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2047 2393
2048 $x -= $inner_pad_px; # substract the padding 2394 $value = ($value - $lo) / $range;
2049 $x = $x * ($hi - $lo) / $inner_w + $lo; 2395 $value = $value * $self->{scale} + $self->{offset};
2050 $x = $lo if $x < $lo;
2051 $x = $hi - $page if $x > $hi - $page;
2052 $self->{range}[0] = $x;
2053 2396
2054 $self->emit (changed => $x); 2397 $self->{knob_x} = $value - $knob_w * 0.5;
2055 $self->update; 2398 $self->{knob_w} = $knob_w;
2056 } 2399 }
2057}
2058
2059# the inner_* stuff is for generating a padding for the slider handle,
2060# so that the handle doesn't leave the texture. This calculation isn't 100%
2061# correct propably, but it does the job for now
2062sub _calc_inner_pad_px {
2063 my ($self, $w) = @_;
2064 ($w / 100) * $self->{inner_pad} # % to pixels
2065}
2066
2067sub _draw {
2068 my ($self) = @_;
2069 2400
2070 $self->SUPER::_draw (); 2401 $self->SUPER::_draw ();
2071 2402
2072 my ($w, $h) = @$self{qw(w h)}; 2403 glScale $self->{w}, $self->{h};
2073 2404
2074 if ($self->{vertical}) { 2405 if ($self->{vertical}) {
2075 # draw a vertical slider like a rotated horizontal slider 2406 # draw a vertical slider like a rotated horizontal slider
2076 2407
2408 glTranslate 1, 0, 0;
2077 glRotate 90, 0, 0, 1; 2409 glRotate 90, 0, 0, 1;
2078 glTranslate 0, -$self->{w}, 0;
2079
2080 ($w, $h) = ($h, $w);
2081 } 2410 }
2082 2411
2083 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2412 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2084 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2413 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2085 2414
2086 my ($value, $lo, $hi, $page) = @{$self->{range}};
2087
2088 $hi = $value + 1 if $lo == $hi;
2089
2090 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2091 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2092
2093 $page = int $page * $inner_w / ($hi - $lo);
2094 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2095
2096 $w -= $page;
2097 $page &= ~1;
2098 glTranslate $page * 0.5, 0, 0;
2099 $page ||= 2;
2100
2101 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2102 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2103
2104 glEnable GL_TEXTURE_2D; 2415 glEnable GL_TEXTURE_2D;
2105 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2106 2417
2107 # draw background 2418 # draw background
2108 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2419 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2109 2420
2110 # draw handle 2421 # draw handle
2111 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2422 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2112 2423
2113 glDisable GL_TEXTURE_2D; 2424 glDisable GL_TEXTURE_2D;
2114} 2425}
2426
2427#############################################################################
2428
2429package CFClient::UI::ValSlider;
2430
2431our @ISA = CFClient::UI::HBox::;
2432
2433sub new {
2434 my ($class, %arg) = @_;
2435
2436 my $range = delete $arg{range};
2437
2438 my $self = $class->SUPER::new (
2439 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2440 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2441 to_value => sub { shift },
2442 from_value => sub { shift },
2443 %arg,
2444 );
2445
2446 $self->{slider}->connect (changed => sub {
2447 my ($self, $value) = @_;
2448 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2449 $self->{parent}->emit (changed => $value);
2450 });
2451
2452# $self->{entry}->connect (changed => sub {
2453# my ($self, $value) = @_;
2454# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2455# $self->{parent}->emit (changed => $value);
2456# });
2457
2458 $self->add ($self->{slider}, $self->{entry});
2459
2460 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2461
2462 $self
2463}
2464
2465sub set_range { shift->{slider}->set_range (@_) }
2466sub set_value { shift->{slider}->set_value (@_) }
2115 2467
2116############################################################################# 2468#############################################################################
2117 2469
2118package CFClient::UI::TextView; 2470package CFClient::UI::TextView;
2119 2471
… …
2125 my $class = shift; 2477 my $class = shift;
2126 2478
2127 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2128 fontsize => 1, 2480 fontsize => 1,
2129 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2130 #font => default_font 2483 #font => default_font
2131 @_, 2484 @_,
2132 2485
2133 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2134 par => [], 2487 par => [],
… …
2149 2502
2150 $self->{fontsize} = $fontsize; 2503 $self->{fontsize} = $fontsize;
2151 $self->reflow; 2504 $self->reflow;
2152} 2505}
2153 2506
2154sub text_height {
2155 my ($self, $text) = @_;
2156
2157 my $layout = $self->{layout};
2158
2159 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2160 $layout->set_width ($self->{children}[0]{w});
2161 $layout->set_markup ($text);
2162
2163 ($layout->size)[1]
2164}
2165
2166sub reflow {
2167 my ($self) = @_;
2168
2169 $self->{need_reflow}++;
2170 $self->update;
2171}
2172
2173sub size_allocate { 2507sub size_allocate {
2174 my ($self, $w, $h) = @_; 2508 my ($self, $w, $h) = @_;
2175 2509
2176 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2177 2511
2178 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2179 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2180 $self->{layout}->set_width ($self->{children}[0]{w}); 2514 $self->{layout}->set_width ($self->{children}[0]{w});
2515 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2181 2516
2182 $self->reflow; 2517 $self->reflow;
2183} 2518}
2184 2519
2520sub text_size {
2521 my ($self, $text, $indent) = @_;
2522
2523 my $layout = $self->{layout};
2524
2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2526 $layout->set_width ($self->{children}[0]{w} - $indent);
2527 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2528 $layout->set_markup ($text);
2529
2530 $layout->size
2531}
2532
2533sub reflow {
2534 my ($self) = @_;
2535
2536 $self->{need_reflow}++;
2537 $self->update;
2538}
2539
2540sub set_offset {
2541 my ($self, $offset) = @_;
2542
2543 # todo: base offset on lines or so, not on pixels
2544 $self->{children}[1]->set_value ($offset);
2545}
2546
2547sub clear {
2548 my ($self) = @_;
2549
2550 $self->{par} = [];
2551 $self->{height} = 0;
2552 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2553}
2554
2185sub add_paragraph { 2555sub add_paragraph {
2186 my ($self, $color, $text) = @_; 2556 my ($self, $color, $text, $indent) = @_;
2187 2557
2188 #TODO: intelligently "reformat" paragraph 2558 for my $line (split /\n/, $text) {
2189 2559 my ($w, $h) = $self->text_size ($line);
2190 my $height = $self->text_height ($text);
2191
2192 $self->{height} += $height; 2560 $self->{height} += $h;
2561 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2562 }
2193 2563
2194 push @{$self->{par}}, [$height, $color, $text];
2195
2196 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2564 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2197 $self->{children}[1]->update;
2198} 2565}
2199 2566
2200sub update { 2567sub update {
2201 my ($self) = @_; 2568 my ($self) = @_;
2202 2569
… …
2204 2571
2205 return unless $self->{h} > 0; 2572 return unless $self->{h} > 0;
2206 2573
2207 delete $self->{texture}; 2574 delete $self->{texture};
2208 2575
2209 $ROOT->on_refresh ($self, sub { 2576 $ROOT->on_post_alloc ($self, sub {
2577 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2578
2210 if (delete $self->{need_reflow}) { 2579 if (delete $self->{need_reflow}) {
2211 my $height = 0; 2580 my $height = 0;
2212 2581
2213 $height += $_->[0] = $self->text_height ($_->[2]) 2582 my $layout = $self->{layout};
2583
2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2585
2214 for @{$self->{par}}; 2586 for (@{$self->{par}}) {
2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2590 $layout->set_markup ($_->[4]);
2591 my ($w, $h) = $layout->size;
2592 $_->[0] = $w + $_->[3];
2593 $_->[1] = $h;
2594 }
2595
2596 $height += $_->[1];
2597 }
2215 2598
2216 $self->{height} = $height; 2599 $self->{height} = $height;
2217 2600
2218 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2601 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2219 2602
2220 delete $self->{texture}; 2603 delete $self->{texture};
2221 } 2604 }
2222 2605
2223 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2224 glClearColor 0, 0, 0, 0; 2607 glClearColor 0, 0, 0, 0;
2225 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2226 2609
2227 glEnable GL_TEXTURE_2D;
2228 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2229
2230 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2231 2611
2232 my $y0 = $top; 2612 my $y0 = $top;
2233 my $y1 = $top + $self->{h}; 2613 my $y1 = $top + $H;
2234 2614
2235 my $y = 0; 2615 my $y = 0;
2236 2616
2237 my $layout = $self->{layout}; 2617 my $layout = $self->{layout};
2238 2618
2239 $layout->set_font ($self->{font}) if $self->{font}; 2619 $layout->set_font ($self->{font}) if $self->{font};
2240 2620
2621 glEnable GL_BLEND;
2622 #TODO# not correct in windows where rgba is forced off
2623 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2624
2241 for my $par (@{$self->{par}}) { 2625 for my $par (@{$self->{par}}) {
2242 my $h = $par->[0]; 2626 my $h = $par->[1];
2243 2627
2244 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2245 $layout->set_foreground (@{ $par->[1] }); 2629 $layout->set_foreground (@{ $par->[2] });
2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2246 $layout->set_markup ($par->[2]); 2632 $layout->set_markup ($par->[4]);
2247 2633
2248 my ($W, $H) = $layout->size; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2249 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2635
2636 glRasterPos $par->[3], $y - $y0;
2637 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2250 } 2638 }
2251 2639
2252 $y += $h; 2640 $y += $h;
2253 } 2641 }
2254 2642
2255 glDisable GL_TEXTURE_2D; 2643 glDisable GL_BLEND;
2256 }; 2644 };
2257 }); 2645 });
2258} 2646}
2259 2647
2260sub _draw { 2648sub _draw {
2261 my ($self) = @_; 2649 my ($self) = @_;
2262 2650
2263 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2264 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2265 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2266 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2654 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2267 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2268 2656
2269 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2270 2658
… …
2320 2708
2321sub new { 2709sub new {
2322 my $class = shift; 2710 my $class = shift;
2323 2711
2324 my $self = $class->SUPER::new ( 2712 my $self = $class->SUPER::new (
2325 state => 0, 2713 state => 0,
2326 connect_activate => \&toggle_flopper, 2714 on_activate => \&toggle_flopper,
2327 @_ 2715 @_
2328 ); 2716 );
2329 2717
2330 if ($self->{state}) {
2331 $self->{state} = 0;
2332 $self->toggle_flopper;
2333 }
2334
2335 $self 2718 $self
2336} 2719}
2337 2720
2338sub toggle_flopper { 2721sub toggle_flopper {
2339 my ($self) = @_; 2722 my ($self) = @_;
2340 2723
2341 # TODO: use animation 2724 $self->{other}->toggle_visibility;
2342 if ($self->{state} = !$self->{state}) {
2343 $CFClient::UI::ROOT->add ($self->{other});
2344 $self->{other}->move ($self->coord2global (0, $self->{h}));
2345 $self->emit ("open");
2346 } else {
2347 $CFClient::UI::ROOT->remove ($self->{other});
2348 $self->emit ("close");
2349 }
2350
2351 $self->emit (changed => $self->{state});
2352} 2725}
2353 2726
2354############################################################################# 2727#############################################################################
2355 2728
2356package CFClient::UI::Tooltip; 2729package CFClient::UI::Tooltip;
… …
2369} 2742}
2370 2743
2371sub set_tooltip_from { 2744sub set_tooltip_from {
2372 my ($self, $widget) = @_; 2745 my ($self, $widget) = @_;
2373 2746
2747 my $tooltip = $widget->{tooltip};
2748
2749 if ($ENV{CFPLUS_DEBUG} & 2) {
2750 $tooltip .= "\n\n" . (ref $widget) . "\n"
2751 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2752 . "req $widget->{req_w} $widget->{req_h}\n"
2753 . "visible $widget->{visible}";
2754 }
2755
2374 $self->{label} = new CFClient::UI::Label 2756 $self->add (new CFClient::UI::Label
2375 markup => $widget->{tooltip}, 2757 markup => $tooltip,
2376 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2377 fontsize => 0.8, 2759 fontsize => 0.8,
2378 fg => [0, 0, 0, 1], 2760 fg => [0, 0, 0, 1],
2761 ellipsise => 0,
2379 font => ($widget->{tooltip_font} || $::FONT_PROP); 2762 font => ($widget->{tooltip_font} || $::FONT_PROP),
2380 2763 );
2381 $self->add ($self->{label});
2382} 2764}
2383 2765
2384sub size_request { 2766sub size_request {
2385 my ($self) = @_; 2767 my ($self) = @_;
2386 2768
… …
2393 my ($self, $w, $h) = @_; 2775 my ($self, $w, $h) = @_;
2394 2776
2395 $self->SUPER::size_allocate ($w - 4, $h - 4); 2777 $self->SUPER::size_allocate ($w - 4, $h - 4);
2396} 2778}
2397 2779
2780sub visibility_change {
2781 my ($self, $visible) = @_;
2782
2783 return unless $visible;
2784
2785 $self->{root}->on_post_alloc ("move_$self" => sub {
2786 my $widget = $self->{owner}
2787 or return;
2788
2789 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2790
2791 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2792 if $x + $self->{w} > $::WIDTH;
2793
2794 $self->move_abs ($x, $y);
2795 });
2796}
2797
2398sub _draw { 2798sub _draw {
2399 my ($self) = @_; 2799 my ($self) = @_;
2400 2800
2401 glPushMatrix;
2402 glTranslate 0.375, 0.375; 2801 glTranslate 0.375, 0.375;
2403 2802
2404 my ($w, $h) = @$self{qw(w h)}; 2803 my ($w, $h) = @$self{qw(w h)};
2405 2804
2406 glColor 1, 0.8, 0.4; 2805 glColor 1, 0.8, 0.4;
… …
2417 glVertex 0 , $h; 2816 glVertex 0 , $h;
2418 glVertex $w, $h; 2817 glVertex $w, $h;
2419 glVertex $w, 0; 2818 glVertex $w, 0;
2420 glEnd; 2819 glEnd;
2421 2820
2422 glPopMatrix; 2821 glTranslate 2 - 0.375, 2 - 0.375;
2423 2822
2424 glTranslate 2, 2;
2425 $self->SUPER::_draw; 2823 $self->SUPER::_draw;
2426} 2824}
2427 2825
2428############################################################################# 2826#############################################################################
2429 2827
… …
2434use CFClient::OpenGL; 2832use CFClient::OpenGL;
2435 2833
2436sub new { 2834sub new {
2437 my $class = shift; 2835 my $class = shift;
2438 2836
2439 $class->SUPER::new ( 2837 my $self = $class->SUPER::new (
2440 aspect => 1, 2838 aspect => 1,
2839 can_events => 0,
2441 @_, 2840 @_,
2442 ) 2841 );
2842
2843 if ($self->{anim} && $self->{animspeed}) {
2844 Scalar::Util::weaken (my $widget = $self);
2845
2846 $self->{timer} = Event->timer (
2847 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2848 hard => 1,
2849 interval => $self->{animspeed},
2850 cb => sub {
2851 ++$widget->{frame};
2852 $widget->update;
2853 },
2854 );
2855 }
2856
2857 $self
2443} 2858}
2444 2859
2445sub size_request { 2860sub size_request {
2446 (32, 8) 2861 (32, 8)
2447} 2862}
2448 2863
2864sub update {
2865 my ($self) = @_;
2866
2867 return unless $self->{visible};
2868
2869 $self->SUPER::update;
2870}
2871
2449sub _draw { 2872sub _draw {
2450 my ($self) = @_; 2873 my ($self) = @_;
2451 2874
2452 return unless $::CONN;#d# manage and cache textures differently 2875 return unless $::CONN;
2876
2877 my $face;
2878
2879 if ($self->{frame}) {
2880 my $anim = $::CONN->{anim}[$self->{anim}];
2881
2882 $face = $anim->[ $self->{frame} % @$anim ]
2883 if $anim && @$anim;
2884 }
2885
2453 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2454 2887
2455 # TODO animation
2456 if ($tex) { 2888 if ($tex) {
2457 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2460 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2461 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2462 } 2894 }
2463} 2895}
2464 2896
2897sub DESTROY {
2898 my ($self) = @_;
2899
2900 $self->{timer}->cancel
2901 if $self->{timer};
2902
2903 $self->SUPER::DESTROY;
2904}
2905
2465############################################################################# 2906#############################################################################
2466 2907
2467package CFClient::UI::InventoryItem; 2908package CFClient::UI::Buttonbar;
2468 2909
2469our @ISA = CFClient::UI::HBox::; 2910our @ISA = CFClient::UI::HBox::;
2470 2911
2471sub new { 2912# TODO: should actualyl wrap buttons and other goodies.
2472 my $class = shift;
2473
2474 my %args = @_;
2475
2476 my $item = delete $args{item};
2477
2478 my $desc = $item->{nrof} < 2
2479 ? $item->{name}
2480 : "$item->{nrof} $item->{name_pl}";
2481
2482
2483 my $self = $class->SUPER::new (
2484 can_hover => 1,
2485 can_events => 1,
2486 tooltip => (CFClient::UI::Label->escape ($desc)
2487 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2488 connect_button_down => sub {
2489 my ($self, $ev, $x, $y) = @_;
2490
2491 # todo: maybe put examine on 1? but should just be a tooltip :(
2492 if ($ev->{button} == 1) {
2493 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2494 } elsif ($ev->{button} == 2) {
2495 $::CONN->send ("apply $item->{tag}");
2496 } elsif ($ev->{button} == 3) {
2497 CFClient::UI::Menu->new (
2498 items => [
2499 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2500 [
2501 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2502 sub { $::CONN->send ("lock $item->{tag}") },
2503 ],
2504 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2505 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2506 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2507 ],
2508 )->popup ($ev);
2509 }
2510
2511 1
2512 },
2513 %args
2514 );
2515
2516 $self->add (new CFClient::UI::Face
2517 can_events => 0,
2518 face => $item->{face},
2519 anim => $item->{anim},
2520 animspeed => $item->{animspeed},
2521 );
2522
2523 $self->add (new CFClient::UI::Label
2524 can_events => 0,
2525 text => $desc,
2526 );
2527
2528 $self
2529}
2530
2531#############################################################################
2532
2533package CFClient::UI::Inventory;
2534
2535our @ISA = CFClient::UI::ScrolledWindow::;
2536
2537sub new {
2538 my $class = shift;
2539
2540 my $self = $class->SUPER::new (
2541 scrolled => (new CFClient::UI::VBox),
2542 @_,
2543 );
2544
2545 $self
2546}
2547
2548sub set_items {
2549 my ($self, $items) = @_;
2550
2551 $self->{scrolled}->clear;
2552 return unless $items;
2553
2554 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2555
2556 $self->{real_items} = \@items;
2557
2558 for my $item (@items) {
2559 my $desc = $item->{nrof} < 2
2560 ? $item->{name}
2561 : "$item->{nrof} $item->{name_pl}";
2562
2563 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2564 }
2565
2566# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2567}
2568
2569sub size_request {
2570 my ($self) = @_;
2571 ($self->{req_w}, $self->{req_h});
2572}
2573 2913
2574############################################################################# 2914#############################################################################
2575 2915
2576package CFClient::UI::Menu; 2916package CFClient::UI::Menu;
2577 2917
… …
2589 ); 2929 );
2590 2930
2591 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2592 2932
2593 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2594 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2595 2935
2596 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2597 if (!ref $widget) { 2937 if (!ref $widget) {
2598 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2599 can_hover => 1, 2939 can_hover => 1,
2600 can_events => 1, 2940 can_events => 1,
2601 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2602 } 2943 }
2603 2944
2604 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2605 2946
2606 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
2611 2952
2612# popup given the event (must be a mouse button down event currently) 2953# popup given the event (must be a mouse button down event currently)
2613sub popup { 2954sub popup {
2614 my ($self, $ev) = @_; 2955 my ($self, $ev) = @_;
2615 2956
2616 $self->emit ("popdown"); 2957 $self->_emit ("popdown");
2617 2958
2618 # maybe save $GRAB? must be careful about events... 2959 # maybe save $GRAB? must be careful about events...
2619 $GRAB = $self; 2960 $GRAB = $self;
2620 $self->{button} = $ev->{button}; 2961 $self->{button} = $ev->{button};
2621 2962
2622 $self->show; 2963 $self->show;
2623 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2964 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2624} 2965}
2625 2966
2626sub mouse_motion { 2967sub mouse_motion {
2627 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2628 2969
2629 # TODO: should use vbox->find_widget or so 2970 # TODO: should use vbox->find_widget or so
2630 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2631 $self->{hover} = $self->{item}{$HOVER}; 2972 $self->{hover} = $self->{item}{$HOVER};
2973
2974 0
2632} 2975}
2633 2976
2634sub button_up { 2977sub button_up {
2635 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2636 2979
2637 if ($ev->{button} == $self->{button}) { 2980 if ($ev->{button} == $self->{button}) {
2638 undef $GRAB; 2981 undef $GRAB;
2639 $self->hide; 2982 $self->hide;
2640 2983
2641 $self->emit ("popdown"); 2984 $self->_emit ("popdown");
2642 $self->{hover}[1]->() if $self->{hover}; 2985 $self->{hover}[1]->() if $self->{hover};
2986 } else {
2987 return 0
2988 }
2989
2643 } 2990 1
2644} 2991}
2645 2992
2646############################################################################# 2993#############################################################################
2647 2994
2995package CFClient::UI::Multiplexer;
2996
2997our @ISA = CFClient::UI::Container::;
2998
2999sub new {
3000 my $class = shift;
3001
3002 my $self = $class->SUPER::new (
3003 @_,
3004 );
3005
3006 $self->{current} = $self->{children}[0]
3007 if @{ $self->{children} };
3008
3009 $self
3010}
3011
3012sub add {
3013 my ($self, @widgets) = @_;
3014
3015 $self->SUPER::add (@widgets);
3016
3017 $self->{current} = $self->{children}[0]
3018 if @{ $self->{children} };
3019}
3020
3021sub set_current_page {
3022 my ($self, $page_or_widget) = @_;
3023
3024 my $widget = ref $page_or_widget
3025 ? $page_or_widget
3026 : $self->{children}[$page_or_widget];
3027
3028 $self->{current} = $widget;
3029 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3030
3031 $self->_emit (page_changed => $self->{current});
3032
3033 $self->realloc;
3034}
3035
3036sub visible_children {
3037 $_[0]{current}
3038}
3039
3040sub size_request {
3041 my ($self) = @_;
3042
3043 $self->{current}->size_request
3044}
3045
3046sub size_allocate {
3047 my ($self, $w, $h) = @_;
3048
3049 $self->{current}->configure (0, 0, $w, $h);
3050}
3051
3052sub _draw {
3053 my ($self) = @_;
3054
3055 $self->{current}->draw;
3056}
3057
3058#############################################################################
3059
3060package CFClient::UI::Notebook;
3061
3062our @ISA = CFClient::UI::VBox::;
3063
3064sub new {
3065 my $class = shift;
3066
3067 my $self = $class->SUPER::new (
3068 buttonbar => (new CFClient::UI::Buttonbar),
3069 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3070 # filter => # will be put between multiplexer and $self
3071 @_,
3072 );
3073
3074 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3075 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3076
3077 $self
3078}
3079
3080sub add {
3081 my ($self, $title, $widget, $tooltip) = @_;
3082
3083 Scalar::Util::weaken $self;
3084
3085 $self->{buttonbar}->add (new CFClient::UI::Button
3086 markup => $title,
3087 tooltip => $tooltip,
3088 on_activate => sub { $self->set_current_page ($widget) },
3089 );
3090
3091 $self->{multiplexer}->add ($widget);
3092}
3093
3094sub set_current_page {
3095 my ($self, $page) = @_;
3096
3097 $self->{multiplexer}->set_current_page ($page);
3098 $self->_emit (page_changed => $self->{multiplexer}{current});
3099}
3100
3101#############################################################################
3102
3103package CFClient::UI::Combobox;
3104
3105use utf8;
3106
3107our @ISA = CFClient::UI::Button::;
3108
3109sub new {
3110 my $class = shift;
3111
3112 my $self = $class->SUPER::new (
3113 options => [], # [title, value, tooltip], ...
3114 value => undef,
3115 @_,
3116 );
3117
3118 $self->_set_value ($self->{value});
3119
3120 $self
3121}
3122
3123sub button_down {
3124 my ($self, $ev) = @_;
3125
3126 my @menu_items;
3127
3128 for (@{ $self->{options} }) {
3129 my ($title, $value, $tooltip) = @$_;
3130
3131 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3132 }
3133
3134 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3135}
3136
3137sub _set_value {
3138 my ($self, $value) = @_;
3139
3140 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3141 or return;
3142
3143 $self->{value} = $item->[1];
3144 $self->set_markup ("$item->[0] ⇓");
3145 $self->set_tooltip ($item->[2]);
3146}
3147
3148sub set_value {
3149 my ($self, $value) = @_;
3150
3151 return unless $self->{value} ne $value;
3152
3153 $self->_set_value ($value);
3154 $self->_emit (changed => $value);
3155}
3156
3157#############################################################################
3158
2648package CFClient::UI::Statusbox; 3159package CFClient::UI::Statusbox;
2649 3160
2650our @ISA = CFClient::UI::VBox::; 3161our @ISA = CFClient::UI::VBox::;
2651 3162
3163sub new {
3164 my $class = shift;
3165
3166 my $self = $class->SUPER::new (
3167 fontsize => 0.8,
3168 @_,
3169 );
3170
3171 Scalar::Util::weaken (my $this = $self);
3172
3173 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3174
3175 $self
3176}
3177
2652sub reorder { 3178sub reorder {
2653 my ($self) = @_; 3179 my ($self) = @_;
2654 my $NOW = time; 3180 my $NOW = Time::HiRes::time;
3181
3182 # freeze display when hovering over any label
3183 return if $CFClient::UI::TOOLTIP->{owner}
3184 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3185 values %{ $self->{item} };
2655 3186
2656 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
2657 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2658 } 3189 }
2659 3190
2660 my @widgets; 3191 my @widgets;
2661 my @items = sort { $a->{time} <=> $b->{time} } values %{ $self->{item} }; 3192
3193 my @items = sort {
3194 $a->{pri} <=> $b->{pri}
3195 or $b->{id} <=> $a->{id}
3196 } values %{ $self->{item} };
3197
3198 $self->{timer}->interval (1);
3199
2662 my $count = 10 + 1; 3200 my $count = 10 + 1;
2663 for my $item (@items) { 3201 for my $item (@items) {
2664 last unless --$count; 3202 last unless --$count;
2665 3203
2666 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
2667 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
2668 my $short = delete $item->{text}; 3206 my $short = $item->{count} > 1
3207 ? "<b>$item->{count} ×</b> $item->{text}"
3208 : $item->{text};
3209
2669 for ($short) { 3210 for ($short) {
2670 s/^\s+//; 3211 s/^\s+//;
2671 s/\012.*//s; 3212 s/\s+/ /g;
2672 my $len = int 30 / $item->{fontsize};
2673 substr $_, $len, length, "…" if $len < length;
2674 } 3213 }
2675 3214
2676 new CFClient::UI::Label 3215 new CFClient::UI::Label
2677 markup => $short, 3216 markup => $short,
2678 tooltip => delete $item->{tooltip}, 3217 tooltip => $item->{tooltip},
2679 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
2680 tooltip_width => 0.75, 3219 tooltip_width => 0.67,
2681 fontsize => delete $item->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
2682 color => delete $item->{color}, 3221 max_w => $::WIDTH * 0.44,
3222 fg => [@{ $item->{fg} }],
2683 can_events => 1, 3223 can_events => 1,
2684 can_hover => 1, 3224 can_hover => 1
2685 }; 3225 };
3226
3227 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3228 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3229 $label->update;
3230 $label->set_max_size (undef, $label->{req_h} * $diff)
3231 if $diff < 1;
3232 $self->{timer}->interval (1/30);
3233 } else {
3234 $label->{fg}[3] = $item->{fg}[3] || 1;
3235 }
3236
3237 push @widgets, $label;
2686 } 3238 }
2687 3239
2688 $self->clear; 3240 $self->clear;
2689 $self->SUPER::add (@widgets); 3241 $self->SUPER::add (reverse @widgets);
2690} 3242}
2691 3243
2692sub add { 3244sub add {
2693 my ($self, $text, %arg) = @_; 3245 my ($self, $text, %arg) = @_;
2694 3246
2695 my $item = { 3247 $text =~ s/^\s+//;
2696 time => time, 3248 $text =~ s/\s+$//;
3249
3250 return unless $text;
3251
3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3253
3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3255
3256 if (my $item = $self->{item}{$group}) {
3257 if ($item->{text} eq $text) {
3258 $item->{count}++;
3259 } else {
3260 $item->{count} = 1;
3261 $item->{text} = $item->{tooltip} = $text;
3262 }
3263 $item->{id} = ++$self->{id};
3264 $item->{timeout} = $timeout;
3265 delete $item->{label};
3266 } else {
3267 $self->{item}{$group} = {
3268 id => ++$self->{id},
2697 text => $text, 3269 text => $text,
2698 timeout => 60, 3270 timeout => $timeout,
2699 tooltip => $text, 3271 tooltip => $text,
2700 fontsize => 0.8,
2701 color => [0.8, 0.8, 0.8, 0.8], 3272 fg => [0.8, 0.8, 0.8, 0.8],
3273 pri => 0,
3274 count => 1,
2702 %arg, 3275 %arg,
3276 };
2703 }; 3277 }
2704
2705 $item->{timeout} += time;
2706 $item->{group} ||= $item+0;
2707
2708 $item = $self->{item}{$item->{group}} ||= $item;
2709 3278
2710 $self->reorder; 3279 $self->reorder;
2711} 3280}
2712 3281
3282sub reconfigure {
3283 my ($self) = @_;
3284
3285 delete $_->{label}
3286 for values %{ $self->{item} || {} };
3287
3288 $self->reorder;
3289 $self->SUPER::reconfigure;
3290}
3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
2713############################################################################# 3300#############################################################################
2714 3301
2715package CFClient::UI::Root; 3302package CFClient::UI::Inventory;
2716 3303
2717our @ISA = CFClient::UI::Container::; 3304our @ISA = CFClient::UI::ScrolledWindow::;
2718
2719use CFClient::OpenGL;
2720 3305
2721sub new { 3306sub new {
2722 my $class = shift; 3307 my $class = shift;
2723 3308
2724 $class->SUPER::new ( 3309 my $self = $class->SUPER::new (
3310 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3311 @_,
3312 );
3313
3314 $self
3315}
3316
3317sub set_items {
3318 my ($self, $items) = @_;
3319
3320 $self->{child}->clear;
3321 return unless $items;
3322
3323 my @items = sort {
3324 ($a->{type} <=> $b->{type})
3325 or ($a->{name} cmp $b->{name})
3326 } @$items;
3327
3328 $self->{real_items} = \@items;
3329
3330 my $row = 0;
3331 for my $item (@items) {
3332 CFClient::Item::update_widgets $item;
3333
3334 $self->{child}->add (0, $row, $item->{face_widget});
3335 $self->{child}->add (1, $row, $item->{desc_widget});
3336 $self->{child}->add (2, $row, $item->{weight_widget});
3337
3338 $row++;
3339 }
3340}
3341
3342#############################################################################
3343
3344package CFClient::UI::BindEditor;
3345
3346our @ISA = CFClient::UI::FancyFrame::;
3347
3348sub new {
3349 my $class = shift;
3350
3351 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3352
3353 $self->add (my $vb = new CFClient::UI::VBox);
3354
3355
3356 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3357 text => "start recording",
3358 tooltip => "Start/Stops recording of actions."
3359 ."All subsequent actions after the recording started will be captured."
3360 ."The actions are displayed after the record was stopped."
3361 ."To bind the action you have to click on the 'Bind' button",
3362 on_activate => sub {
3363 unless ($self->{recording}) {
3364 $self->start;
3365 } else {
3366 $self->stop;
3367 }
3368 });
3369
3370 $vb->add (new CFClient::UI::Label text => "Actions:");
3371 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3372
3373 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3374 $vb->add (my $hb = new CFClient::UI::HBox);
3375 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3376 $hb->add (new CFClient::UI::Button
3377 text => "bind",
3378 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3379 on_activate => sub {
3380 $self->ask_for_bind;
3381 });
3382
3383 $vb->add (my $hb = new CFClient::UI::HBox);
3384 $hb->add (new CFClient::UI::Button
3385 text => "ok",
3386 expand => 1,
3387 tooltip => "This closes the binding editor and saves the binding",
3388 on_activate => sub {
3389 $self->hide;
3390 $self->commit;
3391 });
3392
3393 $hb->add (new CFClient::UI::Button
3394 text => "cancel",
3395 expand => 1,
3396 tooltip => "This closes the binding editor without saving",
3397 on_activate => sub {
3398 $self->hide;
3399 $self->{binding_cancel}->()
3400 if $self->{binding_cancel};
3401 });
3402
3403 $self->update_binding_widgets;
3404
3405 $self
3406}
3407
3408sub commit {
3409 my ($self) = @_;
3410 my ($mod, $sym, $cmds) = $self->get_binding;
3411 if ($sym != 0 && @$cmds > 0) {
3412 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3413 ."'. Don't forget 'Save Config'!");
3414 $self->{binding_change}->($mod, $sym, $cmds)
3415 if $self->{binding_change};
3416 } else {
3417 $::STATUSBOX->add ("No action bound, no key or action specified!");
3418 $self->{binding_cancel}->()
3419 if $self->{binding_cancel};
3420 }
3421}
3422
3423sub start {
3424 my ($self) = @_;
3425
3426 $self->{rec_btn}->set_text ("stop recording");
3427 $self->{recording} = 1;
3428 $self->clear_command_list;
3429 $::CONN->start_record if $::CONN;
3430}
3431
3432sub stop {
3433 my ($self) = @_;
3434
3435 $self->{rec_btn}->set_text ("start recording");
3436 $self->{recording} = 0;
3437
3438 my $rec;
3439 $rec = $::CONN->stop_record if $::CONN;
3440 return unless ref $rec eq 'ARRAY';
3441 $self->set_command_list ($rec);
3442}
3443
3444
3445sub ask_for_bind_and_commit {
3446 my ($self) = @_;
3447 $self->ask_for_bind (1);
3448}
3449
3450sub ask_for_bind {
3451 my ($self, $commit) = @_;
3452
3453 CFClient::Binder::open_binding_dialog (sub {
3454 my ($mod, $sym) = @_;
3455 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3456 $self->update_binding_widgets;
3457 $self->commit if $commit;
3458 });
3459}
3460
3461# $mod and $sym are the modifiers and key symbol
3462# $cmds is a array ref of strings (the commands)
3463# $cb is the callback that is executed on OK
3464# $ccb is the callback that is executed on CANCEL and
3465# when the binding was unsuccessful on OK
3466sub set_binding {
3467 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3468
3469 $self->clear_command_list;
3470 $self->{recording} = 0;
3471 $self->{rec_btn}->set_text ("start recording");
3472
3473 $self->{binding} = [$mod, $sym];
3474 $self->{commands} = $cmds;
3475
3476 $self->{binding_change} = $cb;
3477 $self->{binding_cancel} = $ccb;
3478
3479 $self->update_binding_widgets;
3480}
3481
3482# this is a shortcut method that asks for a binding
3483# and then just binds it.
3484sub do_quick_binding {
3485 my ($self, $cmds) = @_;
3486 $self->set_binding (undef, undef, $cmds, sub {
3487 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3488 });
3489 $self->ask_for_bind (1);
3490}
3491
3492sub update_binding_widgets {
3493 my ($self) = @_;
3494 my ($mod, $sym, $cmds) = $self->get_binding;
3495 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3496 $self->set_command_list ($cmds);
3497}
3498
3499sub get_binding {
3500 my ($self) = @_;
3501 return (
3502 $self->{binding}->[0],
3503 $self->{binding}->[1],
3504 [ grep { defined $_ } @{$self->{commands}} ]
3505 );
3506}
3507
3508sub clear_command_list {
3509 my ($self) = @_;
3510 $self->{cmdbox}->clear ();
3511}
3512
3513sub set_command_list {
3514 my ($self, $cmds) = @_;
3515
3516 $self->{cmdbox}->clear ();
3517 $self->{commands} = $cmds;
3518
3519 my $idx = 0;
3520
3521 for (@$cmds) {
3522 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3523
3524 my $i = $idx;
3525 $hb->add (new CFClient::UI::Label text => $_);
3526 $hb->add (new CFClient::UI::Button
3527 text => "delete",
3528 tooltip => "Deletes the action from the record",
3529 on_activate => sub {
3530 $self->{cmdbox}->remove ($hb);
3531 $cmds->[$i] = undef;
3532 });
3533
3534
3535 $idx++
3536 }
3537}
3538
3539#############################################################################
3540
3541package CFClient::UI::SpellList;
3542
3543our @ISA = CFClient::UI::Table::;
3544
3545sub new {
3546 my $class = shift;
3547
3548 my $self = $class->SUPER::new (
3549 binding => [],
3550 commands => [],
2725 @_, 3551 @_,
2726 ) 3552 )
2727} 3553}
2728 3554
2729sub configure { 3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2730 my ($self, $x, $y, $w, $h) = @_; 3556 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3557my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3558 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3559my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
2731 3561
2732 $self->{w} = $w; 3562sub rebuild_spell_list {
2733 $self->{h} = $h; 3563 my ($self) = @_;
2734}
2735 3564
2736sub check_size { 3565 $CFClient::UI::ROOT->on_refresh ($self => sub {
3566 $self->clear;
3567
3568 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3569 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3570 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3571 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3572
3573 my $row = 0;
3574
3575 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3576 my $spell = $self->{spell}{$_};
3577
3578 $row++;
3579
3580 $self->add (0, $row, new CFClient::UI::Face
3581 face => $spell->{face},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (1, $row, new CFClient::UI::Label
3588 expand => 1,
3589 text => $spell->{name},
3590 can_hover => 1,
3591 can_events => 1,
3592 tooltip => $spell->{message},
3593 );
3594
3595 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3596 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3597 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3598
3599 # TODO: should be done via popup
3600 $self->add (5, $row, new CFClient::UI::Button
3601 text => "bind",
3602 tooltip => "bind spell readying (cast command) to key",
3603 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3604 );
3605 }
3606 });
3607}
3608
3609sub add_spell {
2737 my ($self) = @_; 3610 my ($self, $spell) = @_;
2738 3611
2739 $self->size_allocate ($self->{w}, $self->{h}) 3612 $self->{spell}->{$spell->{name}} = $spell;
2740 if $self->{w}; 3613 $self->rebuild_spell_list;
3614}
3615
3616sub remove_spell {
3617 my ($self, $spell) = @_;
3618
3619 delete $self->{spell}->{$spell->{name}};
3620 $self->rebuild_spell_list;
3621}
3622
3623#############################################################################
3624
3625package CFClient::UI::Root;
3626
3627our @ISA = CFClient::UI::Container::;
3628
3629use List::Util qw(min max);
3630
3631use CFClient::OpenGL;
3632
3633sub new {
3634 my $class = shift;
3635
3636 my $self = $class->SUPER::new (
3637 visible => 1,
3638 @_,
3639 );
3640
3641 Scalar::Util::weaken ($self->{root} = $self);
3642
3643 $self
2741} 3644}
2742 3645
2743sub size_request { 3646sub size_request {
2744 my ($self) = @_; 3647 my ($self) = @_;
2745 3648
2746 ($self->{w}, $self->{h}) 3649 ($self->{w}, $self->{h})
3650}
3651
3652sub _to_pixel {
3653 my ($coord, $size, $max) = @_;
3654
3655 $coord =
3656 $coord eq "center" ? ($max - $size) * 0.5
3657 : $coord eq "max" ? $max
3658 : $coord;
3659
3660 $coord = 0 if $coord < 0;
3661 $coord = $max - $size if $coord > $max - $size;
3662
3663 int $coord + 0.5
2747} 3664}
2748 3665
2749sub size_allocate { 3666sub size_allocate {
2750 my ($self, $w, $h) = @_; 3667 my ($self, $w, $h) = @_;
2751 3668
2752 my $old_w = $self->{old_w};
2753 my $old_h = $self->{old_h};
2754
2755 if ($old_w && $old_h) {
2756 for my $child ($self->children) {
2757 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2758 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2759 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2760 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2761 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2762 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2763 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2764 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2765 }
2766 }
2767
2768 for my $child ($self->children) { 3669 for my $child ($self->children) {
2769 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3670 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2770 3671
2771 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3672 $X = $child->{force_x} if exists $child->{force_x};
2772 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3673 $Y = $child->{force_y} if exists $child->{force_y};
3674
3675 $X = _to_pixel $X, $W, $self->{w};
3676 $Y = _to_pixel $Y, $H, $self->{h};
3677
2773 $child->configure ($X, $Y, $W, $H); 3678 $child->configure ($X, $Y, $W, $H);
2774 } 3679 }
2775
2776 $self->{old_w} = $w;
2777 $self->{old_h} = $h;
2778} 3680}
2779 3681
2780sub coord2local { 3682sub coord2local {
2781 my ($self, $x, $y) = @_; 3683 my ($self, $x, $y) = @_;
2782 3684
… …
2790} 3692}
2791 3693
2792sub update { 3694sub update {
2793 my ($self) = @_; 3695 my ($self) = @_;
2794 3696
2795 $self->check_size;
2796 $::WANT_REFRESH++; 3697 $::WANT_REFRESH++;
2797} 3698}
2798 3699
2799sub add { 3700sub add {
2800 my ($self, $child) = @_; 3701 my ($self, @children) = @_;
2801 3702
2802 # integerise window positions 3703 $_->{is_toplevel} = 1
2803 $child->{x} = int $child->{x}; 3704 for @children;
2804 $child->{y} = int $child->{y};
2805 3705
2806 $self->SUPER::add ($child); 3706 $self->SUPER::add (@children);
3707}
3708
3709sub remove {
3710 my ($self, @children) = @_;
3711
3712 $self->SUPER::remove (@children);
3713
3714 delete $self->{is_toplevel}
3715 for @children;
3716
3717 while (@children) {
3718 my $w = pop @children;
3719 push @children, $w->children;
3720 $w->set_invisible;
3721 }
2807} 3722}
2808 3723
2809sub on_refresh { 3724sub on_refresh {
2810 my ($self, $id, $cb) = @_; 3725 my ($self, $id, $cb) = @_;
2811 3726
2812 $self->{refresh_hook}{$id} = $cb; 3727 $self->{refresh_hook}{$id} = $cb;
2813} 3728}
2814 3729
3730sub on_post_alloc {
3731 my ($self, $id, $cb) = @_;
3732
3733 $self->{post_alloc_hook}{$id} = $cb;
3734}
3735
2815sub draw { 3736sub draw {
2816 my ($self) = @_; 3737 my ($self) = @_;
2817
2818 if ($self->{check_size}) {
2819 my @queue = ([], []);
2820
2821 for (;;) {
2822 if ($self->{check_size}) {
2823 # heuristic: check containers last
2824 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2825 for values %{delete $self->{check_size}}
2826 }
2827
2828 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2829
2830 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2831 ? @$widget{qw(user_w user_h)}
2832 : $widget->size_request;
2833
2834 if ($w != $widget->{req_w} || $h != $widget->{req_h}) {
2835 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2836
2837 $widget->{req_w} = $w;
2838 $widget->{req_h} = $h;
2839
2840 $self->{size_alloc}{$widget} = [$widget, $widget->{w}, $widget->{h}];
2841
2842 $widget->{parent}->check_size
2843 if $widget->{parent};
2844 }
2845 }
2846 }
2847
2848 while ($self->{size_alloc}) {
2849 for (values %{delete $self->{size_alloc}}) {
2850 my ($widget, $w, $h) = @$_;
2851
2852 $w = 0 if $w < 0;
2853 $h = 0 if $h < 0;
2854
2855 $widget->{w} = $w;
2856 $widget->{h} = $h;
2857 $widget->size_allocate ($w, $h);
2858 $widget->emit (size_allocate => $w, $h);
2859 }
2860 }
2861 3738
2862 while ($self->{refresh_hook}) { 3739 while ($self->{refresh_hook}) {
2863 $_->() 3740 $_->()
2864 for values %{delete $self->{refresh_hook}}; 3741 for values %{delete $self->{refresh_hook}};
2865 } 3742 }
2866 3743
3744 if ($self->{realloc}) {
3745 my %queue;
3746 my @queue;
3747 my $widget;
3748
3749 outer:
3750 while () {
3751 if (my $realloc = delete $self->{realloc}) {
3752 for $widget (values %$realloc) {
3753 $widget->{visible} or next; # do not resize invisible widgets
3754
3755 $queue{$widget+0}++ and next; # duplicates are common
3756
3757 push @{ $queue[$widget->{visible}] }, $widget;
3758 }
3759 }
3760
3761 while () {
3762 @queue or last outer;
3763
3764 $widget = pop @{ $queue[-1] || [] }
3765 and last;
3766
3767 pop @queue;
3768 }
3769
3770 delete $queue{$widget+0};
3771
3772 my ($w, $h) = $widget->size_request;
3773
3774 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3775 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3776
3777 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3778 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3779
3780 $w = $widget->{force_w} if exists $widget->{force_w};
3781 $h = $widget->{force_h} if exists $widget->{force_h};
3782
3783 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3784 || delete $widget->{force_realloc}) {
3785 $widget->{req_w} = $w;
3786 $widget->{req_h} = $h;
3787
3788 $self->{size_alloc}{$widget+0} = $widget;
3789
3790 if (my $parent = $widget->{parent}) {
3791 $self->{realloc}{$parent+0} = $parent
3792 unless $queue{$parent+0};
3793
3794 $parent->{force_size_alloc} = 1;
3795 $self->{size_alloc}{$parent+0} = $parent;
3796 }
3797 }
3798
3799 delete $self->{realloc}{$widget+0};
3800 }
3801 }
3802
3803 while (my $size_alloc = delete $self->{size_alloc}) {
3804 my @queue = sort { $b->{visible} <=> $a->{visible} }
3805 values %$size_alloc;
3806
3807 while () {
3808 my $widget = pop @queue || last;
3809
3810 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3811
3812 $w = 0 if $w < 0;
3813 $h = 0 if $h < 0;
3814
3815 $w = int $w + 0.5;
3816 $h = int $h + 0.5;
3817
3818 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3819 $widget->{old_w} = $widget->{w};
3820 $widget->{old_h} = $widget->{h};
3821
3822 $widget->{w} = $w;
3823 $widget->{h} = $h;
3824
3825 $widget->emit (size_allocate => $w, $h);
3826 }
3827 }
3828 }
3829
3830 while ($self->{post_alloc_hook}) {
3831 $_->()
3832 for values %{delete $self->{post_alloc_hook}};
3833 }
3834
3835
2867 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3836 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2868 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3837 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2869 glClear GL_COLOR_BUFFER_BIT; 3838 glClear GL_COLOR_BUFFER_BIT;
2870 3839
2871 glMatrixMode GL_PROJECTION; 3840 glMatrixMode GL_PROJECTION;
2872 glLoadIdentity; 3841 glLoadIdentity;
2873 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3842 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2874 glMatrixMode GL_MODELVIEW; 3843 glMatrixMode GL_MODELVIEW;
2875 glLoadIdentity; 3844 glLoadIdentity;
2876 3845
3846 {
3847 package CFClient::UI::Base;
3848
3849 ($draw_x, $draw_y, $draw_w, $draw_h) =
3850 (0, 0, $self->{w}, $self->{h});
3851 }
3852
2877 $self->_draw; 3853 $self->_draw;
2878} 3854}
2879 3855
2880############################################################################# 3856#############################################################################
2881 3857
2882package CFClient::UI; 3858package CFClient::UI;
2883 3859
2884$ROOT = new CFClient::UI::Root; 3860$ROOT = new CFClient::UI::Root;
2885$TOOLTIP = new CFClient::UI::Tooltip; 3861$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2886 3862
28871 38631
2888 3864

Diff Legend

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