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.28 by root, Sun Apr 9 00:06:10 2006 UTC vs.
Revision 1.57 by root, Mon Apr 10 22:53:49 2006 UTC

5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use Crossfire::Client;
11our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 20}
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev) if $GRAB;
40}
41
42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab;
53 $GRAB->update if $GRAB;
54 }
55}
56
57sub feed_sdl_motion_event {
58 my ($ev) = @_;
59 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
60
61 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
62
63 if ($widget != $HOVER) {
64 my $hover = $HOVER; $HOVER = $widget;
65
66 $hover->update if $hover;
67 $HOVER->update if $HOVER;
68 }
69
70 $HOVER->mouse_motion ($ev) if $HOVER;
71}
18 72
19sub new { 73sub new {
20 my $class = shift; 74 my $class = shift;
21 75
22 bless { @_ }, $class 76 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 77}
36 78
37sub move { 79sub move {
38 my ($self, $x, $y, $z) = @_; 80 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 81 $self->{x} = $x;
44sub needs_redraw { 86sub needs_redraw {
45 0 87 0
46} 88}
47 89
48sub size_request { 90sub size_request {
91 require Carp;
49 die "size_request is abtract"; 92 Carp::confess "size_request is abtract";
93}
94
95sub size_allocate {
96 my ($self, $w, $h) = @_;
97
98 $self->{w} = $w;
99 $self->{h} = $h;
50} 100}
51 101
52sub focus_in { 102sub focus_in {
53 my ($widget) = @_; 103 my ($self) = @_;
54 $FOCUS = $widget; 104
105 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus;
107 $FOCUS->update;
55} 108}
56 109
57sub focus_out { 110sub focus_out {
58 my ($widget) = @_; 111 my ($self) = @_;
59}
60 112
61sub key_down { 113 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 114
65sub key_up { 115 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 116 $focus->update if $focus; #?
67} 117}
68 118
119sub mouse_motion { }
120sub button_up { }
69sub button_down { 121sub button_down { }
70 my ($widget, $sdlev) = @_; 122sub key_down { }
71} 123sub key_up { }
72 124
73sub button_up { 125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 130
83sub draw { 131sub draw {
84 my ($self) = @_; 132 my ($self) = @_;
85 133
86 glPushMatrix; 134 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 135 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 136 $self->_draw;
137 if ($self == $HOVER) {
138 glColor 1, 1, 1, 0.4;
139 glEnable GL_BLEND;
140 glBegin GL_QUADS;
141 glVertex 0 , 0;
142 glVertex $self->{w}, 0;
143 glVertex $self->{w}, $self->{h};
144 glVertex 0 , $self->{h};
145 glEnd;
146 glDisable GL_BLEND;
147 }
89 glPopMatrix; 148 glPopMatrix;
90} 149}
91 150
92sub _draw { 151sub _draw {
93 my ($widget) = @_; 152 my ($self) = @_;
153
154 warn "no draw defined for $self\n";
94} 155}
95 156
96sub bbox { 157sub bbox {
97 my ($widget) = @_; 158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166}
167
168sub find_widget {
169 my ($self, $x, $y) = @_;
170
171 return $self
172 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174
175 ()
176}
177
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent {
181 my ($self, $par) = @_;
182
183 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent};
185}
186
187sub get_parent {
188 $_[0]->{parent}
189}
190
191sub update {
192 my ($self) = @_;
193
194 $self->{parent}->update
195 if $self->{parent};
98} 196}
99 197
100sub DESTROY { 198sub DESTROY {
101 my ($self) = @_; 199 my ($self) = @_;
102 200
103 $self->deactivate; 201 #$self->deactivate;
104} 202}
203
204#############################################################################
105 205
106package Crossfire::Client::Widget::Container; 206package Crossfire::Client::Widget::Container;
107 207
108our @ISA = Crossfire::Client::Widget::; 208our @ISA = Crossfire::Client::Widget::;
109 209
210sub new {
211 my ($class, @widgets) = @_;
212
213 my $self = $class->SUPER::new (children => []);
214 $self->add ($_) for @widgets;
215
216 $self
217}
218
219sub add {
220 my ($self, $chld, $expand) = @_;
221
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self);
224
225 @{$self->{children}} =
226 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld;
228
229 $self->size_allocate ($self->{w}, $self->{h})
230 if $self->{w}; #TODO: check for "realised state"
231}
232
233sub remove {
234 my ($self, $widget) = @_;
235
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237
238 $self->size_allocate ($self->{w}, $self->{h});
239}
240
241sub find_widget {
242 my ($self, $x, $y) = @_;
243
244 $x -= $self->{x};
245 $y -= $self->{y};
246
247 my $res;
248
249 for (reverse @{ $self->{children} }) {
250 $res = $_->find_widget ($x, $y)
251 and return $res;
252 }
253
254 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
255}
256
257sub _draw {
258 my ($self) = @_;
259
260 $_->draw for @{$self->{children}};
261}
262
263#############################################################################
264
265package Crossfire::Client::Widget::Bin;
266
267our @ISA = Crossfire::Client::Widget::Container::;
268
269sub child { $_[0]->{children}[0] }
270
271sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0];
273}
274
275sub size_allocate {
276 my ($self, $w, $h) = @_;
277
278 $self->SUPER::size_allocate ($w, $h);
279 $self->{children}[0]->size_allocate ($w, $h)
280 if $self->{children}[0]
281}
282
283#############################################################################
284
285package Crossfire::Client::Widget::Window;
286
287our @ISA = Crossfire::Client::Widget::Bin::;
288
110use SDL::OpenGL; 289use SDL::OpenGL;
111 290
112sub add { $_[0]->{child} = $_[1] } 291sub new {
113sub get { $_[0]->{child} } 292 my ($class, $x, $y, $z, $w, $h) = @_;
114 293
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 294 my $self = $class->SUPER::new;
116 295
117sub _draw { die "Containers can't be drawn!" } 296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297}
118 298
119package Crossfire::Client::Widget::Window; 299sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 300 my ($self) = @_;
127 $self->SUPER::add ($chld); 301
128 $self->render_chld; #TODO: Move this to the size_request event propably? 302 $self->render_chld;
303 $self->SUPER::update;
129} 304}
130 305
131sub render_chld { 306sub render_chld {
132 my ($self) = @_; 307 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 308
136 $self->{texture} = 309 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 310 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 311 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 312 );
140 $self->{texture}->upload;
141} 313}
142 314
143sub size_request { 315sub size_allocate {
144 my ($self) = @_; 316 my ($self, $w, $h) = @_;
145 my $chld = $self->get 317
146 or return (0, 0); 318 $self->{w} = $w;
147 $chld->size_request 319 $self->{h} = $h;
320
321 $self->child->size_allocate ($w, $h);
322
323 $self->render_chld;
148} 324}
149 325
150sub _draw { 326sub _draw {
151 my ($self) = @_; 327 my ($self) = @_;
152 328
153 my ($w, $h) = $self->size_request;#TODO# use widht/height of texture 329 my ($w, $h) = ($self->w, $self->h);
330
154 my $tex = $self->{texture} 331 my $tex = $self->{texture}
155 or return; 332 or return;
156 333
157 glEnable GL_BLEND; 334 glEnable GL_BLEND;
158 glEnable GL_TEXTURE_2D; 335 glEnable GL_TEXTURE_2D;
159 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
160 glBindTexture GL_TEXTURE_2D, $tex->{name};
161 337
162 glColor 1, 1, 1; 338 $tex->draw_quad (0, 0, $w, $h);
163
164 glBegin GL_QUADS;
165 glTexCoord 0, 0; glVertex 0, 0;
166 glTexCoord 0, 1; glVertex 0, $h;
167 glTexCoord 1, 1; glVertex $w, $h;
168 glTexCoord 1, 0; glVertex $w, 0;
169 glEnd;
170 339
171 glDisable GL_BLEND; 340 glDisable GL_BLEND;
172 glDisable GL_TEXTURE_2D; 341 glDisable GL_TEXTURE_2D;
173} 342}
174 343
344#############################################################################
345
175package Crossfire::Client::Widget::Frame; 346package Crossfire::Client::Widget::Frame;
176 347
177our @ISA = Crossfire::Client::Widget::Container::; 348our @ISA = Crossfire::Client::Widget::Bin::;
178 349
179use SDL::OpenGL; 350use SDL::OpenGL;
180 351
181sub size_request { 352sub size_request {
182 my ($self) = @_; 353 my ($self) = @_;
183 my $chld = $self->get 354 my $chld = $self->child
184 or return (0, 0); 355 or return (0, 0);
356
357 $chld->move (2, 2);
358
185 map { $_ + 4 } $chld->size_request; 359 map { $_ + 4 } $chld->size_request;
186} 360}
187 361
362sub size_allocate {
363 my ($self, $w, $h) = @_;
364
365 $self->{w} = $w;
366 $self->{h} = $h;
367
368 $self->child->size_allocate ($w - 4, $h - 4);
369 $self->child->move (2, 2);
370}
371
188sub _draw { 372sub _draw {
189 my ($self) = @_; 373 my ($self) = @_;
190 374
191 my $chld = $self->get; 375 my $chld = $self->child;
192
193 $chld->move (2, 2, 0); #TODO:move to size_request
194 376
195 my ($w, $h) = $chld->size_request; 377 my ($w, $h) = $chld->size_request;
196 378
197 glColor 1, 0, 0;
198 glBegin GL_QUADS; 379 glBegin GL_QUADS;
199 glTexCoord 0, 0; glVertex 0 , 0; 380 glColor 0, 0, 0;
381 glVertex 0 , 0;
200 glTexCoord 0, 1; glVertex 0 , $h + 4; 382 glVertex 0 , $h + 4;
201 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 383 glVertex $w + 4 , $h + 4;
202 glTexCoord 1, 0; glVertex $w + 4 , 0; 384 glVertex $w + 4 , 0;
203 glEnd; 385 glEnd;
204 386
205 $chld->draw; 387 $chld->draw;
206} 388}
207 389
390#############################################################################
391
392package Crossfire::Client::Widget::FancyFrame;
393
394our @ISA = Crossfire::Client::Widget::Bin::;
395
396use SDL::OpenGL;
397
398my @tex =
399 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
400 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
401
402sub size_request {
403 my ($self) = @_;
404
405 my ($w, $h) = $self->SUPER::size_request;
406
407 $h += $tex[1]->{height};
408 $h += $tex[4]->{height};
409 $w += $tex[2]->{width};
410 $w += $tex[3]->{width};
411
412 ($w, $h)
413}
414
415sub size_allocate {
416 my ($self, $w, $h) = @_;
417
418 $self->SUPER::size_allocate ($w, $h);
419
420 $h -= $tex[1]->{height};
421 $h -= $tex[4]->{height};
422 $w -= $tex[2]->{width};
423 $w -= $tex[3]->{width};
424
425 $h = $h < 0 ? 0 : $h;
426 $w = $w < 0 ? 0 : $w;
427
428 $self->child->size_allocate ($w, $h);
429 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
430}
431
432sub _draw {
433 my ($self) = @_;
434
435 my ($w, $h) = ($self->{w}, $self->{h});
436 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
437
438 glEnable GL_BLEND;
439 glEnable GL_TEXTURE_2D;
440 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
442
443 my $top = $tex[1];
444 $top->draw_quad (0, 0, $w, $top->{height});
445
446 my $left = $tex[3];
447 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
448
449 my $right = $tex[2];
450 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
451
452 my $bottom = $tex[4];
453 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
454
455 my $bg = $tex[0];
456 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460
461 my $rep_x = $cw / $bg->{width};
462 my $rep_y = $ch / $bg->{height};
463
464 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
465
466 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D;
468
469 $self->child->draw;
470
471}
472
473#############################################################################
474
208package Crossfire::Client::Widget::Table; 475package Crossfire::Client::Widget::Table;
209 476
210our @ISA = Crossfire::Client::Widget::Container::; 477our @ISA = Crossfire::Client::Widget::Bin::;
211 478
212use SDL::OpenGL; 479use SDL::OpenGL;
213 480
214sub add { 481sub add {
215 my ($self, $x, $y, $chld) = @_; 482 my ($self, $x, $y, $chld) = @_;
483 my $old_chld = $self->{children}[$y][$x];
484
216 $self->{childs}[$y][$x] = $chld; 485 $self->{children}[$y][$x] = $chld;
486 $chld->set_parent ($self);
487 $self->update;
217} 488}
218 489
219sub max_row_height { 490sub max_row_height {
220 my ($self, $row) = @_; 491 my ($self, $row) = @_;
221 492
222 my $hs = 0; 493 my $hs = 0;
223 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 494 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
224 my $c = $self->{childs}->[$row]->[$xi]; 495 my $c = $self->{children}->[$row]->[$xi];
225 if ($c) { 496 if ($c) {
226 my ($w, $h) = $c->size_request; 497 my ($w, $h) = $c->size_request;
227 if ($hs < $h) { $hs = $h } 498 if ($hs < $h) { $hs = $h }
228 } 499 }
229 } 500 }
232 503
233sub max_col_width { 504sub max_col_width {
234 my ($self, $col) = @_; 505 my ($self, $col) = @_;
235 506
236 my $ws = 0; 507 my $ws = 0;
237 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 508 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
238 my $c = ($self->{childs}->[$yi] || [])->[$col]; 509 my $c = ($self->{children}->[$yi] || [])->[$col];
239 if ($c) { 510 if ($c) {
240 my ($w, $h) = $c->size_request; 511 my ($w, $h) = $c->size_request;
241 if ($ws < $w) { $ws = $w } 512 if ($ws < $w) { $ws = $w }
242 } 513 }
243 } 514 }
247sub size_request { 518sub size_request {
248 my ($self) = @_; 519 my ($self) = @_;
249 520
250 my ($hs, $ws) = (0, 0); 521 my ($hs, $ws) = (0, 0);
251 522
252 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 523 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
253 $hs += $self->max_row_height ($yi); 524 $hs += $self->max_row_height ($yi);
254 } 525 }
255 526
256 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
257 my $wm = 0; 528 my $wm = 0;
258 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 529 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
259 $wm += $self->max_col_width ($xi) 530 $wm += $self->max_col_width ($xi)
260 } 531 }
261 if ($ws < $wm) { $ws = $wm } 532 if ($ws < $wm) { $ws = $wm }
262 } 533 }
263 534
266 537
267sub _draw { 538sub _draw {
268 my ($self) = @_; 539 my ($self) = @_;
269 540
270 my $y = 0; 541 my $y = 0;
271 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
272 my $x = 0; 543 my $x = 0;
273 544
274 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 545 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
275 546
276 my $c = $self->{childs}->[$yi]->[$xi]; 547 my $c = $self->{children}->[$yi]->[$xi];
277 if ($c) { 548 if ($c) {
278 $c->move ($x, $y, 0); #TODO: Move to size_request 549 $c->move ($x, $y, 0); #TODO: Move to size_request
279 $c->draw if $c; 550 $c->draw if $c;
280 } 551 }
281 552
284 555
285 $y += $self->max_row_height ($yi); 556 $y += $self->max_row_height ($yi);
286 } 557 }
287} 558}
288 559
560#############################################################################
561
289package Crossfire::Client::Widget::VBox; 562package Crossfire::Client::Widget::VBox;
290 563
291our @ISA = Crossfire::Client::Widget::Container::; 564our @ISA = Crossfire::Client::Widget::Container::;
292 565
293use SDL::OpenGL; 566use SDL::OpenGL;
294 567
295sub add {
296 my ($self, $chld) = @_;
297 push @{$self->{childs}}, $chld;
298}
299
300sub size_request { 568sub size_request {
301 my ($self) = @_; 569 my ($self) = @_;
302 570
303 my ($hs, $ws) = (0, 0); 571 my @alloc = map [$_->size_request], @{$self->{children}};
572
573 (
574 (List::Util::max map $_->[0], @alloc),
575 (List::Util::sum map $_->[1], @alloc),
576 )
577}
578
579sub size_allocate {
580 my ($self, $w, $h) = @_;
581
582 $self->w ($w);
583 $self->h ($h);
584
585 my $exp;
586 my @oth;
587 # find expand widget
304 for (@{$self->{childs} || []}) { 588 for (@{$self->{children}}) {
589 if ($_->{expand}) {
590 $exp = $_;
591 last;
592 }
593 push @oth, $_;
594 }
595
596 my ($ow, $oh);
597
598 # get sizes of other widgets
599 for (@oth) {
305 my ($w, $h) = $_->size_request; 600 my ($w, $h) = $_->size_request;
306 $hs += $h; 601 $oh += $h;
307 if ($ws < $w) { $ws = $w } 602 if ($ow < $w) { $ow = $w }
308 } 603 }
309 604
310 return ($ws, $hs); 605 my $y = 0;
311}
312
313sub _draw {
314 my ($self) = @_;
315
316 my ($x, $y);
317 for (@{$self->{childs} || []}) { 606 for (@{$self->{children}}) {
318 $_->move (0, $y, 0); #TODO: move to size_request 607 $_->move (0, $y);
319 $_->draw; 608
609 if ($_ == $exp) {
610 $_->size_allocate ($w, $h - $oh);
611 $y += $h - $oh;
612 } else {
320 my ($w, $h) = $_->size_request; 613 my ($cw, $h) = $_->size_request;
614 $_->size_allocate ($w, $h);
321 $y += $h; 615 $y += $h;
616 }
322 } 617 }
323} 618}
619
620#############################################################################
324 621
325package Crossfire::Client::Widget::Label; 622package Crossfire::Client::Widget::Label;
326 623
327our @ISA = Crossfire::Client::Widget::; 624our @ISA = Crossfire::Client::Widget::;
328 625
329use SDL::OpenGL; 626use SDL::OpenGL;
330 627
331sub new { 628sub new {
332 my ($class, $x, $y, $z, $height, $text) = @_; 629 my ($class, $x, $y, $z, $height, $text) = @_;
333 630
631 $height ||= $::FONTSIZE;
632
633 # TODO: color, and make height, xyz etc. optional
334 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 634 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
335 635
336 $self->set_text ($text); 636 $self->set_text ($text);
337 637
338 $self 638 $self
340 640
341sub set_text { 641sub set_text {
342 my ($self, $text) = @_; 642 my ($self, $text) = @_;
343 643
344 $self->{text} = $text; 644 $self->{text} = $text;
345
346 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 645 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
646
647 $self->update;
347} 648}
348 649
349sub get_text { 650sub get_text {
350 my ($self, $text) = @_; 651 my ($self, $text) = @_;
351 652
353} 654}
354 655
355sub size_request { 656sub size_request {
356 my ($self) = @_; 657 my ($self) = @_;
357 658
358 ( 659 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
660 (
359 $self->{texture}{width}, 661 $self->{texture}{width},
360 $self->{texture}{height}, 662 $self->{texture}{height},
663 )
664 } else {
665 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
666
667 ($w, $h)
361 ) 668 }
669
362} 670}
363 671
364sub _draw { 672sub _draw {
365 my ($self) = @_; 673 my ($self) = @_;
366 674
367 my $tex = $self->{texture}; 675 my $tex = $self->{texture};
368 676
369 glEnable GL_BLEND; 677 glEnable GL_BLEND;
370 glEnable GL_TEXTURE_2D; 678 glEnable GL_TEXTURE_2D;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
371 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
372 glBindTexture GL_TEXTURE_2D, $tex->{name};
373 681
374 glColor 1, 0, 1; 682 glColor 1, 0, 0, 1; # TODO color
375 683
376 glBegin GL_QUADS; 684 $tex->draw_quad (0, 0);
377 glTexCoord 0, 0; glVertex 0 , 0;
378 glTexCoord 0, 1; glVertex 0 , $tex->{height};
379 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
380 glTexCoord 1, 0; glVertex $tex->{width}, 0;
381 glEnd;
382 685
383 glDisable GL_BLEND; 686 glDisable GL_BLEND;
384 glDisable GL_TEXTURE_2D; 687 glDisable GL_TEXTURE_2D;
385} 688}
386 689
690#############################################################################
691
387package Crossfire::Client::Widget::TextView; 692package Crossfire::Client::Widget::Entry;
388 693
389use strict;
390
391our @ISA = qw/Crossfire::Client::Widget/; 694our @ISA = Crossfire::Client::Widget::Label::;
392 695
696use SDL;
393use SDL::OpenGL; 697use SDL::OpenGL;
394use SDL::OpenGL::Constants;
395 698
396sub add_line { 699sub key_down {
397 my ($self, $line) = @_; 700 my ($self, $ev) = @_;
398 push @{$self->{lines}}, $line; 701
702 my $mod = $ev->key_mod;
703 my $sym = $ev->key_sym;
704
705 my $uni = $ev->key_unicode;
706
707 my $text = $self->get_text;
708
709 if ($sym == SDLK_BACKSPACE) {
710 substr $text, -1, 1, '';
711 } elsif ($uni) {
712 $text .= chr $uni;
713 print "$uni <$text>\n";#d#
714 }
715
716 $self->set_text ($text);
717}
718
719sub button_down {
720 my ($self, $ev) = @_;
721
722 $self->focus_in;
399} 723}
400 724
401sub _draw { 725sub _draw {
402 my ($self) = @_; 726 my ($self) = @_;
403 727
728 if ($FOCUS == $self) {
729 glColor 1, 1, 1;
730 } else {
731 glColor 0.7, 0.7, 0.7;
732 }
733
734 glBegin GL_QUADS;
735 glVertex 0 , 0;
736 glVertex 0 , $self->{h} - 1;
737 glVertex $self->{w} - 1, $self->{h} - 1;
738 glVertex $self->{w} - 1, 0;
739 glEnd;
740
741 $self->SUPER::_draw;
404} 742}
743
744#############################################################################
405 745
406package Crossfire::Client::Widget::MapWidget; 746package Crossfire::Client::Widget::MapWidget;
407 747
408use strict; 748use strict;
409 749
418sub key_down { 758sub key_down {
419 print "MAPKEYDOWN\n"; 759 print "MAPKEYDOWN\n";
420} 760}
421 761
422sub key_up { 762sub key_up {
763}
764
765sub size_request {
766 (
767 1 + int $::WIDTH / 32,
768 1 + int $::HEIGHT / 32,
769 )
423} 770}
424 771
425sub _draw { 772sub _draw {
426 my ($self) = @_; 773 my ($self) = @_;
427 774
447 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 794 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
448 } 795 }
449 796
450 glEnable GL_TEXTURE_2D; 797 glEnable GL_TEXTURE_2D;
451 glEnable GL_BLEND; 798 glEnable GL_BLEND;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
800
801 my $sw4 = ($sw + 3) & ~3;
802 my $darkness = "\x00" x ($sw4 * $sh);
453 803
454 for my $x (0 .. $sw - 1) { 804 for my $x (0 .. $sw - 1) {
805 my $row = $map->[$x + $xofs];
455 for my $y (0 .. $sh - 1) { 806 for my $y (0 .. $sh - 1) {
456 807
457 my $cell = $map->[$x + $xofs][$y + $yofs] 808 my $cell = $row->[$y + $yofs]
458 or next; 809 or next;
459 810
460 my $darkness = $cell->[0] * (1 / 255); 811 my $dark = $cell->[0];
461 if ($darkness < 0) { 812 if ($dark < 0) {
462 glColor 0.3, 0.3, 0.3; 813 substr $darkness, $y * $sw4 + $x, 1, chr 224;
463 } else { 814 } else {
464 glColor $darkness, $darkness, $darkness; 815 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
465 } 816 }
466 817
467 for my $num (grep $_, @$cell[1,2,3]) { 818 for my $num (grep $_, @$cell[1,2,3]) {
468 my $tex = $::CONN->{face}[$num]{texture} || next; 819 my $tex = $::CONN->{face}[$num]{texture} || next;
469 820
470 glBindTexture GL_TEXTURE_2D, $tex->{name};
471
472 my $w = $tex->{width}; 821 my $w = $tex->{width};
473 my $h = $tex->{height}; 822 my $h = $tex->{height};
474 823
475 my $px = ($x + 1) * 32 - $w; 824 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
476 my $py = ($y + 1) * 32 - $h;
477
478 glBegin GL_QUADS;
479 glTexCoord 0, 0; glVertex $px , $py;
480 glTexCoord 0, 1; glVertex $px , $py + $h;
481 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
482 glTexCoord 1, 0; glVertex $px + $w, $py;
483 glEnd;
484 } 825 }
485 } 826 }
486 } 827 }
828
829# if (1) { # higher quality darkness
830# $lighting =~ s/(.)/$1$1$1/gs;
831# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
832#
833# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
834#
835# $lighting = $pb->get_pixels;
836# $lighting =~ s/(.)../$1/gs;
837# }
838
839 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
841
842 $darkness = new Crossfire::Client::Texture
843 width => $sw4,
844 height => $sh,
845 data => $darkness,
846 internalformat => GL_ALPHA,
847 format => GL_ALPHA;
848
849 glColor 0.45, 0.45, 0.45, 1;
850 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
487 851
488 glDisable GL_TEXTURE_2D; 852 glDisable GL_TEXTURE_2D;
489 glDisable GL_BLEND; 853 glDisable GL_BLEND;
490} 854}
491 855
538 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 902 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
539 $::CONN->send ("command run_stop"); 903 $::CONN->send ("command run_stop");
540 } 904 }
541} 905}
542 906
5431; 907#############################################################################
544 908
909package Crossfire::Client::Widget::Animator;
910
911use SDL::OpenGL;
912
913our @ISA = Crossfire::Client::Widget::Bin::;
914
915sub moveto {
916 my ($self, $x, $y) = @_;
917
918 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
919 $self->{speed} = 0.001;
920 $self->{time} = 1;
921
922 ::animation_start $self;
923}
924
925sub animate {
926 my ($self, $interval) = @_;
927
928 printf "%5.2f\n", 1 / $interval if $interval;#d#
929
930 $self->{time} -= $interval * $self->{speed};
931 if ($self->{time} <= 0) {
932 $self->{time} = 0;
933 ::animation_stop $self;
934 }
935
936 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
937
938 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
939 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
940}
941
942sub _draw {
943 my ($self) = @_;
944
945 glPushMatrix;
946 glRotate $self->{time} * 1000, 0, 1, 0;
947 $self->{children}[0]->draw;
948 glPopMatrix;
949}
950
951#############################################################################
952
953package Crossfire::Client::Widget::Toplevel;
954
955our @ISA = Crossfire::Client::Widget::Container::;
956
957sub size_request {
958 ($::WIDTH, $::HEIGHT)
959}
960
961sub size_allocate {
962 my ($self, $w, $h) = @_;
963
964 $self->SUPER::size_allocate ($w, $h);
965
966 $_->size_allocate ($_->size_request)
967 for @{$self->{children}};
968}
969
970sub update {
971 my ($self) = @_;
972
973 $self->size_allocate ($self->size_request);
974 ::refresh ();
975}
976
977sub add {
978 my ($self, $widget) = @_;
979
980 $self->SUPER::add ($widget);
981
982 $widget->size_allocate ($widget->size_request);
983}
984
985sub draw {
986 my ($self) = @_;
987
988 $self->_draw;
989}
990
991#############################################################################
992
993package Crossfire::Client::Widget;
994
995$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
996
9971
998

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines