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

Diff Legend

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