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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.413 by root, Mon Jul 23 15:30:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines