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.216 by root, Fri May 19 16:43:57 2006 UTC vs.
Revision 1.380 by root, Tue Jul 17 17:39:07 2007 UTC

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

Diff Legend

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