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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.371 by root, Sun Jul 15 22:07:48 2007 UTC

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

Diff Legend

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