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.226 by root, Tue May 23 23:14:46 2006 UTC vs.
Revision 1.284 by root, Mon Jun 5 03:06:04 2006 UTC

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

Diff Legend

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