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

Diff Legend

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