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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines