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

Diff Legend

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