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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.49 by root, Sun Apr 9 22:26:51 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;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 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} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glBegin GL_QUADS;
87 glVertex 0, 0;
88 glVertex $self->{w} - 1, 0;
89 glVertex $self->{w} - 1, $self->{h} - 1;
90 glVertex 0, $self->{h} - 1;
91 glEnd;
92 }
89 glPopMatrix; 93 glPopMatrix;
90} 94}
91 95
92sub _draw { 96sub _draw {
93 my ($widget) = @_; 97 my ($self) = @_;
98
99 warn "no draw defined for $self\n";
94} 100}
95 101
96sub bbox { 102sub bbox {
97 my ($widget) = @_; 103 my ($self) = @_;
104 my ($w, $h) = $self->size_request;
105 (
106 $self->{x},
107 $self->{y},
108 $self->{x} = $w,
109 $self->{y} = $h
110 )
111}
112
113sub find_widget {
114 my ($self, $x, $y) = @_;
115
116 return $self
117 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
118 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
119
120 ()
121}
122
123sub del_parent { $_[0]->{parent} = undef }
124
125sub set_parent {
126 my ($self, $par) = @_;
127
128 $self->{parent} = $par;
129 Scalar::Util::weaken $self->{parent};
130}
131
132sub get_parent {
133 $_[0]->{parent}
134}
135
136sub update {
137 my ($self) = @_;
138
139 $self->{parent}->update
140 if $self->{parent};
98} 141}
99 142
100sub DESTROY { 143sub DESTROY {
101 my ($self) = @_; 144 my ($self) = @_;
102 145
103 $self->deactivate; 146 #$self->deactivate;
104} 147}
148
149#############################################################################
105 150
106package Crossfire::Client::Widget::Container; 151package Crossfire::Client::Widget::Container;
107 152
108our @ISA = Crossfire::Client::Widget::; 153our @ISA = Crossfire::Client::Widget::;
109 154
155sub new {
156 my ($class, @widgets) = @_;
157
158 my $self = $class->SUPER::new (children => []);
159 $self->add ($_) for @widgets;
160
161 $self
162}
163
164sub add {
165 my ($self, $chld, $expand) = @_;
166
167 $chld->{expand} = $expand;
168 $chld->set_parent ($self);
169
170 @{$self->{children}} =
171 sort { $a->{z} <=> $b->{z} }
172 @{$self->{children}}, $chld;
173
174 $self->size_allocate ($self->{w}, $self->{h})
175 if $self->{w}; #TODO: check for "realised state"
176}
177
178sub remove {
179 my ($self, $widget) = @_;
180
181 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
182
183 $self->size_allocate ($self->{w}, $self->{h});
184}
185
186sub find_widget {
187 my ($self, $x, $y) = @_;
188
189 $x -= $self->{x};
190 $y -= $self->{y};
191
192 my $res;
193
194 for (reverse @{ $self->{children} }) {
195 $res = $_->find_widget ($x, $y)
196 and return $res;
197 }
198
199 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
200}
201
202sub _draw {
203 my ($self) = @_;
204
205 $_->draw for @{$self->{children}};
206}
207
208#############################################################################
209
210package Crossfire::Client::Widget::Bin;
211
212our @ISA = Crossfire::Client::Widget::Container::;
213
214sub child { $_[0]->{children}[0] }
215
216sub size_request {
217 $_[0]{children}[0]->size_request if $_[0]{children}[0];
218}
219
220sub size_allocate {
221 my ($self, $w, $h) = @_;
222
223 $self->SUPER::size_allocate ($w, $h);
224 $self->{children}[0]->size_allocate ($w, $h)
225 if $self->{children}[0]
226}
227
228#############################################################################
229
230package Crossfire::Client::Widget::Toplevel;
231
232our @ISA = Crossfire::Client::Widget::Container::;
233
234sub update {
235 my ($self) = @_;
236
237 ::refresh ();
238}
239
240sub add {
241 my ($self, $widget) = @_;
242
243 $self->SUPER::add ($widget);
244
245 $widget->size_allocate ($widget->size_request);
246}
247
248#############################################################################
249
250package Crossfire::Client::Widget::Window;
251
252our @ISA = Crossfire::Client::Widget::Bin::;
253
110use SDL::OpenGL; 254use SDL::OpenGL;
111 255
112sub add { $_[0]->{child} = $_[1] } 256sub new {
113sub get { $_[0]->{child} } 257 my ($class, $x, $y, $z, $w, $h) = @_;
114 258
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 259 my $self = $class->SUPER::new;
116 260
117sub _draw { die "Containers can't be drawn!" } 261 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
262}
118 263
119package Crossfire::Client::Widget::Window; 264sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 265 my ($self) = @_;
127 $self->SUPER::add ($chld); 266
128 $self->render_chld; #TODO: Move this to the size_request event propably? 267 $self->render_chld;
268 $self->SUPER::update;
129} 269}
130 270
131sub render_chld { 271sub render_chld {
132 my ($self) = @_; 272 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 273
136 $self->{texture} = 274 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 275 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 276 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 277 );
140 $self->{texture}->upload;
141} 278}
142 279
143sub size_request { 280sub size_allocate {
144 my ($self) = @_; 281 my ($self, $w, $h) = @_;
145 my $chld = $self->get 282
146 or return (0, 0); 283 $self->{w} = $w;
147 $chld->size_request 284 $self->{h} = $h;
285
286 $self->child->size_allocate ($w, $h);
287
288 $self->render_chld;
148} 289}
149 290
150sub _draw { 291sub _draw {
151 my ($self) = @_; 292 my ($self) = @_;
152 293
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 294 my ($w, $h) = ($self->w, $self->h);
154 295
155 my $tex = $self->{texture} 296 my $tex = $self->{texture}
156 or return; 297 or return;
157 298
158 glEnable GL_BLEND; 299 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 300 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 301 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name}; 302 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 0, 1;
164 303
165 glBegin GL_QUADS; 304 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0; 305 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h; 306 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h; 307 glTexCoord 1, 1; glVertex $w, $h;
171 310
172 glDisable GL_BLEND; 311 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 312 glDisable GL_TEXTURE_2D;
174} 313}
175 314
315#############################################################################
316
176package Crossfire::Client::Widget::Frame; 317package Crossfire::Client::Widget::Frame;
177 318
178our @ISA = Crossfire::Client::Widget::Container::; 319our @ISA = Crossfire::Client::Widget::Bin::;
179 320
180use SDL::OpenGL; 321use SDL::OpenGL;
181 322
182sub size_request { 323sub size_request {
183 my ($self) = @_; 324 my ($self) = @_;
184 my $chld = $self->get 325 my $chld = $self->child
185 or return (0, 0); 326 or return (0, 0);
186 327
187 $chld->move (2, 2); 328 $chld->move (2, 2);
188 329
189 map { $_ + 4 } $chld->size_request; 330 map { $_ + 4 } $chld->size_request;
190} 331}
191 332
333sub size_allocate {
334 my ($self, $w, $h) = @_;
335
336 $self->{w} = $w;
337 $self->{h} = $h;
338
339 $self->child->size_allocate ($w - 4, $h - 4);
340 $self->child->move (2, 2);
341}
342
192sub _draw { 343sub _draw {
193 my ($self) = @_; 344 my ($self) = @_;
194 345
195 my $chld = $self->get; 346 my $chld = $self->child;
196 347
197 my ($w, $h) = $chld->size_request; 348 my ($w, $h) = $chld->size_request;
198 349
199 glBegin GL_QUADS; 350 glBegin GL_QUADS;
200 glColor 0, 0, 0; 351 glColor 0, 0, 0;
205 glEnd; 356 glEnd;
206 357
207 $chld->draw; 358 $chld->draw;
208} 359}
209 360
361#############################################################################
362
210package Crossfire::Client::Widget::FancyFrame; 363package Crossfire::Client::Widget::FancyFrame;
211 364
212our @ISA = Crossfire::Client::Widget::Frame::; 365our @ISA = Crossfire::Client::Widget::Bin::;
213 366
214use SDL::OpenGL; 367use SDL::OpenGL;
215 368
216#TODO: implement themed frame 369my @tex =
370 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
371 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
372
373sub size_request {
374 my ($self) = @_;
375
376 my ($w, $h) = $self->SUPER::size_request;
377
378 $h += $tex[1]->{height};
379 $h += $tex[4]->{height};
380 $w += $tex[2]->{width};
381 $w += $tex[3]->{width};
382
383 ($w, $h)
384}
385
386sub size_allocate {
387 my ($self, $w, $h) = @_;
388
389 $self->SUPER::size_allocate ($w, $h);
390
391 $h -= $tex[1]->{height};
392 $h -= $tex[4]->{height};
393 $w -= $tex[2]->{width};
394 $w -= $tex[3]->{width};
395
396 $h = $h < 0 ? 0 : $h;
397 $w = $w < 0 ? 0 : $w;
398
399 $self->child->size_allocate ($w, $h);
400 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
401}
402
403sub _draw {
404 my ($self) = @_;
405
406 my ($w, $h) = ($self->{w}, $self->{h});
407 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
408
409 glEnable GL_BLEND;
410 glEnable GL_TEXTURE_2D;
411 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
412 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
413
414 my $top = $tex[1];
415 glBindTexture GL_TEXTURE_2D, $top->{name};
416
417 glBegin GL_QUADS;
418 glTexCoord 0, 0; glVertex 0 , 0;
419 glTexCoord 0, 1; glVertex 0 , $top->{height};
420 glTexCoord 1, 1; glVertex $w , $top->{height};
421 glTexCoord 1, 0; glVertex $w , 0;
422 glEnd;
423
424 my $left = $tex[3];
425 glBindTexture GL_TEXTURE_2D, $left->{name};
426
427 glBegin GL_QUADS;
428 glTexCoord 0, 0; glVertex 0 , $top->{height};
429 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
430 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
431 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
432 glEnd;
433
434 my $right = $tex[2];
435 glBindTexture GL_TEXTURE_2D, $right->{name};
436
437 glBegin GL_QUADS;
438 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
439 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
440 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
441 glTexCoord 1, 0; glVertex $w , $top->{height};
442 glEnd;
443
444 my $bottom = $tex[4];
445 glBindTexture GL_TEXTURE_2D, $bottom->{name};
446
447 glBegin GL_QUADS;
448 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
449 glTexCoord 0, 1; glVertex 0 , $h;
450 glTexCoord 1, 1; glVertex $w , $h;
451 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
452 glEnd;
453
454 my $bg = $tex[0];
455 glBindTexture GL_TEXTURE_2D, $bg->{name};
456 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
457 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
459
460 my $rep_x = $cw / $bg->{width};
461 my $rep_y = $ch / $bg->{height};
462
463 glBegin GL_QUADS;
464 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
465 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
466 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
467 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
468 glEnd;
469
470 glDisable GL_BLEND;
471 glDisable GL_TEXTURE_2D;
472
473 $self->child->draw;
474
475}
476
477#############################################################################
217 478
218package Crossfire::Client::Widget::Table; 479package Crossfire::Client::Widget::Table;
219 480
220our @ISA = Crossfire::Client::Widget::Container::; 481our @ISA = Crossfire::Client::Widget::Bin::;
221 482
222use SDL::OpenGL; 483use SDL::OpenGL;
223 484
224sub add { 485sub add {
225 my ($self, $x, $y, $chld) = @_; 486 my ($self, $x, $y, $chld) = @_;
487 my $old_chld = $self->{children}[$y][$x];
488
226 $self->{childs}[$y][$x] = $chld; 489 $self->{children}[$y][$x] = $chld;
490 $chld->set_parent ($self);
491 $self->update;
227} 492}
228 493
229sub max_row_height { 494sub max_row_height {
230 my ($self, $row) = @_; 495 my ($self, $row) = @_;
231 496
232 my $hs = 0; 497 my $hs = 0;
233 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 498 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
234 my $c = $self->{childs}->[$row]->[$xi]; 499 my $c = $self->{children}->[$row]->[$xi];
235 if ($c) { 500 if ($c) {
236 my ($w, $h) = $c->size_request; 501 my ($w, $h) = $c->size_request;
237 if ($hs < $h) { $hs = $h } 502 if ($hs < $h) { $hs = $h }
238 } 503 }
239 } 504 }
242 507
243sub max_col_width { 508sub max_col_width {
244 my ($self, $col) = @_; 509 my ($self, $col) = @_;
245 510
246 my $ws = 0; 511 my $ws = 0;
247 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 512 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
248 my $c = ($self->{childs}->[$yi] || [])->[$col]; 513 my $c = ($self->{children}->[$yi] || [])->[$col];
249 if ($c) { 514 if ($c) {
250 my ($w, $h) = $c->size_request; 515 my ($w, $h) = $c->size_request;
251 if ($ws < $w) { $ws = $w } 516 if ($ws < $w) { $ws = $w }
252 } 517 }
253 } 518 }
257sub size_request { 522sub size_request {
258 my ($self) = @_; 523 my ($self) = @_;
259 524
260 my ($hs, $ws) = (0, 0); 525 my ($hs, $ws) = (0, 0);
261 526
262 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
263 $hs += $self->max_row_height ($yi); 528 $hs += $self->max_row_height ($yi);
264 } 529 }
265 530
266 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 531 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
267 my $wm = 0; 532 my $wm = 0;
268 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 533 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
269 $wm += $self->max_col_width ($xi) 534 $wm += $self->max_col_width ($xi)
270 } 535 }
271 if ($ws < $wm) { $ws = $wm } 536 if ($ws < $wm) { $ws = $wm }
272 } 537 }
273 538
276 541
277sub _draw { 542sub _draw {
278 my ($self) = @_; 543 my ($self) = @_;
279 544
280 my $y = 0; 545 my $y = 0;
281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 546 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
282 my $x = 0; 547 my $x = 0;
283 548
284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 549 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
285 550
286 my $c = $self->{childs}->[$yi]->[$xi]; 551 my $c = $self->{children}->[$yi]->[$xi];
287 if ($c) { 552 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request 553 $c->move ($x, $y, 0); #TODO: Move to size_request
289 $c->draw if $c; 554 $c->draw if $c;
290 } 555 }
291 556
294 559
295 $y += $self->max_row_height ($yi); 560 $y += $self->max_row_height ($yi);
296 } 561 }
297} 562}
298 563
564#############################################################################
565
299package Crossfire::Client::Widget::VBox; 566package Crossfire::Client::Widget::VBox;
300 567
301our @ISA = Crossfire::Client::Widget::Container::; 568our @ISA = Crossfire::Client::Widget::Container::;
302 569
303use SDL::OpenGL; 570use SDL::OpenGL;
304 571
305sub add {
306 my ($self, $chld) = @_;
307 push @{$self->{childs}}, $chld;
308}
309
310sub size_request { 572sub size_request {
311 my ($self) = @_; 573 my ($self) = @_;
312 574
313 my ($hs, $ws) = (0, 0); 575 my @alloc = map [$_->size_request], @{$self->{children}};
576
577 (
578 (List::Util::max map $_->[0], @alloc),
579 (List::Util::sum map $_->[1], @alloc),
580 )
581}
582
583sub size_allocate {
584 my ($self, $w, $h) = @_;
585
586 $self->w ($w);
587 $self->h ($h);
588
589 my $exp;
590 my @oth;
591 # find expand widget
314 for (@{$self->{childs} || []}) { 592 for (@{$self->{children}}) {
593 if ($_->{expand}) {
594 $exp = $_;
595 last;
596 }
597 push @oth, $_;
598 }
599
600 my ($ow, $oh);
601
602 # get sizes of other widgets
603 for (@oth) {
315 my ($w, $h) = $_->size_request; 604 my ($w, $h) = $_->size_request;
316 $hs += $h; 605 $oh += $h;
317 if ($ws < $w) { $ws = $w } 606 if ($ow < $w) { $ow = $w }
318 } 607 }
319 608
320 return ($ws, $hs); 609 my $y = 0;
321}
322
323sub _draw {
324 my ($self) = @_;
325
326 my ($x, $y);
327 for (@{$self->{childs} || []}) { 610 for (@{$self->{children}}) {
328 $_->move (0, $y, 0); #TODO: move to size_request 611 $_->move (0, $y);
329 $_->draw; 612
613 if ($_ == $exp) {
614 $_->size_allocate ($w, $h - $oh);
615 $y += $h - $oh;
616 } else {
330 my ($w, $h) = $_->size_request; 617 my ($cw, $h) = $_->size_request;
618 $_->size_allocate ($w, $h);
331 $y += $h; 619 $y += $h;
620 }
332 } 621 }
333} 622}
623
624#############################################################################
334 625
335package Crossfire::Client::Widget::Label; 626package Crossfire::Client::Widget::Label;
336 627
337our @ISA = Crossfire::Client::Widget::; 628our @ISA = Crossfire::Client::Widget::;
338 629
339use SDL::OpenGL; 630use SDL::OpenGL;
340 631
341sub new { 632sub new {
342 my ($class, $x, $y, $z, $height, $text) = @_; 633 my ($class, $x, $y, $z, $height, $text) = @_;
343 634
635 # TODO: color, and make height, xyz etc. optional
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 636 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345 637
346 $self->set_text ($text); 638 $self->set_text ($text);
347 639
348 $self 640 $self
350 642
351sub set_text { 643sub set_text {
352 my ($self, $text) = @_; 644 my ($self, $text) = @_;
353 645
354 $self->{text} = $text; 646 $self->{text} = $text;
355
356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 647 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
648
649 $self->update;
357} 650}
358 651
359sub get_text { 652sub get_text {
360 my ($self, $text) = @_; 653 my ($self, $text) = @_;
361 654
380 glEnable GL_TEXTURE_2D; 673 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 674 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383 glBindTexture GL_TEXTURE_2D, $tex->{name}; 676 glBindTexture GL_TEXTURE_2D, $tex->{name};
384 677
385 glColor 1, 1, 1, 0.8; 678 glColor 1, 0, 0, 1; # TODO color
386 679
387 glBegin GL_QUADS; 680 glBegin GL_QUADS;
388 glTexCoord 0, 0; glVertex 0 , 0; 681 glTexCoord 0, 0; glVertex 0 , 0;
389 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 682 glTexCoord 0, 1; glVertex 0 , $tex->{height};
390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 683 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
393 686
394 glDisable GL_BLEND; 687 glDisable GL_BLEND;
395 glDisable GL_TEXTURE_2D; 688 glDisable GL_TEXTURE_2D;
396} 689}
397 690
691#############################################################################
692
398package Crossfire::Client::Widget::TextEntry; 693package Crossfire::Client::Widget::TextEntry;
399 694
400our @ISA = Crossfire::Client::Widget::Label::; 695our @ISA = Crossfire::Client::Widget::Label::;
401 696
402use SDL; 697use SDL;
420 $text .= chr $uni; 715 $text .= chr $uni;
421 } 716 }
422 $self->set_text ($text); 717 $self->set_text ($text);
423} 718}
424 719
425 720#############################################################################
426# XXX: TextView isn't neccessary with pango multiline text rendering
427package Crossfire::Client::Widget::TextView;
428
429use strict;
430
431our @ISA = qw/Crossfire::Client::Widget/;
432
433use SDL::OpenGL;
434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_;
438 my $self = $class->SUPER::new ();
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447}
448
449#sub render_lines {
450# my ($self) = @_;
451#
452# $self->{txt_lines} = [];
453#
454# for (@{$self->{lines}}) {
455# push @{$self->{txt_lines}},
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# }
458#}
459
460sub add_line {
461 my ($self, $line) = @_;
462 push @{$self->{lines}}, $line;
463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
482sub draw_line {
483 my ($self, $tex, $y) = @_;
484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488
489 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
493 glTexCoord 1, 0; glVertex $tex->{width}, $y;
494 glEnd;
495}
496
497sub _draw {
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
512}
513 721
514package Crossfire::Client::Widget::MapWidget; 722package Crossfire::Client::Widget::MapWidget;
515 723
516use strict; 724use strict;
517 725
526sub key_down { 734sub key_down {
527 print "MAPKEYDOWN\n"; 735 print "MAPKEYDOWN\n";
528} 736}
529 737
530sub key_up { 738sub key_up {
739}
740
741sub size_request {
742
743}
744
745sub size_allocate {
531} 746}
532 747
533sub _draw { 748sub _draw {
534 my ($self) = @_; 749 my ($self) = @_;
535 750
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 770 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 } 771 }
557 772
558 glEnable GL_TEXTURE_2D; 773 glEnable GL_TEXTURE_2D;
559 glEnable GL_BLEND; 774 glEnable GL_BLEND;
560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 775 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
776
777 my $sw4 = ($sw + 3) & ~3;
778 my $lighting = "\x00" x ($sw4 * $sh);
561 779
562 for my $x (0 .. $sw - 1) { 780 for my $x (0 .. $sw - 1) {
563 for my $y (0 .. $sh - 1) { 781 for my $y (0 .. $sh - 1) {
564 782
565 my $cell = $map->[$x + $xofs][$y + $yofs] 783 my $cell = $map->[$x + $xofs][$y + $yofs]
566 or next; 784 or next;
567 785
568 my $darkness = $cell->[0] * (1 / 255); 786 my $darkness = $cell->[0] * (1 / 255);
569 if ($darkness < 0) { 787 if ($darkness < 0) {
570 glColor 0.3, 0.3, 0.3; 788 $darkness = 0.15;
571 } else {
572 glColor $darkness, $darkness, $darkness;
573 } 789 }
790 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
574 791
575 for my $num (grep $_, @$cell[1,2,3]) { 792 for my $num (grep $_, @$cell[1,2,3]) {
576 my $tex = $::CONN->{face}[$num]{texture} || next; 793 my $tex = $::CONN->{face}[$num]{texture} || next;
577 794
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 795 glBindTexture GL_TEXTURE_2D, $tex->{name};
590 glTexCoord 1, 0; glVertex $px + $w, $py; 807 glTexCoord 1, 0; glVertex $px + $w, $py;
591 glEnd; 808 glEnd;
592 } 809 }
593 } 810 }
594 } 811 }
812
813# if (1) { # higher quality darkness
814# $lighting =~ s/(.)/$1$1$1/gs;
815# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
816#
817# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
818#
819# $lighting = $pb->get_pixels;
820# $lighting =~ s/(.)../$1/gs;
821# }
822
823 $lighting = new Crossfire::Client::Texture
824 width => $sw4,
825 height => $sh,
826 data => $lighting,
827 internalformat => GL_ALPHA4,
828 format => GL_ALPHA;
829
830 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
831 glColor 0, 0, 0, 0.75;
832 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
833 glBindTexture GL_TEXTURE_2D, $lighting->{name};
834 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
835 glBegin GL_QUADS;
836 glTexCoord 0, 0; glVertex 0 , 0;
837 glTexCoord 0, 1; glVertex 0 , $sh * 32;
838 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
839 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
840 glEnd;
595 841
596 glDisable GL_TEXTURE_2D; 842 glDisable GL_TEXTURE_2D;
597 glDisable GL_BLEND; 843 glDisable GL_BLEND;
598} 844}
599 845
646 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 892 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647 $::CONN->send ("command run_stop"); 893 $::CONN->send ("command run_stop");
648 } 894 }
649} 895}
650 896
897#############################################################################
898
899package Crossfire::Client::Widget::Animator;
900
901use SDL::OpenGL;
902
903our @ISA = Crossfire::Client::Widget::Bin::;
904
905sub moveto {
906 my ($self, $x, $y) = @_;
907
908 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
909 $self->{speed} = 0.2;
910 $self->{time} = 1;
911
912 ::animation_start $self;
913}
914
915sub animate {
916 my ($self, $interval) = @_;
917
918 $self->{time} -= $interval * $self->{speed};
919 if ($self->{time} <= 0) {
920 $self->{time} = 0;
921 ::animation_stop $self;
922 }
923
924 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
925
926 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
927 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
928}
929
930sub _draw {
931 my ($self) = @_;
932
933 glPushMatrix;
934 glRotate $self->{time} * 10000, 0, 1, 0;
935 $self->{children}[0]->draw;
936 glPopMatrix;
937}
938
6511; 9391;
652 940

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines