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.69 by root, Tue Apr 11 17:32:14 2006 UTC vs.
Revision 1.118 by root, Sat Apr 15 23:25:00 2006 UTC

1package CFClient::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6 6use List::Util ();
7use SDL::OpenGL;
8use SDL::OpenGL::Constants;
9 7
10use CFClient; 8use CFClient;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $ROOT;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
16 14
17# class methods for events 15# class methods for events
18sub feed_sdl_key_down_event { 16sub feed_sdl_key_down_event {
19 $FOCUS->key_down ($_[0]) if $FOCUS; 17 $FOCUS->key_down ($_[0]) if $FOCUS;
26sub feed_sdl_button_down_event { 24sub feed_sdl_button_down_event {
27 my ($ev) = @_; 25 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 26 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29 27
30 if (!$BUTTON_STATE) { 28 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y); 29 my $widget = $ROOT->find_widget ($x, $y);
32 30
33 $GRAB = $widget; 31 $GRAB = $widget;
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49 47
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB; 48 $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
51 49
52 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab; 52 $grab->update if $grab;
55 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
58 56
59sub feed_sdl_motion_event { 57sub feed_sdl_motion_event {
60 my ($ev) = @_; 58 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62 60
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 61 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
64 62
65 if ($widget != $HOVER) { 63 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget; 64 my $hover = $HOVER; $HOVER = $widget;
67 65
68 $hover->update if $hover; 66 $hover->update if $hover && $hover->{can_hover};
69 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER && $HOVER->{can_hover};
70 } 68 }
71 69
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
73} 71}
72
73# convert position array to integers
74sub harmonize {
75 my ($vals) = @_;
76
77 my $rem = 0;
78
79 for (@$vals) {
80 my $i = int $_ + $rem;
81 $rem += $_ - $i;
82 $_ = $i;
83 }
84}
85
86#############################################################################
87
88package CFClient::UI::Base;
89
90use strict;
91
92use SDL::OpenGL;
74 93
75sub new { 94sub new {
76 my $class = shift; 95 my $class = shift;
77 96
78 bless { 97 my $self = bless {
79 x => 0, 98 x => 0,
80 y => 0, 99 y => 0,
81 z => 0, 100 z => 0,
101 w => -1,
102 h => -1,
82 @_ 103 @_
83 }, $class 104 }, $class;
105
106 for (keys %$self) {
107 if (/^connect_(.*)$/) {
108 $self->connect ($1 => delete $self->{$_});
109 }
110 }
111
112 $self
84} 113}
85 114
86sub move { 115sub move {
87 my ($self, $x, $y, $z) = @_; 116 my ($self, $x, $y, $z) = @_;
88 $self->{x} = $x; 117 $self->{x} = int $x;
89 $self->{y} = $y; 118 $self->{y} = int $y;
90 $self->{z} = $z if defined $z; 119 $self->{z} = $z if defined $z;
91} 120}
92 121
93sub needs_redraw { 122sub needs_redraw {
94 0 123 0
97sub size_request { 126sub size_request {
98 require Carp; 127 require Carp;
99 Carp::confess "size_request is abtract"; 128 Carp::confess "size_request is abtract";
100} 129}
101 130
102sub size_allocate { 131sub _size_allocate {
103 my ($self, $w, $h) = @_; 132 my ($self, $x, $y, $w, $h) = @_;
133
134 $self->{x} = $x;
135 $self->{y} = $y;
136
137 return unless $self->{w} != $w || $self->{h} != $h;
104 138
105 $self->{w} = $w; 139 $self->{w} = $w;
106 $self->{h} = $h; 140 $self->{h} = $h;
107}
108 141
109# translate global koordinates to local coordinate system 142 1
110sub translate { 143}
144
145sub size_allocate {
146 my ($self, $x, $y, $w, $h) = @_;
147
148 $self->_size_allocate ($x, $y, $w, $h);
149}
150
151# return top left coordinates
152sub _topleft {
111 my ($self, $x, $y) = @_; 153 my ($self, $x, $y) = @_;
112 154
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y}); 155 $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
156}
157
158# translate global coordinates to local coordinate system
159sub coord2local {
160 my ($self, $x, $y) = @_;
161
162 my ($X, $Y) = $self->_topleft;
163 ($x - $X, $y - $Y)
164}
165
166# translate local coordinates to global coordinate system
167sub coord2global {
168 my ($self, $x, $y) = @_;
169
170 my ($X, $Y) = $self->_topleft;
171 ($x + $X, $y + $Y)
114} 172}
115 173
116sub focus_in { 174sub focus_in {
117 my ($self) = @_; 175 my ($self) = @_;
118 176
119 return if $FOCUS == $self; 177 return if $FOCUS == $self;
178 return unless $self->{can_focus};
120 179
121 my $focus = $FOCUS; $FOCUS = $self; 180 my $focus = $FOCUS; $FOCUS = $self;
122 $focus->update if $focus; 181 $focus->update if $focus;
123 $FOCUS->update; 182 $FOCUS->update;
124} 183}
155 return unless $self->{h} && $self->{w}; 214 return unless $self->{h} && $self->{w};
156 215
157 glPushMatrix; 216 glPushMatrix;
158 glTranslate $self->{x}, $self->{y}, 0; 217 glTranslate $self->{x}, $self->{y}, 0;
159 $self->_draw; 218 $self->_draw;
160 if ($self == $HOVER) { 219 glPopMatrix;
161 glColor 1, 1, 1, 0.4; 220
221 if ($self == $HOVER && $self->{can_hover}) {
222 my ($x, $y) = @$self{qw(x y)};
223
224 glColor 0, 0, 1, 0.2;
162 glEnable GL_BLEND; 225 glEnable GL_BLEND;
226 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
163 glBegin GL_QUADS; 227 glBegin GL_QUADS;
164 glVertex 0 , 0; 228 glVertex $x , $y;
165 glVertex $self->{w}, 0; 229 glVertex $x + $self->{w}, $y;
166 glVertex $self->{w}, $self->{h}; 230 glVertex $x + $self->{w}, $y + $self->{h};
167 glVertex 0 , $self->{h}; 231 glVertex $x , $y + $self->{h};
168 glEnd; 232 glEnd;
169 glDisable GL_BLEND; 233 glDisable GL_BLEND;
170 } 234 }
171 glPopMatrix;
172} 235}
173 236
174sub _draw { 237sub _draw {
175 my ($self) = @_; 238 my ($self) = @_;
176 239
177 warn "no draw defined for $self\n"; 240 warn "no draw defined for $self\n";
178}
179
180sub bbox {
181 my ($self) = @_;
182 my ($w, $h) = $self->size_request;
183 (
184 $self->{x},
185 $self->{y},
186 $self->{x} = $w,
187 $self->{y} = $h
188 )
189} 241}
190 242
191sub find_widget { 243sub find_widget {
192 my ($self, $x, $y) = @_; 244 my ($self, $x, $y) = @_;
193 245
196 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 248 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
197 249
198 () 250 ()
199} 251}
200 252
201sub del_parent { $_[0]->{parent} = undef }
202
203sub set_parent { 253sub set_parent {
204 my ($self, $par) = @_; 254 my ($self, $parent) = @_;
205 255
206 $self->{parent} = $par;
207 Scalar::Util::weaken $self->{parent}; 256 Scalar::Util::weaken ($self->{parent} = $parent);
208}
209
210sub get_parent {
211 $_[0]->{parent}
212} 257}
213 258
214sub update { 259sub update {
215 my ($self) = @_; 260 my ($self) = @_;
216 261
217 $self->{parent}->update 262 $self->{parent}->update
218 if $self->{parent}; 263 if $self->{parent};
219} 264}
220 265
266sub connect {
267 my ($self, $signal, $cb) = @_;
268
269 push @{ $self->{cb}{$signal} }, $cb;
270}
271
272sub emit {
273 my ($self, $signal, @args) = @_;
274
275 $_->($self, @args)
276 for @{$self->{cb}{$signal} || []};
277}
278
221sub DESTROY { 279sub DESTROY {
222 my ($self) = @_; 280 my ($self) = @_;
223 281
224 #$self->deactivate; 282 #$self->deactivate;
225} 283}
226 284
227############################################################################# 285#############################################################################
228 286
229package CFClient::Widget::DrawBG; 287package CFClient::UI::DrawBG;
230 288
231our @ISA = CFClient::Widget::; 289our @ISA = CFClient::UI::Base::;
232 290
233use strict; 291use strict;
234use SDL::OpenGL; 292use SDL::OpenGL;
235 293
236sub new { 294sub new {
237 my $class = shift; 295 my $class = shift;
238 296
239 # range [value, low, high, page] 297 # range [value, low, high, page]
240 298
241 $class->SUPER::new ( 299 $class->SUPER::new (
242 bg => [0, 0, 0, 0.4], 300 bg => [0, 0, 0, 0.2],
243 active_bg => [1, 1, 1], 301 active_bg => [1, 1, 1, 0.5],
244 @_ 302 @_
245 ) 303 )
246} 304}
247 305
248sub _draw { 306sub _draw {
249 my ($self) = @_; 307 my ($self) = @_;
250 308
251 my ($w, $h) = @$self{qw(w h)}; 309 my ($w, $h) = @$self{qw(w h)};
252 310
311 glEnable GL_BLEND;
312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
253 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 313 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
314
254 glBegin GL_QUADS; 315 glBegin GL_QUADS;
255 glVertex 0 , 0; 316 glVertex 0 , 0;
256 glVertex 0 , $h; 317 glVertex 0 , $h;
257 glVertex $w, $h; 318 glVertex $w, $h;
258 glVertex $w, 0; 319 glVertex $w, 0;
259 glEnd; 320 glEnd;
260}
261 321
262############################################################################# 322 glDisable GL_BLEND;
323}
263 324
325#############################################################################
326
264package CFClient::Widget::Empty; 327package CFClient::UI::Empty;
265 328
266our @ISA = CFClient::Widget::; 329our @ISA = CFClient::UI::Base::;
267 330
268sub size_request { 331sub size_request {
269 (0, 0) 332 (0, 0)
270} 333}
271 334
272sub draw { } 335sub draw { }
273 336
274############################################################################# 337#############################################################################
275 338
276package CFClient::Widget::Container; 339package CFClient::UI::Container;
277 340
278our @ISA = CFClient::Widget::; 341our @ISA = CFClient::UI::Base::;
279 342
280sub new { 343sub new {
281 my ($class, %arg) = @_; 344 my ($class, %arg) = @_;
282 345
283 my $children = delete $arg{children} || []; 346 my $children = delete $arg{children} || [];
287 350
288 $self 351 $self
289} 352}
290 353
291sub add { 354sub add {
292 my ($self, $chld, $expand) = @_; 355 my ($self, $child) = @_;
293 356
294 $chld->{expand} = $expand;
295 $chld->set_parent ($self); 357 $child->set_parent ($self);
358
359 use sort 'stable';
296 360
297 $self->{children} = [ 361 $self->{children} = [
298 sort { $a->{z} <=> $b->{z} } 362 sort { $a->{z} <=> $b->{z} }
299 @{$self->{children}}, $chld 363 @{$self->{children}}, $child
300 ]; 364 ];
301 365
302 $self->size_allocate ($self->{w}, $self->{h}) 366 $self->{w} = $self->{h} = -1;
303 if $self->{w}; #TODO: check for "realised state" 367 $self->update;
304} 368}
305 369
306sub remove { 370sub remove {
307 my ($self, $widget) = @_; 371 my ($self, $widget) = @_;
308 372
309 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 373 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
310 374
311 $self->size_allocate ($self->{w}, $self->{h}); 375 $self->size_allocate (0, 0, $self->{w}, $self->{h});
312} 376}
313 377
314sub find_widget { 378sub find_widget {
315 my ($self, $x, $y) = @_; 379 my ($self, $x, $y) = @_;
316 380
333 $_->draw for @{$self->{children}}; 397 $_->draw for @{$self->{children}};
334} 398}
335 399
336############################################################################# 400#############################################################################
337 401
338package CFClient::Widget::Bin; 402package CFClient::UI::Bin;
339 403
340our @ISA = CFClient::Widget::Container::; 404our @ISA = CFClient::UI::Container::;
341 405
342sub new { 406sub new {
343 my ($class, %arg) = @_; 407 my ($class, %arg) = @_;
344 408
345 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::; 409 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
346 410
347 $class->SUPER::new (children => [$child], %arg) 411 $class->SUPER::new (children => [$child], %arg)
348} 412}
349 413
350sub add { 414sub add {
358sub remove { 422sub remove {
359 my ($self, $widget) = @_; 423 my ($self, $widget) = @_;
360 424
361 $self->SUPER::remove ($widget); 425 $self->SUPER::remove ($widget);
362 426
363 $self->{children} = [new CFClient::Widget::Empty] 427 $self->{children} = [new CFClient::UI::Empty]
364 unless @{$self->{children}}; 428 unless @{$self->{children}};
365} 429}
366 430
367sub child { $_[0]->{children}[0] } 431sub child { $_[0]->{children}[0] }
368 432
369sub size_request { 433sub size_request {
370 $_[0]{children}[0]->size_request 434 $_[0]{children}[0]->size_request
371} 435}
372 436
373sub size_allocate { 437sub size_allocate {
374 my ($self, $w, $h) = @_; 438 my ($self, $x, $y, $w, $h) = @_;
375 439
376 return unless $self->{w} != $w || $self->{h} != $h; 440 $self->_size_allocate ($x, $y, $w, $h) or return;
377 441
378 $self->SUPER::size_allocate ($w, $h);
379 $self->{children}[0]->size_allocate ($w, $h); 442 $self->{children}[0]->size_allocate (0, 0, $w, $h);
380} 443}
381 444
382############################################################################# 445#############################################################################
383 446
384package CFClient::Widget::Window; 447package CFClient::UI::Window;
385 448
386our @ISA = CFClient::Widget::Bin::; 449our @ISA = CFClient::UI::Bin::;
387 450
388use SDL::OpenGL; 451use SDL::OpenGL;
389 452
390sub new { 453sub new {
391 my ($class, %arg) = @_; 454 my ($class, %arg) = @_;
402} 465}
403 466
404sub render_chld { 467sub render_chld {
405 my ($self) = @_; 468 my ($self) = @_;
406 469
407 $self->{texture} = 470 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
408 CFClient::Texture->new_from_opengl ( 471 glClearColor 0, 0, 0, 1;
409 $self->{w}, $self->{h}, sub { $self->child->draw } 472 glClear GL_COLOR_BUFFER_BIT;
410 ); 473 $self->child->draw;
474 };
411} 475}
412 476
413sub size_allocate { 477sub size_allocate {
414 my ($self, $w, $h) = @_; 478 my ($self, $x, $y, $w, $h) = @_;
415 479
416 return unless $self->{w} != $w || $self->{h} != $h; 480 $self->_size_allocate ($x, $y, $w, $h) or return;
417 481
418 $self->{w} = $w;
419 $self->{h} = $h;
420
421 $self->child->size_allocate ($w, $h); 482 $self->child->size_allocate (0, 0, $w, $h);
422 483
423 $self->render_chld; 484 $self->render_chld;
424} 485}
425 486
426sub _draw { 487sub _draw {
430 491
431 my $tex = $self->{texture} 492 my $tex = $self->{texture}
432 or return; 493 or return;
433 494
434 glEnable GL_BLEND; 495 glEnable GL_BLEND;
496 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
435 glEnable GL_TEXTURE_2D; 497 glEnable GL_TEXTURE_2D;
436 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 498 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
437 499
438 $tex->draw_quad (0, 0, $w, $h); 500 $tex->draw_quad (0, 0, $w, $h);
439 501
441 glDisable GL_TEXTURE_2D; 503 glDisable GL_TEXTURE_2D;
442} 504}
443 505
444############################################################################# 506#############################################################################
445 507
446package CFClient::Widget::Frame; 508package CFClient::UI::Frame;
447 509
448our @ISA = CFClient::Widget::Bin::; 510our @ISA = CFClient::UI::Bin::;
449 511
450use SDL::OpenGL; 512use SDL::OpenGL;
451 513
452sub size_request { 514sub size_request {
453 my ($self) = @_; 515 my ($self) = @_;
458 520
459 map { $_ + 4 } $chld->size_request; 521 map { $_ + 4 } $chld->size_request;
460} 522}
461 523
462sub size_allocate { 524sub size_allocate {
463 my ($self, $w, $h) = @_; 525 my ($self, $x, $y, $w, $h) = @_;
464 526
465 return unless $self->{w} != $w || $self->{h} != $h; 527 $self->_size_allocate ($x, $y, $w, $h) or return;
466 528
467 $self->{w} = $w;
468 $self->{h} = $h;
469
470 $self->child->size_allocate ($w - 4, $h - 4); 529 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
471 $self->child->move (2, 2);
472} 530}
473 531
474sub _draw { 532sub _draw {
475 my ($self) = @_; 533 my ($self) = @_;
476 534
489 $chld->draw; 547 $chld->draw;
490} 548}
491 549
492############################################################################# 550#############################################################################
493 551
494package CFClient::Widget::FancyFrame; 552package CFClient::UI::FancyFrame;
495 553
496our @ISA = CFClient::Widget::Bin::; 554our @ISA = CFClient::UI::Bin::;
497 555
498use SDL::OpenGL; 556use SDL::OpenGL;
499 557
500my @tex = 558my @tex =
501 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 559 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
502 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 560 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
503 561
562sub new {
563 my $class = shift;
564
565 # TODO: user_x, user_y, overwrite moveto?
566
567 $class->SUPER::new (
568 bg => [1, 1, 1, 1],
569 border_bg => [1, 1, 1, 1],
570 border => int $::FONTSIZE * 0.8,
571 @_
572 )
573}
574
504sub size_request { 575sub size_request {
505 my ($self) = @_; 576 my ($self) = @_;
506 577
578 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
579
507 my ($w, $h) = $self->SUPER::size_request; 580 my ($w, $h) = $self->SUPER::size_request;
508 581
509 $h += $tex[1]->{height}; 582 (
510 $h += $tex[4]->{height}; 583 $w + $self->{border} * 2,
511 $w += $tex[2]->{width}; 584 $h + $self->{border} * 2,
512 $w += $tex[3]->{width}; 585 )
513
514 ($w, $h)
515} 586}
516 587
517sub size_allocate { 588sub size_allocate {
518 my ($self, $w, $h) = @_; 589 my ($self, $x, $y, $w, $h) = @_;
519 590
520 return unless $self->{w} != $w || $self->{h} != $h; 591 $self->_size_allocate ($x, $y, $w, $h) or return;
521 592
522 $self->SUPER::size_allocate ($w, $h); 593 $h -= List::Util::max 0, $self->{border} * 2;
594 $w -= List::Util::max 0, $self->{border} * 2;
523 595
524 $h -= $tex[1]->{height}; 596 $self->child->size_allocate ($self->{border}, $self->{border}, $w, $h);
525 $h -= $tex[4]->{height}; 597}
526 $w -= $tex[2]->{width};
527 $w -= $tex[3]->{width};
528 598
529 $h = $h < 0 ? 0 : $h; 599sub button_down {
530 $w = $w < 0 ? 0 : $w; 600 my ($self, $ev, $x, $y) = @_;
531 601
532 my $child = $self->child; 602 if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
603 && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
533 604
534 $child->size_allocate ($w, $h); 605 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
535 $child->move ($tex[3]->{width}, $tex[1]->{height}); 606 my ($bw, $bh) = ($self->{w}, $self->{h});
607
608 $self->{motion} = sub {
609 my ($ev, $x, $y) = @_;
610
611 ($x, $y) = ($ev->motion_x, $ev->motion_y);
612
613 $self->{user_w} = $bw + $x - $ox;
614 $self->{user_h} = $bh + $y - $oy;
615 $self->update;
616 };
617
618 } elsif ($x >= 0 && $x < $self->{w}
619 && $y >= 0 && $y < $self->{border}) {
620
621 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
622 my ($bx, $by) = ($self->{x}, $self->{y});
623
624 $self->{motion} = sub {
625 my ($ev, $x, $y) = @_;
626
627 ($x, $y) = ($ev->motion_x, $ev->motion_y);
628
629 $self->move ($bx + $x - $ox, $by + $y - $oy);
630 $self->update;
631 };
632 }
633}
634
635sub button_up {
636 my ($self, $ev, $x, $y) = @_;
637
638 delete $self->{motion};
639}
640
641sub mouse_motion {
642 my ($self, $ev, $x, $y) = @_;
643
644 $self->{motion}->($ev, $x, $y) if $self->{motion};
536} 645}
537 646
538sub _draw { 647sub _draw {
539 my ($self) = @_; 648 my ($self) = @_;
540 649
541 my ($w, $h) = ($self->{w}, $self->{h}); 650 my ($w, $h ) = ($self->{w}, $self->{h});
542 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 651 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
543 652
544 glEnable GL_BLEND; 653 glEnable GL_BLEND;
654 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
545 glEnable GL_TEXTURE_2D; 655 glEnable GL_TEXTURE_2D;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
547 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
548 657
549 my $top = $tex[1]; 658 glColor @{ $self->{border_bg} };
550 $top->draw_quad (0, 0, $w, $top->{height}); 659 $tex[1]->draw_quad (0, 0, $w, $self->{border});
551 660 $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
552 my $left = $tex[3]; 661 $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
553 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 662 $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
554
555 my $right = $tex[2];
556 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
557
558 my $bottom = $tex[4];
559 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
560 663
561 my $bg = $tex[0]; 664 my $bg = $tex[0];
562 glBindTexture GL_TEXTURE_2D, $bg->{name};
563 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
564 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
565 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
566 665
666 # TODO: repeat texture not scale
567 my $rep_x = $cw / $bg->{width}; 667 my $rep_x = $cw / $bg->{w};
568 my $rep_y = $ch / $bg->{height}; 668 my $rep_y = $ch / $bg->{h};
569 669
670 glColor @{ $self->{bg} };
671
672 $bg->{s} = $rep_x;
673 $bg->{t} = $rep_y;
674 $bg->{wrap_mode} = 1;
570 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 675 $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
571 676
677 glDisable GL_TEXTURE_2D;
572 glDisable GL_BLEND; 678 glDisable GL_BLEND;
573 glDisable GL_TEXTURE_2D;
574 679
575 $self->child->draw; 680 $self->child->draw;
576
577} 681}
578 682
579############################################################################# 683#############################################################################
580 684
581package CFClient::Widget::Table; 685package CFClient::UI::Table;
582 686
583our @ISA = CFClient::Widget::Bin::; 687our @ISA = CFClient::UI::Base::;
688
689use List::Util qw(max sum);
584 690
585use SDL::OpenGL; 691use SDL::OpenGL;
586 692
693sub new {
694 my $class = shift;
695
696 $class->SUPER::new (
697 col_expand => [],
698 @_
699 )
700}
701
587sub add { 702sub add {
588 my ($self, $x, $y, $chld) = @_; 703 my ($self, $x, $y, $child) = @_;
589 my $old_chld = $self->{children}[$y][$x];
590 704
705 $child->set_parent ($self);
591 $self->{children}[$y][$x] = $chld; 706 $self->{children}[$y][$x] = $child;
592 $chld->set_parent ($self); 707
708 $self->{w} = $self->{h} = -1;
593 $self->update; 709 $self->update;
594} 710}
595 711
596sub max_row_height { 712# TODO: move to container class maybe? send childs a signal on removal?
713sub clear {
597 my ($self, $row) = @_; 714 my ($self) = @_;
598 715
599 my $hs = 0; 716 delete $self->{children};
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 717 $self->update;
718}
719
720sub get_wh {
721 my ($self) = @_;
722
723 my (@w, @h);
724
725 for my $y (0 .. $#{$self->{children}}) {
601 my $c = $self->{children}->[$row]->[$xi]; 726 my $row = $self->{children}[$y]
602 if ($c) { 727 or next;
728
729 for my $x (0 .. $#$row) {
730 my $widget = $row->[$x]
731 or next;
603 my ($w, $h) = $c->size_request; 732 my ($w, $h) = $widget->size_request;
604 if ($hs < $h) { $hs = $h } 733
734 $w[$x] = max $w[$x], $w;
735 $h[$y] = max $h[$y], $h;
605 } 736 }
606 } 737 }
607 return $hs;
608}
609 738
610sub max_col_width { 739 (\@w, \@h)
740}
741
742sub size_request {
611 my ($self, $col) = @_; 743 my ($self) = @_;
612 744
745 my ($ws, $hs) = $self->get_wh;
746
747 (
748 (sum @$ws),
749 (sum @$hs),
750 )
751}
752
753sub size_allocate {
754 my ($self, $x, $y, $w, $h) = @_;
755
756 $self->_size_allocate ($x, $y, $w, $h) or return;
757
758 my ($ws, $hs) = $self->get_wh;
759
760 my $req_w = sum @$ws;
761 my $req_h = sum @$hs;
762
763 # TODO: nicer code && do row_expand
764 my @col_expand = @{$self->{col_expand}};
765 @col_expand = (1) x @$ws unless @col_expand;
766 my $col_expand = (sum @col_expand) || 1;
767
768 # linearly scale sizes
769 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
770 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
771
772 CFClient::UI::harmonize $ws;
773 CFClient::UI::harmonize $hs;
774
775 my $y;
776
777 for my $r (0 .. $#{$self->{children}}) {
778 my $row = $self->{children}[$r]
779 or next;
780
613 my $ws = 0; 781 my $x = 0;
614 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 782 my $row_h = $hs->[$r];
615 my $c = ($self->{children}->[$yi] || [])->[$col]; 783
616 if ($c) { 784 for my $c (0 .. $#$row) {
617 my ($w, $h) = $c->size_request; 785 my $col_w = $ws->[$c];
618 if ($ws < $w) { $ws = $w } 786
787 if (my $widget = $row->[$c]) {
788 $widget->size_allocate ($x, $y, $col_w, $row_h);
789 }
790
791 $x += $col_w;
619 } 792 }
793
794 $y += $row_h;
620 } 795 }
621 return $ws; 796
622} 797}
798
799sub find_widget {
800 my ($self, $x, $y) = @_;
801
802 $x -= $self->{x};
803 $y -= $self->{y};
804
805 my $res;
806
807 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
808 $res = $_->find_widget ($x, $y)
809 and return $res;
810 }
811
812 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
813}
814
815sub _draw {
816 my ($self) = @_;
817
818 for (grep $_, @{$self->{children}}) {
819 $_->draw for grep $_, @$_;
820 }
821}
822
823#############################################################################
824
825package CFClient::UI::HBox;
826
827# TODO: wrap into common Box base class
828
829our @ISA = CFClient::UI::Container::;
623 830
624sub size_request { 831sub size_request {
625 my ($self) = @_; 832 my ($self) = @_;
626 833
834 my @alloc = map [$_->size_request], @{$self->{children}};
835
836 (
837 (List::Util::sum map $_->[0], @alloc),
838 (List::Util::max map $_->[1], @alloc),
839 )
840}
841
842sub size_allocate {
843 my ($self, $x, $y, $w, $h) = @_;
844
845 $self->_size_allocate ($x, $y, $w, $h);
846
627 my ($hs, $ws) = (0, 0); 847 ($h, $w) = ($w, $h);
628 848
629 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 849 my $children = $self->{children};
630 $hs += $self->max_row_height ($yi);
631 }
632 850
633 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 851 my @h = map +($_->size_request)[0], @$children;
634 my $wm = 0; 852
635 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 853 my $req_h = List::Util::sum @h;
636 $wm += $self->max_col_width ($xi) 854
855 if ($req_h > $h) {
856 # ah well, not enough space
857 $_ *= $h / $req_h for @h;
858 } else {
859 my $exp = List::Util::sum map $_->{expand}, @$children;
860 $exp ||= 1;
861
862 for (0 .. $#$children) {
863 my $child = $children->[$_];
864
865 my $alloc_h = $h[$_];
866 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
867 $h[$_] = $alloc_h;
637 } 868 }
638 if ($ws < $wm) { $ws = $wm }
639 } 869 }
640 870
641 return ($ws, $hs); 871 CFClient::UI::harmonize \@h;
642}
643
644sub _draw {
645 my ($self) = @_;
646 872
647 my $y = 0; 873 my $y = 0;
648 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 874 for (0 .. $#$children) {
875 my $child = $children->[$_];
649 my $x = 0; 876 my $h = $h[$_];
877 $child->size_allocate ($y, 0, $h, $w);
650 878
651 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 879 $y += $h;
652
653 my $c = $self->{children}->[$yi]->[$xi];
654 if ($c) {
655 $c->move ($x, $y, 0); #TODO: Move to size_request
656 $c->draw if $c;
657 }
658
659 $x += $self->max_col_width ($xi);
660 }
661
662 $y += $self->max_row_height ($yi);
663 } 880 }
664} 881}
665 882
666############################################################################# 883#############################################################################
667 884
668package CFClient::Widget::VBox; 885package CFClient::UI::VBox;
669 886
887# TODO: wrap into common Box base class
888
670our @ISA = CFClient::Widget::Container::; 889our @ISA = CFClient::UI::Container::;
671
672use SDL::OpenGL;
673 890
674sub size_request { 891sub size_request {
675 my ($self) = @_; 892 my ($self) = @_;
676 893
677 my @alloc = map [$_->size_request], @{$self->{children}}; 894 my @alloc = map [$_->size_request], @{$self->{children}};
681 (List::Util::sum map $_->[1], @alloc), 898 (List::Util::sum map $_->[1], @alloc),
682 ) 899 )
683} 900}
684 901
685sub size_allocate { 902sub size_allocate {
686 my ($self, $w, $h) = @_; 903 my ($self, $x, $y, $w, $h) = @_;
687 904
688 return unless $self->{w} != $w || $self->{h} != $h; 905 $self->_size_allocate ($x, $y, $w, $h);
689
690 $self->{w} = $w;
691 $self->{h} = $h;
692
693 return unless $self->{h};
694 906
695 my $children = $self->{children}; 907 my $children = $self->{children};
696 908
697 my @h = map +($_->size_request)[1], @$children; 909 my @h = map +($_->size_request)[1], @$children;
698 910
699 my $req_h = List::Util::sum @h; 911 my $req_h = List::Util::sum @h;
700 912
701 if ($req_h > $h) { 913 if ($req_h > $h) {
702 # ah well, not enough space 914 # ah well, not enough space
703 $_ = $h[$_] * $h / $req_h for @h; 915 $_ *= $h / $req_h for @h;
704 } else { 916 } else {
705 my @exp = grep $_->{expand}, @$children; 917 my $exp = List::Util::sum map $_->{expand}, @$children;
706 @exp = @$children unless @exp; 918 $exp ||= 1;
707 919
708 my %exp = map +($_ => 1), @exp;
709
710 for (0 .. $#$children) { 920 for (0 .. $#$children) {
711 my $child = $children->[$_]; 921 my $child = $children->[$_];
712 922
713 my $alloc_h = $h[$_]; 923 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
714 $alloc_h += ($h - $req_h) / @exp if $exp{$child};
715 $h[$_] = $alloc_h;
716 } 924 }
717 } 925 }
926
927 CFClient::UI::harmonize \@h;
718 928
719 my $y = 0; 929 my $y = 0;
720 for (0 .. $#$children) { 930 for (0 .. $#$children) {
721 my $child = $children->[$_]; 931 my $child = $children->[$_];
722 my $h = $h[$_]; 932 my $h = $h[$_];
723 $child->move (0, $y);
724 $child->size_allocate ($w, $h); 933 $child->size_allocate (0, $y, $w, $h);
725 934
726 $y += $h; 935 $y += $h;
727 } 936 }
728} 937}
729 938
730############################################################################# 939#############################################################################
731 940
732package CFClient::Widget::Label; 941package CFClient::UI::Label;
733 942
734our @ISA = CFClient::Widget::; 943our @ISA = CFClient::UI::Base::;
735 944
736use SDL::OpenGL; 945use SDL::OpenGL;
737 946
738sub new { 947sub new {
739 my ($class, %arg) = @_; 948 my ($class, %arg) = @_;
740 949
741 my $self = $class->SUPER::new ( 950 my $self = $class->SUPER::new (
742 fg => [1, 1, 1], 951 fg => [1, 1, 1],
743 height => $::FONTSIZE, 952 fontsize => $::FONTSIZE,
744 text => "", 953 text => "",
954 align => -1,
955 valign => -1,
956 padding => 2,
745 layout => new CFClient::Layout, 957 layout => new CFClient::Layout,
746 %arg 958 %arg
747 ); 959 );
748 960
749 $self->set_text ($self->{text}); 961 $self->set_text ($self->{text});
750 962
766 978
767 $self->{text} = $text; 979 $self->{text} = $text;
768 $self->{layout}->set_markup ($text); 980 $self->{layout}->set_markup ($text);
769 981
770 delete $self->{texture}; 982 delete $self->{texture};
983# $self->{w} = $self->{h} = -1;
771 $self->update; 984 $self->update;
772} 985}
773 986
774sub get_text { 987sub get_text {
775 my ($self, $text) = @_; 988 my ($self, $text) = @_;
779 992
780sub size_request { 993sub size_request {
781 my ($self) = @_; 994 my ($self) = @_;
782 995
783 $self->{layout}->set_width; 996 $self->{layout}->set_width;
784 $self->{layout}->set_height ($self->{height}); 997 $self->{layout}->set_height ($self->{fontsize});
785 $self->{layout}->size 998 my ($w, $h) = $self->{layout}->size;
786# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 999
787# ( 1000 (
788# $self->{texture}{width}, 1001 $w + $self->{padding} * 2,
789# $self->{texture}{height}, 1002 $h + $self->{padding} * 2,
790# ) 1003 )
791# } else {
792# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
793#
794# ($w, $h)
795# }
796} 1004}
797 1005
798sub size_allocate { 1006sub size_allocate {
799 my ($self, $w, $h) = @_; 1007 my ($self, $x, $y, $w, $h) = @_;
800 1008
801 return unless $self->{w} != $w || $self->{h} != $h; 1009 $self->_size_allocate ($x, $y, $w, $h) or return;
802 1010
803 $self->SUPER::size_allocate ($w, $h);
804 delete $self->{texture}; 1011 delete $self->{texture};
805} 1012}
806 1013
807sub update { 1014sub update {
808 my ($self) = @_; 1015 my ($self) = @_;
814sub _draw { 1021sub _draw {
815 my ($self) = @_; 1022 my ($self) = @_;
816 1023
817 my $tex = $self->{texture} ||= do { 1024 my $tex = $self->{texture} ||= do {
818 $self->{layout}->set_width ($self->{w}); 1025 $self->{layout}->set_width ($self->{w});
1026 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
819 new_from_layout CFClient::Texture $self->{layout}; 1027 new_from_layout CFClient::Texture $self->{layout}
820 }; 1028 };
821 1029
822 glEnable GL_BLEND; 1030 glEnable GL_BLEND;
1031 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
823 glEnable GL_TEXTURE_2D; 1032 glEnable GL_TEXTURE_2D;
824 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
825 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1033 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
826 1034
827 glColor @{$self->{fg}}; 1035 glColor @{$self->{fg}};
828 1036
1037 my $x =
1038 $self->{align} < 0 ? $self->{padding}
1039 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1040 : ($self->{w} - $tex->{w}) * 0.5;
1041
1042 my $y =
1043 $self->{valign} < 0 ? $self->{padding}
1044 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1045 : ($self->{h} - $tex->{h}) * 0.5;
1046
829 $tex->draw_quad (0, 0); 1047 $tex->draw_quad (int $x, int $y);
830 1048
1049 glDisable GL_TEXTURE_2D;
831 glDisable GL_BLEND; 1050 glDisable GL_BLEND;
832 glDisable GL_TEXTURE_2D;
833} 1051}
834 1052
835############################################################################# 1053#############################################################################
836 1054
837package CFClient::Widget::Entry; 1055package CFClient::UI::Entry;
838 1056
839our @ISA = CFClient::Widget::Label::; 1057our @ISA = CFClient::UI::Label::;
840 1058
841use SDL; 1059use SDL;
842use SDL::OpenGL; 1060use SDL::OpenGL;
843 1061
844sub new { 1062sub new {
845 my $class = shift; 1063 my $class = shift;
846 1064
847 $class->SUPER::new ( 1065 $class->SUPER::new (
848 fg => [1, 1, 1], 1066 fg => [1, 1, 1],
849 bg => [0, 0, 0, 0.4], 1067 bg => [0, 0, 0, 0.2],
850 active_bg => [1, 1, 1], 1068 active_bg => [1, 1, 1, 0.5],
851 active_fg => [0, 0, 0], 1069 active_fg => [0, 0, 0],
1070 can_hover => 1,
1071 can_focus => 1,
1072 valign => 0,
852 @_ 1073 @_
853 ) 1074 )
854} 1075}
855 1076
856sub _set_text { 1077sub _set_text {
857 my ($self, $text) = @_; 1078 my ($self, $text) = @_;
858 1079
1080 my $old_text = $self->{text};
1081
859 $self->{last_activity} = $::NOW; 1082 $self->{last_activity} = $::NOW;
860 1083
861 $self->{text} = $text; 1084 $self->{text} = $text;
862 $self->{layout}->set_width ($self->{w}); 1085 $self->{layout}->set_width ($self->{w});
1086 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
1087
1088 $text =~ s/./*/g if $self->{hidden};
1089
863 $self->{layout}->set_markup ($self->escape_text ($text)); 1090 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
864 1091
865 $text = substr $text, 0, $self->{cursor}; 1092 $text = substr $text, 0, $self->{cursor};
866 utf8::encode $text; 1093 utf8::encode $text;
867 1094
868 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text); 1095 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1096
1097 $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
1098 if $old_text ne $self->{text};
869} 1099}
870 1100
871sub size_request { 1101sub size_request {
872 my ($self) = @_; 1102 my ($self) = @_;
873 1103
875 1105
876 ($w + 1, $h) # add 1 for cursor 1106 ($w + 1, $h) # add 1 for cursor
877} 1107}
878 1108
879sub size_allocate { 1109sub size_allocate {
880 my ($self, $w, $h) = @_; 1110 my ($self, $x, $y, $w, $h) = @_;
881 1111
882 return unless $self->{w} != $w || $self->{h} != $h;
883
884 $self->SUPER::size_allocate ($w, $h); 1112 $self->SUPER::size_allocate ($x, $y, $w, $h);
885 1113
886 $self->_set_text ($self->{text}); 1114 $self->_set_text ($self->{text});
887} 1115}
888 1116
889sub set_text { 1117sub set_text {
910 substr $text, $self->{cursor}, 1, ""; 1138 substr $text, $self->{cursor}, 1, "";
911 } elsif ($sym == SDLK_LEFT) { 1139 } elsif ($sym == SDLK_LEFT) {
912 --$self->{cursor} if $self->{cursor}; 1140 --$self->{cursor} if $self->{cursor};
913 } elsif ($sym == SDLK_RIGHT) { 1141 } elsif ($sym == SDLK_RIGHT) {
914 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1142 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1143 } elsif ($sym == SDLK_HOME) {
1144 $self->{cursor} = 0;
1145 } elsif ($sym == SDLK_END) {
1146 $self->{cursor} = length $text;
1147 } elsif ($sym == SDLK_ESCAPE) {
1148 $self->emit ('escape');
915 } elsif ($uni) { 1149 } elsif ($uni) {
916 substr $text, $self->{cursor}++, 0, chr $uni; 1150 substr $text, $self->{cursor}++, 0, chr $uni;
917 } 1151 }
918 1152
919 $self->_set_text ($text); 1153 $self->_set_text ($text);
934 $self->SUPER::button_down ($ev, $x, $y); 1168 $self->SUPER::button_down ($ev, $x, $y);
935 1169
936 my $idx = $self->{layout}->xy_to_index ($x, $y); 1170 my $idx = $self->{layout}->xy_to_index ($x, $y);
937 1171
938 # byte-index to char-index 1172 # byte-index to char-index
939 my $text = $self->{layout}; 1173 my $text = $self->{text};
940 utf8::encode $text; 1174 utf8::encode $text;
941 $self->{cursor} = length substr $text, 0, $idx; 1175 $self->{cursor} = length substr $text, 0, $idx;
942 1176
943 $self->_set_text ($self->{text}); 1177 $self->_set_text ($self->{text});
944 $self->update; 1178 $self->update;
959 $self->{fg} = $self->{active_fg}; 1193 $self->{fg} = $self->{active_fg};
960 } else { 1194 } else {
961 glColor @{$self->{bg}}; 1195 glColor @{$self->{bg}};
962 } 1196 }
963 1197
1198 glEnable GL_BLEND;
1199 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
964 glBegin GL_QUADS; 1200 glBegin GL_QUADS;
965 glVertex 0 , 0; 1201 glVertex 0 , 0;
966 glVertex 0 , $self->{h}; 1202 glVertex 0 , $self->{h};
967 glVertex $self->{w}, $self->{h}; 1203 glVertex $self->{w}, $self->{h};
968 glVertex $self->{w}, 0; 1204 glVertex $self->{w}, 0;
969 glEnd; 1205 glEnd;
1206 glDisable GL_BLEND;
970 1207
971 $self->SUPER::_draw; 1208 $self->SUPER::_draw;
972 1209
973 #TODO: force update every cursor change :( 1210 #TODO: force update every cursor change :(
974 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) { 1211 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
978 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h}; 1215 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
979 glEnd; 1216 glEnd;
980 } 1217 }
981} 1218}
982 1219
983############################################################################# 1220package CFClient::UI::LineEntry;
984 1221
985package CFClient::Widget::Slider; 1222our @ISA = CFClient::UI::Entry::;
986 1223
987use strict; 1224use SDL;
988
989use SDL::OpenGL; 1225use SDL::OpenGL;
990use SDL::OpenGL::Constants;
991 1226
992our @ISA = CFClient::Widget::DrawBG::; 1227sub key_down {
993
994sub size_request {
995 my ($self) = @_; 1228 my ($self, $ev) = @_;
996 1229
997 my $w = 20; 1230 my $sym = $ev->key_sym;
998 my $h = 10;
999 1231
1000 $self->{vertical} ? ($h, $w) : ($w, $h) 1232 if ($sym == SDLK_RETURN) {
1233 $self->emit (activate => $self->get_text);
1234 $self->update;
1235
1236 } else {
1237 $self->SUPER::key_down ($ev);
1238 }
1239
1001} 1240}
1241
1242#############################################################################
1243
1244package CFClient::UI::Button;
1245
1246our @ISA = CFClient::UI::Label::;
1247
1248use SDL;
1249use SDL::OpenGL;
1250
1251my @tex =
1252 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1253 qw(b1_button_active.png);
1002 1254
1003sub new { 1255sub new {
1004 my $class = shift; 1256 my $class = shift;
1005 1257
1258 $class->SUPER::new (
1259 padding => 4,
1260 fg => [1, 1, 1],
1261 bg => [1, 1, 1, 0.2],
1262 active_fg => [1, 1, 0],
1263 can_hover => 1,
1264 @_
1265 )
1266}
1267
1268sub button_up {
1269 my ($self, $ev, $x, $y) = @_;
1270
1271 if ($x >= 0 && $x < $self->{w}
1272 && $y >= 0 && $y < $self->{h}) {
1273 $self->emit ("activate");
1274 }
1275}
1276
1277sub _draw {
1278 my ($self) = @_;
1279
1280 local $self->{fg} = $self->{fg};
1281 my $tex = $tex[0];
1282
1283 glEnable GL_BLEND;
1284 glEnable GL_TEXTURE_2D;
1285 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1286
1287 if ($GRAB == $self) {
1288 $self->{fg} = $self->{active_fg};
1289 }
1290
1291 glBindTexture GL_TEXTURE_2D, $tex->{name};
1292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1293
1294 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
1295
1296 glDisable GL_TEXTURE_2D;
1297 glDisable GL_BLEND;
1298
1299 $self->SUPER::_draw;
1300}
1301
1302#############################################################################
1303
1304package CFClient::UI::CheckBox;
1305
1306our @ISA = CFClient::UI::DrawBG::;
1307
1308my @tex =
1309 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1310 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1311
1312use SDL;
1313use SDL::OpenGL;
1314
1315sub new {
1316 my $class = shift;
1317
1318 $class->SUPER::new (
1319 padding => 2,
1320 fg => [1, 1, 1],
1321 active_fg => [1, 1, 0],
1322 state => 0,
1323 can_hover => 1,
1324 @_
1325 )
1326}
1327
1328sub size_request {
1329 my ($self) = @_;
1330
1331 ($self->{padding} * 2 + 6) x 2
1332}
1333
1334sub size_allocate {
1335 my ($self, $x, $y, $w, $h) = @_;
1336
1337 $self->_size_allocate ($x, $y, $w, $h);
1338}
1339
1340sub button_down {
1341 my ($self, $ev, $x, $y) = @_;
1342
1343 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1344 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1345 $self->{state} = !$self->{state};
1346 $self->emit (changed => $self->{state});
1347 }
1348}
1349
1350sub _draw {
1351 my ($self) = @_;
1352
1353 $self->SUPER::_draw;
1354
1355 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1356
1357 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1358
1359 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1360
1361 glEnable GL_BLEND;
1362 glEnable GL_TEXTURE_2D;
1363 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1364
1365 my $tex = $self->{state} ? $tex[1] : $tex[0];
1366
1367 $tex->draw_quad (0, 0, $s, $s);
1368
1369 glDisable GL_TEXTURE_2D;
1370 glDisable GL_BLEND;
1371}
1372
1373#############################################################################
1374
1375package CFClient::UI::Slider;
1376
1377use strict;
1378
1379use SDL::OpenGL;
1380
1381our @ISA = CFClient::UI::DrawBG::;
1382
1383my @tex =
1384 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1385 qw(s1_slider.png s1_slider_bg.png);
1386
1387sub new {
1388 my $class = shift;
1389
1006 # range [value, low, high, page] 1390 # range [value, low, high, page]
1007 1391
1392 # TODO: 0-width page
1393 # TODO: req_w/h are wrong with vertical
1394 # TODO: calculations are off
1008 $class->SUPER::new ( 1395 my $self = $class->SUPER::new (
1009 fg => [1, 1, 1], 1396 fg => [1, 1, 1],
1010 active_fg => [0, 0, 0], 1397 active_fg => [0, 0, 0],
1011 range => [0, 0, 100, 10], 1398 range => [0, 0, 100, 10],
1399 req_w => 40,
1400 req_h => 13,
1012 vertical => 0, 1401 vertical => 0,
1402 can_hover => 1,
1403 inner_pad => 5,
1013 @_ 1404 @_
1014 ) 1405 );
1406
1407 $self
1408}
1409
1410sub size_request {
1411 my ($self) = @_;
1412
1413 my $w = $self->{req_w};
1414 my $h = $self->{req_h};
1415
1416 $self->{vertical} ? ($h, $w) : ($w, $h)
1015} 1417}
1016 1418
1017sub button_down { 1419sub button_down {
1018 my ($self, $ev, $x, $y) = @_; 1420 my ($self, $ev, $x, $y) = @_;
1019 1421
1025 my ($self, $ev, $x, $y) = @_; 1427 my ($self, $ev, $x, $y) = @_;
1026 1428
1027 if ($GRAB == $self) { 1429 if ($GRAB == $self) {
1028 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1430 my ($value, $lo, $hi, $page) = @{$self->{range}};
1029 1431
1432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1433
1434 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1435 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1436
1437 $x -= $inner_pad_px; # substract the padding
1030 $x = $x * ($hi - $lo) / $self->{w} + $lo; 1438 $x = $x * ($hi - $lo) / $inner_w + $lo;
1031 $x = $lo if $x < $lo; 1439 $x = $lo if $x < $lo;
1032 $x = $hi - $page if $x > $hi - $page; 1440 $x = $hi - $page if $x > $hi - $page;
1033 $self->{range}[0] = $x; 1441 $self->{range}[0] = $x;
1034 1442
1035 $self->{changed}($x) if $self->{changed}; 1443 $self->emit (changed => $x);
1036 $self->update; 1444 $self->update;
1037 } 1445 }
1038} 1446}
1039 1447
1448# the inner_* stuff is for generating a padding for the slider handle,
1449# so that the handle doesn't leave the texture. This calculation isn't 100%
1450# correct propably, but it does the job for now
1451sub _calc_inner_pad_px {
1452 my ($self, $w) = @_;
1453 ($w / 100) * $self->{inner_pad} # % to pixels
1454}
1455
1040sub _draw { 1456sub _draw {
1041 my ($self) = @_; 1457 my ($self) = @_;
1042 1458
1043 $self->SUPER::_draw (); 1459 $self->SUPER::_draw ();
1044
1045 glPushMatrix;
1046 1460
1047 my ($w, $h) = @$self{qw(w h)}; 1461 my ($w, $h) = @$self{qw(w h)};
1048 1462
1049 if ($self->{vertical}) { 1463 if ($self->{vertical}) {
1050 # draw a vertical slider like a rotated horizontal slider 1464 # draw a vertical slider like a rotated horizontal slider
1051 1465
1052 glTranslate 0, $self->{w};
1053 glRotate 90, 0, 0, 1; 1466 glRotate 90, 0, 0, 1;
1467 glTranslate 0, -$self->{w}, 0;
1054 1468
1055 ($w, $h) = ($h, $w); 1469 ($w, $h) = ($h, $w);
1056 } 1470 }
1057 1471
1058 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 1472 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1059 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 1473 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1060 1474
1061 my ($value, $lo, $hi, $page) = @{$self->{range}}; 1475 my ($value, $lo, $hi, $page) = @{$self->{range}};
1062 1476
1477 $hi = $value + 1 if $lo == $hi;
1478
1479 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1480 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1481
1063 $page = int $page * $w / ($hi - $lo); 1482 $page = int $page * $inner_w / ($hi - $lo);
1064 $value = int +($value - $lo) * $w / ($hi - $lo); 1483 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1065 1484
1066 $w -= $page; 1485 $w -= $page;
1067 $page &= ~1; 1486 $page &= ~1;
1068 glTranslate $page * 0.5, 0, 0; 1487 glTranslate $page * 0.5, 0, 0;
1488 $page ||= 2;
1069 1489
1070 glColor @$fg;
1071 glBegin GL_LINES;
1072 glVertex 0, 0; glVertex 0, $h;
1073 glVertex $w - 1, 0; glVertex $w - 1, $h;
1074 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1075 glEnd;
1076
1077 my $knob_a = $value - $page * 0.5; 1490 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1078 my $knob_b = $value + $page * 0.5; 1491 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1079 1492
1080 glBegin GL_QUADS; 1493 glEnable GL_BLEND;
1081 glColor @$fg; 1494 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1082 glVertex $knob_a, 0; 1495 glEnable GL_TEXTURE_2D;
1083 glVertex $knob_a, $h; 1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1084 glVertex $knob_b, $h;
1085 glVertex $knob_b, 0;
1086 1497
1087 if ($knob_a < $knob_b - 2) { 1498 # draw background
1088 glColor @$bg; 1499 $tex[1]->draw_quad (0, 0, $w, $h);
1089 glVertex $knob_a + 1, 1; 1500
1090 glVertex $knob_a + 1, $h - 1; 1501 # draw handle
1091 glVertex $knob_b - 1, $h - 1; 1502 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
1092 glVertex $knob_b - 1, 1; 1503
1504 glDisable GL_BLEND;
1505 glDisable GL_TEXTURE_2D;
1506}
1507
1508#############################################################################
1509
1510package CFClient::UI::TextView;
1511
1512our @ISA = CFClient::UI::HBox::;
1513
1514use SDL::OpenGL;
1515
1516sub new {
1517 my $class = shift;
1518
1519 my $self = $class->SUPER::new (
1520 req_w => $::WIDTH / 6,
1521 req_h => $::HEIGHT / 6,
1522 fontsize => $::FONTSIZE,
1523 @_,
1524
1525 layout => (new CFClient::Layout),
1526 par => [],
1527 height => 0,
1528 children => [
1529 (new CFClient::UI::Empty expand => 1),
1530 (new CFClient::UI::Slider vertical => 1),
1531 ],
1532 );
1533
1534 $self->{children}[1]->connect (changed => sub {
1535 $self->update;
1536 });
1537
1538 $self
1539}
1540
1541sub set_fontsize {
1542 my ($self, $fontsize) = @_;
1543
1544 $self->{fontsize} = $fontsize;
1545 $self->reflow;
1546}
1547
1548sub text_height {
1549 my ($self, $text) = @_;
1550
1551 my $layout = $self->{layout};
1552
1553 $layout->set_height ($self->{fontsize});
1554 $layout->set_width ($self->{w});
1555 $layout->set_text ($text);
1093 } 1556
1094 glEnd; 1557 ($layout->size)[1]
1095
1096 glPopMatrix;
1097} 1558}
1098 1559
1099############################################################################# 1560sub reflow {
1561 my ($self) = @_;
1100 1562
1563 $self->{need_reflow}++;
1564 $self->update;
1565}
1566
1567sub size_request {
1568 my ($self) = @_;
1569
1570 ($self->{req_w}, $self->{req_h})
1571}
1572
1573sub size_allocate {
1574 my ($self, $x, $y, $w, $h) = @_;
1575
1576 $self->SUPER::size_allocate ($x, $y, $w, $h);
1577
1578 $self->{layout}->set_height ($self->{fontsize});
1579 $self->{layout}->set_width ($self->{w});
1580
1581 $self->reflow;
1582}
1583
1584sub add_paragraph {
1585 my ($self, $color, $text) = @_;
1586
1587 #TODO: intelligently "reformat" paragraph
1588
1589 my $height = $self->text_height ($text);
1590
1591 $self->{height} += $height;
1592
1593 push @{$self->{par}}, [$height, $color, $text];
1594
1595 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
1596 $self->{children}[1]->update;
1597}
1598
1599sub update {
1600 my ($self) = @_;
1601
1602 $self->SUPER::update;
1603
1604 return unless $self->{h} > 0;
1605
1606 delete $self->{texture};
1607
1608 $ROOT->on_refresh ($self, sub {
1609 if (delete $self->{need_reflow}) {
1610 my $height = 0;
1611
1612 $height += $_->[0] = $self->text_height ($_->[2])
1613 for @{$self->{par}};
1614
1615 $self->{height} = $height;
1616
1617 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
1618
1619 delete $self->{texture};
1620 }
1621
1622 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
1623 glClearColor 0, 0, 0, 1;
1624 glClear GL_COLOR_BUFFER_BIT;
1625
1626 glEnable GL_BLEND;
1627 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1628 glEnable GL_TEXTURE_2D;
1629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1630
1631 my $top = int $self->{children}[1]{range}[0];
1632
1633 my $y0 = $top;
1634 my $y1 = $top + $self->{h};
1635
1636 my $y = 0;
1637
1638 my $layout = $self->{layout};
1639
1640 for my $par (@{$self->{par}}) {
1641 my $h = $par->[0];
1642
1643 if ($y0 < $y + $h && $y < $y1) {
1644 $layout->set_text ($par->[2]);
1645
1646 glColor @{ $par->[1] };
1647 my ($W, $H) = $layout->size;
1648 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
1649 }
1650
1651 $y += $h;
1652 }
1653
1654 glDisable GL_TEXTURE_2D;
1655 glDisable GL_BLEND;
1656 };
1657 });
1658}
1659
1660sub _draw {
1661 my ($self) = @_;
1662
1663 if ($self->{texture}) {
1664 glEnable GL_TEXTURE_2D;
1665 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1666 $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
1667 glDisable GL_TEXTURE_2D;
1668 }
1669
1670 $self->{children}[1]->draw;
1671
1672}
1673
1674#############################################################################
1675
1101package CFClient::Widget::MapWidget; 1676package CFClient::UI::MapWidget;
1102 1677
1103use strict; 1678use strict;
1104 1679
1105use List::Util qw(min max); 1680use List::Util qw(min max);
1106 1681
1107use SDL; 1682use SDL;
1108use SDL::OpenGL; 1683use SDL::OpenGL;
1109use SDL::OpenGL::Constants;
1110 1684
1111our @ISA = CFClient::Widget::; 1685our @ISA = CFClient::UI::Base::;
1112 1686
1113sub new { 1687sub new {
1114 my $class = shift; 1688 my $class = shift;
1115 1689
1116 $class->SUPER::new ( 1690 $class->SUPER::new (
1117 z => -1, 1691 z => -1,
1692 can_focus => 1,
1118 list => (glGenLists 1), 1693 list => (glGenLists 1),
1119 @_ 1694 @_
1120 ) 1695 )
1121} 1696}
1122 1697
1123sub key_down { 1698sub key_down {
1125} 1700}
1126 1701
1127sub key_up { 1702sub key_up {
1128} 1703}
1129 1704
1705sub button_down {
1706 my ($self, $ev, $x, $y) = @_;
1707
1708 $self->focus_in;
1709
1710 if ($ev->button == 2) {
1711 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
1712 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
1713
1714 $self->{motion} = sub {
1715 my ($ev, $x, $y) = @_;
1716
1717 ($x, $y) = ($ev->motion_x, $ev->motion_y);
1718
1719 $::CFG->{map_shift_x} = $bw + $x - $ox;
1720 $::CFG->{map_shift_y} = $bh + $y - $oy;
1721
1722 $self->update;
1723 };
1724 }
1725}
1726
1727sub button_up {
1728 my ($self, $ev, $x, $y) = @_;
1729
1730 delete $self->{motion};
1731}
1732
1733sub mouse_motion {
1734 my ($self, $ev, $x, $y) = @_;
1735
1736 $self->{motion}->($ev, $x, $y) if $self->{motion};
1737}
1738
1130sub size_request { 1739sub size_request {
1131 ( 1740 (
1132 1 + int $::WIDTH / 32, 1741 1 + 32 * int $::WIDTH / 32,
1133 1 + int $::HEIGHT / 32, 1742 1 + 32 * int $::HEIGHT / 32,
1134 ) 1743 )
1135} 1744}
1136 1745
1137sub update { 1746sub update {
1138 my ($self) = @_; 1747 my ($self) = @_;
1139 1748
1140 $self->{need_update} = 1; 1749 $self->{need_update} = 1;
1750 $self->SUPER::update;
1141} 1751}
1142 1752
1143sub _draw { 1753sub draw {
1144 my ($self) = @_; 1754 my ($self) = @_;
1145 1755
1146 if (delete $self->{need_update}) { 1756 if (delete $self->{need_update}) {
1147 glNewList $self->{list}, GL_COMPILE; 1757 glNewList $self->{list}, GL_COMPILE;
1148 1758
1149 my $mx = $::CONN->{mapx}; 1759 if ($::MAP) {
1150 my $my = $::CONN->{mapy};
1151
1152 my $map = $::CONN->{map};
1153
1154 my ($xofs, $yofs);
1155
1156 my $sw = 1 + int $::WIDTH / 32; 1760 my $sw = int $::WIDTH / 32;
1157 my $sh = 1 + int $::HEIGHT / 32; 1761 my $sh = int $::HEIGHT / 32;
1158 1762
1159 if ($::CONN->{mapw} > $sw) { 1763 my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
1160 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1764 my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
1161 } else { 1765
1162 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1766 glTranslate $sx0 - 32, $sy0 - 32, 0;
1767
1768 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
1769
1770 if ($::CFG->{fow_enable}) {
1771 if ($::CFG->{fow_smooth}) { # smooth fog of war
1772 glConvolutionParameter GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER;
1773 glConvolutionFilter2D
1774 GL_CONVOLUTION_2D,
1775 GL_ALPHA,
1776 3, 3,
1777 GL_ALPHA, GL_FLOAT,
1778 pack "f*",
1779 0.1, 0.1, 0.1,
1780 0.1, 0.2, 0.1,
1781 0.1, 0.1, 0.1,
1782 ;
1783 glEnable GL_CONVOLUTION_2D;
1784 }
1785
1786 $self->{fow_texture} = new CFClient::Texture
1787 w => $w,
1788 h => $h,
1789 data => $data,
1790 internalformat => GL_ALPHA,
1791 format => GL_ALPHA;
1792
1793 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1794
1795 glEnable GL_BLEND;
1796 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1797 glEnable GL_TEXTURE_2D;
1798 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1799
1800 glColor +($::CFG->{fow_intensity}) x 3, 1;
1801 $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
1802
1803 glDisable GL_TEXTURE_2D;
1804 glDisable GL_BLEND;
1805 }
1806
1807 # HACK BEGIN
1808 {
1809 glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
1810 my ($w, $h) = (250, 250);
1811
1812 glEnable GL_BLEND;
1813 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1814 glEnable GL_TEXTURE_2D;
1815 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1816
1817 $self->{mapmap_texture} =
1818 new CFClient::Texture
1819 w => $w,
1820 h => $h,
1821 data => $::MAP->mapmap ($w, $h),
1822 type => GL_UNSIGNED_INT_8_8_8_8_REV;
1823
1824 $self->{mapmap_texture}->draw_quad (100, 100);
1825
1826 glDisable GL_TEXTURE_2D;
1827 glDisable GL_BLEND;
1828 }
1829 # HACK END
1163 } 1830 }
1164 1831
1165 if ($::CONN->{maph} > $sh) {
1166 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
1167 } else {
1168 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
1169 }
1170
1171 glEnable GL_TEXTURE_2D;
1172 glEnable GL_BLEND;
1173 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1174
1175 my $sw4 = ($sw + 3) & ~3;
1176 my $darkness = "\x00" x ($sw4 * $sh);
1177
1178 for my $x (0 .. $sw - 1) {
1179 my $row = $map->[$x + $xofs];
1180 for my $y (0 .. $sh - 1) {
1181
1182 my $cell = $row->[$y + $yofs]
1183 or next;
1184
1185 my $dark = $cell->[0];
1186 if ($dark < 0) {
1187 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1188 } else {
1189 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
1190 }
1191
1192 for my $num (grep $_, @$cell[1,2,3]) {
1193 my $tex = $::CONN->{face}[$num]{texture} || next;
1194
1195 my $w = $tex->{width};
1196 my $h = $tex->{height};
1197
1198 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
1199 }
1200 }
1201 }
1202
1203# if (1) { # higher quality darkness
1204# $lighting =~ s/(.)/$1$1$1/gs;
1205# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
1206#
1207# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
1208#
1209# $lighting = $pb->get_pixels;
1210# $lighting =~ s/(.)../$1/gs;
1211# }
1212
1213 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1215
1216 $darkness = new CFClient::Texture
1217 width => $sw4,
1218 height => $sh,
1219 data => $darkness,
1220 internalformat => GL_ALPHA,
1221 format => GL_ALPHA;
1222
1223 glColor 0.45, 0.45, 0.45, 1;
1224 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
1225
1226 glDisable GL_TEXTURE_2D;
1227 glDisable GL_BLEND;
1228
1229 glEndList; 1832 glEndList;
1230 } 1833 }
1231 1834
1835 glPushMatrix;
1232 glCallList $self->{list}; 1836 glCallList $self->{list};
1837 glPopMatrix;
1838
1839 if ($FOCUS != $self) {
1840 glColor 64/255, 64/255, 64/255;
1841 glLogicOp GL_AND;
1842 glEnable GL_COLOR_LOGIC_OP;
1843 glBegin GL_QUADS;
1844 glVertex 0, 0;
1845 glVertex 0, $::HEIGHT;
1846 glVertex $::WIDTH, $::HEIGHT;
1847 glVertex $::WIDTH, 0;
1848 glEnd;
1849 glDisable GL_COLOR_LOGIC_OP;
1850 }
1233} 1851}
1234 1852
1235my %DIR = ( 1853my %DIR = (
1236 SDLK_KP8, [1, "north"], 1854 SDLK_KP8, [1, "north"],
1237 SDLK_KP9, [2, "northeast"], 1855 SDLK_KP9, [2, "northeast"],
1253 1871
1254 my $mod = $ev->key_mod; 1872 my $mod = $ev->key_mod;
1255 my $sym = $ev->key_sym; 1873 my $sym = $ev->key_sym;
1256 1874
1257 if ($sym == SDLK_KP5) { 1875 if ($sym == SDLK_KP5) {
1258 $::CONN->send ("command stay fire"); 1876 $::CONN->user_send ("command stay fire");
1877 } elsif ($sym == SDLK_a) {
1878 $::CONN->user_send ("command apply");
1879 } elsif ($sym == SDLK_QUOTE) {
1880 $self->emit ('activate_console');
1881 } elsif ($sym == SDLK_SLASH) {
1882 $self->emit ('activate_console' => '/');
1259 } elsif (exists $DIR{$sym}) { 1883 } elsif (exists $DIR{$sym}) {
1260 if ($mod & KMOD_SHIFT) { 1884 if ($mod & KMOD_SHIFT) {
1261 $self->{shft}++; 1885 $self->{shft}++;
1262 $::CONN->send ("command fire $DIR{$sym}[0]"); 1886 $::CONN->user_send ("command fire $DIR{$sym}[0]");
1263 } elsif ($mod & KMOD_CTRL) { 1887 } elsif ($mod & KMOD_CTRL) {
1264 $self->{ctrl}++; 1888 $self->{ctrl}++;
1265 $::CONN->send ("command run $DIR{$sym}[0]"); 1889 $::CONN->user_send ("command run $DIR{$sym}[0]");
1266 } else { 1890 } else {
1267 $::CONN->send ("command $DIR{$sym}[1]"); 1891 $::CONN->user_send ("command $DIR{$sym}[1]");
1268 } 1892 }
1269 } 1893 }
1270} 1894}
1271 1895
1272sub key_up { 1896sub key_up {
1274 1898
1275 my $mod = $ev->key_mod; 1899 my $mod = $ev->key_mod;
1276 my $sym = $ev->key_sym; 1900 my $sym = $ev->key_sym;
1277 1901
1278 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1902 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
1279 $::CONN->send ("command fire_stop"); 1903 $::CONN->user_send ("command fire_stop");
1280 } 1904 }
1281 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1905 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
1282 $::CONN->send ("command run_stop"); 1906 $::CONN->user_send ("command run_stop");
1283 } 1907 }
1284} 1908}
1285 1909
1286############################################################################# 1910#############################################################################
1287 1911
1288package CFClient::Widget::Animator; 1912package CFClient::UI::Animator;
1289 1913
1290use SDL::OpenGL; 1914use SDL::OpenGL;
1291 1915
1292our @ISA = CFClient::Widget::Bin::; 1916our @ISA = CFClient::UI::Bin::;
1293 1917
1294sub moveto { 1918sub moveto {
1295 my ($self, $x, $y) = @_; 1919 my ($self, $x, $y) = @_;
1296 1920
1297 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1921 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
1325 glPopMatrix; 1949 glPopMatrix;
1326} 1950}
1327 1951
1328############################################################################# 1952#############################################################################
1329 1953
1330package CFClient::Widget::Toplevel; 1954package CFClient::UI::Flopper;
1331 1955
1956our @ISA = CFClient::UI::Button::;
1957
1958sub new {
1959 my $class = shift;
1960
1961 my $self = $class->SUPER::new (
1962 state => 0,
1963 connect_activate => \&toggle_flopper,
1964 @_
1965 );
1966
1967 if ($self->{state}) {
1968 $self->{state} = 0;
1969 $self->toggle_flopper;
1970 }
1971
1972 $self
1973}
1974
1975sub toggle_flopper {
1976 my ($self) = @_;
1977
1978 # TODO: use animation
1979 if ($self->{state} = !$self->{state}) {
1980 $CFClient::UI::ROOT->add ($self->{other});
1981 $self->{other}->move ($self->coord2global (0, $self->{h}));
1982 $self->emit ("open");
1983 } else {
1984 $CFClient::UI::ROOT->remove ($self->{other});
1985 $self->emit ("close");
1986 }
1987
1988 $self->emit (changed => $self->{state});
1989}
1990
1991#############################################################################
1992
1993package CFClient::UI::Root;
1994
1332our @ISA = CFClient::Widget::Container::; 1995our @ISA = CFClient::UI::Container::;
1996
1997use SDL::OpenGL;
1333 1998
1334sub size_request { 1999sub size_request {
1335 ($::WIDTH, $::HEIGHT) 2000 ($::WIDTH, $::HEIGHT)
1336} 2001}
1337 2002
1338sub size_allocate { 2003sub size_allocate {
1339 my ($self, $w, $h) = @_; 2004 my ($self, $x, $y, $w, $h) = @_;
1340 2005
1341 $self->SUPER::size_allocate ($w, $h); 2006 $self->_size_allocate ($x, $y, $w, $h);
1342 2007
1343 $_->size_allocate ($_->size_request) 2008 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
1344 for @{$self->{children}}; 2009 for @{$self->{children}};
1345} 2010}
1346 2011
1347sub translate { 2012sub _topleft {
1348 my ($self, $x, $y) = @_; 2013 my ($self, $x, $y) = @_;
1349 2014
1350 ($x, $y) 2015 ($x, $y)
1351} 2016}
1352 2017
1353sub update { 2018sub update {
1354 my ($self) = @_; 2019 my ($self) = @_;
1355 2020
1356 $self->size_allocate ($self->size_request); 2021 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
1357 ::refresh (); 2022 ::refresh ();
1358} 2023}
1359 2024
1360sub add { 2025sub add {
1361 my ($self, $widget) = @_; 2026 my ($self, $widget) = @_;
1362 2027
1363 $self->SUPER::add ($widget); 2028 $self->SUPER::add ($widget);
1364 2029
1365 $widget->size_allocate ($widget->size_request); 2030 $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
2031}
2032
2033sub on_refresh {
2034 my ($self, $id, $cb) = @_;
2035
2036 $self->{refresh_hook}{$id} = $cb;
1366} 2037}
1367 2038
1368sub draw { 2039sub draw {
1369 my ($self) = @_; 2040 my ($self) = @_;
1370 2041
2042 while (my $rcb = delete $self->{refresh_hook}) {
2043 $_->() for values %$rcb;
2044 }
2045
2046 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2047 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2048 glClear GL_COLOR_BUFFER_BIT;
2049
2050 glMatrixMode GL_PROJECTION;
2051 glLoadIdentity;
2052 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
2053 glMatrixMode GL_MODELVIEW;
2054 glLoadIdentity;
2055
1371 $self->_draw; 2056 $self->_draw;
1372} 2057}
1373 2058
1374############################################################################# 2059#############################################################################
1375 2060
1376package CFClient::Widget; 2061package CFClient::UI;
1377 2062
1378$TOPLEVEL = new CFClient::Widget::Toplevel; 2063$ROOT = new CFClient::UI::Root;
1379 2064
13801 20651
1381 2066

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines