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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines