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.223 by elmex, Tue May 23 18:10:51 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub {
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
225 },
226 );
227}
228 264
229sub hide { 265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
278 delete $self->{visible};
231 279
232 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
233 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
234 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
306}
307
308sub hide {
309 my ($self) = @_;
310
311 $self->set_invisible;
312
235 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
236 if $self->{parent}; 314 if $self->{parent};
237} 315}
238 316
239sub move { 317sub move_abs {
240 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
241 319
242 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
243 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
749 890
750 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
751} 895}
752 896
753sub size_allocate { 897sub size_allocate {
754 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
755 899
900 my $child = $self->child;
901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
905 $self->child->configure (0, 0, $w, $h);
756 $self->update; 906 $self->update;
757} 907}
758 908
759sub set_offset { 909sub set_offset {
760 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
794} 944}
795 945
796sub _render { 946sub _render {
797 my ($self) = @_; 947 my ($self) = @_;
798 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
799 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
800 953
801 $self->SUPER::_render; 954 $self->SUPER::_render;
802} 955}
803 956
… …
806package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
807 960
808our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
809 962
810sub new { 963sub new {
811 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
812 967
813 my $self; 968 my $self;
814 969
815 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
816 vertical => 1, 971 vertical => 1,
817 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
818 connect_changed => sub { 973 on_changed => sub {
819 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 974 $self->{vp}->set_offset (0, $_[1]);
820 }, 975 },
821 ; 976 ;
822 977
823 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
824 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
825 slider => $slider, 980 slider => $slider,
826 @_, 981 %arg,
827 ); 982 );
828 983
829 $self->{vp}->add ($self->{scrolled});
830 $self->add ($self->{vp});
831 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
832 986
833 $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]);
834} 1013}
835 1014
836#TODO# update range on size_allocate depending on child 1015#TODO# update range on size_allocate depending on child
837# update viewport offset on scroll 1016# update viewport offset on scroll
838 1017
… …
858 1037
859 if ($self->{bg}) { 1038 if ($self->{bg}) {
860 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
861 1040
862 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
863 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
864 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
865 1044
866 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
867 glVertex 0 , 0; 1046 glVertex 0 , 0;
868 glVertex 0 , $h; 1047 glVertex 0 , $h;
869 glVertex $w, $h; 1048 glVertex $w, $h;
… …
882 1061
883our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
884 1063
885use CFClient::OpenGL; 1064use CFClient::OpenGL;
886 1065
887my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
888 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
889 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
890 1073
891sub new { 1074sub new {
892 my $class = shift; 1075 my ($class, %arg) = @_;
893 1076
894 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
895 1078
896 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
897 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
898 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
899 border => 0.6, 1082 border => 0.6,
900 toplevel => 1,
901 can_events => 1, 1083 can_events => 1,
902 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
903 ); 1087 );
904 1088
905 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
906 align => 0, 1090 align => 0,
907 valign => 1, 1091 valign => 1,
908 text => $self->{title}, 1092 text => $title,
909 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
910 1095
911 $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};
912} 1104}
913 1105
914sub border { 1106sub border {
915 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
916} 1108}
917 1109
918sub size_request { 1110sub size_request {
919 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
920 1115
921 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
922 1117
923 ( 1118 (
924 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
927} 1122}
928 1123
929sub size_allocate { 1124sub size_allocate {
930 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
931 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
932 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
933 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
934 1137
935 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
936 if $self->{title};
937
938 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
939} 1139}
940 1140
941sub button_down { 1141sub button_down {
942 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
943 1143
… …
959 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
960 1160
961 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
962 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
963 1163
964 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
965 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
966 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
967 $self->check_size; 1168 $self->realloc;
968 }; 1169 };
969 1170
970 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
971 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
972 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
974 $self->{motion} = sub { 1175 $self->{motion} = sub {
975 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
976 1177
977 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
978 1179
979 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
980 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
981 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
982 } 1188 1
983} 1189}
984 1190
985sub button_up { 1191sub button_up {
986 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
987 1193
988 delete $self->{motion}; 1194 !!delete $self->{motion}
989} 1195}
990 1196
991sub mouse_motion { 1197sub mouse_motion {
992 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
993 1199
994 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
995} 1203}
996 1204
997sub _draw { 1205sub _draw {
998 my ($self) = @_; 1206 my ($self) = @_;
999 1207
1208 my $child = $self->{children}[0];
1209
1000 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1001 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1002 1212
1003 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1004 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1005 1215
1006 my $border = $self->border; 1216 my $border = $self->border;
1007 1217
1008 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1009 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1010 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1011 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1012 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1013 1223
1014 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1015 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1016 1226
1017 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1018 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1019 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1020
1021 glColor @{ $self->{bg} };
1022
1023 $bg->{s} = $rep_x;
1024 $bg->{t} = $rep_y;
1025 $bg->{wrap_mode} = 1;
1026 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1027 } 1232 }
1028 1233
1029 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1030 1235
1031 $self->{title}->draw if $self->{title};
1032
1033 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1034} 1242}
1035 1243
1036############################################################################# 1244#############################################################################
1037 1245
1038package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1046sub new { 1254sub new {
1047 my $class = shift; 1255 my $class = shift;
1048 1256
1049 $class->SUPER::new ( 1257 $class->SUPER::new (
1050 col_expand => [], 1258 col_expand => [],
1051 @_ 1259 @_,
1052 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1053} 1265}
1054 1266
1055sub add { 1267sub add {
1056 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1057 1269
1058 $child->set_parent ($self); 1270 $child->set_parent ($self);
1059 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1060 1272
1061 $child->check_size; 1273 $self->realloc;
1062} 1274}
1063 1275
1064sub children {
1065 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1066}
1067
1068# 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?
1069sub clear { 1277sub clear {
1070 my ($self) = @_; 1278 my ($self) = @_;
1071 1279
1072 my @children = $self->children; 1280 my @children = $self->children;
1073 delete $self->{children}; 1281 delete $self->{children};
… …
1075 for (@children) { 1283 for (@children) {
1076 delete $_->{parent}; 1284 delete $_->{parent};
1077 $_->hide; 1285 $_->hide;
1078 } 1286 }
1079 1287
1080 $self->update; 1288 $self->realloc;
1081} 1289}
1082 1290
1083sub get_wh { 1291sub get_wh {
1084 my ($self) = @_; 1292 my ($self) = @_;
1085 1293
… …
1116sub size_allocate { 1324sub size_allocate {
1117 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1118 1326
1119 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1120 1328
1121 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1122 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1123 1331
1124 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1125 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1126 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1127 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1181 } 1389 }
1182} 1390}
1183 1391
1184############################################################################# 1392#############################################################################
1185 1393
1186package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1187
1188# TODO: wrap into common Box base class
1189 1395
1190our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1191 1397
1192sub size_request { 1398sub size_request {
1193 my ($self) = @_; 1399 my ($self) = @_;
1194 1400
1195 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1196 1402 ? (
1197 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1198 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1199 (List::Util::max map $_->[1], @alloc), 1405 )
1200 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1201} 1410}
1202 1411
1203sub size_allocate { 1412sub size_allocate {
1204 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1205 1414
1206 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1207
1208 my $children = $self->{children}; 1416 my $children = $self->{children};
1209 1417
1210 my @h = map $_->{req_w}, @$children; 1418 my @req;
1211 1419
1212 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1213 1421 @req = ($space / (@$children || 1)) x @$children;
1214 if ($req_h > $h) {
1215 # ah well, not enough space
1216 $_ *= $h / $req_h for @h;
1217 } else { 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 {
1218 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1219 $exp ||= 1;
1220 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1221 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1222 my $child = $children->[$_];
1223
1224 my $alloc_h = $h[$_];
1225 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1226 $h[$_] = $alloc_h;
1227 } 1436 }
1228 } 1437 }
1229 1438
1230 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1231 1440
1232 my $y = 0; 1441 my $pos = 0;
1233 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1234 my $child = $children->[$_];
1235 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1236 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1237 1445
1238 $y += $h; 1446 $pos += $alloc;
1239 } 1447 }
1240 1448
1241 1 1449 1
1242} 1450}
1243 1451
1244############################################################################# 1452#############################################################################
1245 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
1246package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1247 1470
1248# TODO: wrap into common Box base class
1249
1250our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1251 1472
1252sub size_request { 1473sub new {
1253 my ($self) = @_; 1474 my $class = shift;
1254 1475
1255 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1256 1477 vertical => 1,
1257 ( 1478 @_,
1258 (List::Util::max map $_->[0], @alloc),
1259 (List::Util::sum map $_->[1], @alloc),
1260 ) 1479 )
1261}
1262
1263sub size_allocate {
1264 my ($self, $w, $h) = @_;
1265
1266 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1267
1268 my $children = $self->{children};
1269
1270 my @h = map $_->{req_h}, @$children;
1271
1272 my $req_h = List::Util::sum @h;
1273
1274 if ($req_h > $h) {
1275 # ah well, not enough space
1276 $_ *= $h / $req_h for @h;
1277 } else {
1278 my $exp = List::Util::sum map $_->{expand}, @$children;
1279 $exp ||= 1;
1280
1281 for (0 .. $#$children) {
1282 my $child = $children->[$_];
1283
1284 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1285 }
1286 }
1287
1288 CFClient::UI::harmonize \@h;
1289
1290 my $y = 0;
1291 for (0 .. $#$children) {
1292 my $child = $children->[$_];
1293 my $h = $h[$_];
1294 $child->configure (0, $y, $w, $h);
1295
1296 $y += $h;
1297 }
1298
1299 1
1300} 1480}
1301 1481
1302############################################################################# 1482#############################################################################
1303 1483
1304package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1321 ellipsise => 3, # end 1501 ellipsise => 3, # end
1322 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1323 fontsize => 1, 1503 fontsize => 1,
1324 align => -1, 1504 align => -1,
1325 valign => -1, 1505 valign => -1,
1326 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1327 can_events => 0, 1508 can_events => 0,
1328 %arg 1509 %arg
1329 ); 1510 );
1330 1511
1331 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1358 1539
1359 delete $self->{texture}; 1540 delete $self->{texture};
1360 $self->SUPER::update; 1541 $self->SUPER::update;
1361} 1542}
1362 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1363sub set_text { 1551sub set_text {
1364 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1365 1553
1366 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1367 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1368 1556
1369 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1370 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1371 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1372 $self->update; 1562 $self->update;
1373 $self->check_size;
1374} 1563}
1375 1564
1376sub set_markup { 1565sub set_markup {
1377 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1378 1567
… …
1382 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1383 1572
1384 $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;
1385 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1386 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1387 $self->update; 1578 $self->update;
1388 $self->check_size;
1389} 1579}
1390 1580
1391sub size_request { 1581sub size_request {
1392 my ($self) = @_; 1582 my ($self) = @_;
1393 1583
1584 $self->{size_req} ||= do {
1394 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1395 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1396 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1397 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1398 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1399 1590
1400 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1401 1592
1402 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1403 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1404 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1405 1596
1406 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1407 1598
1408 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1409 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1410 } 1604 };
1411 1605
1412 ( 1606 @{ $self->{size_req} }
1413 $w + $self->{padding} * 2,
1414 $h + $self->{padding} * 2,
1415 )
1416} 1607}
1417 1608
1418sub size_allocate { 1609sub size_allocate {
1419 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1420 1611
1612 delete $self->{ox};
1613
1421 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1422} 1616}
1423 1617
1424sub set_fontsize { 1618sub set_fontsize {
1425 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1426 1620
1427 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1428 delete $self->{texture}; 1622 delete $self->{texture};
1429 1623
1430 $self->update; 1624 $self->realloc;
1431 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1432} 1633}
1433 1634
1434sub _draw { 1635sub _draw {
1435 my ($self) = @_; 1636 my ($self) = @_;
1436 1637
… …
1442 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1443 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1444 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1445 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1446 1647
1447 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1448 1650
1651 unless (exists $self->{ox}) {
1449 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1450 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1451 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1452 1655
1453 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1454 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1455 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1456
1457 $tex
1458 }; 1659 };
1459 1660
1460 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1461 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1462 1665
1463 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1464 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1465 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1466 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1467 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1468 } 1673 }
1469 1674
1470 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1471} 1676}
1472 1677
… …
1488 active_fg => [0, 0, 0], 1693 active_fg => [0, 0, 0],
1489 can_hover => 1, 1694 can_hover => 1,
1490 can_focus => 1, 1695 can_focus => 1,
1491 valign => 0, 1696 valign => 0,
1492 can_events => 1, 1697 can_events => 1,
1698 #text => ...
1699 #hidden => "*",
1493 @_ 1700 @_
1494 ) 1701 )
1495} 1702}
1496 1703
1497sub _set_text { 1704sub _set_text {
… …
1499 1706
1500 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1501 1708
1502 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1503 1710
1504 delete $self->{texture};
1505
1506 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1507 $self->{text} = $text; 1712 $self->{text} = $text;
1508 1713
1509 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1510 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1511 1717
1512 $self->emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1513} 1722}
1514 1723
1515sub set_text { 1724sub set_text {
1516 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1517 1726
1518 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1519 $self->_set_text ($text); 1728 $self->_set_text ($text);
1520 $self->update;
1521 $self->check_size;
1522} 1729}
1523 1730
1524sub get_text { 1731sub get_text {
1525 $_[0]{text} 1732 $_[0]{text}
1526} 1733}
… …
1529 my ($self) = @_; 1736 my ($self) = @_;
1530 1737
1531 my ($w, $h) = $self->SUPER::size_request; 1738 my ($w, $h) = $self->SUPER::size_request;
1532 1739
1533 ($w + 1, $h) # add 1 for cursor 1740 ($w + 1, $h) # add 1 for cursor
1534}
1535
1536sub size_allocate {
1537 my ($self, $w, $h) = @_;
1538
1539 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1540} 1741}
1541 1742
1542sub key_down { 1743sub key_down {
1543 my ($self, $ev) = @_; 1744 my ($self, $ev) = @_;
1544 1745
… …
1559 } elsif ($sym == CFClient::SDLK_HOME) { 1760 } elsif ($sym == CFClient::SDLK_HOME) {
1560 $self->{cursor} = 0; 1761 $self->{cursor} = 0;
1561 } elsif ($sym == CFClient::SDLK_END) { 1762 } elsif ($sym == CFClient::SDLK_END) {
1562 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1563 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1564 $self->emit ('escape'); 1765 $self->_emit ('escape');
1565 } elsif ($uni) { 1766 } elsif ($uni) {
1566 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1567 } 1770 }
1568 1771
1569 $self->_set_text ($text); 1772 $self->_set_text ($text);
1570 $self->update; 1773
1571 $self->check_size; 1774 $self->realloc;
1775
1776 1
1572} 1777}
1573 1778
1574sub focus_in { 1779sub focus_in {
1575 my ($self) = @_; 1780 my ($self) = @_;
1576 1781
… …
1591 utf8::encode $text; 1796 utf8::encode $text;
1592 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1593 1798
1594 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1595 $self->update; 1800 $self->update;
1801
1802 1
1596} 1803}
1597 1804
1598sub mouse_motion { 1805sub mouse_motion {
1599 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1600# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1601} 1810}
1602 1811
1603sub _draw { 1812sub _draw {
1604 my ($self) = @_; 1813 my ($self) = @_;
1605 1814
1606 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1607 1816
1608 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1609 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1610 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1611 } else { 1820 } else {
1612 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1613 } 1822 }
1614 1823
1615 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1616 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1617 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1618 glVertex 0 , 0; 1827 glVertex 0 , 0;
1619 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1620 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1621 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1656 if ($sym == 13) { 1865 if ($sym == 13) {
1657 unshift @{$self->{history}}, 1866 unshift @{$self->{history}},
1658 my $txt = $self->get_text; 1867 my $txt = $self->get_text;
1659 $self->{history_pointer} = -1; 1868 $self->{history_pointer} = -1;
1660 $self->{history_saveback} = ''; 1869 $self->{history_saveback} = '';
1661 $self->emit (activate => $txt); 1870 $self->_emit (activate => $txt);
1662 $self->update; 1871 $self->update;
1663 1872
1664 } elsif ($sym == CFClient::SDLK_UP) { 1873 } elsif ($sym == CFClient::SDLK_UP) {
1665 if ($self->{history_pointer} < 0) { 1874 if ($self->{history_pointer} < 0) {
1666 $self->{history_saveback} = $self->get_text; 1875 $self->{history_saveback} = $self->get_text;
… …
1682 } else { 1891 } else {
1683 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1684 } 1893 }
1685 1894
1686 } else { 1895 } else {
1687 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1688 } 1899 1
1689
1690} 1900}
1691 1901
1692############################################################################# 1902#############################################################################
1693 1903
1694package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1703 1913
1704sub new { 1914sub new {
1705 my $class = shift; 1915 my $class = shift;
1706 1916
1707 $class->SUPER::new ( 1917 $class->SUPER::new (
1708 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1709 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1710 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1711 can_hover => 1, 1922 can_hover => 1,
1712 align => 0, 1923 align => 0,
1713 valign => 0, 1924 valign => 0,
1714 can_events => 1, 1925 can_events => 1,
1715 @_ 1926 @_
1716 ) 1927 )
1717} 1928}
1718 1929
1930sub activate { }
1931
1719sub button_up { 1932sub button_up {
1720 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1721 1934
1935 $self->emit ("activate")
1722 if ($x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1723 && $y >= 0 && $y < $self->{h}) { 1937 && $y >= 0 && $y < $self->{h};
1724 $self->emit ("activate"); 1938
1725 } 1939 1
1726} 1940}
1727 1941
1728sub _draw { 1942sub _draw {
1729 my ($self) = @_; 1943 my ($self) = @_;
1730 1944
1731 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1732
1733 if ($GRAB == $self) {
1734 $self->{fg} = $self->{active_fg};
1735 }
1736 1946
1737 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1738 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1739 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1740 1950
… …
1759 1969
1760sub new { 1970sub new {
1761 my $class = shift; 1971 my $class = shift;
1762 1972
1763 $class->SUPER::new ( 1973 $class->SUPER::new (
1764 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1765 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1766 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1767 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1768 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1769 state => 0, 1980 state => 0,
… …
1773} 1984}
1774 1985
1775sub size_request { 1986sub size_request {
1776 my ($self) = @_; 1987 my ($self) = @_;
1777 1988
1778 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1779} 1990}
1780 1991
1781sub button_down { 1992sub button_down {
1782 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1783 1994
1784 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1785 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1786 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1787 $self->emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1788 } 2003 1
1789} 2004}
1790 2005
1791sub _draw { 2006sub _draw {
1792 my ($self) = @_; 2007 my ($self) = @_;
1793 2008
1794 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1795 2010
1796 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1797 2012
1798 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1799 2016
1800 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1801 2018
1802 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1803 2020
… …
1958 2175
1959 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
1960 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
1961 2178
1962 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
1963 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1964 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
1965 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1966 2184
1967 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
1968 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2067 my $self = $class->SUPER::new ( 2285 my $self = $class->SUPER::new (
2068 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2069 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2070 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2071 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2072 range => [0, 0, 100, 10], 2290 range => [0, 0, 100, 10, 0],
2073 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2074 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2075 vertical => 0, 2293 vertical => 0,
2076 can_hover => 1, 2294 can_hover => 1,
2077 inner_pad => 0.02, 2295 inner_pad => 0.02,
2078 @_ 2296 @_
2079 ); 2297 );
… …
2082 $self->update; 2300 $self->update;
2083 2301
2084 $self 2302 $self
2085} 2303}
2086 2304
2305sub changed { }
2306
2307sub set_range {
2308 my ($self, $range) = @_;
2309
2310 ($range, $self->{range}) = ($self->{range}, $range);
2311
2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2316}
2317
2087sub set_value { 2318sub set_value {
2088 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2089 2320
2090 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2321 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2091 2322
2092 $hi = $lo + 1 if $hi <= $lo; 2323 $hi = $lo + 1 if $hi <= $lo;
2093 2324
2325 $page = $hi - $lo if $page > $hi - $lo;
2326
2094 $value = $lo if $value < $lo; 2327 $value = $lo if $value < $lo;
2095 $value = $hi if $value > $hi; 2328 $value = $hi - $page if $value > $hi - $page;
2096 2329
2097 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2330 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2098 if $unit; 2331 if $unit;
2099 2332
2100 $page = $hi - $lo if $page > $hi - $lo;
2101
2102 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2333 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2103 2334
2104 if ($value != $old_value) { 2335 if ($value != $old_value) {
2105 $self->emit (changed => $value); 2336 $self->_emit (changed => $value);
2106 $self->update; 2337 $self->update;
2107 } 2338 }
2108} 2339}
2109 2340
2110sub size_request { 2341sub size_request {
2111 my ($self) = @_; 2342 my ($self) = @_;
2112 2343
2113 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2114 my $h = $self->{req_h};
2115
2116 $self->{vertical} ? ($h, $w) : ($w, $h)
2117} 2345}
2118 2346
2119sub button_down { 2347sub button_down {
2120 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2121 2349
2122 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2351
2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2353
2123 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2124} 2355}
2125 2356
2126sub mouse_motion { 2357sub mouse_motion {
2127 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2128 2359
2129 if ($GRAB == $self) { 2360 if ($GRAB == $self) {
2130 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2361 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2131 2362
2132 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2133 2364
2134 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2135 2366
2136 $self->set_value ($x * ($hi - $lo) + $lo); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2137 } 2372 1
2138} 2373}
2139 2374
2140sub update { 2375sub update {
2141 my ($self) = @_; 2376 my ($self) = @_;
2142 2377
2143 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2144 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2145 2387
2146 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2389 my $range = ($hi - $page - $lo) || 1e-100;
2147 2390
2148 my $inner_w = 1 - 2 * $self->{inner_pad}; 2391 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2149 2392
2150 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2393 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2394 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2151 2395
2152 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2396 $value = ($value - $lo) / $range;
2153 $value = $self->{scale} * ($value - $lo); 2397 $value = $value * $self->{scale} + $self->{offset};
2154 2398
2155 $value = $self->{inner_pad} + ($value - $page * 0.5);
2156
2157 $value = 0 if $value < 0;
2158 $page = 1 - $value if $value + $page > 1;
2159
2160 $self->{knob_x} = $value; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2161 $self->{knob_w} = $page; 2400 $self->{knob_w} = $knob_w;
2162 }); 2401 }
2163
2164 $self->SUPER::update;
2165}
2166
2167sub _draw {
2168 my ($self) = @_;
2169 2402
2170 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2171 2404
2172 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2173 2406
… …
2193 glDisable GL_TEXTURE_2D; 2426 glDisable GL_TEXTURE_2D;
2194} 2427}
2195 2428
2196############################################################################# 2429#############################################################################
2197 2430
2431package CFClient::UI::ValSlider;
2432
2433our @ISA = CFClient::UI::HBox::;
2434
2435sub new {
2436 my ($class, %arg) = @_;
2437
2438 my $range = delete $arg{range};
2439
2440 my $self = $class->SUPER::new (
2441 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2442 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2443 to_value => sub { shift },
2444 from_value => sub { shift },
2445 %arg,
2446 );
2447
2448 $self->{slider}->connect (changed => sub {
2449 my ($self, $value) = @_;
2450 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2451 $self->{parent}->emit (changed => $value);
2452 });
2453
2454# $self->{entry}->connect (changed => sub {
2455# my ($self, $value) = @_;
2456# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2457# $self->{parent}->emit (changed => $value);
2458# });
2459
2460 $self->add ($self->{slider}, $self->{entry});
2461
2462 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2463
2464 $self
2465}
2466
2467sub set_range { shift->{slider}->set_range (@_) }
2468sub set_value { shift->{slider}->set_value (@_) }
2469
2470#############################################################################
2471
2198package CFClient::UI::TextView; 2472package CFClient::UI::TextView;
2199 2473
2200our @ISA = CFClient::UI::HBox::; 2474our @ISA = CFClient::UI::HBox::;
2201 2475
2202use CFClient::OpenGL; 2476use CFClient::OpenGL;
… …
2205 my $class = shift; 2479 my $class = shift;
2206 2480
2207 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2208 fontsize => 1, 2482 fontsize => 1,
2209 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2210 #font => default_font 2485 #font => default_font
2211 @_, 2486 @_,
2212 2487
2213 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2214 par => [], 2489 par => [],
… …
2237 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2238 2513
2239 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2240 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2241 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2242 2518
2243 $self->reflow; 2519 $self->reflow;
2244} 2520}
2245 2521
2246sub text_height { 2522sub text_size {
2247 my ($self, $text, $indent) = @_; 2523 my ($self, $text, $indent) = @_;
2248 2524
2249 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2250 2526
2251 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2252 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2253 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2254 2531
2255 ($layout->size)[1] 2532 $layout->size
2256} 2533}
2257 2534
2258sub reflow { 2535sub reflow {
2259 my ($self) = @_; 2536 my ($self) = @_;
2260 2537
2261 $self->{need_reflow}++; 2538 $self->{need_reflow}++;
2262 $self->update; 2539 $self->update;
2263} 2540}
2264 2541
2542sub set_offset {
2543 my ($self, $offset) = @_;
2544
2545 # todo: base offset on lines or so, not on pixels
2546 $self->{children}[1]->set_value ($offset);
2547}
2548
2549sub clear {
2550 my ($self) = @_;
2551
2552 $self->{par} = [];
2553 $self->{height} = 0;
2554 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2555}
2556
2265sub add_paragraph { 2557sub add_paragraph {
2266 my ($self, $color, $text, $indent) = @_; 2558 my ($self, $color, $text, $indent) = @_;
2267 2559
2268 #TODO: intelligently "reformat" paragraph
2269
2270 for my $line (split /\n/, $text) { 2560 for my $line (split /\n/, $text) {
2271 my $height = $self->text_height ($line); 2561 my ($w, $h) = $self->text_size ($line);
2272 $self->{height} += $height; 2562 $self->{height} += $h;
2273 push @{$self->{par}}, [$height, $color, $indent, $line]; 2563 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2274 } 2564 }
2275 2565
2276 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2566 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2277 $self->{children}[1]->update;
2278} 2567}
2279 2568
2280sub update { 2569sub update {
2281 my ($self) = @_; 2570 my ($self) = @_;
2282 2571
… …
2284 2573
2285 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2286 2575
2287 delete $self->{texture}; 2576 delete $self->{texture};
2288 2577
2289 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2580
2290 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2291 my $height = 0; 2582 my $height = 0;
2292 2583
2293 $height += $_->[0] = $self->text_height ($_->[3], $_->[2]) 2584 my $layout = $self->{layout};
2585
2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2587
2294 for @{$self->{par}}; 2588 for (@{$self->{par}}) {
2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2592 $layout->set_markup ($_->[4]);
2593 my ($w, $h) = $layout->size;
2594 $_->[0] = $w + $_->[3];
2595 $_->[1] = $h;
2596 }
2597
2598 $height += $_->[1];
2599 }
2295 2600
2296 $self->{height} = $height; 2601 $self->{height} = $height;
2297 2602
2298 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2299 $self->{children}[1]->update; 2604
2300
2301 delete $self->{texture}; 2605 delete $self->{texture};
2302 } 2606 }
2303 2607
2304 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2305 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2306 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2307 2611
2308 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2309 2613
2310 my $y0 = $top; 2614 my $y0 = $top;
2311 my $y1 = $top + $self->{h}; 2615 my $y1 = $top + $H;
2312 2616
2313 my $y = 0; 2617 my $y = 0;
2314 2618
2315 my $layout = $self->{layout}; 2619 my $layout = $self->{layout};
2316 2620
2317 $layout->set_font ($self->{font}) if $self->{font}; 2621 $layout->set_font ($self->{font}) if $self->{font};
2318 2622
2319 glEnable GL_BLEND; 2623 glEnable GL_BLEND;
2624 #TODO# not correct in windows where rgba is forced off
2320 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2625 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2321 2626
2322 for my $par (@{$self->{par}}) { 2627 for my $par (@{$self->{par}}) {
2323 my $h = $par->[0]; 2628 my $h = $par->[1];
2324 2629
2325 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2326 $layout->set_foreground (@{ $par->[1] }); 2631 $layout->set_foreground (@{ $par->[2] });
2327 $layout->set_width ($self->{w} - $par->[2]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2328 $layout->set_markup ($par->[3]); 2634 $layout->set_markup ($par->[4]);
2329 2635
2330 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2331 2637
2332 glRasterPos $par->[2], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
2333 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2639 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2334 } 2640 }
2335 2641
2336 $y += $h; 2642 $y += $h;
2337 } 2643 }
… …
2344sub _draw { 2650sub _draw {
2345 my ($self) = @_; 2651 my ($self) = @_;
2346 2652
2347 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2348 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2349 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2350 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2351 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2352 2658
2353 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2354 2660
2355} 2661}
… …
2404 2710
2405sub new { 2711sub new {
2406 my $class = shift; 2712 my $class = shift;
2407 2713
2408 my $self = $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2409 state => 0, 2715 state => 0,
2410 connect_activate => \&toggle_flopper, 2716 on_activate => \&toggle_flopper,
2411 @_ 2717 @_
2412 ); 2718 );
2413 2719
2414 if ($self->{state}) {
2415 $self->{state} = 0;
2416 $self->toggle_flopper;
2417 }
2418
2419 $self 2720 $self
2420} 2721}
2421 2722
2422sub toggle_flopper { 2723sub toggle_flopper {
2423 my ($self) = @_; 2724 my ($self) = @_;
2424 2725
2425 # TODO: use animation 2726 $self->{other}->toggle_visibility;
2426 if ($self->{state} = !$self->{state}) {
2427 $CFClient::UI::ROOT->add ($self->{other});
2428 $self->{other}->move ($self->coord2global (0, $self->{h}));
2429 $self->emit ("open");
2430 } else {
2431 $CFClient::UI::ROOT->remove ($self->{other});
2432 $self->emit ("close");
2433 }
2434
2435 $self->emit (changed => $self->{state});
2436} 2727}
2437 2728
2438############################################################################# 2729#############################################################################
2439 2730
2440package CFClient::UI::Tooltip; 2731package CFClient::UI::Tooltip;
… …
2453} 2744}
2454 2745
2455sub set_tooltip_from { 2746sub set_tooltip_from {
2456 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2457 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2458 $self->add (new CFClient::UI::Label 2758 $self->add (new CFClient::UI::Label
2459 markup => $widget->{tooltip}, 2759 markup => $tooltip,
2460 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2461 fontsize => 0.8, 2761 fontsize => 0.8,
2462 fg => [0, 0, 0, 1], 2762 fg => [0, 0, 0, 1],
2463 ellipsise => 0, 2763 ellipsise => 0,
2464 font => ($widget->{tooltip_font} || $::FONT_PROP), 2764 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2475 2775
2476sub size_allocate { 2776sub size_allocate {
2477 my ($self, $w, $h) = @_; 2777 my ($self, $w, $h) = @_;
2478 2778
2479 $self->SUPER::size_allocate ($w - 4, $h - 4); 2779 $self->SUPER::size_allocate ($w - 4, $h - 4);
2780}
2781
2782sub visibility_change {
2783 my ($self, $visible) = @_;
2784
2785 return unless $visible;
2786
2787 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner}
2789 or return;
2790
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w};
2795
2796 $self->move_abs ($x, $y);
2797 });
2480} 2798}
2481 2799
2482sub _draw { 2800sub _draw {
2483 my ($self) = @_; 2801 my ($self) = @_;
2484 2802
… …
2501 glVertex $w, $h; 2819 glVertex $w, $h;
2502 glVertex $w, 0; 2820 glVertex $w, 0;
2503 glEnd; 2821 glEnd;
2504 2822
2505 glTranslate 2 - 0.375, 2 - 0.375; 2823 glTranslate 2 - 0.375, 2 - 0.375;
2824
2506 $self->SUPER::_draw; 2825 $self->SUPER::_draw;
2507} 2826}
2508 2827
2509############################################################################# 2828#############################################################################
2510 2829
… …
2516 2835
2517sub new { 2836sub new {
2518 my $class = shift; 2837 my $class = shift;
2519 2838
2520 my $self = $class->SUPER::new ( 2839 my $self = $class->SUPER::new (
2521 aspect => 1, 2840 aspect => 1,
2841 can_events => 0,
2522 @_, 2842 @_,
2523 ); 2843 );
2524 2844
2525 if ($self->{anim} && $self->{animspeed}) { 2845 if ($self->{anim} && $self->{animspeed}) {
2526 Scalar::Util::weaken (my $widget = $self); 2846 Scalar::Util::weaken (my $widget = $self);
… …
2552} 2872}
2553 2873
2554sub _draw { 2874sub _draw {
2555 my ($self) = @_; 2875 my ($self) = @_;
2556 2876
2557 return unless $::CONN;#d# manage and cache textures differently 2877 return unless $::CONN;
2558 2878
2559 my $face; 2879 my $face;
2560 2880
2561 if ($self->{frame}) { 2881 if ($self->{frame}) {
2562 my $anim = $::CONN->{anim}[$self->{anim}]; 2882 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2568 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2569 2889
2570 if ($tex) { 2890 if ($tex) {
2571 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2572 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2574 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2575 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2576 } 2896 }
2577} 2897}
2578 2898
… …
2585 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2586} 2906}
2587 2907
2588############################################################################# 2908#############################################################################
2589 2909
2590package CFClient::UI::InventoryItem; 2910package CFClient::UI::Buttonbar;
2591 2911
2592our @ISA = CFClient::UI::HBox::; 2912our @ISA = CFClient::UI::HBox::;
2593 2913
2594sub _item_to_desc { 2914# TODO: should actualyl wrap buttons and other goodies.
2595 my ($item) = @_;
2596
2597 my $desc =
2598 $item->{nrof} < 2
2599 ? $item->{name}
2600 : "$item->{nrof} × $item->{name_pl}";
2601
2602 $item->{flags} & Crossfire::Protocol::F_OPEN
2603 and $desc .= " (open)";
2604 $item->{flags} & Crossfire::Protocol::F_APPLIED
2605 and $desc .= " (applied)";
2606 $item->{flags} & Crossfire::Protocol::F_UNPAID
2607 and $desc .= " (unpaid)";
2608 $item->{flags} & Crossfire::Protocol::F_MAGIC
2609 and $desc .= " (magic)";
2610 $item->{flags} & Crossfire::Protocol::F_CURSED
2611 and $desc .= " (cursed)";
2612 $item->{flags} & Crossfire::Protocol::F_DAMNED
2613 and $desc .= " (damned)";
2614 $item->{flags} & Crossfire::Protocol::F_LOCKED
2615 and $desc .= " *";
2616
2617 $desc
2618}
2619
2620sub new {
2621 my $class = shift;
2622
2623 my %args = @_;
2624
2625 my $item = delete $args{item};
2626
2627 my $desc = _item_to_desc ($item);
2628
2629 my $self = $class->SUPER::new (
2630 can_hover => 1,
2631 can_events => 1,
2632 tooltip => ((CFClient::UI::Label::escape $desc)
2633 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2634 connect_button_down => sub {
2635 my ($self, $ev, $x, $y) = @_;
2636
2637 # todo: maybe put examine on 1? but should just be a tooltip :(
2638 if ($ev->{button} == 1) {
2639 my $targ = $::CONN->{player}{tag};
2640
2641 if ($item->{container} == $::CONN->{player}{tag}) {
2642 $targ = $main::OPENCONT;
2643 }
2644
2645 $::CONN->send ("move $targ $item->{tag} 0");
2646 } elsif ($ev->{button} == 2) {
2647 $::CONN->send ("apply $item->{tag}");
2648 } elsif ($ev->{button} == 3) {
2649 my @menu_items = (
2650 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2651 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2652 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2653 (
2654 $item->{flags} & Crossfire::Protocol::F_LOCKED
2655 ? (
2656 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2657 )
2658 : (
2659 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2660 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2661 )
2662 ),
2663 );
2664
2665 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2666 }
2667
2668 1
2669 },
2670 %args
2671 );
2672
2673
2674 $self->add (new CFClient::UI::Face
2675 can_events => 0,
2676 face => $item->{face},
2677 anim => $item->{anim},
2678 animspeed => $item->{animspeed},
2679 );
2680
2681 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2682
2683 $self->{item} = $item;
2684
2685 $self->update_item;
2686
2687 $self
2688}
2689
2690sub update_item {
2691 my ($self) = @_;
2692
2693 my $desc = _item_to_desc ($self->{item});
2694
2695 $self->{name_lbl}->set_text ($desc);
2696}
2697
2698#############################################################################
2699
2700package CFClient::UI::Inventory;
2701
2702our @ISA = CFClient::UI::ScrolledWindow::;
2703
2704sub new {
2705 my $class = shift;
2706
2707 my $self = $class->SUPER::new (
2708 scrolled => (new CFClient::UI::VBox),
2709 @_,
2710 );
2711
2712 $self
2713}
2714
2715sub set_items {
2716 my ($self, $items) = @_;
2717
2718 $self->{scrolled}->clear;
2719 return unless $items;
2720
2721 my @items = sort {
2722 ($a->{type} <=> $b->{type})
2723 or ($a->{name} cmp $b->{name})
2724 } @$items;
2725
2726 $self->{real_items} = \@items;
2727
2728 for my $item (@items) {
2729 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2730 $item->update_item ();
2731 }
2732
2733 $self->{scrolled}->add (@items);
2734
2735# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2736}
2737
2738sub size_request {
2739 my ($self) = @_;
2740 ($self->{req_w}, $self->{req_h});
2741}
2742 2915
2743############################################################################# 2916#############################################################################
2744 2917
2745package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2746 2919
… …
2758 ); 2931 );
2759 2932
2760 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2761 2934
2762 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2763 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2764 2937
2765 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2766 if (!ref $widget) { 2939 if (!ref $widget) {
2767 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2768 can_hover => 1, 2941 can_hover => 1,
2769 can_events => 1, 2942 can_events => 1,
2770 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2771 } 2945 }
2772 2946
2773 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2774 2948
2775 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2780 2954
2781# popup given the event (must be a mouse button down event currently) 2955# popup given the event (must be a mouse button down event currently)
2782sub popup { 2956sub popup {
2783 my ($self, $ev) = @_; 2957 my ($self, $ev) = @_;
2784 2958
2785 $self->emit ("popdown"); 2959 $self->_emit ("popdown");
2786 2960
2787 # maybe save $GRAB? must be careful about events... 2961 # maybe save $GRAB? must be careful about events...
2788 $GRAB = $self; 2962 $GRAB = $self;
2789 $self->{button} = $ev->{button}; 2963 $self->{button} = $ev->{button};
2790 2964
2791 $self->show; 2965 $self->show;
2792 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2793} 2967}
2794 2968
2795sub mouse_motion { 2969sub mouse_motion {
2796 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2797 2971
2798 # TODO: should use vbox->find_widget or so 2972 # TODO: should use vbox->find_widget or so
2799 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2800 $self->{hover} = $self->{item}{$HOVER}; 2974 $self->{hover} = $self->{item}{$HOVER};
2975
2976 0
2801} 2977}
2802 2978
2803sub button_up { 2979sub button_up {
2804 my ($self, $ev, $x, $y) = @_; 2980 my ($self, $ev, $x, $y) = @_;
2805 2981
2806 if ($ev->{button} == $self->{button}) { 2982 if ($ev->{button} == $self->{button}) {
2807 undef $GRAB; 2983 undef $GRAB;
2808 $self->hide; 2984 $self->hide;
2809 2985
2810 $self->emit ("popdown"); 2986 $self->_emit ("popdown");
2811 $self->{hover}[1]->() if $self->{hover}; 2987 $self->{hover}[1]->() if $self->{hover};
2988 } else {
2989 return 0
2990 }
2991
2812 } 2992 1
2813} 2993}
2814 2994
2815############################################################################# 2995#############################################################################
2816 2996
2817package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2818 2998
2819our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2820 3000
2821sub new { 3001sub new {
2822 my $class = shift; 3002 my $class = shift;
2823 3003
2824 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2825 fontsize => 0.8, 3169 fontsize => 0.8,
2826 @_, 3170 @_,
2827 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2828} 3178}
2829 3179
2830sub reorder { 3180sub reorder {
2831 my ($self) = @_; 3181 my ($self) = @_;
2832 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2833 3188
2834 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2835 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2836 } 3191 }
2837 3192
… …
2840 my @items = sort { 3195 my @items = sort {
2841 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2842 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2843 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2844 3199
3200 $self->{timer}->interval (1);
3201
2845 my $count = 10 + 1; 3202 my $count = 10 + 1;
2846 for my $item (@items) { 3203 for my $item (@items) {
2847 last unless --$count; 3204 last unless --$count;
2848 3205
2849 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2850 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2851 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2852 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2853 : $item->{text}; 3210 : $item->{text};
2854 3211
… …
2862 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2863 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2864 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2865 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2866 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2867 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2868 can_events => 1, 3225 can_events => 1,
2869 can_hover => 1 3226 can_hover => 1
2870 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2871 } 3240 }
2872 3241
2873 $self->clear; 3242 $self->clear;
2874 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2875} 3244}
… …
2878 my ($self, $text, %arg) = @_; 3247 my ($self, $text, %arg) = @_;
2879 3248
2880 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
2881 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
2882 3251
3252 return unless $text;
3253
2883 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2884 3255
2885 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2886 3257
2887 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
2888 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
2918 3289
2919 $self->reorder; 3290 $self->reorder;
2920 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
2921} 3292}
2922 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
2923############################################################################# 3302#############################################################################
2924 3303
2925package CFClient::UI::Root; 3304package CFClient::UI::Inventory;
2926 3305
2927our @ISA = CFClient::UI::Container::; 3306our @ISA = CFClient::UI::ScrolledWindow::;
2928
2929use CFClient::OpenGL;
2930 3307
2931sub new { 3308sub new {
2932 my $class = shift; 3309 my $class = shift;
2933 3310
2934 $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
2935 @_, 3553 @_,
2936 ) 3554 )
2937} 3555}
2938 3556
2939sub configure { 3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2940 my ($self, $x, $y, $w, $h) = @_; 3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
2941 3563
2942 $self->{w} = $w; 3564sub rebuild_spell_list {
2943 $self->{h} = $h; 3565 my ($self) = @_;
2944}
2945 3566
2946sub check_size { 3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
2947 my ($self) = @_; 3612 my ($self, $spell) = @_;
2948 3613
2949 $self->size_allocate ($self->{w}, $self->{h}) 3614 $self->{spell}->{$spell->{name}} = $spell;
2950 if $self->{w}; 3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root;
3628
3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3632
3633use CFClient::OpenGL;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 visible => 1,
3640 @_,
3641 );
3642
3643 Scalar::Util::weaken ($self->{root} = $self);
3644
3645 $self
2951} 3646}
2952 3647
2953sub size_request { 3648sub size_request {
2954 my ($self) = @_; 3649 my ($self) = @_;
2955 3650
2956 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
3652}
3653
3654sub _to_pixel {
3655 my ($coord, $size, $max) = @_;
3656
3657 $coord =
3658 $coord eq "center" ? ($max - $size) * 0.5
3659 : $coord eq "max" ? $max
3660 : $coord;
3661
3662 $coord = 0 if $coord < 0;
3663 $coord = $max - $size if $coord > $max - $size;
3664
3665 int $coord + 0.5
2957} 3666}
2958 3667
2959sub size_allocate { 3668sub size_allocate {
2960 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
2961 3670
2962 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2963 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2964
2965 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2966 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2967
2968 for my $child ($self->children) { 3671 for my $child ($self->children) {
2969 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2970 3673
2971 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3674 $X = $child->{force_x} if exists $child->{force_x};
2972 if exists $child->{req_x}; 3675 $Y = $child->{force_y} if exists $child->{force_y};
2973 3676
2974 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3677 $X = _to_pixel $X, $W, $self->{w};
2975 if exists $child->{req_y}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
2976
2977 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2978 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2979 3679
2980 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
2981 } 3681 }
2982} 3682}
2983 3683
… …
2994} 3694}
2995 3695
2996sub update { 3696sub update {
2997 my ($self) = @_; 3697 my ($self) = @_;
2998 3698
2999 $self->check_size;
3000 $::WANT_REFRESH++; 3699 $::WANT_REFRESH++;
3001} 3700}
3002 3701
3003sub add { 3702sub add {
3004 my ($self, @children) = @_; 3703 my ($self, @children) = @_;
3005 3704
3006 for my $child (@children) {
3007 $child->{toplevel} = 1; 3705 $_->{is_toplevel} = 1
3008 3706 for @children;
3009 # integerise window positions
3010 $child->{x} = int $child->{x};
3011 $child->{y} = int $child->{y};
3012 }
3013 3707
3014 $self->SUPER::add (@children); 3708 $self->SUPER::add (@children);
3709}
3710
3711sub remove {
3712 my ($self, @children) = @_;
3713
3714 $self->SUPER::remove (@children);
3715
3716 delete $self->{is_toplevel}
3717 for @children;
3015 3718
3016 while (@children) { 3719 while (@children) {
3017 my $w = pop @children; 3720 my $w = pop @children;
3018 push @children, $w->children; 3721 push @children, $w->children;
3019 $w->{visible} = 1; 3722 $w->set_invisible;
3020 }
3021}
3022
3023sub remove {
3024 my ($self, @children) = @_;
3025
3026 $self->SUPER::remove (@children);
3027
3028 while (@children) {
3029 my $w = pop @children;
3030 push @children, $w->children;
3031 delete $w->{visible};
3032 } 3723 }
3033} 3724}
3034 3725
3035sub on_refresh { 3726sub on_refresh {
3036 my ($self, $id, $cb) = @_; 3727 my ($self, $id, $cb) = @_;
… …
3050 while ($self->{refresh_hook}) { 3741 while ($self->{refresh_hook}) {
3051 $_->() 3742 $_->()
3052 for values %{delete $self->{refresh_hook}}; 3743 for values %{delete $self->{refresh_hook}};
3053 } 3744 }
3054 3745
3055 if ($self->{check_size}) { 3746 if ($self->{realloc}) {
3056 my @queue = ([], []); 3747 my %queue;
3748 my @queue;
3749 my $widget;
3057 3750
3058 for (;;) { 3751 outer:
3059 if ($self->{check_size}) { 3752 while () {
3060 # heuristic: check containers last 3753 if (my $realloc = delete $self->{realloc}) {
3061 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3754 for $widget (values %$realloc) {
3062 for values %{delete $self->{check_size}} 3755 $widget->{visible} or next; # do not resize invisible widgets
3756
3757 $queue{$widget+0}++ and next; # duplicates are common
3758
3759 push @{ $queue[$widget->{visible}] }, $widget;
3760 }
3063 } 3761 }
3064 3762
3065 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3763 while () {
3764 @queue or last outer;
3066 3765
3067 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3766 $widget = pop @{ $queue[-1] || [] }
3068 ? @$widget{qw(user_w user_h)} 3767 and last;
3069 : $widget->size_request;
3070
3071 if (delete $widget->{force_alloc}
3072 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3073 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3074 3768
3769 pop @queue;
3770 }
3771
3772 delete $queue{$widget+0};
3773
3774 my ($w, $h) = $widget->size_request;
3775
3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3781
3782 $w = $widget->{force_w} if exists $widget->{force_w};
3783 $h = $widget->{force_h} if exists $widget->{force_h};
3784
3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3786 || delete $widget->{force_realloc}) {
3075 $widget->{req_w} = $w; 3787 $widget->{req_w} = $w;
3076 $widget->{req_h} = $h; 3788 $widget->{req_h} = $h;
3077 3789
3078 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3790 $self->{size_alloc}{$widget+0} = $widget;
3079 3791
3080 $widget->{parent}->check_size
3081 if $widget->{parent}; 3792 if (my $parent = $widget->{parent}) {
3793 $self->{realloc}{$parent+0} = $parent
3794 unless $queue{$parent+0};
3795
3796 $parent->{force_size_alloc} = 1;
3797 $self->{size_alloc}{$parent+0} = $parent;
3798 }
3082 } 3799 }
3800
3801 delete $self->{realloc}{$widget+0};
3083 } 3802 }
3084 } 3803 }
3085 3804
3086 while ($self->{size_alloc}) { 3805 while (my $size_alloc = delete $self->{size_alloc}) {
3087 for (values %{delete $self->{size_alloc}}) { 3806 my @queue = sort { $b->{visible} <=> $a->{visible} }
3088 my ($widget, $w, $h) = @$_; 3807 values %$size_alloc;
3808
3809 while () {
3810 my $widget = pop @queue || last;
3811
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3089 3813
3090 $w = 0 if $w < 0; 3814 $w = 0 if $w < 0;
3091 $h = 0 if $h < 0; 3815 $h = 0 if $h < 0;
3092 3816
3817 $w = int $w + 0.5;
3818 $h = int $h + 0.5;
3819
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h};
3823
3093 $widget->{w} = $w; 3824 $widget->{w} = $w;
3094 $widget->{h} = $h; 3825 $widget->{h} = $h;
3095 $widget->size_allocate ($w, $h); 3826
3096 $widget->emit (size_allocate => $w, $h); 3827 $widget->emit (size_allocate => $w, $h);
3828 }
3097 } 3829 }
3098 } 3830 }
3099 3831
3100 while ($self->{post_alloc_hook}) { 3832 while ($self->{post_alloc_hook}) {
3101 $_->() 3833 $_->()
3102 for values %{delete $self->{post_alloc_hook}}; 3834 for values %{delete $self->{post_alloc_hook}};
3103 } 3835 }
3836
3104 3837
3105 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3838 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3106 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3107 glClear GL_COLOR_BUFFER_BIT; 3840 glClear GL_COLOR_BUFFER_BIT;
3108 3841
… …
3110 glLoadIdentity; 3843 glLoadIdentity;
3111 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3112 glMatrixMode GL_MODELVIEW; 3845 glMatrixMode GL_MODELVIEW;
3113 glLoadIdentity; 3846 glLoadIdentity;
3114 3847
3848 {
3849 package CFClient::UI::Base;
3850
3851 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h});
3853 }
3854
3115 $self->_draw; 3855 $self->_draw;
3116} 3856}
3117 3857
3118############################################################################# 3858#############################################################################
3119 3859

Diff Legend

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