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

Diff Legend

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