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

Diff Legend

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