Fixed broken example.

This commit is contained in:
Camilla Berglund 2012-03-29 13:30:40 +02:00
parent 92d4c02e07
commit e49f1b8801

View File

@ -39,10 +39,10 @@ static void usage(void)
printf("Usage: clipboard [-h]\n"); printf("Usage: clipboard [-h]\n");
} }
static GLboolean control_is_down(void) static GLboolean control_is_down(GLFWwindow window)
{ {
return glfwGetKey(GLFW_KEY_LEFT_CONTROL) || return glfwGetKey(window, GLFW_KEY_LEFT_CONTROL) ||
glfwGetKey(GLFW_KEY_RIGHT_CONTROL); glfwGetKey(window, GLFW_KEY_RIGHT_CONTROL);
} }
static void key_callback(GLFWwindow window, int key, int action) static void key_callback(GLFWwindow window, int key, int action)
@ -56,7 +56,7 @@ static void key_callback(GLFWwindow window, int key, int action)
glfwCloseWindow(window); glfwCloseWindow(window);
break; break;
case GLFW_KEY_V: case GLFW_KEY_V:
if (control_is_down()) if (control_is_down(window))
{ {
char buffer[4096]; char buffer[4096];
size_t size; size_t size;
@ -66,11 +66,11 @@ static void key_callback(GLFWwindow window, int key, int action)
{ {
printf("Buffer wasn't big enough to hold clipboard data.\n"); printf("Buffer wasn't big enough to hold clipboard data.\n");
} }
printf("[%ld]: %s\n", size, buffer); printf("[%lu]: %s\n", (unsigned long) size, buffer);
} }
break; break;
case GLFW_KEY_C: case GLFW_KEY_C:
if (control_is_down()) if (control_is_down(window))
{ {
glfwSetClipboardData("Hello GLFW World!", sizeof("Hello GLFW World!"), glfwSetClipboardData("Hello GLFW World!", sizeof("Hello GLFW World!"),
GLFW_CLIPBOARD_FORMAT_STRING); GLFW_CLIPBOARD_FORMAT_STRING);