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.224 by elmex, Tue May 23 20:00:55 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 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
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $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
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 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 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 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
235 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
236 if $self->{parent}; 314 if $self->{parent};
237} 315}
238 316
239sub move { 317sub move_abs {
240 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
241 319
242 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
243 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
244 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
245 323
246 $self->update; 324 $self->update;
247} 325}
248 326
249sub set_size { 327sub set_size {
250 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
251 329
252 $self->{user_w} = $w; 330 $self->{force_w} = $w;
253 $self->{user_h} = $h; 331 $self->{force_h} = $h;
254 332
255 $self->check_size; 333 $self->realloc;
256} 334}
257 335
258sub size_request { 336sub size_request {
259 require Carp; 337 require Carp;
260 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
262 340
263sub configure { 341sub configure {
264 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
265 343
266 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
267 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
268 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
269 349
270 # use alignment to adjust x, y 350 # use alignment to adjust x, y
271 351
272 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
273 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
274
275 ($w, $h) = ($w2, $h2);
276 } 354 }
277 355
278 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
279 $self->{x} = $x; 357 $self->{x} = $x;
280 $self->{y} = $y; 358 $self->{y} = $y;
281 $self->update; 359 $self->update;
282 } 360 }
283 361
284 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
285 $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;
286 } 369 }
287} 370}
288 371
289sub size_allocate { 372sub size_allocate {
290 # nothing to be done 373 # nothing to be done
291} 374}
292 375
293sub reconfigure {
294 my ($self) = @_;
295
296 $self->check_size (1);
297 $self->update;
298}
299
300sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
301} 382}
302 383
303sub set_max_size { 384sub set_max_size {
304 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
305 386
306 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
307 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
308} 391}
309 392
310sub set_tooltip { 393sub set_tooltip {
311 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
312 395
396 $tooltip =~ s/^\s+//;
397 $tooltip =~ s/\s+$//;
398
399 return if $self->{tooltip} eq $tooltip;
400
313 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
314 402
315 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
316 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
317 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
318 } 406 }
319} 407}
320 408
321# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
322sub coord2local { 410sub coord2local {
… …
338 return if $FOCUS == $self; 426 return if $FOCUS == $self;
339 return unless $self->{can_focus}; 427 return unless $self->{can_focus};
340 428
341 my $focus = $FOCUS; $FOCUS = $self; 429 my $focus = $FOCUS; $FOCUS = $self;
342 430
343 $self->emit (focus_in => $focus); 431 $self->_emit (focus_in => $focus);
344 432
345 $focus->update if $focus; 433 $focus->update if $focus;
346 $FOCUS->update; 434 $FOCUS->update;
347} 435}
348 436
… …
351 439
352 return unless $FOCUS == $self; 440 return unless $FOCUS == $self;
353 441
354 my $focus = $FOCUS; undef $FOCUS; 442 my $focus = $FOCUS; undef $FOCUS;
355 443
356 $self->emit (focus_out => $focus); 444 $self->_emit (focus_out => $focus);
357 445
358 $focus->update if $focus; #? 446 $focus->update if $focus; #?
359}
360 447
448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
449 unless $FOCUS;
450}
451
361sub mouse_motion { } 452sub mouse_motion { 0 }
362sub button_up { } 453sub button_up { 0 }
363sub key_down { } 454sub key_down { 0 }
364sub key_up { } 455sub key_up { 0 }
365 456
366sub button_down { 457sub button_down {
367 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
368 459
369 $self->focus_in; 460 $self->focus_in;
370}
371 461
372sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
373sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
374sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
375sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
376sub 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
377 542
378sub draw { 543sub draw {
379 my ($self) = @_; 544 my ($self) = @_;
380 545
381 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
382 557
383 glPushMatrix; 558 glPushMatrix;
384 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
385 $self->_draw;
386 glPopMatrix;
387 560
388 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
389 my ($x, $y) = @$self{qw(x y)};
390
391 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
392 glEnable GL_BLEND; 563 glEnable GL_BLEND;
393 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
394 glBegin GL_QUADS; 565 glBegin GL_QUADS;
395 glVertex $x , $y;
396 glVertex $x + $self->{w}, $y;
397 glVertex $x + $self->{w}, $y + $self->{h};
398 glVertex $x , $y + $self->{h};
399 glEnd;
400 glDisable GL_BLEND;
401 }
402
403 if ($ENV{PCLIENT_DEBUG}) {
404 glPushMatrix;
405 glColor 1, 1, 0, 1;
406 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
407 glBegin GL_LINE_LOOP;
408 glVertex 0 , 0; 566 glVertex 0 , 0;
409 glVertex $self->{w}, 0; 567 glVertex $self->{w}, 0;
410 glVertex $self->{w}, $self->{h}; 568 glVertex $self->{w}, $self->{h};
411 glVertex 0 , $self->{h}; 569 glVertex 0 , $self->{h};
412 glEnd; 570 glEnd;
571 glDisable GL_BLEND;
572 }
573
574 if ($ENV{CFPLUS_DEBUG} & 1) {
575 glPushMatrix;
576 glColor 1, 1, 0, 1;
577 glTranslate 0.375, 0.375;
578 glBegin GL_LINE_LOOP;
579 glVertex 0 , 0;
580 glVertex $self->{w} - 1, 0;
581 glVertex $self->{w} - 1, $self->{h} - 1;
582 glVertex 0 , $self->{h} - 1;
583 glEnd;
413 glPopMatrix; 584 glPopMatrix;
414 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
415 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
416} 590}
417 591
418sub _draw { 592sub _draw {
419 my ($self) = @_; 593 my ($self) = @_;
420 594
421 warn "no draw defined for $self\n"; 595 warn "no draw defined for $self\n";
422}
423
424sub find_widget {
425 my ($self, $x, $y) = @_;
426
427 return () unless $self->{can_events};
428
429 return $self
430 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
431 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
432
433 ()
434}
435
436sub set_parent {
437 my ($self, $parent) = @_;
438
439 Scalar::Util::weaken ($self->{parent} = $parent);
440
441 # TODO: req_w _does_change after ->reconfigure
442 $self->check_size
443 unless exists $self->{req_w};
444
445 $self->show;
446}
447
448sub check_size {
449 my ($self, $forced) = @_;
450
451 $self->{force_alloc} = 1 if $forced;
452 $CFClient::UI::ROOT->{check_size}{$self} = $self;
453}
454
455sub update {
456 my ($self) = @_;
457
458 $self->{parent}->update
459 if $self->{parent};
460}
461
462sub connect {
463 my ($self, $signal, $cb) = @_;
464
465 push @{ $self->{signal_cb}{$signal} }, $cb;
466}
467
468sub emit {
469 my ($self, $signal, @args) = @_;
470
471 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
472} 596}
473 597
474sub DESTROY { 598sub DESTROY {
475 my ($self) = @_; 599 my ($self) = @_;
476 600
… …
508 632
509 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
510 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
511 635
512 glEnable GL_BLEND; 636 glEnable GL_BLEND;
513 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
514 glColor @$color; 638 glColor_premultiply @$color;
515 639
516 glBegin GL_QUADS; 640 glBegin GL_QUADS;
517 glVertex 0 , 0; 641 glVertex 0 , 0;
518 glVertex 0 , $h; 642 glVertex 0 , $h;
519 glVertex $w, $h; 643 glVertex $w, $h;
… …
534 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
535 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
536} 660}
537 661
538sub size_request { 662sub size_request {
539 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
540} 666}
541 667
542sub draw { } 668sub draw { }
543 669
544############################################################################# 670#############################################################################
… …
548our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
549 675
550sub new { 676sub new {
551 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
552 678
553 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
554 680
555 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
556 children => [], 682 children => [],
557 can_events => 0, 683 can_events => 0,
558 %arg, 684 %arg,
559 ); 685 );
686
560 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
561 689
562 $self 690 $self
563} 691}
564 692
565sub add { 693sub add {
… …
573 $self->{children} = [ 701 $self->{children} = [
574 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
575 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
576 ]; 704 ];
577 705
578 $self->check_size (1); 706 $self->realloc;
579 $self->update;
580} 707}
581 708
582sub children { 709sub children {
583 @{ $_[0]{children} } 710 @{ $_[0]{children} }
584} 711}
… …
589 delete $child->{parent}; 716 delete $child->{parent};
590 $child->hide; 717 $child->hide;
591 718
592 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
593 720
594 $self->check_size; 721 $self->realloc;
595 $self->update;
596} 722}
597 723
598sub clear { 724sub clear {
599 my ($self) = @_; 725 my ($self) = @_;
600 726
… …
604 for (@$children) { 730 for (@$children) {
605 delete $_->{parent}; 731 delete $_->{parent};
606 $_->hide; 732 $_->hide;
607 } 733 }
608 734
609 $self->check_size; 735 $self->realloc;
610 $self->update;
611} 736}
612 737
613sub find_widget { 738sub find_widget {
614 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
615 740
616 $x -= $self->{x}; 741 $x -= $self->{x};
617 $y -= $self->{y}; 742 $y -= $self->{y};
618 743
619 my $res; 744 my $res;
620 745
621 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
622 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
623 and return $res; 748 and return $res;
624 } 749 }
625 750
626 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
675 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
676} 801}
677 802
678############################################################################# 803#############################################################################
679 804
805# back-buffered drawing area
806
680package CFClient::UI::Window; 807package CFClient::UI::Window;
681 808
682our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
683 810
684use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
702 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
703 $self->update; 830 $self->update;
704} 831}
705 832
706sub _render { 833sub _render {
834 my ($self) = @_;
835
707 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
708} 837}
709 838
710sub render_child { 839sub render_child {
711 my ($self) = @_; 840 my ($self) = @_;
712 841
713 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
714 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
715 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
716 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
717 $self->_render; 853 $self->_render;
718 }; 854 };
719} 855}
720 856
721sub _draw { 857sub _draw {
722 my ($self) = @_; 858 my ($self) = @_;
723 859
724 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
725 861
726 my $tex = $self->{texture} 862 my $tex = $self->{texture}
727 or return; 863 or return;
728 864
729 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
730 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
731 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
732 868
733 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
734 870
735 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
736} 872}
… …
739 875
740package CFClient::UI::ViewPort; 876package CFClient::UI::ViewPort;
741 877
742our @ISA = CFClient::UI::Window::; 878our @ISA = CFClient::UI::Window::;
743 879
880sub new {
881 my $class = shift;
882
883 $class->SUPER::new (
884 scroll_x => 0,
885 scroll_y => 1,
886 @_,
887 )
888}
889
744sub size_request { 890sub size_request {
745 my ($self) = @_; 891 my ($self) = @_;
746 892
747 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
748 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 894
750 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
751} 899}
752 900
753sub size_allocate { 901sub size_allocate {
754 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
755 903
904 my $child = $self->child;
905
906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
908
909 $self->child->configure (0, 0, $w, $h);
756 $self->update; 910 $self->update;
757} 911}
758 912
759sub set_offset { 913sub set_offset {
760 my ($self, $x, $y) = @_; 914 my ($self, $x, $y) = @_;
… …
794} 948}
795 949
796sub _render { 950sub _render {
797 my ($self) = @_; 951 my ($self) = @_;
798 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 957
801 $self->SUPER::_render; 958 $self->SUPER::_render;
802} 959}
803 960
… …
806package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
807 964
808our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
809 966
810sub new { 967sub new {
811 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
812 971
813 my $self; 972 my $self;
814 973
815 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
816 vertical => 1, 975 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 977 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 978 $self->{vp}->set_offset (0, $_[1]);
820 }, 979 },
821 ; 980 ;
822 981
823 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 984 slider => $slider,
826 @_, 985 %arg,
827 ); 986 );
828 987
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
832 990
833 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
998}
999
1000sub update {
1001 my ($self) = @_;
1002
1003 $self->SUPER::update;
1004
1005 # todo: overwrite size_allocate of child
1006 my $child = $self->{vp}->child;
1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1008}
1009
1010sub size_allocate {
1011 my ($self, $w, $h) = @_;
1012
1013 $self->SUPER::size_allocate ($w, $h);
1014
1015 my $child = $self->{vp}->child;
1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
834} 1017}
835 1018
836#TODO# update range on size_allocate depending on child 1019#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1020# update viewport offset on scroll
838 1021
… …
858 1041
859 if ($self->{bg}) { 1042 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
861 1044
862 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
865 1048
866 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
867 glVertex 0 , 0; 1050 glVertex 0 , 0;
868 glVertex 0 , $h; 1051 glVertex 0 , $h;
869 glVertex $w, $h; 1052 glVertex $w, $h;
… …
882 1065
883our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
884 1067
885use CFClient::OpenGL; 1068use CFClient::OpenGL;
886 1069
887my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1077
891sub new { 1078sub new {
892 my $class = shift; 1079 my ($class, %arg) = @_;
893 1080
894 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
895 1082
896 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1086 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1087 can_events => 1,
902 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
903 ); 1091 );
904 1092
905 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
906 align => 0, 1094 align => 0,
907 valign => 1, 1095 valign => 1,
908 text => $self->{title}, 1096 text => $title,
909 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
910 1099
911 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
912} 1108}
913 1109
914sub border { 1110sub border {
915 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
916} 1112}
917 1113
918sub size_request { 1114sub size_request {
919 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
920 1119
921 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
922 1121
923 ( 1122 (
924 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
927} 1126}
928 1127
929sub size_allocate { 1128sub size_allocate {
930 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
931 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
932 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
934 1141
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
939} 1143}
940 1144
941sub button_down { 1145sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
943 1147
… …
959 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
960 1164
961 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
963 1167
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1172 $self->realloc;
968 }; 1173 };
969 1174
970 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1179 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
976 1181
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
978 1183
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
982 } 1192 1
983} 1193}
984 1194
985sub button_up { 1195sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
987 1197
988 delete $self->{motion}; 1198 !!delete $self->{motion}
989} 1199}
990 1200
991sub mouse_motion { 1201sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
993 1203
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
995} 1207}
996 1208
997sub _draw { 1209sub _draw {
998 my ($self) = @_; 1210 my ($self) = @_;
999 1211
1212 my $child = $self->{children}[0];
1213
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1216
1003 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1219
1006 my $border = $self->border; 1220 my $border = $self->border;
1007 1221
1008 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1227
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1016 1230
1017 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1236 }
1028 1237
1029 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1030 1239
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1034} 1246}
1035 1247
1036############################################################################# 1248#############################################################################
1037 1249
1038package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1046sub new { 1258sub new {
1047 my $class = shift; 1259 my $class = shift;
1048 1260
1049 $class->SUPER::new ( 1261 $class->SUPER::new (
1050 col_expand => [], 1262 col_expand => [],
1051 @_ 1263 @_,
1052 ) 1264 )
1265}
1266
1267sub children {
1268 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1269}
1054 1270
1055sub add { 1271sub add {
1056 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1057 1273
1058 $child->set_parent ($self); 1274 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1060 1276
1061 $child->check_size; 1277 $self->realloc;
1062} 1278}
1063 1279
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# TODO: move to container class maybe? send childs a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1069sub clear { 1281sub clear {
1070 my ($self) = @_; 1282 my ($self) = @_;
1071 1283
1072 my @children = $self->children; 1284 my @children = $self->children;
1073 delete $self->{children}; 1285 delete $self->{children};
… …
1075 for (@children) { 1287 for (@children) {
1076 delete $_->{parent}; 1288 delete $_->{parent};
1077 $_->hide; 1289 $_->hide;
1078 } 1290 }
1079 1291
1080 $self->update; 1292 $self->realloc;
1081} 1293}
1082 1294
1083sub get_wh { 1295sub get_wh {
1084 my ($self) = @_; 1296 my ($self) = @_;
1085 1297
… …
1116sub size_allocate { 1328sub size_allocate {
1117 my ($self, $w, $h) = @_; 1329 my ($self, $w, $h) = @_;
1118 1330
1119 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1120 1332
1121 my $req_w = sum @$ws; 1333 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1334 my $req_h = (sum @$hs) || 1;
1123 1335
1124 # TODO: nicer code && do row_expand 1336 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1337 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1338 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1339 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1393 }
1182} 1394}
1183 1395
1184############################################################################# 1396#############################################################################
1185 1397
1186package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1399
1190our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1191 1401
1192sub size_request { 1402sub size_request {
1193 my ($self) = @_; 1403 my ($self) = @_;
1194 1404
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1196 1406 ? (
1197 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1409 )
1200 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1201} 1414}
1202 1415
1203sub size_allocate { 1416sub size_allocate {
1204 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1205 1418
1206 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1420 my $children = $self->{children};
1209 1421
1210 my @h = map $_->{req_w}, @$children; 1422 my @req;
1211 1423
1212 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1213 1425 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1440 }
1228 } 1441 }
1229 1442
1230 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1231 1444
1232 my $y = 0; 1445 my $pos = 0;
1233 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1449
1238 $y += $h; 1450 $pos += $alloc;
1239 } 1451 }
1240 1452
1241 1 1453 1
1242} 1454}
1243 1455
1244############################################################################# 1456#############################################################################
1245 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1246package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1247 1474
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1251 1476
1252sub size_request { 1477sub new {
1253 my ($self) = @_; 1478 my $class = shift;
1254 1479
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1256 1481 vertical => 1,
1257 ( 1482 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1483 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1484}
1301 1485
1302############################################################################# 1486#############################################################################
1303 1487
1304package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1505 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1323 fontsize => 1, 1507 fontsize => 1,
1324 align => -1, 1508 align => -1,
1325 valign => -1, 1509 valign => -1,
1326 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1327 can_events => 0, 1512 can_events => 0,
1328 %arg 1513 %arg
1329 ); 1514 );
1330 1515
1331 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1358 1543
1359 delete $self->{texture}; 1544 delete $self->{texture};
1360 $self->SUPER::update; 1545 $self->SUPER::update;
1361} 1546}
1362 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1363sub set_text { 1555sub set_text {
1364 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1365 1557
1366 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1368 1560
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1371 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1372 $self->update; 1566 $self->update;
1373 $self->check_size;
1374} 1567}
1375 1568
1376sub set_markup { 1569sub set_markup {
1377 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1378 1571
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1576
1384 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1385 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1386 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1387 $self->update; 1582 $self->update;
1388 $self->check_size;
1389} 1583}
1390 1584
1391sub size_request { 1585sub size_request {
1392 my ($self) = @_; 1586 my ($self) = @_;
1393 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1596
1400 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1401 1598
1402 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1403 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1602
1406 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1407 1604
1408 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1410 } 1607 }
1411 1608
1609 ($w, $h)
1412 ( 1610 }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1611}
1417 1612
1418sub size_allocate { 1613sub size_allocate {
1419 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1420 1615
1616 delete $self->{ox};
1617
1421 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1620}
1423 1621
1424sub set_fontsize { 1622sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1426 1624
1427 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1626 delete $self->{texture};
1429 1627
1430 $self->update; 1628 $self->realloc;
1431 $self->check_size;
1432} 1629}
1433 1630
1434sub _draw { 1631sub _draw {
1435 my ($self) = @_; 1632 my ($self) = @_;
1436 1633
… …
1442 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1643
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1448 1646
1647 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1452 1651
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1655 };
1459 1656
1460 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1462 1658
1463 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1464 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1466 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1468 } 1666 }
1469 1667
1470 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1471} 1669}
… …
1488 active_fg => [0, 0, 0], 1686 active_fg => [0, 0, 0],
1489 can_hover => 1, 1687 can_hover => 1,
1490 can_focus => 1, 1688 can_focus => 1,
1491 valign => 0, 1689 valign => 0,
1492 can_events => 1, 1690 can_events => 1,
1691 #text => ...
1493 @_ 1692 @_
1494 ) 1693 )
1495} 1694}
1496 1695
1497sub _set_text { 1696sub _set_text {
… …
1499 1698
1500 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1501 1700
1502 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1503 1702
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1704 $self->{text} = $text;
1508 1705
1509 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1511 1709
1512 $self->emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1513} 1714}
1514 1715
1515sub set_text { 1716sub set_text {
1516 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1517 1718
1518 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1720 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1721}
1523 1722
1524sub get_text { 1723sub get_text {
1525 $_[0]{text} 1724 $_[0]{text}
1526} 1725}
… …
1529 my ($self) = @_; 1728 my ($self) = @_;
1530 1729
1531 my ($w, $h) = $self->SUPER::size_request; 1730 my ($w, $h) = $self->SUPER::size_request;
1532 1731
1533 ($w + 1, $h) # add 1 for cursor 1732 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1733}
1541 1734
1542sub key_down { 1735sub key_down {
1543 my ($self, $ev) = @_; 1736 my ($self, $ev) = @_;
1544 1737
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1752 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1753 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1754 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1757 $self->_emit ('escape');
1565 } elsif ($uni) { 1758 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1567 } 1762 }
1568 1763
1569 $self->_set_text ($text); 1764 $self->_set_text ($text);
1570 $self->update; 1765
1571 $self->check_size; 1766 $self->realloc;
1767
1768 1
1572} 1769}
1573 1770
1574sub focus_in { 1771sub focus_in {
1575 my ($self) = @_; 1772 my ($self) = @_;
1576 1773
… …
1591 utf8::encode $text; 1788 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1593 1790
1594 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1595 $self->update; 1792 $self->update;
1793
1794 1
1596} 1795}
1597 1796
1598sub mouse_motion { 1797sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1601} 1802}
1602 1803
1603sub _draw { 1804sub _draw {
1604 my ($self) = @_; 1805 my ($self) = @_;
1605 1806
1606 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1607 1808
1608 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1611 } else { 1812 } else {
1612 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1613 } 1814 }
1614 1815
1615 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1819 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1656 if ($sym == 13) { 1857 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1858 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1859 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1860 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1861 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1862 $self->_emit (activate => $txt);
1662 $self->update; 1863 $self->update;
1663 1864
1664 } elsif ($sym == CFClient::SDLK_UP) { 1865 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1866 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1867 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1883 } else {
1683 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1684 } 1885 }
1685 1886
1686 } else { 1887 } else {
1687 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1688 } 1891 1
1689
1690} 1892}
1691 1893
1692############################################################################# 1894#############################################################################
1693 1895
1694package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1703 1905
1704sub new { 1906sub new {
1705 my $class = shift; 1907 my $class = shift;
1706 1908
1707 $class->SUPER::new ( 1909 $class->SUPER::new (
1708 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1709 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1711 can_hover => 1, 1914 can_hover => 1,
1712 align => 0, 1915 align => 0,
1713 valign => 0, 1916 valign => 0,
1714 can_events => 1, 1917 can_events => 1,
1715 @_ 1918 @_
1716 ) 1919 )
1717} 1920}
1718 1921
1922sub activate { }
1923
1719sub button_up { 1924sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1721 1926
1927 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1929 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1930
1725 } 1931 1
1726} 1932}
1727 1933
1728sub _draw { 1934sub _draw {
1729 my ($self) = @_; 1935 my ($self) = @_;
1730 1936
1731 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1938
1737 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1740 1942
… …
1759 1961
1760sub new { 1962sub new {
1761 my $class = shift; 1963 my $class = shift;
1762 1964
1763 $class->SUPER::new ( 1965 $class->SUPER::new (
1764 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1765 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1972 state => 0,
… …
1773} 1976}
1774 1977
1775sub size_request { 1978sub size_request {
1776 my ($self) = @_; 1979 my ($self) = @_;
1777 1980
1778 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1779} 1982}
1780 1983
1781sub button_down { 1984sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1783 1986
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1788 } 1995 1
1789} 1996}
1790 1997
1791sub _draw { 1998sub _draw {
1792 my ($self) = @_; 1999 my ($self) = @_;
1793 2000
1794 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1795 2002
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 2004
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 2008
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2010
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2012
… …
1958 2167
1959 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
1961 2170
1962 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2176
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2277 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2282 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2075 vertical => 0, 2285 vertical => 0,
2076 can_hover => 1, 2286 can_hover => 1,
2077 inner_pad => 0.02, 2287 inner_pad => 0.02,
2078 @_ 2288 @_
2079 ); 2289 );
… …
2082 $self->update; 2292 $self->update;
2083 2293
2084 $self 2294 $self
2085} 2295}
2086 2296
2297sub changed { }
2298
2299sub set_range {
2300 my ($self, $range) = @_;
2301
2302 ($range, $self->{range}) = ($self->{range}, $range);
2303
2304 $self->update
2305 if "@$range" ne "@{$self->{range}}";
2306}
2307
2087sub set_value { 2308sub set_value {
2088 my ($self, $value) = @_; 2309 my ($self, $value) = @_;
2089 2310
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2311 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2312
2092 $hi = $lo + 1 if $hi <= $lo; 2313 $hi = $lo + 1 if $hi <= $lo;
2093 2314
2315 $page = $hi - $lo if $page > $hi - $lo;
2316
2094 $value = $lo if $value < $lo; 2317 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2318 $value = $hi - $page if $value > $hi - $page;
2096 2319
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2320 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2321 if $unit;
2099 2322
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2323 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2324
2104 if ($value != $old_value) { 2325 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2326 $self->_emit (changed => $value);
2106 $self->update; 2327 $self->update;
2107 } 2328 }
2108} 2329}
2109 2330
2110sub size_request { 2331sub size_request {
2111 my ($self) = @_; 2332 my ($self) = @_;
2112 2333
2113 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2335}
2118 2336
2119sub button_down { 2337sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2121 2339
2122 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2341
2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2343
2123 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2124} 2345}
2125 2346
2126sub mouse_motion { 2347sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2128 2349
2129 if ($GRAB == $self) { 2350 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2351 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2352
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2354
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2356
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2137 } 2362 1
2138} 2363}
2139 2364
2140sub update { 2365sub update {
2141 my ($self) = @_; 2366 my ($self) = @_;
2142 2367
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2145 2377
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2379 my $range = ($hi - $page - $lo) || 1e-100;
2147 2380
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2381 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2382
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2383 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2384 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2385
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2386 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2387 $value = $value * $self->{scale} + $self->{offset};
2154 2388
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2390 $self->{knob_w} = $knob_w;
2162 }); 2391 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2392
2170 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2171 2394
2172 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2173 2396
… …
2190 # draw handle 2413 # draw handle
2191 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2414 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2192 2415
2193 glDisable GL_TEXTURE_2D; 2416 glDisable GL_TEXTURE_2D;
2194} 2417}
2418
2419#############################################################################
2420
2421package CFClient::UI::ValSlider;
2422
2423our @ISA = CFClient::UI::HBox::;
2424
2425sub new {
2426 my ($class, %arg) = @_;
2427
2428 my $range = delete $arg{range};
2429
2430 my $self = $class->SUPER::new (
2431 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2432 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2433 to_value => sub { shift },
2434 from_value => sub { shift },
2435 %arg,
2436 );
2437
2438 $self->{slider}->connect (changed => sub {
2439 my ($self, $value) = @_;
2440 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2441 $self->{parent}->emit (changed => $value);
2442 });
2443
2444# $self->{entry}->connect (changed => sub {
2445# my ($self, $value) = @_;
2446# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2447# $self->{parent}->emit (changed => $value);
2448# });
2449
2450 $self->add ($self->{slider}, $self->{entry});
2451
2452 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2453
2454 $self
2455}
2456
2457sub set_range { shift->{slider}->set_range (@_) }
2458sub set_value { shift->{slider}->set_value (@_) }
2195 2459
2196############################################################################# 2460#############################################################################
2197 2461
2198package CFClient::UI::TextView; 2462package CFClient::UI::TextView;
2199 2463
… …
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
2242 2506
2243 $self->reflow; 2507 $self->reflow;
2244} 2508}
2245 2509
2246sub text_height { 2510sub text_size {
2247 my ($self, $text, $indent) = @_; 2511 my ($self, $text, $indent) = @_;
2248 2512
2249 my $layout = $self->{layout}; 2513 my $layout = $self->{layout};
2250 2514
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2516 $layout->set_width ($self->{children}[0]{w} - $indent);
2253 $layout->set_markup ($text); 2517 $layout->set_markup ($text);
2254 2518
2255 ($layout->size)[1] 2519 $layout->size
2256} 2520}
2257 2521
2258sub reflow { 2522sub reflow {
2259 my ($self) = @_; 2523 my ($self) = @_;
2260 2524
2261 $self->{need_reflow}++; 2525 $self->{need_reflow}++;
2262 $self->update; 2526 $self->update;
2263} 2527}
2264 2528
2529sub set_offset {
2530 my ($self, $offset) = @_;
2531
2532 # todo: base offset on lines or so, not on pixels
2533 $self->{children}[1]->set_value ($offset);
2534}
2535
2536sub clear {
2537 my ($self) = @_;
2538
2539 $self->{par} = [];
2540 $self->{height} = 0;
2541 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2542}
2543
2265sub add_paragraph { 2544sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2545 my ($self, $color, $text, $indent) = @_;
2267 2546
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2547 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2548 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2549 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2550 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2551 }
2275 2552
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2553 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2554}
2279 2555
2280sub update { 2556sub update {
2281 my ($self) = @_; 2557 my ($self) = @_;
2282 2558
… …
2285 return unless $self->{h} > 0; 2561 return unless $self->{h} > 0;
2286 2562
2287 delete $self->{texture}; 2563 delete $self->{texture};
2288 2564
2289 $ROOT->on_post_alloc ($self, sub { 2565 $ROOT->on_post_alloc ($self, sub {
2566 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2567
2290 if (delete $self->{need_reflow}) { 2568 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2569 my $height = 0;
2292 2570
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2571 my $layout = $self->{layout};
2572
2573 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2574
2294 for @{$self->{par}}; 2575 for (@{$self->{par}}) {
2576 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2577 $layout->set_width ($W - $_->[3]);
2578 $layout->set_markup ($_->[4]);
2579 my ($w, $h) = $layout->size;
2580 $_->[0] = $w + $_->[3];
2581 $_->[1] = $h;
2582 }
2583
2584 $height += $_->[1];
2585 }
2295 2586
2296 $self->{height} = $height; 2587 $self->{height} = $height;
2297 2588
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2589 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update;
2300 2590
2301 delete $self->{texture}; 2591 delete $self->{texture};
2302 } 2592 }
2303 2593
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2307 2597
2308 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2309 2599
2310 my $y0 = $top; 2600 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2601 my $y1 = $top + $H;
2312 2602
2313 my $y = 0; 2603 my $y = 0;
2314 2604
2315 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2316 2606
2317 $layout->set_font ($self->{font}) if $self->{font}; 2607 $layout->set_font ($self->{font}) if $self->{font};
2318 2608
2319 glEnable GL_BLEND; 2609 glEnable GL_BLEND;
2610 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2611 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2612
2322 for my $par (@{$self->{par}}) { 2613 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2614 my $h = $par->[1];
2324 2615
2325 if ($y0 < $y + $h && $y < $y1) { 2616 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2617 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2618 $layout->set_width ($W - $par->[3]);
2328 $layout->set_markup ($par->[3]); 2619 $layout->set_markup ($par->[4]);
2329 2620
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2621 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2622
2332 glRasterPos $par->[2], $y - $y0; 2623 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2624 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2625 }
2335 2626
2336 $y += $h; 2627 $y += $h;
2337 } 2628 }
… …
2344sub _draw { 2635sub _draw {
2345 my ($self) = @_; 2636 my ($self) = @_;
2346 2637
2347 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2351 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2352 2643
2353 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2354 2645
2355} 2646}
… …
2404 2695
2405sub new { 2696sub new {
2406 my $class = shift; 2697 my $class = shift;
2407 2698
2408 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2409 state => 0, 2700 state => 0,
2410 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2411 @_ 2702 @_
2412 ); 2703 );
2413 2704
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2705 $self
2420} 2706}
2421 2707
2422sub toggle_flopper { 2708sub toggle_flopper {
2423 my ($self) = @_; 2709 my ($self) = @_;
2424 2710
2425 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2712}
2437 2713
2438############################################################################# 2714#############################################################################
2439 2715
2440package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2453} 2729}
2454 2730
2455sub set_tooltip_from { 2731sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2457 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2458 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2746 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2748 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2760
2476sub size_allocate { 2761sub size_allocate {
2477 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2478 2763
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2480} 2783}
2481 2784
2482sub _draw { 2785sub _draw {
2483 my ($self) = @_; 2786 my ($self) = @_;
2484 2787
… …
2501 glVertex $w, $h; 2804 glVertex $w, $h;
2502 glVertex $w, 0; 2805 glVertex $w, 0;
2503 glEnd; 2806 glEnd;
2504 2807
2505 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2506 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2507} 2811}
2508 2812
2509############################################################################# 2813#############################################################################
2510 2814
… …
2516 2820
2517sub new { 2821sub new {
2518 my $class = shift; 2822 my $class = shift;
2519 2823
2520 my $self = $class->SUPER::new ( 2824 my $self = $class->SUPER::new (
2521 aspect => 1, 2825 aspect => 1,
2826 can_events => 0,
2522 @_, 2827 @_,
2523 ); 2828 );
2524 2829
2525 if ($self->{anim} && $self->{animspeed}) { 2830 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2831 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2857}
2553 2858
2554sub _draw { 2859sub _draw {
2555 my ($self) = @_; 2860 my ($self) = @_;
2556 2861
2557 return unless $::CONN;#d# manage and cache textures differently 2862 return unless $::CONN;
2558 2863
2559 my $face; 2864 my $face;
2560 2865
2561 if ($self->{frame}) { 2866 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2867 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2874
2570 if ($tex) { 2875 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2576 } 2881 }
2577} 2882}
2578 2883
… …
2585 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2586} 2891}
2587 2892
2588############################################################################# 2893#############################################################################
2589 2894
2590package CFClient::UI::InventoryItem; 2895package CFClient::UI::Buttonbar;
2591 2896
2592our @ISA = CFClient::UI::HBox::; 2897our @ISA = CFClient::UI::HBox::;
2593 2898
2594sub _item_to_desc { 2899# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 1) {
2647 $::CONN->send ("examine $item->{tag}");
2648 } elsif ($ev->{button} == 2) {
2649 $::CONN->send ("apply $item->{tag}");
2650 } elsif ($ev->{button} == 3) {
2651 my @menu_items = (
2652 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2653 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2654 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2655 (
2656 $item->{flags} & Crossfire::Protocol::F_LOCKED
2657 ? (
2658 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2659 )
2660 : (
2661 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2662 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2663 )
2664 ),
2665 );
2666
2667 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2668 }
2669
2670 1
2671 },
2672 %args
2673 );
2674
2675
2676 $self->add (new CFClient::UI::Face
2677 can_events => 0,
2678 face => $item->{face},
2679 anim => $item->{anim},
2680 animspeed => $item->{animspeed},
2681 );
2682
2683 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2684
2685 $self->{item} = $item;
2686
2687 $self->update_item;
2688
2689 $self
2690}
2691
2692sub update_item {
2693 my ($self) = @_;
2694
2695 my $desc = _item_to_desc ($self->{item});
2696
2697 $self->{name_lbl}->set_text ($desc);
2698}
2699
2700#############################################################################
2701
2702package CFClient::UI::Inventory;
2703
2704our @ISA = CFClient::UI::ScrolledWindow::;
2705
2706sub new {
2707 my $class = shift;
2708
2709 my $self = $class->SUPER::new (
2710 scrolled => (new CFClient::UI::Table),
2711 @_,
2712 );
2713
2714 $self
2715}
2716
2717sub set_items {
2718 my ($self, $items) = @_;
2719
2720 $self->{scrolled}->clear;
2721 return unless $items;
2722
2723 my @items = sort {
2724 ($a->{type} <=> $b->{type})
2725 or ($a->{name} cmp $b->{name})
2726 } @$items;
2727
2728 $self->{real_items} = \@items;
2729
2730 for my $item (@items) {
2731 $item->{item} = $item;
2732 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2733 $item->update_item ();
2734 }
2735
2736 my $i = 0;
2737 for (@items) {
2738 $self->{scrolled}->add (0, $i, $_);
2739 my $nrof = $_->{item}->{nrof} || 1;
2740 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2741 }
2742
2743# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2744}
2745
2746sub size_request {
2747 my ($self) = @_;
2748 ($self->{req_w}, $self->{req_h});
2749}
2750 2900
2751############################################################################# 2901#############################################################################
2752 2902
2753package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2754 2904
… …
2788 2938
2789# popup given the event (must be a mouse button down event currently) 2939# popup given the event (must be a mouse button down event currently)
2790sub popup { 2940sub popup {
2791 my ($self, $ev) = @_; 2941 my ($self, $ev) = @_;
2792 2942
2793 $self->emit ("popdown"); 2943 $self->_emit ("popdown");
2794 2944
2795 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2796 $GRAB = $self; 2946 $GRAB = $self;
2797 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2798 2948
2799 $self->show; 2949 $self->show;
2800 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2801} 2951}
2802 2952
2803sub mouse_motion { 2953sub mouse_motion {
2804 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2805 2955
2806 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2807 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2808 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2809} 2961}
2810 2962
2811sub button_up { 2963sub button_up {
2812 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2813 2965
2814 if ($ev->{button} == $self->{button}) { 2966 if ($ev->{button} == $self->{button}) {
2815 undef $GRAB; 2967 undef $GRAB;
2816 $self->hide; 2968 $self->hide;
2817 2969
2818 $self->emit ("popdown"); 2970 $self->_emit ("popdown");
2819 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2820 } 2976 1
2821} 2977}
2822 2978
2823############################################################################# 2979#############################################################################
2824 2980
2825package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2826 2982
2827our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2828 2984
2829sub new { 2985sub new {
2830 my $class = shift; 2986 my $class = shift;
2831 2987
2832 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2833 fontsize => 0.8, 3097 fontsize => 0.8,
2834 @_, 3098 @_,
2835 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2836} 3106}
2837 3107
2838sub reorder { 3108sub reorder {
2839 my ($self) = @_; 3109 my ($self) = @_;
2840 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2841 3116
2842 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2843 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2844 } 3119 }
2845 3120
… …
2848 my @items = sort { 3123 my @items = sort {
2849 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2850 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2851 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2852 3127
3128 $self->{timer}->interval (1);
3129
2853 my $count = 10 + 1; 3130 my $count = 10 + 1;
2854 for my $item (@items) { 3131 for my $item (@items) {
2855 last unless --$count; 3132 last unless --$count;
2856 3133
2857 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2858 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2859 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2860 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2861 : $item->{text}; 3138 : $item->{text};
2862 3139
… …
2870 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2871 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2872 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2873 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2874 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2875 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2876 can_events => 1, 3153 can_events => 1,
2877 can_hover => 1 3154 can_hover => 1
2878 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2879 } 3168 }
2880 3169
2881 $self->clear; 3170 $self->clear;
2882 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2883} 3172}
… …
2886 my ($self, $text, %arg) = @_; 3175 my ($self, $text, %arg) = @_;
2887 3176
2888 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2889 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2890 3179
3180 return unless $text;
3181
2891 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2892 3183
2893 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2894 3185
2895 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2896 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2926 3217
2927 $self->reorder; 3218 $self->reorder;
2928 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2929} 3220}
2930 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2931############################################################################# 3230#############################################################################
2932 3231
2933package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2934 3233
2935our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2936
2937use CFClient::OpenGL;
2938 3235
2939sub new { 3236sub new {
2940 my $class = shift; 3237 my $class = shift;
2941 3238
2942 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
2943 @_, 3481 @_,
2944 ) 3482 )
2945} 3483}
2946 3484
2947sub configure { 3485# XXX: Do sorting? Argl...
2948 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2949
2950 $self->{w} = $w;
2951 $self->{h} = $h;
2952}
2953
2954sub check_size {
2955 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2956 3489
2957 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2958 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2959} 3546}
2960 3547
2961sub size_request { 3548sub size_request {
2962 my ($self) = @_; 3549 my ($self) = @_;
2963 3550
2964 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
2965} 3566}
2966 3567
2967sub size_allocate { 3568sub size_allocate {
2968 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2969 3570
2970 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2971 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2972
2973 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2974 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2975
2976 for my $child ($self->children) { 3571 for my $child ($self->children) {
2977 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2978 3573
2979 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
2980 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
2981 3576
2982 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
2983 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
2984
2985 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2986 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2987 3579
2988 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
2989 } 3581 }
2990} 3582}
2991 3583
… …
3002} 3594}
3003 3595
3004sub update { 3596sub update {
3005 my ($self) = @_; 3597 my ($self) = @_;
3006 3598
3007 $self->check_size;
3008 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3009} 3600}
3010 3601
3011sub add { 3602sub add {
3012 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3013 3604
3014 for my $child (@children) {
3015 $child->{toplevel} = 1; 3605 $_->{is_toplevel} = 1
3016 3606 for @children;
3017 # integerise window positions
3018 $child->{x} = int $child->{x};
3019 $child->{y} = int $child->{y};
3020 }
3021 3607
3022 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3609}
3610
3611sub remove {
3612 my ($self, @children) = @_;
3613
3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3023 3618
3024 while (@children) { 3619 while (@children) {
3025 my $w = pop @children; 3620 my $w = pop @children;
3026 push @children, $w->children; 3621 push @children, $w->children;
3027 $w->{visible} = 1; 3622 $w->set_invisible;
3028 }
3029}
3030
3031sub remove {
3032 my ($self, @children) = @_;
3033
3034 $self->SUPER::remove (@children);
3035
3036 while (@children) {
3037 my $w = pop @children;
3038 push @children, $w->children;
3039 delete $w->{visible};
3040 } 3623 }
3041} 3624}
3042 3625
3043sub on_refresh { 3626sub on_refresh {
3044 my ($self, $id, $cb) = @_; 3627 my ($self, $id, $cb) = @_;
… …
3058 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3059 $_->() 3642 $_->()
3060 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3061 } 3644 }
3062 3645
3063 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3064 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3065 3650
3066 for (;;) { 3651 outer:
3067 if ($self->{check_size}) { 3652 while () {
3068 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3069 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3070 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3071 } 3661 }
3072 3662
3073 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3074 3665
3075 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3076 ? @$widget{qw(user_w user_h)} 3667 and last;
3077 : $widget->size_request;
3078
3079 if (delete $widget->{force_alloc}
3080 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3081 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3082 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3083 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3084 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3085 3689
3086 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3087 3691
3088 $widget->{parent}->check_size
3089 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3090 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3091 } 3702 }
3092 } 3703 }
3093 3704
3094 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3095 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3096 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3097 3713
3098 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3099 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3100 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3101 $widget->{w} = $w; 3724 $widget->{w} = $w;
3102 $widget->{h} = $h; 3725 $widget->{h} = $h;
3103 $widget->size_allocate ($w, $h); 3726
3104 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3105 } 3729 }
3106 } 3730 }
3107 3731
3108 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3109 $_->() 3733 $_->()
3110 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3111 } 3735 }
3736
3112 3737
3113 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3114 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3115 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3116 3741
… …
3118 glLoadIdentity; 3743 glLoadIdentity;
3119 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3120 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3121 glLoadIdentity; 3746 glLoadIdentity;
3122 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3123 $self->_draw; 3755 $self->_draw;
3124} 3756}
3125 3757
3126############################################################################# 3758#############################################################################
3127 3759

Diff Legend

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