MOS
/
OpenBoard
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:Sankore/Sankore-3.1

Browse Source
preferencesAboutTextFull
Claudio Valerio 13 years ago
parent 47f69a82ac 0ba8dd86fa
commit 0317a3e64d
20 changed files with 784 additions and 669 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 247
      resources/library/interactive/ColorPicker.wgt/css/colorpicker.css
  2. 2
      resources/library/interactive/ColorPicker.wgt/css/layout.css
  3. BIN
      resources/library/interactive/ColorPicker.wgt/images/blank.gif
  4. BIN
      resources/library/interactive/ColorPicker.wgt/images/blank.png
  5. BIN
      resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.gif
  6. BIN
      resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.png
  7. BIN
      resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.gif
  8. BIN
      resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.png
  9. BIN
      resources/library/interactive/ColorPicker.wgt/images/custom_indic.gif
  10. BIN
      resources/library/interactive/ColorPicker.wgt/images/custom_indic.png
  11. BIN
      resources/library/interactive/ColorPicker.wgt/images/tools.jpg
  12. 26
      resources/library/interactive/ColorPicker.wgt/index.html
  13. 1025
      resources/library/interactive/ColorPicker.wgt/js/colorpicker.js
  14. 4
      resources/library/interactive/TextEditor.wgt/config.xml
  15. 130
      resources/library/interactive/TextEditor.wgt/index.html
  16. 2
      resources/library/interactive/TextEditor.wgt/jscripts/tiny_mce/themes/advanced/langs/en.js
  17. 2
      resources/library/interactive/iCell.wgt/js/script.js
  18. 2
      src/frameworks/UBPlatformUtils_linux.cpp
  19. 2
      src/frameworks/UBPlatformUtils_win.cpp
  20. 9
      src/gui/UBKeyboardPalette_linux.cpp

247
resources/library/interactive/ColorPicker.wgt/css/colorpicker.css
Unescape View File

@ -1,161 +1,180 @@
.colorpicker { .colorpicker {
width: 356px; width: 356px;
height: 176px; height: 176px;
overflow: hidden; overflow: hidden;
position: absolute; position: absolute;
background: url(../images/colorpicker_background.png); background: url(../images/colorpicker_background.png);
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
display: none; display: none;
} }
.colorpicker_color { .colorpicker_color {
width: 150px; width: 150px;
height: 150px; height: 150px;
left: 14px; left: 14px;
top: 13px; top: 13px;
position: absolute; position: absolute;
background: #f00; background: #f00;
overflow: hidden; overflow: hidden;
cursor: crosshair; cursor: crosshair;
} }
.colorpicker_color div { .colorpicker_color div {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 150px; width: 150px;
height: 150px; height: 150px;
background: url(../images/colorpicker_overlay.png); background: url(../images/colorpicker_overlay.png);
} }
.colorpicker_color div div { .colorpicker_color div div {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 11px; width: 11px;
height: 11px; height: 11px;
overflow: hidden; overflow: hidden;
background: url(../images/colorpicker_select.gif); background: url(../images/colorpicker_select.png);
margin: -5px 0 0 -5px; margin: -5px 0 0 -5px;
} }
.colorpicker_hue { .colorpicker_hue {
position: absolute; position: absolute;
top: 13px; top: 13px;
left: 171px; left: 171px;
width: 35px; width: 35px;
height: 150px; height: 150px;
cursor: n-resize; cursor: n-resize;
} }
.colorpicker_hue div { .colorpicker_hue div {
position: absolute; position: absolute;
width: 35px; width: 35px;
height: 9px; height: 9px;
overflow: hidden; overflow: hidden;
background: url(../images/colorpicker_indic.gif) left top; background: url(../images/colorpicker_indic.png) left top;
margin: -4px 0 0 0; margin: -4px 0 0 0;
left: 0px; left: 0px;
} }
.colorpicker_new_color { .colorpicker_new_color {
position: absolute; position: absolute;
width: 60px; width: 60px;
height: 30px; height: 30px;
left: 213px; left: 213px;
top: 13px; top: 13px;
background: #f00; background: #f00;
} }
.colorpicker_current_color { .colorpicker_current_color {
position: absolute; position: absolute;
width: 60px; width: 60px;
height: 30px; height: 30px;
left: 283px; left: 283px;
top: 13px; top: 13px;
background: #f00; background: #f00;
} }
.colorpicker input { .colorpicker input {
background-color: transparent; background-color: transparent;
border: 1px solid transparent; border: 1px solid transparent;
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
color: #898989; color: #898989;
top: 4px; top: 4px;
right: 11px; right: 11px;
text-align: right; text-align: right;
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 11px; height: 11px;
} }
.colorpicker_hex { .colorpicker_hex {
position: absolute; position: absolute;
width: 72px; width: 72px;
height: 22px; height: 22px;
background: url(../images/colorpicker_hex.png) top; background: url(../images/colorpicker_hex.png) top;
left: 212px; left: 212px;
top: 142px; top: 142px;
} }
.colorpicker_hex input { .colorpicker_hex input {
right: 6px; right: 6px;
} }
.colorpicker_field { .colorpicker_field {
height: 22px; height: 22px;
width: 62px; width: 62px;
background-position: top; background-position: top;
position: absolute; position: absolute;
} }
.colorpicker_field span { .colorpicker_field span {
position: absolute; position: absolute;
width: 12px; width: 12px;
height: 22px; height: 22px;
overflow: hidden; overflow: hidden;
top: 0; top: 0;
right: 0; right: 0;
cursor: n-resize; cursor: n-resize;
} }
.colorpicker_rgb_r { .colorpicker_rgb_r {
background-image: url(../images/colorpicker_rgb_r.png); background-image: url(../images/colorpicker_rgb_r.png);
top: 52px; top: 52px;
left: 212px; left: 212px;
} }
.colorpicker_rgb_g { .colorpicker_rgb_g {
background-image: url(../images/colorpicker_rgb_g.png); background-image: url(../images/colorpicker_rgb_g.png);
top: 82px; top: 82px;
left: 212px; left: 212px;
} }
.colorpicker_rgb_b { .colorpicker_rgb_b {
background-image: url(../images/colorpicker_rgb_b.png); background-image: url(../images/colorpicker_rgb_b.png);
top: 112px; top: 112px;
left: 212px; left: 212px;
} }
.colorpicker_hsb_h { .colorpicker_hsb_h {
background-image: url(../images/colorpicker_hsb_h.png); background-image: url(../images/colorpicker_hsb_h.png);
top: 52px; top: 52px;
left: 282px; left: 282px;
} }
.colorpicker_hsb_s { .colorpicker_hsb_s {
background-image: url(../images/colorpicker_hsb_s.png); background-image: url(../images/colorpicker_hsb_s.png);
top: 82px; top: 82px;
left: 282px; left: 282px;
} }
.colorpicker_hsb_b { .colorpicker_hsb_b {
background-image: url(../images/colorpicker_hsb_b.png); background-image: url(../images/colorpicker_hsb_b.png);
top: 112px; top: 112px;
left: 282px; left: 282px;
} }
.colorpicker_submit { .colorpicker_submit {
position: absolute; position: absolute;
width: 22px; width: 22px;
height: 22px; height: 22px;
background: url(../images/colorpicker_submit.png) top; background: url(../images/colorpicker_submit.png) top;
left: 322px; left: 322px;
top: 142px; top: 142px;
overflow: hidden; overflow: hidden;
} }
.tools_change {
position: absolute;
width: 22px;
height: 22px;
background: url(../images/tools.jpg) top;
left: 290px;
top: 142px;
overflow: hidden;
}
.tools_change.tools_compass{
background-position: bottom;
}
.tools_change.tools_border{
border: 1px solid #999090;
}
.colorpicker_focus { .colorpicker_focus {
background-position: center; background-position: center;
} }
.colorpicker_hex.colorpicker_focus { .colorpicker_hex.colorpicker_focus {
background-position: bottom; background-position: bottom;
} }
.colorpicker_submit.colorpicker_focus { .colorpicker_submit.colorpicker_focus {
background-position: bottom; background-position: bottom;
} }
.colorpicker_slider { .colorpicker_slider {
background-position: bottom; background-position: bottom;
} }

2
resources/library/interactive/ColorPicker.wgt/css/layout.css
Unescape View File

@ -180,7 +180,7 @@ h1 {
left: 0; left: 0;
} }
#colorpickerHolder2 .colorpicker_hue div { #colorpickerHolder2 .colorpicker_hue div {
background-image: url(../images/custom_indic.gif); background-image: url(../images/custom_indic.png);
} }
#colorpickerHolder2 .colorpicker_hex { #colorpickerHolder2 .colorpicker_hex {
background-image: url(../images/custom_hex.png); background-image: url(../images/custom_hex.png);

BIN
resources/library/interactive/ColorPicker.wgt/images/blank.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 49 B

BIN
resources/library/interactive/ColorPicker.wgt/images/blank.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 B

BIN
resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 B

BIN
resources/library/interactive/ColorPicker.wgt/images/colorpicker_indic.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 941 B

BIN
resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 78 B

BIN
resources/library/interactive/ColorPicker.wgt/images/colorpicker_select.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 935 B

BIN
resources/library/interactive/ColorPicker.wgt/images/custom_indic.gif
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 86 B

BIN
resources/library/interactive/ColorPicker.wgt/images/custom_indic.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 941 B

BIN
resources/library/interactive/ColorPicker.wgt/images/tools.jpg
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

26
resources/library/interactive/ColorPicker.wgt/index.html
Unescape View File

@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<link rel="stylesheet" href="css/colorpicker.css" type="text/css" /> <link rel="stylesheet" href="css/colorpicker.css" type="text/css" />
<link rel="stylesheet" media="screen" type="text/css" href="css/layout.css" /> <link rel="stylesheet" media="screen" type="text/css" href="css/layout.css" />
<title>ColorPicker - jQuery plugin</title> <title>ColorPicker - jQuery plugin</title>
<script type="text/javascript" src="js/jquery.js"></script> <script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/colorpicker.js"></script> <script type="text/javascript" src="js/colorpicker.js"></script>
<script type="text/javascript" src="js/eye.js"></script> <script type="text/javascript" src="js/eye.js"></script>
<script type="text/javascript" src="js/utils.js"></script> <script type="text/javascript" src="js/utils.js"></script>
<script type="text/javascript" src="js/layout.js?ver=1.0.2"></script> <script type="text/javascript" src="js/layout.js?ver=1.0.2"></script>
</head> </head>
<body> <body>
<p id="colorpickerHolder"> <p id="colorpickerHolder"></p>
</body> </body>
</html> </html>

1025
resources/library/interactive/ColorPicker.wgt/js/colorpicker.js
View File

File diff suppressed because it is too large Load Diff

4
resources/library/interactive/TextEditor.wgt/config.xml
Unescape View File

@ -4,8 +4,8 @@
xmlns:ub="http://uniboard.mnemis.com/widgets" xmlns:ub="http://uniboard.mnemis.com/widgets"
id="http://www.example.net/widgets/helloworld" id="http://www.example.net/widgets/helloworld"
version="1.0" version="1.0"
width="200" width="540"
height="700" height="320"
ub:resizable="true"> ub:resizable="true">
<name>Rich Note</name> <name>Rich Note</name>

130
resources/library/interactive/TextEditor.wgt/index.html
Unescape View File

@ -1,65 +1,85 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<title>Full featured example</title> <title>Full featured example</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge" /> <meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- TinyMCE --> <!-- TinyMCE -->
<script type="text/javascript" src="jscripts/tiny_mce/tiny_mce.js"></script> <script type="text/javascript" src="jscripts/tiny_mce/tiny_mce.js"></script>
<script type="text/javascript"> <script type="text/javascript">
tinyMCE.init({ var flag = false;
// General options tinyMCE.init({
mode : "textareas", // General options
theme : "advanced", mode : "textareas",
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave", theme : "advanced",
plugins : "autolink,lists,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,wordcount,advlist,autosave",
// Theme options // Theme options
theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,styleselect,formatselect,fontselect,fontsizeselect", theme_advanced_buttons1 : "newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,code,insertdate,inserttime,preview,|,forecolor,backcolor", theme_advanced_buttons2 : "undo,redo,|,cut,copy,paste,pasteword,|,bullist,numlist,|,outdent,indent,|,code,insertdate,inserttime,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,advhr,|,ltr,rtl,|,fullscreen,|,visualchars,nonbreaking", theme_advanced_buttons3 : "hr,removeformat,|,sub,sup,|,charmap,emotions,iespell,|,ltr,rtl",
theme_advanced_toolbar_location : "top", theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_align : "left",
theme_advanced_statusbar_location : "bottom", theme_advanced_statusbar_location : "bottom",
theme_advanced_resizing : true, theme_advanced_resizing : true,
// Example content CSS (should be your site CSS) // Example content CSS (should be your site CSS)
content_css : "css/content.css", content_css : "css/content.css",
// Drop lists for link/image/media/template dialogs // Drop lists for link/image/media/template dialogs
template_external_list_url : "lists/template_list.js", template_external_list_url : "lists/template_list.js",
external_link_list_url : "lists/link_list.js", external_link_list_url : "lists/link_list.js",
external_image_list_url : "lists/image_list.js", external_image_list_url : "lists/image_list.js",
media_external_list_url : "lists/media_list.js", media_external_list_url : "lists/media_list.js",
// Style formats // Style formats
style_formats : [ style_formats : [
{title : 'Bold text', inline : 'b'}, {title : 'Bold text', inline : 'b'},
{title : 'Red text', inline : 'span', styles : {color : '#ff0000'}}, {title : 'Red text', inline : 'span', styles : {color : '#ff0000'}},
{title : 'Red header', block : 'h1', styles : {color : '#ff0000'}}, {title : 'Red header', block : 'h1', styles : {color : '#ff0000'}},
{title : 'Example 1', inline : 'span', classes : 'example1'}, {title : 'Example 1', inline : 'span', classes : 'example1'},
{title : 'Example 2', inline : 'span', classes : 'example2'}, {title : 'Example 2', inline : 'span', classes : 'example2'},
{title : 'Table styles'}, {title : 'Table styles'},
{title : 'Table row 1', selector : 'tr', classes : 'tablerow1'} {title : 'Table row 1', selector : 'tr', classes : 'tablerow1'}
], ],
// Replace values for the template plugin // Replace values for the template plugin
template_replace_values : { template_replace_values : {
username : "Some User", username : "Some User",
staffid : "991234" staffid : "991234"
} }
}); });
</script>
<!-- /TinyMCE -->
</head> function setSankoreData() {
<body> if(window.sankore) {
if(flag)
window.sankore.setPreference("textForEditing", window.frames[0].document.getElementById("tinymce").innerHTML);
}
}
<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%"> function setTextEditorData() {
&lt;p&gt; if(window.sankore) {
This is some example text that you can edit inside the &lt;strong&gt;TinyMCE editor&lt;/strong&gt;. if(!window.frames[0])
&lt;/p&gt; setTimeout(function(){setTextEditorData()}, 300);
&lt;p&gt; else {
Nam nisi elit, cursus in rhoncus sit amet, pulvinar laoreet leo. Nam sed lectus quam, ut sagittis tellus. Quisque dignissim mauris a augue rutrum tempor. Donec vitae purus nec massa vestibulum ornare sit amet id tellus. Nunc quam mauris, fermentum nec lacinia eget, sollicitudin nec ante. Aliquam molestie volutpat dapibus. Nunc interdum viverra sodales. Morbi laoreet pulvinar gravida. Quisque ut turpis sagittis nunc accumsan vehicula. Duis elementum congue ultrices. Cras faucibus feugiat arcu quis lacinia. In hac habitasse platea dictumst. Pellentesque fermentum magna sit amet tellus varius ullamcorper. Vestibulum at urna augue, eget varius neque. Fusce facilisis venenatis dapibus. Integer non sem at arcu euismod tempor nec sed nisl. Morbi ultricies, mauris ut ultricies adipiscing, felis odio condimentum massa, et luctus est nunc nec eros. flag = true;
&lt;/p&gt; window.frames[0].document.getElementById("tinymce").innerHTML = window.sankore.preference("textForEditing","<p>Enter your text here ...</p>");
</textarea> }
</body> }
}
/*function setSpanHandler(){
alert(document.body.innerHTML);
alert(document.getElementById("elm1_toolbargroup").innerHTML);
document.getElementById("elm1_toolbargroup").onmouseout = function(){
setSankoreData();
};
}*/
</script>
<!-- /TinyMCE -->
</head>
<body onmouseout="setSankoreData()" onload="setTextEditorData()">
<textarea id="elm1" name="elm1" rows="15" cols="80" style="width: 80%">
</textarea>
</body>
</html> </html>

2
resources/library/interactive/TextEditor.wgt/jscripts/tiny_mce/themes/advanced/langs/en.js vendored
Unescape View File

@ -51,7 +51,7 @@ cut_desc:"Cut",
copy_desc:"Copy", copy_desc:"Copy",
paste_desc:"Paste", paste_desc:"Paste",
image_props_desc:"Image properties", image_props_desc:"Image properties",
newdocument_desc:"New document", newdocument_desc:"Clean",
help_desc:"Help", help_desc:"Help",
blockquote_desc:"Blockquote", blockquote_desc:"Blockquote",
clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?", clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",

2
resources/library/interactive/iCell.wgt/js/script.js
Unescape View File

@ -102,7 +102,7 @@ function adn() {
document.getElementById("div_zoom").innerHTML='<img src="images/'+elt_a_zoomer+'_zoom.jpg" alt="" />' document.getElementById("div_zoom").innerHTML='<img src="images/'+elt_a_zoomer+'_zoom.jpg" alt="" />'
/*Uniboard 4 ne supportant pas bien les gifs...*/ /*Uniboard 4 ne supportant pas bien les gifs...*/
if(window.uniboard){ if(window.sankore){
document.getElementById("img_ADN").src="images/adn.jpg" document.getElementById("img_ADN").src="images/adn.jpg"
} else { } else {
document.getElementById("img_ADN").src="images/ADN.gif" document.getElementById("img_ADN").src="images/ADN.gif"

2
src/frameworks/UBPlatformUtils_linux.cpp
Unescape View File

@ -248,7 +248,7 @@ const KEYBT FRENCH_LOCALE[] = {
/* j J */ KEYBT(0x6a, 0x4a), /* j J */ KEYBT(0x6a, 0x4a),
/* k K */ KEYBT(0x6b, 0x4b), /* k K */ KEYBT(0x6b, 0x4b),
/* l L */ KEYBT(0x6c, 0x4c), /* l L */ KEYBT(0x6c, 0x4c),
/* m M */ KEYBT(0x6b, 0x4d), /* m M */ KEYBT(0x6d, 0x4d),
/* ? % */ KEYBT(0xf9, 0x25), /* ? % */ KEYBT(0xf9, 0x25),
/* * ? */ KEYBT(0x2a, 0xb5), /* * ? */ KEYBT(0x2a, 0xb5),

2
src/frameworks/UBPlatformUtils_win.cpp
Unescape View File

@ -282,7 +282,7 @@ const KEYBT FRENCH_LOCALE[] = {
/* j J */ KEYBT(0x6a, 0x4a), /* j J */ KEYBT(0x6a, 0x4a),
/* k K */ KEYBT(0x6b, 0x4b), /* k K */ KEYBT(0x6b, 0x4b),
/* l L */ KEYBT(0x6c, 0x4c), /* l L */ KEYBT(0x6c, 0x4c),
/* m M */ KEYBT(0x6b, 0x4d), /* m M */ KEYBT(0x6d, 0x4d),
/* ? % */ KEYBT(0xf9, 0x25), /* ? % */ KEYBT(0xf9, 0x25),
/* * ? */ KEYBT(0x2a, 0xb5), /* * ? */ KEYBT(0x2a, 0xb5),

9
src/gui/UBKeyboardPalette_linux.cpp
Unescape View File

@ -75,6 +75,7 @@ void x11SendKey(Display *display, int keyCode, int modifiers)
void UBKeyboardButton::sendUnicodeSymbol(unsigned int nSymbol1, unsigned int nSymbol2, bool shift) void UBKeyboardButton::sendUnicodeSymbol(unsigned int nSymbol1, unsigned int nSymbol2, bool shift)
{ {
unsigned int nSymbol = shift ? nSymbol2 : nSymbol1; unsigned int nSymbol = shift ? nSymbol2 : nSymbol1;
// Obtain the X11 display. // Obtain the X11 display.
Display *display = XOpenDisplay(0); Display *display = XOpenDisplay(0);
if(display == NULL) if(display == NULL)
@ -97,6 +98,7 @@ void UBKeyboardButton::sendControlSymbol(int nSymbol)
if(display == NULL) if(display == NULL)
return; return;
KeyCode keyCode = XKeysymToKeycode(display, nSymbol); KeyCode keyCode = XKeysymToKeycode(display, nSymbol);
if (keyCode != NoSymbol) if (keyCode != NoSymbol)
@ -174,8 +176,10 @@ void setSymbolsFromButton(Display *display,
{ {
keySyms[byte_per_code * i + 0] = keySyms[byte_per_code * i + 0] =
keySyms[byte_per_code * i + 2] = locale[nFromButton + i]->code1; keySyms[byte_per_code * i + 2] = locale[nFromButton + i]->code1;
keySyms[byte_per_code * i + 1] = keySyms[byte_per_code * i + 1] =
keySyms[byte_per_code * i + 3] = locale[nFromButton + i]->code2; keySyms[byte_per_code * i + 3] = locale[nFromButton + i]->code2;
for(int j=4; j<byte_per_code; j++) for(int j=4; j<byte_per_code; j++)
keySyms[byte_per_code * i + j] = NoSymbol; keySyms[byte_per_code * i + j] = NoSymbol;
} }
@ -193,11 +197,8 @@ void UBKeyboardPalette::onLocaleChanged(UBKeyboardLocale* locale)
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 41, 0, 1); setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 41, 0, 1);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 2, 1, 12); setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 2, 1, 12);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 16, 13, 12); setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 16, 13, 12);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 30, 25, 12); setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 30, 25, 11);
setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 44, 37, 10); setSymbolsFromButton(display, *locale, byte_per_code, min_keycodes + 44, 37, 10);
XCloseDisplay(display); XCloseDisplay(display);
} }

Write Preview
Loading…
Cancel
Save