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

Diff Legend

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