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

Diff Legend

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