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

Diff Legend

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