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

Diff Legend

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